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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi 2013-07-26 13:10:04 +05:30
commit 1276031fef
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/accounts_controller.py
View File

@ -389,10 +389,11 @@ class AccountsController(TransactionBase):
where %s=%s and docstatus=1""" % (based_on, self.tname, item_ref_dn, '%s'),
item.fields[item_ref_dn])[0][0]
max_allowed_amt = webnotes.conn.get_value(ref_dt + " Item",
item.fields[item_ref_dn], based_on)
max_allowed_amt = flt(webnotes.conn.get_value(ref_dt + " Item",
item.fields[item_ref_dn], based_on))
if flt(already_billed) + flt(item.fields[based_on]) > max_allowed_amt:
if max_allowed_amt and \
flt(already_billed) + flt(item.fields[based_on]) > max_allowed_amt:
webnotes.msgprint(_("Row ")+ cstr(item.idx) + ": " + cstr(item.item_code) +
_(" will be over-billed against mentioned ") + cstr(ref_dt) +
_(". Max allowed " + cstr(based_on) + ": " + cstr(max_allowed_amt)),

11
manufacturing/doctype/bom/bom.js
View File

@ -20,12 +20,23 @@ cur_frm.cscript.refresh = function(doc,dt,dn){
if (!doc.__islocal && doc.docstatus==0) {
cur_frm.set_intro("Submit the BOM to use it for manufacturing or repacking.");
cur_frm.add_custom_button("Update Cost", cur_frm.cscript.update_cost);
} else cur_frm.set_intro("");
cur_frm.cscript.with_operations(doc);
set_operation_no(doc);
}
cur_frm.cscript.update_cost = function() {
wn.call({
doc: cur_frm.doc,
method: "update_cost",
callback: function(r) {
if(!r.exc) cur_frm.refresh_fields();
}
})
}
cur_frm.cscript.with_operations = function(doc) {
cur_frm.fields_dict["bom_materials"].grid.set_column_disp("operation_no", doc.with_operations);
cur_frm.fields_dict["bom_materials"].grid.toggle_reqd("operation_no", doc.with_operations)

11
manufacturing/doctype/bom/bom.py
View File

@ -135,6 +135,17 @@ class DocType:
rate = arg['standard_rate']
return rate
def update_cost(self):
for d in self.doclist.get({"parentfield": "bom_materials"}):
d.rate = self.get_bom_material_detail({
'item_code': d.item_code,
'bom_no': d.bom_no,
'qty': d.qty
})["rate"]
self.on_update()
def get_bom_unitcost(self, bom_no):
bom = sql("""select name, total_cost/quantity as unit_cost from `tabBOM`