Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: apply discount on item after applying price list (#36317)

Browse Source
This commit is contained in:
Anand Baburajan 2023-07-25 21:55:17 +05:30 committed by GitHub
parent eead2bba9f
commit 11a9d4124f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -991,6 +991,16 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
this.frm.set_df_property("conversion_rate", "read_only", erpnext.stale_rate_allowed() ? 0 : 1);
}
apply_discount_on_item(doc, cdt, cdn, field) {
var item = frappe.get_doc(cdt, cdn);
if(!item.price_list_rate) {
item[field] = 0.0;
} else {
this.price_list_rate(doc, cdt, cdn);
}
this.set_gross_profit(item);
}
shipping_rule() {
var me = this;
if(this.frm.doc.shipping_rule) {
@ -1661,6 +1671,9 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
() => {
if(args.items.length) {
me._set_values_for_item_list(r.message.children);
$.each(r.message.children || [], function(i, d) {
me.apply_discount_on_item(d, d.doctype, d.name, 'discount_percentage');
});
}
},
() => { me.in_apply_price_list = false; }

10
erpnext/public/js/utils/sales_common.js
View File

@ -142,16 +142,6 @@ erpnext.sales_common = {
this.apply_discount_on_item(doc, cdt, cdn, 'discount_amount');
}
apply_discount_on_item(doc, cdt, cdn, field) {
var item = frappe.get_doc(cdt, cdn);
if(!item.price_list_rate) {
item[field] = 0.0;
} else {
this.price_list_rate(doc, cdt, cdn);
}
this.set_gross_profit(item);
}
commission_rate() {
this.calculate_commission();
}