Merge branch 'develop' into fix-ignore-pricing-rule

This commit is contained in:
Saqib Ansari
2022-02-08 15:29:28 +05:30
committed by GitHub
6 changed files with 14 additions and 6 deletions

View File

@@ -2289,7 +2289,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
() => this.frm.doc.ignore_pricing_rule=1,
() => me.ignore_pricing_rule(),
() => this.frm.doc.ignore_pricing_rule=0,
() => me.apply_pricing_rule()
() => me.apply_pricing_rule(),
() => this.frm.save()
]);
} else {
frappe.run_serially([