nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fixed updating sales order work qty after cancelling work order

Browse Source
This commit is contained in:
noahjacob
2021-04-28 10:12:17 +05:30
parent 1e912db3bb
commit 82905166d9
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/manufacturing/doctype/production_plan/production_plan.js
View File

@@ -224,7 +224,6 @@ frappe.ui.form.on('Production Plan', {
}); });
}, },
combine_items: function (frm) { combine_items: function (frm) {
frm.clear_table('po_items');
frm.clear_table('prod_plan_ref'); frm.clear_table('prod_plan_ref');
frappe.call({ frappe.call({

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

@@ -258,7 +258,13 @@ class WorkOrder(Document):
self.validate_cancel() self.validate_cancel()
frappe.db.set(self,'status', 'Cancelled') frappe.db.set(self,'status', 'Cancelled')
self.update_work_order_qty_in_so() prod_plan = frappe.get_doc('Production Plan', self.production_plan)
pp_ref = prod_plan.prod_plan_ref
if pp_ref:
self.update_work_order_qty_in_combined_so(cancel = True)
else:
self.update_work_order_qty_in_so()
self.delete_job_card() self.delete_job_card()
self.update_completed_qty_in_material_request() self.update_completed_qty_in_material_request()
self.update_planned_qty() self.update_planned_qty()
@@ -364,7 +370,7 @@ class WorkOrder(Document):
frappe.db.set_value('Sales Order Item', frappe.db.set_value('Sales Order Item',
self.sales_order_item, 'work_order_qty', flt(work_order_qty/total_bundle_qty, 2)) self.sales_order_item, 'work_order_qty', flt(work_order_qty/total_bundle_qty, 2))
def update_work_order_qty_in_combined_so(self): def update_work_order_qty_in_combined_so(self, cancel = None):
total_bundle_qty = 1 total_bundle_qty = 1
if self.product_bundle_item: if self.product_bundle_item:
total_bundle_qty = frappe.db.sql(""" select sum(qty) from total_bundle_qty = frappe.db.sql(""" select sum(qty) from
@@ -378,7 +384,7 @@ class WorkOrder(Document):
pp_ref = prod_plan.prod_plan_ref pp_ref = prod_plan.prod_plan_ref
for p in pp_ref: for p in pp_ref:
if p.item_ref == self.production_plan_item: if p.item_ref == self.production_plan_item:
work_order_qty = int(p.qty) work_order_qty = int(p.qty) if not cancel else 0
frappe.db.set_value('Sales Order Item', frappe.db.set_value('Sales Order Item',
p.sales_order_item, 'work_order_qty', flt(work_order_qty/total_bundle_qty, 2)) p.sales_order_item, 'work_order_qty', flt(work_order_qty/total_bundle_qty, 2))