Shiloh/brotherton-erpnext
1
0
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:
Rushabh Mehta 2012-12-05 06:42:02 +01:00
commit 0ea88cd3d2
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
home/page/latest_updates/latest_updates.js
View File

@ -1,5 +1,12 @@
erpnext.updates = [ erpnext.updates = [
["4rd December 2012", [ ["5th December 2012", [
"Production Order is now linked with sales order.",
"Production Planning Tool: The field 'Allow SA items as raw material' has been renamed to 'Use multi-level BOM', 'Include in plan' column from SO table has been deleted",
"Batch nos are now filtered with item and available qty",
"BOM: 'Update Costing' button has been deleted, once submitted cost are fixed.",
"[For indian customer only] Deprecated TDS related documents and fields. Old TDS amount added into tax table in Purchase Invoice and entries table in case of JV",
]],
["4th December 2012", [
"POS / Mode of Payment: Select default bank / cash account in Mode of Payment and it will be automatically selected in POS Invoice.", "POS / Mode of Payment: Select default bank / cash account in Mode of Payment and it will be automatically selected in POS Invoice.",
"Email: Add contact name as 'Dear so-and-so' in Email.", "Email: Add contact name as 'Dear so-and-so' in Email.",
"Report Builder: Remember last column setup for users", "Report Builder: Remember last column setup for users",
@ -9,6 +16,7 @@ erpnext.updates = [
"Linked With: Added new Linked with in all Forms.", "Linked With: Added new Linked with in all Forms.",
"Rename Tool: Documents that can be renamed will have a 'Rename' option in the sidebar (wherever applicable).", "Rename Tool: Documents that can be renamed will have a 'Rename' option in the sidebar (wherever applicable).",
"Chart of Accounts: Ability to rename / delete from Chart of Accounts.", "Chart of Accounts: Ability to rename / delete from Chart of Accounts.",
"Delivery and Billing status now updated in sales order, if POS made against that sales order"
]], ]],
["30th November 2012", [ ["30th November 2012", [
"Auto Notifications: System will prompt user with pre-set message for auto-notification.", "Auto Notifications: System will prompt user with pre-set message for auto-notification.",

2
production/doctype/bom/bom.js
View File

@ -67,7 +67,7 @@ var get_bom_material_detail= function(doc,dt,dn) {
calculate_total(doc); calculate_total(doc);
} }
var bom_no = (d.bom_no!=null) ? d.bom_no:'' var bom_no = (d.bom_no!=null) ? d.bom_no: ''
if (d.item_code) { if (d.item_code) {
arg = {'item_code': d.item_code, 'bom_no': bom_no, 'qty': d.qty}; arg = {'item_code': d.item_code, 'bom_no': bom_no, 'qty': d.qty};
get_server_fields('get_bom_material_detail', JSON.stringify(arg), 'bom_materials', doc, dt, dn, 1, callback); get_server_fields('get_bom_material_detail', JSON.stringify(arg), 'bom_materials', doc, dt, dn, 1, callback);

14
production/doctype/bom/bom.py
View File

@ -31,7 +31,8 @@ class DocType:
self.doclist = doclist self.doclist = doclist
def autoname(self): def autoname(self):
last_name = sql("select max(name) from `tabBOM` where name like 'BOM/%s/%%'" % self.doc.item) last_name = sql("""select max(name) from `tabBOM`
where name like 'BOM/%s/%%'""" % self.doc.item)
if last_name: if last_name:
idx = cint(cstr(last_name[0][0]).split('/')[-1]) + 1 idx = cint(cstr(last_name[0][0]).split('/')[-1]) + 1
else: else:
@ -40,9 +41,10 @@ class DocType:
def get_item_det(self, item_code): def get_item_det(self, item_code):
item = sql("""select name, is_asset_item, is_purchase_item, docstatus, is_sub_contracted_item, item = sql("""select name, is_asset_item, is_purchase_item, docstatus,
description, stock_uom, default_bom, last_purchase_rate, standard_rate, is_manufactured_item from `tabItem` is_sub_contracted_item, description, stock_uom, default_bom,
where item_code = %s""", item_code, as_dict = 1) last_purchase_rate, standard_rate, is_manufactured_item
from `tabItem` where item_code = %s""", item_code, as_dict = 1)
return item return item
@ -86,8 +88,8 @@ class DocType:
def get_bom_material_detail(self, arg): def get_bom_material_detail(self, arg):
""" Get raw material details like uom, desc and rate""" """ Get raw material details like uom, desc and rate"""
import json
arg = eval(arg) arg = json.loads(arg)
item = self.get_item_det(arg['item_code']) item = self.get_item_det(arg['item_code'])
self.validate_rm_item(item) self.validate_rm_item(item)