schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Price list rate fix multiple uom and validation with prev doc (#8718)

Browse Source
This commit is contained in:
Nabin Hait
2017-05-06 12:47:14 +05:30
committed by GitHub
parent 7228e1af6e
commit 3257aeeb55
4 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -564,14 +564,14 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
},
conversion_factor: function(doc, cdt, cdn) {
conversion_factor: function(doc, cdt, cdn, dont_fetch_price_list_rate) {
if(frappe.meta.get_docfield(cdt, "stock_qty", cdn)) {
var item = frappe.get_doc(cdt, cdn);
frappe.model.round_floats_in(item, ["qty", "conversion_factor"]);
item.stock_qty = flt(item.qty * item.conversion_factor, precision("stock_qty", item));
refresh_field("stock_qty", item.name, item.parentfield);
this.toggle_conversion_factor(item);
this.apply_price_list(item, true);
if(!dont_fetch_price_list_rate) this.apply_price_list(item, true);
}
},
@@ -582,7 +582,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
},
qty: function(doc, cdt, cdn) {
this.conversion_factor(doc, cdt, cdn);
this.conversion_factor(doc, cdt, cdn, true);
this.apply_pricing_rule(frappe.get_doc(cdt, cdn), true);
},
set_dynamic_labels: function() {