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

Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule

Browse Source 
feat: recursive pricing rule
This commit is contained in:
rohitwaghchaure
2021-03-26 19:10:10 +05:30
committed by GitHub
parent 86628ea287 bde159a77d
commit d5759bab11
10 changed files with 162 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -577,7 +577,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
var d = locals[cdt][cdn];
me.add_taxes_from_item_tax_template(d.item_tax_rate);
if (d.free_item_data) {
me.apply_product_discount(d.free_item_data);
me.apply_product_discount(d);
}
},
() => {
@@ -1198,7 +1198,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
calculate_stock_uom_rate: function(doc, cdt, cdn) {
let item = frappe.get_doc(cdt, cdn);
item.stock_uom_rate = flt(item.rate)/flt(item.conversion_factor);
item.stock_uom_rate = flt(item.rate)/flt(item.conversion_factor);
refresh_field("stock_uom_rate", item.name, item.parentfield);
},
service_stop_date: function(frm, cdt, cdn) {
@@ -1527,7 +1527,10 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(k=="price_list_rate") {
if(flt(v) != flt(d.price_list_rate)) price_list_rate_changed = true;
}
frappe.model.set_value(d.doctype, d.name, k, v);
if (k !== 'free_item_data') {
frappe.model.set_value(d.doctype, d.name, k, v);
}
}
}
@@ -1539,7 +1542,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
if (d.free_item_data) {
me.apply_product_discount(d.free_item_data);
me.apply_product_discount(d);
}
if (d.apply_rule_on_other_items) {
@@ -1573,20 +1576,31 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
},
apply_product_discount: function(free_item_data) {
const items = this.frm.doc.items.filter(d => (d.item_code == free_item_data.item_code
&& d.is_free_item)) || [];
apply_product_discount: function(args) {
const items = this.frm.doc.items.filter(d => (d.is_free_item)) || [];
if (!items.length) {
let row_to_modify = frappe.model.add_child(this.frm.doc,
this.frm.doc.doctype + ' Item', 'items');
const exist_items = items.map(row => (row.item_code, row.pricing_rules));
for (let key in free_item_data) {
row_to_modify[key] = free_item_data[key];
args.free_item_data.forEach(pr_row => {
let row_to_modify = {};
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
&& d.pricing_rules === pr_row.pricing_rules))[0];
}
} if (items && items.length && free_item_data) {
items[0].qty = free_item_data.qty
}
for (let key in pr_row) {
row_to_modify[key] = pr_row[key];
}
});
// free_item_data is a temporary variable
args.free_item_data = '';
refresh_field('items');
},
apply_price_list: function(item, reset_plc_conversion) {