fix: fixes in work order doctype #28217

mohammedyusufshaikh · 2021-11-03T06:52:36Z

Issues before fixes :

Form Layout of the "Operations" child table was not appropriate and most of the fields were readonly so it was not possible to add any operations manually.
In the operation section If the transfer material against "job order" was selected and the required items table did not have an operation against the items in it. It would throw an error while submitting the worker order that an operation has to be added in required Items table. better to notify user before hand for better UX.

After Fixes :

Fixed the form layout and made fields editable so operations can be added manually.

Notify the user before submit to add operation in the required items table if the transfer against material is selected as job card either when the form is loaded or when manually it is changed from work order to job card.

Operations is in collapsed state if there are no operations in it.
Hidden the sequence ID field since it is of much importance to the user

codecov · 2021-11-03T07:15:16Z

Codecov Report

Merging #28217 (951fe6d) into develop (ab2c1f6) will increase coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop   #28217      +/-   ##
===========================================
+ Coverage    55.29%   55.31%   +0.01%     
===========================================
  Files         1119     1119              
  Lines        66636    66636              
===========================================
+ Hits         36848    36860      +12     
+ Misses       29788    29776      -12

Impacted Files	Coverage Δ
...wise_balance_history/batch_wise_balance_history.py	`68.96% <0.00%> (-24.14%)`	⬇️
...eport/item_variant_details/item_variant_details.py	`84.33% <0.00%> (-3.62%)`	⬇️
...e/asset_value_adjustment/asset_value_adjustment.py	`86.04% <0.00%> (-3.49%)`	⬇️
...ctype/accounting_dimension/accounting_dimension.py	`64.06% <0.00%> (-1.57%)`	⬇️
.../hr/doctype/upload_attendance/upload_attendance.py	`44.69% <0.00%> (-1.52%)`	⬇️
...e/period_closing_voucher/period_closing_voucher.py	`88.23% <0.00%> (-1.48%)`	⬇️
erpnext/accounts/deferred_revenue.py	`75.11% <0.00%> (-0.89%)`	⬇️
erpnext/stock/reorder_item.py	`75.21% <0.00%> (-0.86%)`	⬇️
erpnext/stock/stock_ledger.py	`85.84% <0.00%> (-0.73%)`	⬇️
...ype/account/chart_of_accounts/chart_of_accounts.py	`77.24% <0.00%> (-0.69%)`	⬇️
... and 15 more

erpnext/manufacturing/doctype/work_order/work_order.json

erpnext/manufacturing/doctype/work_order/work_order.js

erpnext/manufacturing/doctype/work_order/work_order.json

erpnext/manufacturing/doctype/work_order/work_order.js

erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json

* fix: fixes in work order doctype * fix: sider issues and disabled set only once property * fix: set default qty to manufacture * fix: dont manually collapse sections * fix: remove unnecessary messages * fix: make dependent fields read only Co-authored-by: Ankush Menat <ankush@frappe.io> (cherry picked from commit 8d2abc4)

* fix: fixes in work order doctype * fix: sider issues and disabled set only once property * fix: set default qty to manufacture * fix: dont manually collapse sections * fix: remove unnecessary messages * fix: make dependent fields read only Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com> Co-authored-by: Ankush Menat <ankush@frappe.io>

* fix: fixes in work order doctype * fix: sider issues and disabled set only once property * fix: set default qty to manufacture * fix: dont manually collapse sections * fix: remove unnecessary messages * fix: make dependent fields read only Co-authored-by: Ankush Menat <ankush@frappe.io>

