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

Merge pull request #17514 from rohitwaghchaure/pricing_rule_not_working_on_quotation

Browse Source 
fix: pricing rule not working properly on the quotation
This commit is contained in:
rohitwaghchaure
2019-05-08 11:14:34 +05:30
committed by GitHub
parent 5ac8dbfceb 9f3eb9e077
commit 85731053fd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -428,7 +428,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
serial_no: item.serial_no, serial_no: item.serial_no,
set_warehouse: me.frm.doc.set_warehouse, set_warehouse: me.frm.doc.set_warehouse,
warehouse: item.warehouse, warehouse: item.warehouse,
customer: me.frm.doc.customer, customer: me.frm.doc.customer || me.frm.doc.party_name,
supplier: me.frm.doc.supplier, supplier: me.frm.doc.supplier,
currency: me.frm.doc.currency, currency: me.frm.doc.currency,
update_stock: update_stock, update_stock: update_stock,
@@ -1118,7 +1118,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
var me = this; var me = this;
return { return {
"items": this._get_item_list(item), "items": this._get_item_list(item),
"customer": me.frm.doc.customer, "customer": me.frm.doc.customer || me.frm.doc.party_name,
"customer_group": me.frm.doc.customer_group, "customer_group": me.frm.doc.customer_group,
"territory": me.frm.doc.territory, "territory": me.frm.doc.territory,
"supplier": me.frm.doc.supplier, "supplier": me.frm.doc.supplier,