nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: sider issue

Browse Source 
(cherry picked from commit e290fe0721)
This commit is contained in:
Anupam
2021-10-31 14:42:10 +05:30
committed by mergify-bot
parent d43aecbe13
commit 44c53deb90
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/work_order/work_order.js
View File

@@ -145,12 +145,12 @@ frappe.ui.form.on("Work Order", {
&& frm.doc.operations && frm.doc.operations.length) { && frm.doc.operations && frm.doc.operations.length) {
const not_completed = frm.doc.operations.filter(d => { const not_completed = frm.doc.operations.filter(d => {
if(d.status != 'Completed') { if (d.status != 'Completed') {
return true; return true;
} }
}); });
if(not_completed && not_completed.length) { if (not_completed && not_completed.length) {
frm.add_custom_button(__('Create Job Card'), () => { frm.add_custom_button(__('Create Job Card'), () => {
frm.trigger("make_job_card"); frm.trigger("make_job_card");
}).addClass('btn-primary'); }).addClass('btn-primary');

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

@@ -1015,8 +1015,7 @@ def close_work_order(work_order, status):
filters={ filters={
"work_order": work_order.name, "work_order": work_order.name,
"status": "Work In Progress" "status": "Work In Progress"
}, }, pluck='name')
pluck='name')
if job_cards: if job_cards:
job_cards = ", ".join(job_cards) job_cards = ", ".join(job_cards)