diff --git a/templates/bill/bill_detail.html b/templates/bill/bill_detail.html index 568ddc95..dbd9cd7d 100644 --- a/templates/bill/bill_detail.html +++ b/templates/bill/bill_detail.html @@ -141,15 +141,15 @@
- +
- + - + @@ -182,7 +182,7 @@ {% currency_symbol %}{{ bill_item.total_amount | currency_format }} -
{% trans 'Item' %} {% trans 'Entity Unit' %} {% trans 'Unit Cost' %} {% trans 'Quantity' %} {% trans 'Total' %}{% trans 'PO' %}{% trans 'PO' %}
+ {% if bill_item.po_model_id %} diff --git a/templates/bill/transactions/tags/txs_table.html b/templates/bill/transactions/tags/txs_table.html index 0e801373..ccf6762f 100644 --- a/templates/bill/transactions/tags/txs_table.html +++ b/templates/bill/transactions/tags/txs_table.html @@ -3,45 +3,45 @@ {% if style == 'detail' %}
- - - - - - - - - - +
{% trans 'Timestamp' %}{% trans 'Account' %}{% trans 'Account Name' %}{% trans 'Unit' %}{% trans 'Credit' %}{% trans 'Debit' %}{% trans 'Description' %}
+ + + + + + + + + {% for transaction_model in transaction_model_qs %} - - - - - - - + + + + + + + {% endfor %} - - - - - + + + + +
{% trans 'Timestamp' %}{% trans 'Account' %}{% trans 'Account Name' %}{% trans 'Unit' %}{% trans 'Credit' %}{% trans 'Debit' %}{% trans 'Description' %}
{{ transaction_model.timestamp }}{{ transaction_model.account_code }}{{ transaction_model.account_name }}{% if transaction_model.entity_unit_name %}{{ transaction_model.entity_unit_name }}{% endif %}{% if transaction_model.is_credit %}${{ transaction_model.amount | currency_format }}{% endif %}{% if transaction_model.is_debit %}${{ transaction_model.amount | currency_format }}{% endif %}{% if transaction_model.description %}{{ transaction_model.description }}{% endif %}{{ transaction_model.timestamp }}{{ transaction_model.account_code }}{{ transaction_model.account_name }}{% if transaction_model.entity_unit_name %}{{ transaction_model.entity_unit_name }}{% endif %}{% if transaction_model.is_credit %}${{ transaction_model.amount | currency_format }}{% endif %}{% if transaction_model.is_debit %}${{ transaction_model.amount | currency_format }}{% endif %}{% if transaction_model.description %}{{ transaction_model.description }}{% endif %}
{% trans 'Total' %}{% currency_symbol %}{{ total_credits | currency_format }}{% currency_symbol %}{{ total_debits | currency_format }}{% trans 'Total' %}{% currency_symbol %}{{ total_credits | currency_format }}{% currency_symbol %}{{ total_debits | currency_format }}
{% elif style == 'compact' %}
- - - +
+ + diff --git a/templates/purchase_orders/po_upload_cars.html b/templates/purchase_orders/po_upload_cars.html index 3f70aa13..cd767118 100644 --- a/templates/purchase_orders/po_upload_cars.html +++ b/templates/purchase_orders/po_upload_cars.html @@ -3,7 +3,29 @@ {% block content %}

{{po.po_number}}

-

Satus:{{po.po_status|capfirst}}

+ +
+

Status:

+ {% comment %} Apply appropriate text color based on po.po_status {% endcomment %} + {% if po.po_status == 'draft' %} +

{{ po.po_status|capfirst }}

+ {% elif po.po_status == 'in_review' %} +

{{ po.po_status|capfirst }}

+ {% elif po.po_status == 'approved' %} +

{{ po.po_status|capfirst }}

+ {% elif po.po_status == 'fulfilled' %} +

{{ po.po_status|capfirst }}

+ {% elif po.po_status == 'void' %} +

{{ po.po_status|capfirst }}

+ {% else %} +

{{ po.po_status|capfirst }}

{# Use muted for unknown/default status #} + {% endif %} +
+ + + + +
{% trans 'Account' %} {% trans 'Account Name' %} {% trans 'Credit' %}