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

Merge pull request #2519 from nabinhait/fix1

Browse Source 
Dont reset pricing if ignore pricing rule
This commit is contained in:
Nabin Hait 2014-12-22 11:16:02 +05:30
commit 01ad94bfad
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/public/js/transaction.js
View File

@ -411,7 +411,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
} }
}); });
// if pricing rule set as blank from an existing value, apply price_list // if pricing rule set as blank from an existing value, apply price_list
if(existing_pricing_rule && !d.pricing_rule) { if(!me.frm.doc.ignore_pricing_rule && existing_pricing_rule && !d.pricing_rule) {
me.apply_price_list(frappe.get_doc(d.doctype, d.name)); me.apply_price_list(frappe.get_doc(d.doctype, d.name));
} }
}); });