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

feat: Confirmation to submit material request against Production Plan (#18062)

Browse Source 
* feat: Confirmation to submit material request against Production Plan

* fix: Test cases for production plan

* fix: Test Cases for production plan
This commit is contained in:
Deepesh Garg 2019-06-28 12:48:28 +05:30 committed by Nabin Hait
parent f5aff98589
commit dbe9a41389
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,6 +126,20 @@ frappe.ui.form.on('Production Plan', {
}, },
make_material_request: function(frm) { make_material_request: function(frm) {
frappe.confirm(__("Do you want to submit the material request"),
function() {
frm.events.create_material_request(frm, 1);
},
function() {
frm.events.create_material_request(frm, 0);
}
);
},
create_material_request: function(frm, submit) {
frm.doc.submit_material_request = submit;
frappe.call({ frappe.call({
method: "make_material_request", method: "make_material_request",
freeze: true, freeze: true,

6
erpnext/manufacturing/doctype/production_plan/production_plan.py
View File

@ -395,7 +395,11 @@ class ProductionPlan(Document):
# submit # submit
material_request.flags.ignore_permissions = 1 material_request.flags.ignore_permissions = 1
material_request.run_method("set_missing_values") material_request.run_method("set_missing_values")
material_request.submit()
if self.get('submit_material_request'):
material_request.submit()
else:
material_request.save()
frappe.flags.mute_messages = False frappe.flags.mute_messages = False

3
erpnext/manufacturing/doctype/production_plan/test_production_plan.py
View File

@ -51,7 +51,8 @@ class TestProductionPlan(unittest.TestCase):
for name in material_requests: for name in material_requests:
mr = frappe.get_doc('Material Request', name[0]) mr = frappe.get_doc('Material Request', name[0])
mr.cancel() if mr.docstatus != 0:
mr.cancel()
for name in work_orders: for name in work_orders:
mr = frappe.delete_doc('Work Order', name[0]) mr = frappe.delete_doc('Work Order', name[0])