Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: multiple Work Orders against same production plan #35842

Merged
merged 1 commit into from
Jun 22, 2023
Merged

fix: multiple Work Orders against same production plan #35842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion erpnext/manufacturing/doctype/production_plan/production_plan.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ frappe.ui.form.on('Production Plan', {
}, __('Create'));
}

if (frm.doc.mr_items && !in_list(['Material Requested', 'Closed'], frm.doc.status)) {
if (frm.doc.mr_items && frm.doc.mr_items.length && !in_list(['Material Requested', 'Closed'], frm.doc.status)) {
frm.add_custom_button(__("Material Request"), ()=> {
frm.trigger("make_material_request");
}, __('Create'));
Expand Down
6 changes: 6 additions & 0 deletions erpnext/manufacturing/doctype/production_plan/production_plan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,9 @@ def make_work_order(self):
self.show_list_created_message("Work Order", wo_list)
self.show_list_created_message("Purchase Order", po_list)

if not wo_list:
frappe.msgprint(_("No Work Orders were created"))

def make_work_order_for_finished_goods(self, wo_list, default_warehouses):
items_data = self.get_production_items()

Expand Down Expand Up @@ -618,6 +621,9 @@ def show_list_created_message(self, doctype, doc_list=None):
def create_work_order(self, item):
from erpnext.manufacturing.doctype.work_order.work_order import OverProductionError

if item.get("qty") <= 0:
return

wo = frappe.new_doc("Work Order")
wo.update(item)
wo.planned_start_date = item.get("planned_start_date") or item.get("schedule_date")
Expand Down
7 changes: 7 additions & 0 deletions erpnext/manufacturing/doctype/production_plan/test_production_plan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,13 @@ def test_production_plan_mr_creation(self):
"Work Order", fields=["name"], filters={"production_plan": pln.name}, as_list=1
)

pln.make_work_order()
nwork_orders = frappe.get_all(
"Work Order", fields=["name"], filters={"production_plan": pln.name}, as_list=1
)

self.assertTrue(len(work_orders), len(nwork_orders))

self.assertTrue(len(work_orders), len(pln.po_items))

for name in material_requests:
Expand Down