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

minor fixes

Browse Source
This commit is contained in:
Nabin Hait 2014-05-30 11:43:00 +05:30
parent cb9bdf43f6
commit c1367d9d10
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -367,8 +367,9 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
} }
if(item) _apply_pricing_rule(item); if(item) {
else { _apply_pricing_rule(item);
} else {
$.each(this.get_item_doclist(), function(n, item) { $.each(this.get_item_doclist(), function(n, item) {
_apply_pricing_rule(item); _apply_pricing_rule(item);
}); });

2
erpnext/public/js/utils/party.js
View File

@ -33,7 +33,7 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) {
frm.updating_party_details = true; frm.updating_party_details = true;
frm.set_value(r.message); frm.set_value(r.message);
frm.updating_party_details = false; frm.updating_party_details = false;
if(callback) callback() if(callback) callback();
} }
} }
}); });

3
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -181,8 +181,7 @@ class StockEntry(StockController):
valuation_at_target += flt(d.amount) valuation_at_target += flt(d.amount)
if valuation_at_target < valuation_at_source: if valuation_at_target < valuation_at_source:
frappe.throw(_("Total valuation for manufactured or repacked item(s) can not be less than \ frappe.throw(_("Total valuation for manufactured or repacked item(s) can not be less than total valuation of raw materials"))
total valuation of raw materials"))
def set_total_amount(self): def set_total_amount(self):
self.total_amount = sum([flt(item.amount) for item in self.get("mtn_details")]) self.total_amount = sum([flt(item.amount) for item in self.get("mtn_details")])