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

Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor

Browse Source
This commit is contained in:
marination
2021-06-28 16:50:08 +05:30
parent d6a32ea832 c1853ddf73
commit db792c307f
701 changed files with 9390 additions and 13054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/templates/includes/cart/cart_address.html
View File

@@ -101,6 +101,7 @@ frappe.ready(() => {
fieldname: 'country',
fieldtype: 'Link',
options: 'Country',
only_select: true,
reqd: 1
},
{

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

@@ -13,9 +13,11 @@
{{ doc.items_preview }}
</div>
</div>
<div class="col-sm-3 text-right bold">
{{ doc.get_formatted("grand_total") }}
</div>
{% if doc.get('grand_total') %}
<div class="col-sm-3 text-right bold">
{{ doc.get_formatted("grand_total") }}
</div>
{% endif %}
</div>
<a class="transaction-item-link" href="/{{ pathname }}/{{ doc.name }}">Link</a>
</div>