CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 02:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflicts

Browse Source
This commit is contained in:
Saqib Ansari
2022-03-07 11:52:16 +05:30
parent 25c434fb02
commit 3525f0e585
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2263,17 +2263,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
},
<<<<<<< HEAD
coupon_code: function() {
var me = this;
frappe.run_serially([
() => this.frm.doc.ignore_pricing_rule=1,
() => me.ignore_pricing_rule(),
() => this.frm.doc.ignore_pricing_rule=0,
() => me.apply_pricing_rule()
]);
=======
coupon_code() {
if (this.frm.doc.coupon_code || this.frm._last_coupon_code) {
// reset pricing rules if coupon code is set or is unset
const _ignore_pricing_rule = this.frm.doc.ignore_pricing_rule;
@@ -2285,7 +2275,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
() => this.frm._last_coupon_code = this.frm.doc.coupon_code
]);
}
>>>>>>> 81514516f3 (fix(pos): coupon code is applied even if ignore pricing rule is check)
}
});