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

fix: Job Card sub operations status and list view (backport #30243) (#30256)

Browse Source 
* fix: show status in job card list view in Draft mode

(cherry picked from commit fa32fc3c832196004154055ac1b2334d6202c261)

* fix: job card - sub operations table status misbehaviour on pause / resume Job Card

(cherry picked from commit 7b8723445ee695e88590bb833f60a0c4731106fa)

Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com>
This commit is contained in:
mergify[bot] 2022-03-15 15:48:15 +05:30 committed by GitHub
parent 3218ccbb96
commit e8310c6dec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/manufacturing/doctype/job_card/job_card.py
View File

@ -48,7 +48,7 @@ class JobCard(Document):
self.validate_work_order()
def set_sub_operations(self):
if self.operation:
if not self.sub_operations and self.operation:
self.sub_operations = []
for row in frappe.get_all('Sub Operation',
filters = {'parent': self.operation}, fields=['operation', 'idx'], order_by='idx'):

1
erpnext/manufacturing/doctype/job_card/job_card_list.js
View File

@ -1,4 +1,5 @@
frappe.listview_settings['Job Card'] = {
has_indicator_for_draft: true,
get_indicator: function(doc) {
if (doc.status === "Work In Progress") {
return [__("Work In Progress"), "orange", "status,=,Work In Progress"];