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

Merge pull request #3706 from neilLasrado/variant

Browse Source 
Fetch Template Bom if no BOM is set against Item Variant in Production Order
This commit is contained in:
Nabin Hait 2015-07-23 17:26:11 +05:30
commit 975ef07c48
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/manufacturing/doctype/production_order/production_order.py
View File

@ -335,12 +335,15 @@ def get_item_details(item):
res = frappe.db.sql("""select stock_uom, description res = frappe.db.sql("""select stock_uom, description
from `tabItem` where (ifnull(end_of_life, "0000-00-00")="0000-00-00" or end_of_life > now()) from `tabItem` where (ifnull(end_of_life, "0000-00-00")="0000-00-00" or end_of_life > now())
and name=%s""", item, as_dict=1) and name=%s""", item, as_dict=1)
if not res: if not res:
return {} return {}
res = res[0] res = res[0]
res["bom_no"] = frappe.db.get_value("BOM", filters={"item": item, "is_default": 1}) res["bom_no"] = frappe.db.get_value("BOM", filters={"item": item, "is_default": 1})
if not res["bom_no"]:
variant_of= frappe.db.get_value("Item", item, "variant_of")
if variant_of:
res["bom_no"] = frappe.db.get_value("BOM", filters={"item": variant_of, "is_default": 1})
return res return res
@frappe.whitelist() @frappe.whitelist()

21
erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
View File

@ -9,6 +9,7 @@ from frappe import msgprint, _
from frappe.model.document import Document from frappe.model.document import Document
from erpnext.manufacturing.doctype.bom.bom import validate_bom_no from erpnext.manufacturing.doctype.bom.bom import validate_bom_no
from erpnext.manufacturing.doctype.production_order.production_order import get_item_details
class ProductionPlanningTool(Document): class ProductionPlanningTool(Document):
def __init__(self, arg1, arg2=None): def __init__(self, arg1, arg2=None):
@ -27,16 +28,7 @@ class ProductionPlanningTool(Document):
return ret return ret
def get_item_details(self, item_code): def get_item_details(self, item_code):
""" Pull other item details from item master""" return get_item_details(item_code)
item = frappe.db.sql("""select description, stock_uom, default_bom
from `tabItem` where name = %s""", item_code, as_dict =1)
ret = {
'description' : item and item[0]['description'],
'stock_uom' : item and item[0]['stock_uom'],
'bom_no' : item and item[0]['default_bom']
}
return ret
def clear_so_table(self): def clear_so_table(self):
self.set('sales_orders', []) self.set('sales_orders', [])
@ -142,15 +134,14 @@ class ProductionPlanningTool(Document):
self.clear_item_table() self.clear_item_table()
for p in items: for p in items:
item_details = frappe.db.sql("""select description, stock_uom, default_bom item_details = get_item_details(p['item_code'])
from tabItem where name=%s""", p['item_code'])
pi = self.append('items', {}) pi = self.append('items', {})
pi.sales_order = p['parent'] pi.sales_order = p['parent']
pi.warehouse = p['warehouse'] pi.warehouse = p['warehouse']
pi.item_code = p['item_code'] pi.item_code = p['item_code']
pi.description = item_details and item_details[0][0] or '' pi.description = item_details and item_details.description or ''
pi.stock_uom = item_details and item_details[0][1] or '' pi.stock_uom = item_details and item_details.stock_uom or ''
pi.bom_no = item_details and item_details[0][2] or '' pi.bom_no = item_details and item_details.bom_no or ''
pi.so_pending_qty = flt(p['pending_qty']) pi.so_pending_qty = flt(p['pending_qty'])
pi.planned_qty = flt(p['pending_qty']) pi.planned_qty = flt(p['pending_qty'])