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

fix: ignore pricing rule for other item group

Browse Source
This commit is contained in:
Rohit Waghchaure
2020-01-02 17:29:50 +05:30
parent c5cd7cd65d
commit b6351b4ca0
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1398,7 +1398,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
remove_pricing_rule: function(item) {
let me = this;
const fields = ["discount_percentage", "discount_amount", "pricing_rules"];
const fields = ["discount_percentage",
"discount_amount", "margin_rate_or_amount", "rate_with_margin"];
if(item.remove_free_item) {
var items = [];
@@ -1418,6 +1419,12 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
fields.forEach(f => {
row[f] = 0;
});
["pricing_rules", "margin_type"].forEach(field => {
if (row[field]) {
row[field] = '';
}
})
}
});