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

fix: merge conflicts

Browse Source
This commit is contained in:
Subin Tom
2021-11-30 16:06:55 +05:30
parent facaa9cc39
commit f591596615
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/public/js/controllers/transaction.js
View File

@@ -1067,14 +1067,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
method: "apply_shipping_rule",
}).fail(() => this.frm.set_value('shipping_rule', ''));
}
<<<<<<< HEAD
else {
me.calculate_taxes_and_totals();
}
},
=======
}
>>>>>>> c78b8b7897 (fix: Shipping Rule picking up old net_rate)
set_margin_amount_based_on_currency: function(exchange_rate) {
if (in_list(["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", "Purchase Invoice", "Purchase Order", "Purchase Receipt"]), this.frm.doc.doctype) {