* feat: create party link from customer/supplier (backport frappe#28387) * fix: Customer, Supplier heatmap data not rendering (backport frappe#28553) * fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (backport frappe#28443) * fix: allow creating Shift Assignment for same day (backport frappe#28613) * fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice (cherry picked from commit 6a75e8d) * fix: India utils code cleanup (cherry picked from commit 56c626a) * fix: dont requeue repost immediately and clear progress (backport frappe#28684) * fix: Employee Advance paid amount not updated on PE cancellation (backport frappe#28572) * fix: coa balance rendering bug (backport frappe#28468) * fix(UX): combine_items checkbox to trigger get_items and sub_assembly button (backport frappe#28558) * fix: added job_card_item link in material request (backport frappe#28222) * fix: incorrect discount amount set when item is replaced (frappe#28556) (cherry picked from commit c0cc72e) * fix: cost center wise ledger posting for pcv (backport frappe#28477) * fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (backport frappe#28497) * fix: Employee link formatter showing incorrect value for Employee Name (backport frappe#28504) * fix: Remove RM Cost column as cost is not retrievable from Job card (backport frappe#28123) * fix: total stock summary UI glitch (backport frappe#28564) * fix: (style) Warehouse Capacity Dashboard UI (backport frappe#28431) * fix: incorrect balance in "Warehouse Wise Item Balance and Age" report (backport frappe#28583) * refactor!: remove abbreviation renaming (backport frappe#27766) * fix: POS Item cart only taxes with amount displayed (backport frappe#28501) * refactor: (ux) Accepted/Rejected/Received Qty UX (cherry picked from commit 5fb5a75) # Conflicts: # erpnext/public/js/controllers/buying.js * fix: Sider + Fields UX - remove extra space (sider) - PR: Bring rejected qty in grid view - PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM` - PI: Move `Accepted Qty in Stock UOM` under Stock UOM (cherry picked from commit afe1c45) * test: Purchase Receipt Received Qty (cherry picked from commit 05ec7cc) * test: Purchase Invoice Received Qty (cherry picked from commit e9c75d6) * fix: Sider, Linter and Server Side Test - Fix Server side PR test - linter: re-arrange imports - sider: avoid single line multi statement - Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt - Removed unused variables in test_purchase_receipt (cherry picked from commit 293f6cb) # Conflicts: # erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py * fix: Merge conflicts * fix: fixes in work order doctype (backport frappe#28217) * fix: (server test) Missing variable declaration * refactor: item-wh wise reposting by default (cherry picked from commit 6dc9b82) * test: item-wh repost creation (cherry picked from commit a36c249) * refactor: reuse get_items_to_be_repost function (cherry picked from commit d220e08) * feat: option to select reposting method In current implementation selecting Item-Warehouse based reposting is better for few users, who don't use depenent SLEs but have frequent transactions involving same items. This change lets them switch to item-warehouse based reposting if required. Only use this if you understand technicalities of stock reposting. This is experimental but will become mainstream in coming days. (cherry picked from commit 45dd46b) * perf: index for item-sh on repost item valuation Item-WH based reposting requires querying existing similar repost. Assuming there is only 1 max extra entry with same params just indexing item-WH is sufficient to speed up the query. (cherry picked from commit a5a8c91) * fix: dont erase voucher_type and voucher_no for item_wh repost kept for tracability. (cherry picked from commit 1d3842f) * perf: skip unnecessary item-wh reposts Using basic idea that repost with older posting date will also take care of subsequent posting dates... When Item-WH reposts are queued: 1. If another repost with same item-wh but older posting date exists then skip current one. 2. If another repost with same item-wh but newer posting date exists then skip another one. (cherry picked from commit 0d0e24a) * test: item-wh deduplication in reposting (cherry picked from commit 55631dd) * refactor: deduplicate during repost background job (cherry picked from commit ed94f0f) * fix: ignore permissions while creating reposts (cherry picked from commit 0a2964d) * fix: Shipping Rule picking up old net_rate (cherry picked from commit c78b8b7) # Conflicts: # erpnext/public/js/controllers/taxes_and_totals.js # erpnext/public/js/controllers/transaction.js * fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py (cherry picked from commit 18ae03d) * fix: check if shipping rule value exists (cherry picked from commit af1fce0) * fix: fixed tests, separated a method for shipping charges (cherry picked from commit a8e2c02) * fix: sider issues (cherry picked from commit e7b4204) # Conflicts: # erpnext/public/js/controllers/taxes_and_totals.js * fix: merge conflicts * fix: fixes in work order doctype (backport frappe#28217) * fix: abbr Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Ankush Menat <ankush@frappe.io> Co-authored-by: Subin Tom <subintom2@gmail.com>

* feat: create party link from customer/supplier (backport frappe#28387) * fix: Customer, Supplier heatmap data not rendering (backport frappe#28553) * fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (backport frappe#28443) * fix: allow creating Shift Assignment for same day (backport frappe#28613) * fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice (cherry picked from commit 6a75e8d) * fix: India utils code cleanup (cherry picked from commit 56c626a) * fix: dont requeue repost immediately and clear progress (backport frappe#28684) * fix: Employee Advance paid amount not updated on PE cancellation (backport frappe#28572) * fix: coa balance rendering bug (backport frappe#28468) * fix(UX): combine_items checkbox to trigger get_items and sub_assembly button (backport frappe#28558) * fix: added job_card_item link in material request (backport frappe#28222) * fix: incorrect discount amount set when item is replaced (frappe#28556) (cherry picked from commit c0cc72e) * fix: cost center wise ledger posting for pcv (backport frappe#28477) * fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (backport frappe#28497) * fix: Employee link formatter showing incorrect value for Employee Name (backport frappe#28504) * fix: Remove RM Cost column as cost is not retrievable from Job card (backport frappe#28123) * fix: total stock summary UI glitch (backport frappe#28564) * fix: (style) Warehouse Capacity Dashboard UI (backport frappe#28431) * fix: incorrect balance in "Warehouse Wise Item Balance and Age" report (backport frappe#28583) * refactor!: remove abbreviation renaming (backport frappe#27766) * fix: POS Item cart only taxes with amount displayed (backport frappe#28501) * refactor: (ux) Accepted/Rejected/Received Qty UX (cherry picked from commit 5fb5a75) * fix: Sider + Fields UX - remove extra space (sider) - PR: Bring rejected qty in grid view - PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM` - PI: Move `Accepted Qty in Stock UOM` under Stock UOM (cherry picked from commit afe1c45) * test: Purchase Receipt Received Qty (cherry picked from commit 05ec7cc) * test: Purchase Invoice Received Qty (cherry picked from commit e9c75d6) * fix: Sider, Linter and Server Side Test - Fix Server side PR test - linter: re-arrange imports - sider: avoid single line multi statement - Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt - Removed unused variables in test_purchase_receipt (cherry picked from commit 293f6cb) * fix: Merge conflicts * fix: fixes in work order doctype (backport frappe#28217) * fix: (server test) Missing variable declaration * refactor: item-wh wise reposting by default (cherry picked from commit 6dc9b82) * test: item-wh repost creation (cherry picked from commit a36c249) * refactor: reuse get_items_to_be_repost function (cherry picked from commit d220e08) * feat: option to select reposting method In current implementation selecting Item-Warehouse based reposting is better for few users, who don't use depenent SLEs but have frequent transactions involving same items. This change lets them switch to item-warehouse based reposting if required. Only use this if you understand technicalities of stock reposting. This is experimental but will become mainstream in coming days. (cherry picked from commit 45dd46b) * perf: index for item-sh on repost item valuation Item-WH based reposting requires querying existing similar repost. Assuming there is only 1 max extra entry with same params just indexing item-WH is sufficient to speed up the query. (cherry picked from commit a5a8c91) * fix: dont erase voucher_type and voucher_no for item_wh repost kept for tracability. (cherry picked from commit 1d3842f) * perf: skip unnecessary item-wh reposts Using basic idea that repost with older posting date will also take care of subsequent posting dates... When Item-WH reposts are queued: 1. If another repost with same item-wh but older posting date exists then skip current one. 2. If another repost with same item-wh but newer posting date exists then skip another one. (cherry picked from commit 0d0e24a) * test: item-wh deduplication in reposting (cherry picked from commit 55631dd) * refactor: deduplicate during repost background job (cherry picked from commit ed94f0f) * fix: ignore permissions while creating reposts (cherry picked from commit 0a2964d) * fix: Shipping Rule picking up old net_rate (cherry picked from commit c78b8b7) * fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py (cherry picked from commit 18ae03d) * fix: check if shipping rule value exists (cherry picked from commit af1fce0) * fix: fixed tests, separated a method for shipping charges (cherry picked from commit a8e2c02) * fix: sider issues (cherry picked from commit e7b4204) * fix: merge conflicts * fix: fixes in work order doctype (backport frappe#28217) * fix: abbr Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Ankush Menat <ankush@frappe.io> Co-authored-by: Subin Tom <subintom2@gmail.com>

* feat: create party link from customer/supplier (backport frappe#28387) * fix: Customer, Supplier heatmap data not rendering (backport frappe#28553) * fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (backport frappe#28443) * fix: allow creating Shift Assignment for same day (backport frappe#28613) * fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice (cherry picked from commit 6a75e8d) * fix: India utils code cleanup (cherry picked from commit 56c626a) * fix: dont requeue repost immediately and clear progress (backport frappe#28684) * fix: Employee Advance paid amount not updated on PE cancellation (backport frappe#28572) * fix: coa balance rendering bug (backport frappe#28468) * fix(UX): combine_items checkbox to trigger get_items and sub_assembly button (backport frappe#28558) * fix: added job_card_item link in material request (backport frappe#28222) * fix: incorrect discount amount set when item is replaced (frappe#28556) (cherry picked from commit c0cc72e) * fix: cost center wise ledger posting for pcv (backport frappe#28477) * fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (backport frappe#28497) * fix: Employee link formatter showing incorrect value for Employee Name (backport frappe#28504) * fix: Remove RM Cost column as cost is not retrievable from Job card (backport frappe#28123) * fix: total stock summary UI glitch (backport frappe#28564) * fix: (style) Warehouse Capacity Dashboard UI (backport frappe#28431) * fix: incorrect balance in "Warehouse Wise Item Balance and Age" report (backport frappe#28583) * refactor!: remove abbreviation renaming (backport frappe#27766) * fix: POS Item cart only taxes with amount displayed (backport frappe#28501) * refactor: (ux) Accepted/Rejected/Received Qty UX (cherry picked from commit 5fb5a75) * fix: Sider + Fields UX - remove extra space (sider) - PR: Bring rejected qty in grid view - PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM` - PI: Move `Accepted Qty in Stock UOM` under Stock UOM (cherry picked from commit afe1c45) * test: Purchase Receipt Received Qty (cherry picked from commit 05ec7cc) * test: Purchase Invoice Received Qty (cherry picked from commit e9c75d6) * fix: Sider, Linter and Server Side Test - Fix Server side PR test - linter: re-arrange imports - sider: avoid single line multi statement - Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt - Removed unused variables in test_purchase_receipt (cherry picked from commit 293f6cb) * fix: Merge conflicts * fix: fixes in work order doctype (backport frappe#28217) * fix: (server test) Missing variable declaration * refactor: item-wh wise reposting by default (cherry picked from commit 6dc9b82) * test: item-wh repost creation (cherry picked from commit a36c249) * refactor: reuse get_items_to_be_repost function (cherry picked from commit d220e08) * feat: option to select reposting method In current implementation selecting Item-Warehouse based reposting is better for few users, who don't use depenent SLEs but have frequent transactions involving same items. This change lets them switch to item-warehouse based reposting if required. Only use this if you understand technicalities of stock reposting. This is experimental but will become mainstream in coming days. (cherry picked from commit 45dd46b) * perf: index for item-sh on repost item valuation Item-WH based reposting requires querying existing similar repost. Assuming there is only 1 max extra entry with same params just indexing item-WH is sufficient to speed up the query. (cherry picked from commit a5a8c91) * fix: dont erase voucher_type and voucher_no for item_wh repost kept for tracability. (cherry picked from commit 1d3842f) * perf: skip unnecessary item-wh reposts Using basic idea that repost with older posting date will also take care of subsequent posting dates... When Item-WH reposts are queued: 1. If another repost with same item-wh but older posting date exists then skip current one. 2. If another repost with same item-wh but newer posting date exists then skip another one. (cherry picked from commit 0d0e24a) * test: item-wh deduplication in reposting (cherry picked from commit 55631dd) * refactor: deduplicate during repost background job (cherry picked from commit ed94f0f) * fix: ignore permissions while creating reposts (cherry picked from commit 0a2964d) * fix: Shipping Rule picking up old net_rate (cherry picked from commit c78b8b7) * fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py (cherry picked from commit 18ae03d) * fix: check if shipping rule value exists (cherry picked from commit af1fce0) * fix: fixed tests, separated a method for shipping charges (cherry picked from commit a8e2c02) * fix: sider issues (cherry picked from commit e7b4204) * fix: merge conflicts * fix: fixes in work order doctype (backport frappe#28217) * fix: abbr Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Ankush Menat <ankush@frappe.io> Co-authored-by: Subin Tom <subintom2@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Ankush Menat <ankush@frappe.io> Co-authored-by: Subin Tom <subintom2@gmail.com>

fix: fixes in work order doctype

d789db3

mohammedyusufshaikh requested review from ankush, marination and rohitwaghchaure as code owners November 3, 2021 06:52

Merge branch 'develop' into work_order_fix

a4f8b04

ankush requested changes Nov 3, 2021

View reviewed changes

erpnext/manufacturing/doctype/work_order/work_order.json Outdated Show resolved Hide resolved

erpnext/manufacturing/doctype/work_order/work_order.js Outdated Show resolved Hide resolved

fix: sider issues and disabled set only once property

27d4ca9

ankush reviewed Nov 7, 2021

View reviewed changes

erpnext/manufacturing/doctype/work_order/work_order.json Outdated Show resolved Hide resolved

mohammedyusufshaikh and others added 3 commits November 8, 2021 17:38

fix: set default qty to manufacture

a498f95

Merge branch 'develop' into work_order_fix

8ddc8c0

Merge branch 'develop' into work_order_fix

eac5711

ankush reviewed Nov 17, 2021

View reviewed changes

erpnext/manufacturing/doctype/work_order/work_order.js Outdated Show resolved Hide resolved

fix: dont manually collapse sections

99b5b15

ankush reviewed Nov 17, 2021

View reviewed changes

erpnext/manufacturing/doctype/work_order/work_order.js Outdated Show resolved Hide resolved

ankush self-assigned this Nov 24, 2021

ankush added 2 commits November 24, 2021 14:56

Merge branch 'develop' into work_order_fix

04256e2

fix: remove unnecessary messages

af21202

ankush reviewed Nov 24, 2021

View reviewed changes

erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json Outdated Show resolved Hide resolved

fix: make dependent fields read only

951fe6d

ankush force-pushed the work_order_fix branch from 95fe14b to 951fe6d Compare November 24, 2021 09:53

ankush approved these changes Nov 24, 2021

View reviewed changes

ankush added this to the v13.16 milestone Nov 24, 2021

ankush added backport version-13-hotfix squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. labels Nov 24, 2021

ankush merged commit 8d2abc4 into frappe:develop Nov 24, 2021

mergify bot mentioned this pull request Nov 24, 2021

fix: fixes in work order doctype (backport #28217) #28543

Merged

rohitwaghchaure mentioned this pull request Dec 5, 2021

chore: change log for v13.16.0 #28737

Merged

sharmanakul added this to In progress in ERPNext Roadmap via automation Dec 7, 2021

sharmanakul moved this from In progress to Done in ERPNext Roadmap Dec 7, 2021

fproldan added a commit to fproldan/erpnext that referenced this pull request Oct 17, 2022

fix: fixes in work order doctype (backport frappe#28217)

50a3e31

fproldan added a commit to fproldan/erpnext that referenced this pull request Oct 17, 2022

fix: fixes in work order doctype (backport frappe#28217)

58b6c68

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: fixes in work order doctype #28217

fix: fixes in work order doctype #28217

mohammedyusufshaikh commented Nov 3, 2021

codecov bot commented Nov 3, 2021 •

edited

fix: fixes in work order doctype #28217

fix: fixes in work order doctype #28217

Conversation

mohammedyusufshaikh commented Nov 3, 2021

codecov bot commented Nov 3, 2021 • edited

Codecov Report

codecov bot commented Nov 3, 2021 •

edited