diff --git a/inventory/models.py b/inventory/models.py index 95a447e5..aecd91f0 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -2703,7 +2703,8 @@ class CustomGroup(models.Model): "carfinance", "notes", "tasks", - "activity",], + "activity", + "payment"], other_perms=[ "view_car", "view_carlocation", diff --git a/templates/bill/bill_detail.html b/templates/bill/bill_detail.html index 0ecab405..5de0d08e 100644 --- a/templates/bill/bill_detail.html +++ b/templates/bill/bill_detail.html @@ -43,8 +43,7 @@
{% include 'bill/includes/card_bill.html' with dealer_slug=request.dealer.slug bill=bill entity_slug=view.kwargs.entity_slug style='bill-detail' %} -
- {% include 'bill/includes/card_vendor.html' with vendor=bill.vendor %} +
diff --git a/templates/bill/bill_update.html b/templates/bill/bill_update.html index 80417b15..1e38b52e 100644 --- a/templates/bill/bill_update.html +++ b/templates/bill/bill_update.html @@ -7,30 +7,18 @@ {% block content %}
-
- -
- {% include 'bill/includes/card_vendor.html' with vendor=bill_model.vendor %} -
+
+
-
-
+ +
+
+
+
{% include 'bill/includes/card_bill.html' with dealer_slug=request.dealer.slug bill=bill_model style='bill-detail' entity_slug=view.kwargs.entity_slug %} - -
- {% csrf_token %} - -
- {{ form|crispy }} -
- - - - {% trans 'Back to Bill Detail' %} @@ -39,12 +27,21 @@ class="btn btn-phoenix-info w-100 mb-2"> {% trans 'Bill List' %} - -
+ +
+
-
-
+ + + + +
+ +
+ + +
{% bill_item_formset_table itemtxs_formset %} diff --git a/templates/bill/includes/card_bill.html b/templates/bill/includes/card_bill.html index c70b13d2..90d9933c 100644 --- a/templates/bill/includes/card_bill.html +++ b/templates/bill/includes/card_bill.html @@ -90,7 +90,7 @@ {% elif style == 'bill-detail' %}
-
+

@@ -98,10 +98,14 @@

-
+
{% if bill.is_draft %}

{% trans 'This bill is' %} {{ bill.get_bill_status_display }}

-
+

+ {% trans 'Vendor Name' %}: + {{ bill.vendor.vendor_name }} +

+

{% trans 'Amount Due' %}: {% currency_symbol %}{{ bill.amount_due | currency_format }} @@ -121,7 +125,11 @@

{% elif bill.is_review %}

{% trans 'This bill is' %} {{ bill.get_bill_status_display }}

-
+

+ {% trans 'Vendor Name' %}: + {{ bill.vendor.vendor_name }} +

+

{% trans 'Amount Due' %}: {% currency_symbol %}{{ bill.amount_due | currency_format }} @@ -144,7 +152,11 @@ {% endif %} {% elif bill.is_approved %}

{% trans 'This bill is' %} {{ bill.get_bill_status_display }}

-
+

+ {% trans 'Vendor Name' %}: + {{ bill.vendor.vendor_name }} +

+

{% trans 'Amount Due' %}: {% currency_symbol %}{{ bill.amount_due | currency_format }} @@ -176,7 +188,11 @@ {% endif %} {% elif bill.is_paid %}

{% trans 'This bill is' %} {{ bill.get_bill_status_display }}

-
+

+ {% trans 'Vendor Name' %}: + {{ bill.vendor.vendor_name }} +

+

{% trans 'Amount Paid' %}: {% currency_symbol %}{{ bill.amount_paid | currency_format }} @@ -190,7 +206,7 @@

{% trans 'External Ref' %}: {{ bill.xref }}

{% endif %} {% else %} -
+

{% trans 'Bill Amount' %}: {% currency_symbol %}{{ bill.amount_due | currency_format }} diff --git a/templates/bill/tags/bill_item_formset.html b/templates/bill/tags/bill_item_formset.html index d7978ae6..5737e81a 100644 --- a/templates/bill/tags/bill_item_formset.html +++ b/templates/bill/tags/bill_item_formset.html @@ -140,7 +140,7 @@

-
+
{% if not item_formset.has_po %} diff --git a/templates/purchase_orders/includes/card_po.html b/templates/purchase_orders/includes/card_po.html index 8d718e0e..bca2e91f 100644 --- a/templates/purchase_orders/includes/card_po.html +++ b/templates/purchase_orders/includes/card_po.html @@ -32,134 +32,87 @@ {% if not create_po %} {% if style == 'po-detail' %}
-
-
- - {% icon 'uil:bill' 36 %} - -

- {{ po_model.po_number }} -

-
-
+
+
+ + {% icon 'uil:bill' 36 %} + +

+ {{ po_model.po_number }} +

+
+
-
-

+
+
+ +
+

{{ po_model.get_po_status_display }}

+
- {# Display PO Contract Information #} - {% if po_model.is_contract_bound %} -
- -
-

{% trans 'Contract' %}

-

{{ po_model.ce_model.estimate_number }}

-
- - - - - {% trans 'View Contract' %} - -
+ +
+ {% if po_model.is_draft %} +
{% trans 'Draft Date' %}
+

{{ po_model.date_draft|date }}

{% endif %} -
- {% if po_model.is_draft %} -
-
-
-
{% trans 'Draft Date' %}
-

{{ po_model.date_draft|date }}

-
-
-
-
-
-
-
{% trans 'Purchase Order Amount' %}
-

{{CURRENCY}}{{ po_model.po_amount|currency_format }}

-
-
-
- {% endif %} + {% if po_model.is_review %} +
{% trans 'Review Date' %}
+

{{ po_model.date_in_review|date }}

+ {% endif %} - {% if po_model.is_review %} -
-
-
-
{% trans 'Review Date' %}
-

{{ po_model.date_in_review|date }}

-
-
-
-
-
-
-
{% trans 'Purchase Order Amount' %}
-

{{CURRENCY}}{{ po_model.po_amount|currency_format }}

-
-
-
- {% endif %} + {% if po_model.is_approved %} +
{% trans 'Approved Date' %}
+

{{ po_model.date_approved|date }}

+ {% endif %} - {% if po_model.is_approved %} -
-
-
-
{% trans 'Approved Date' %}
-

{{ po_model.date_approved|date }}

-
-
-
-
-
-
-
{% trans 'PO Amount' %}
-

{{ po_model.po_amount|currency_format }}{{CURRENCY}}

-
-
-
-
-
-
-
{% trans 'Received Amount' %}
-

{{ po_model.po_amount_received|currency_format }}{{CURRENCY}}

-
-
-
- {% endif %} + {% if po_model.is_fulfilled %} +
{% trans 'Fulfilled Date' %}
+

{{ po_model.date_fulfilled|date }}

+ {% endif %} +
- {% if po_model.is_fulfilled %} -
-
-
-
{% trans 'Fulfilled Date' %}
-

{{ po_model.date_fulfilled|date }}

-
-
+ +
+
+
+
+
{% trans 'PO Amount' %}
+

+ {{CURRENCY}}{{ po_model.po_amount | absolute | currency_format }} +

-
-
-
-
{% trans 'PO Amount' %}
-
-

{{CURRENCY}}{{ po_model.po_amount|currency_format }}

- - {% trans 'Fulfilled' %} - -
-
-
+
+
+
{% trans 'Amount Received' %}
+

+ {{CURRENCY}}{{ po_model.po_amount_received | currency_format }} +

- {% endif %} +
+ +
+ + {% trans 'PO List' %} + +
+
+
+ + +
{% if perms.django_ledger.change_purchaseordermodel%}
@@ -170,7 +123,7 @@
- {# Status Action Buttons #} + {% if po_model.can_draft %} {% endif %} {% endif %} {% if po_model.can_void %} - {% endif %} {% if po_model.can_cancel %} - diff --git a/templates/purchase_orders/po_detail.html b/templates/purchase_orders/po_detail.html index 9bb06a22..184889b7 100644 --- a/templates/purchase_orders/po_detail.html +++ b/templates/purchase_orders/po_detail.html @@ -8,69 +8,19 @@
- -
-
- -
-
-
- {% include 'purchase_orders/includes/card_po.html' with dealer_slug=request.dealer.slug po_model=po_model entity_slug=entity_slug style='po-detail' %} -
-
-
- -
- -
- -
-
-
-
-
-
-
{% trans 'PO Amount' %}
-

- {{CURRENCY}}{{ po_model.po_amount | absolute | currency_format }} -

-
-
-
-
-
{% trans 'Amount Received' %}
-

- {{CURRENCY}}{{ po_model.po_amount_received | currency_format }} -

-
-
-
-
-
-
- - -
- - {% trans 'PO List' %} - -
- -
+
+
+
+ {% include 'purchase_orders/includes/card_po.html' with dealer_slug=request.dealer.slug po_model=po_model entity_slug=entity_slug style='po-detail' %} +
- -
-
- - -
-
- {% po_item_table1 po_items %}
-
- +
+
+ {% po_item_table1 po_items %} +
+