nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't club same free item

Browse Source
This commit is contained in:
Rohit Waghchaure
2021-03-17 18:49:54 +05:30
parent a9b1347600
commit 77add49c6a
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1585,17 +1585,18 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
apply_product_discount: function(args) {
const items = this.frm.doc.items.filter(d => (d.is_free_item)) || [];
const exist_items = items.map(row => row.item_code);
const exist_items = items.map(row => (row.item_code, row.pricing_rules));
args.free_item_data.forEach(pr_row => {
let row_to_modify = {};
if (!items || !in_list(exist_items, pr_row.item_code)) {
if (!items || !in_list(exist_items, (pr_row.item_code, pr_row.pricing_rules))) {
row_to_modify = frappe.model.add_child(this.frm.doc,
this.frm.doc.doctype + ' Item', 'items');
} else if(items) {
row_to_modify = items.filter(d => d.item_code === pr_row.item_code)[0];
row_to_modify = items.filter(d => (d.item_code === pr_row.item_code
&& d.pricing_rules === pr_row.pricing_rules))[0];
}
for (let key in pr_row) {