Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: UI fixes

Browse Source
This commit is contained in:
Anupam 2020-09-24 13:21:54 +05:30
parent 09775bbdaa
commit a4df105813
2 changed files with 49 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/templates/includes/transaction_row.html
View File

@ -15,7 +15,7 @@
</div> </div>
<div class="col-sm-3 text-right bold"> <div class="col-sm-3 text-right bold">
{% if doc.doctype == "Quotation" and not doc.docstatus %} {% if doc.doctype == "Quotation" and not doc.docstatus %}
{{ _("Pending For Approval") }} {{ _("Pending") }}
{% else %} {% else %}
{{ doc.get_formatted("grand_total") }} {{ doc.get_formatted("grand_total") }}
{% endif %} {% endif %}

10
erpnext/templates/pages/order.html
View File

@ -12,7 +12,6 @@
{% endblock %} {% endblock %}
{% block header_actions %} {% block header_actions %}
{% if not(doc.doctype == "Quotation" and not doc.docstatus) %}
<div class="dropdown"> <div class="dropdown">
<button class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <button class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span>{{ _('Actions') }}</span> <span>{{ _('Actions') }}</span>
@ -28,7 +27,6 @@
</a> </a>
</ul> </ul>
</div> </div>
{% endif %}
{% endblock %} {% endblock %}
{% block page_content %} {% block page_content %}
@ -36,7 +34,11 @@
<div class="row transaction-subheading"> <div class="row transaction-subheading">
<div class="col-6"> <div class="col-6">
<span class="indicator {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgrey") }}"> <span class="indicator {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgrey") }}">
{% if doc.doctype == "Quotation" and not doc.docstatus %}
{{ _("Pending") }}
{% else %}
{{ _(doc.get('indicator_title')) or _(doc.status) or _("Submitted") }} {{ _(doc.get('indicator_title')) or _(doc.status) or _("Submitted") }}
{% endif %}
</span> </span>
</div> </div>
<div class="col-6 text-muted text-right small"> <div class="col-6 text-muted text-right small">
@ -66,9 +68,6 @@
<div class="order-container"> <div class="order-container">
<!-- items --> <!-- items -->
{% if doc.doctype == "Quotation" and not doc.docstatus %}
{{ _("Pending For Approval") }}
{% else %}
<div class="order-item-table"> <div class="order-item-table">
<div class="row order-items order-item-header text-muted"> <div class="row order-items order-item-header text-muted">
<div class="col-sm-6 col-6 h6 text-uppercase"> <div class="col-sm-6 col-6 h6 text-uppercase">
@ -105,7 +104,6 @@
{% include "erpnext/templates/includes/order/order_taxes.html" %} {% include "erpnext/templates/includes/order/order_taxes.html" %}
</table> </table>
</div> </div>
{% endif %}
</div> </div>
{% if enabled_checkout and ((doc.doctype=="Sales Order" and doc.per_billed <= 0) {% if enabled_checkout and ((doc.doctype=="Sales Order" and doc.per_billed <= 0)