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

fix: Item discounts for quotation

Browse Source 
(cherry picked from commit 3a547cb0d9)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.js
This commit is contained in:
Deepesh Garg
2022-02-22 16:25:32 +05:30
committed by mergify-bot
parent a8ae86e23f
commit fd3adbb6fe
2 changed files with 9 additions and 1 deletions
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:
item.rate = 0.0
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 *
(1.0 - (item.discount_percentage / 100.0)), item.precision("rate"))
item.discount_amount = item.price_list_rate * (item.discount_percentage / 100.0)

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

@@ -38,6 +38,7 @@ frappe.ui.form.on('Quotation', {
}
});
<<<<<<< HEAD
erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
onload: function(doc, dt, dn) {
var me = this;
@@ -45,6 +46,13 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
},
party_name: function() {
=======
erpnext.selling.QuotationController = class QuotationController extends erpnext.selling.SellingController {
onload(doc, dt, dn) {
super.onload(doc, dt, dn);
}
party_name() {
>>>>>>> 3a547cb0d9 (fix: Item discounts for quotation)
var me = this;
erpnext.utils.get_party_details(this.frm, null, null, function() {
me.apply_price_list();