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

fix: Item discounts for quotation

Browse Source
This commit is contained in:
Deepesh Garg 2022-02-22 16:25:32 +05:30
parent e4c4dc402e
commit 3a547cb0d9
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/taxes_and_totals.py
View File

@ -116,7 +116,7 @@ class calculate_taxes_and_totals(object):
if item.discount_percentage == 100: if item.discount_percentage == 100:
item.rate = 0.0 item.rate = 0.0
elif item.price_list_rate: elif item.price_list_rate:
if not item.rate or (item.pricing_rules and item.discount_percentage > 0): if item.pricing_rules or item.discount_percentage > 0:
item.rate = flt(item.price_list_rate * item.rate = flt(item.price_list_rate *
(1.0 - (item.discount_percentage / 100.0)), item.precision("rate")) (1.0 - (item.discount_percentage / 100.0)), item.precision("rate"))
item.discount_amount = item.price_list_rate * (item.discount_percentage / 100.0) item.discount_amount = item.price_list_rate * (item.discount_percentage / 100.0)

1
erpnext/selling/doctype/quotation/quotation.js
View File

@ -40,7 +40,6 @@ frappe.ui.form.on('Quotation', {
erpnext.selling.QuotationController = class QuotationController extends erpnext.selling.SellingController { erpnext.selling.QuotationController = class QuotationController extends erpnext.selling.SellingController {
onload(doc, dt, dn) { onload(doc, dt, dn) {
var me = this;
super.onload(doc, dt, dn); super.onload(doc, dt, dn);
} }
party_name() { party_name() {