schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge conflicts

Browse Source
This commit is contained in:
Saqib Ansari
2022-02-25 15:45:52 +05:30
parent f2264fa58d
commit 6bb1dccddd
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

@@ -2264,17 +2264,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
} }
}, },
<<<<<<< HEAD
coupon_code: function() { 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) { if (this.frm.doc.coupon_code || this.frm._last_coupon_code) {
// reset pricing rules if coupon code is set or is unset // reset pricing rules if coupon code is set or is unset
const _ignore_pricing_rule = this.frm.doc.ignore_pricing_rule; const _ignore_pricing_rule = this.frm.doc.ignore_pricing_rule;
@@ -2286,7 +2276,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
() => this.frm._last_coupon_code = this.frm.doc.coupon_code () => this.frm._last_coupon_code = this.frm.doc.coupon_code
]); ]);
} }
>>>>>>> 81514516f3 (fix(pos): coupon code is applied even if ignore pricing rule is check)
} }
}); });