Fixes in Order / Quotation (#10361)
* Additions in Order Page for Sidebar Menu with "Order" page route
* Adjust Columns in order_taxes.html to avoid number breaks for more precisions
* Fields additions in transaction_row.html
* [fix] style for order pages, indicator for quotation etc
* [fix] style for order pages, indicator for quotation etc
* [test] add timeout
diff --git a/erpnext/templates/includes/order/order_taxes.html b/erpnext/templates/includes/order/order_taxes.html
index 471576f..462d77d 100644
--- a/erpnext/templates/includes/order/order_taxes.html
+++ b/erpnext/templates/includes/order/order_taxes.html
@@ -1,22 +1,22 @@
{% if doc.taxes %}
<div class="row tax-net-total-row">
- <div class="col-xs-8 text-right">{{ _("Net Total") }}</div>
- <div class="col-xs-4 text-right">
+ <div class="col-xs-6 text-right">{{ _("Net Total") }}</div>
+ <div class="col-xs-6 text-right">
{{ doc.get_formatted("net_total") }}</div>
</div>
{% endif %}
{% for d in doc.taxes %}
{% if d.base_tax_amount > 0 %}
<div class="row tax-row">
- <div class="col-xs-8 text-right">{{ d.description }}</div>
- <div class="col-xs-4 text-right">
+ <div class="col-xs-6 text-right">{{ d.description }}</div>
+ <div class="col-xs-6 text-right">
{{ d.get_formatted("base_tax_amount") }}</div>
</div>
{% endif %}
{% endfor %}
<div class="row tax-grand-total-row">
- <div class="col-xs-8 text-right text-uppercase h6 text-muted">{{ _("Grand Total") }}</div>
- <div class="col-xs-4 text-right">
+ <div class="col-xs-6 text-right text-uppercase h6 text-muted">{{ _("Grand Total") }}</div>
+ <div class="col-xs-6 text-right">
<span class="tax-grand-total bold">
{{ doc.get_formatted("grand_total") }}
</span>
diff --git a/erpnext/templates/includes/transaction_row.html b/erpnext/templates/includes/transaction_row.html
index 10d7605..0e47f7d 100644
--- a/erpnext/templates/includes/transaction_row.html
+++ b/erpnext/templates/includes/transaction_row.html
@@ -1,23 +1,22 @@
<div class="web-list-item transaction-list-item">
<a href="/{{ pathname }}/{{ doc.name }}">
<div class="row">
- <div class="col-sm-5">
- <span class="indicator small {{ doc.indicator_color or "darkgrey" }}">
+ <div class="col-sm-4" style='margin-top: -3px;'>
+ <span class="indicator small {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgrey") }}">
{{ doc.name }}</span>
<div class="small text-muted transaction-time"
title="{{ frappe.utils.format_datetime(doc.modified, "medium") }}">
- {{ frappe.utils.format_datetime(doc.modified, "medium") }}
+ {{ frappe.utils.global_date_format(doc.modified) }}
</div>
</div>
- <div class="col-sm-4 items-preview ellipsis small">
- {{ doc.items_preview }}
+ <div class="col-sm-5">
+ <div class="small text-muted items-preview ellipsis">
+ {{ doc.items_preview }}
+ </div>
</div>
<div class="col-sm-3 text-right bold">
{{ doc.get_formatted("grand_total") }}
</div>
- <!-- <div class="col-sm-3 text-right">
-
- </div> -->
</div>
</a>
</div>