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

Merge pull request #24811 from rohitwaghchaure/minor-fixes-for-work-order

Browse Source 
fix: minor changes in work order
This commit is contained in:
rohitwaghchaure 2021-03-07 12:53:29 +05:30 committed by GitHub
commit 15c0199e07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/manufacturing/doctype/work_order/work_order.py
View File

@ -528,6 +528,10 @@ class WorkOrder(Document):
if not reset_only_qty: if not reset_only_qty:
self.required_items = [] self.required_items = []
operation = None
if self.get('operations') and len(self.operations) == 1:
operation = self.operations[0].operation
if self.bom_no and self.qty: if self.bom_no and self.qty:
item_dict = get_bom_items_as_dict(self.bom_no, self.company, qty=self.qty, item_dict = get_bom_items_as_dict(self.bom_no, self.company, qty=self.qty,
fetch_exploded = self.use_multi_level_bom) fetch_exploded = self.use_multi_level_bom)
@ -536,6 +540,9 @@ class WorkOrder(Document):
for d in self.get("required_items"): for d in self.get("required_items"):
if item_dict.get(d.item_code): if item_dict.get(d.item_code):
d.required_qty = item_dict.get(d.item_code).get("qty") d.required_qty = item_dict.get(d.item_code).get("qty")
if not d.operation:
d.operation = operation
else: else:
# Attribute a big number (999) to idx for sorting putpose in case idx is NULL # Attribute a big number (999) to idx for sorting putpose in case idx is NULL
# For instance in BOM Explosion Item child table, the items coming from sub assembly items # For instance in BOM Explosion Item child table, the items coming from sub assembly items
@ -543,7 +550,7 @@ class WorkOrder(Document):
self.append('required_items', { self.append('required_items', {
'rate': item.rate, 'rate': item.rate,
'amount': item.amount, 'amount': item.amount,
'operation': item.operation, 'operation': item.operation or operation,
'item_code': item.item_code, 'item_code': item.item_code,
'item_name': item.item_name, 'item_name': item.item_name,
'description': item.description, 'description': item.description,
@ -879,7 +886,7 @@ def create_job_card(work_order, row, qty=0, enable_capacity_planning=False, auto
doc.schedule_time_logs(row) doc.schedule_time_logs(row)
doc.insert() doc.insert()
frappe.msgprint(_("Job card {0} created").format(get_link_to_form("Job Card", doc.name))) frappe.msgprint(_("Job card {0} created").format(get_link_to_form("Job Card", doc.name)), alert=True)
return doc return doc