diff --git a/erpnext/public/js/transaction.js b/erpnext/public/js/transaction.js index b336637f0a..6d30ef0999 100644 --- a/erpnext/public/js/transaction.js +++ b/erpnext/public/js/transaction.js @@ -367,8 +367,9 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({ } - if(item) _apply_pricing_rule(item); - else { + if(item) { + _apply_pricing_rule(item); + } else { $.each(this.get_item_doclist(), function(n, item) { _apply_pricing_rule(item); }); diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js index 9da0353dbb..40db97feb8 100644 --- a/erpnext/public/js/utils/party.js +++ b/erpnext/public/js/utils/party.js @@ -33,7 +33,7 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) { frm.updating_party_details = true; frm.set_value(r.message); frm.updating_party_details = false; - if(callback) callback() + if(callback) callback(); } } }); diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index c613e4ea11..cbe8c29749 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -181,8 +181,7 @@ class StockEntry(StockController): valuation_at_target += flt(d.amount) if valuation_at_target < valuation_at_source: - frappe.throw(_("Total valuation for manufactured or repacked item(s) can not be less than \ - total valuation of raw materials")) + frappe.throw(_("Total valuation for manufactured or repacked item(s) can not be less than total valuation of raw materials")) def set_total_amount(self): self.total_amount = sum([flt(item.amount) for item in self.get("mtn_details")])