nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 04:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui

Browse Source
This commit is contained in:
Shivam Mishra
2020-11-12 11:32:59 +05:30
parent 2d1f8341f9 0ea0a7495c
commit bed717b442
375 changed files with 26443 additions and 9717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/templates/pages/material_request_info.html
View File

@@ -25,7 +25,7 @@
</span>
</div>
<div class="col-xs-6 text-muted text-right small">
{{ frappe.utils.formatdate(doc.transaction_date, 'medium') }}
{{ frappe.utils.format_date(doc.transaction_date, 'medium') }}
</div>
</div>

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

@@ -42,10 +42,10 @@
</span>
</div>
<div class="col-6 text-muted text-right small">
{{ frappe.utils.formatdate(doc.transaction_date, 'medium') }}
{{ frappe.utils.format_date(doc.transaction_date, 'medium') }}
{% if doc.valid_till %}
<p>
{{ _("Valid Till") }}: {{ frappe.utils.formatdate(doc.valid_till, 'medium') }}
{{ _("Valid Till") }}: {{ frappe.utils.format_date(doc.valid_till, 'medium') }}
</p>
{% endif %}
</div>