fix(UX): combine_items checkbox to trigger get_items and sub_assembly button #28558

noahjacob · 2021-11-25T10:14:01Z

Issue

When ticking the "Consolidate Items" checkbox, you would need to click on the "Get Finished Goods for Manufacture" button to get the combined items.
Similarly for getting the combined Sub-Assembly Items, you would have to click on the button after ticking the checkbox.

Fix

On ticking the "Consolidate Items" checkbox, the "Get Finished Goods for Manufacture"" button is triggered.
If there are items in the sub-assembly items table before the checkbox is ticked, the "Get Sub Assembly Items" button would also get triggered.

(cherry picked from commit 73bfd59)

…28571) (cherry picked from commit 73bfd59) Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>

… button (backport frappe#28558)

* 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>

noahjacob requested review from ankush, marination and rohitwaghchaure as code owners November 25, 2021 10:14

fix: checkbox triggers get_items and sub_assembly buttons

f2db95a

noahjacob force-pushed the prod_plan_trigger_fix branch from 84c34d2 to f2db95a Compare November 25, 2021 10:14

ankush approved these changes Nov 26, 2021

View reviewed changes

ankush added the backport version-13-hotfix label Nov 26, 2021

ankush merged commit 73bfd59 into frappe:develop Nov 26, 2021

mergify bot mentioned this pull request Nov 26, 2021

fix(UX): combine_items checkbox to trigger get_items and sub_assembly button (backport #28558) #28571

Merged

mergify bot pushed a commit that referenced this pull request Nov 26, 2021

fix: checkbox triggers get_items and sub_assembly buttons (#28558)

66791a2

(cherry picked from commit 73bfd59)

ankush pushed a commit that referenced this pull request Nov 26, 2021

fix: checkbox triggers get_items and sub_assembly buttons (#28558) (#…

eac67db

…28571) (cherry picked from commit 73bfd59) Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>

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 added this to the v13.16 milestone Dec 7, 2021

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

conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022

fix: checkbox triggers get_items and sub_assembly buttons (frappe#28558)

c0aeda7

conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022

fix: checkbox triggers get_items and sub_assembly buttons (frappe#28558)

18e3af9

yadavyk mentioned this pull request Jan 13, 2022

bug: Production Plan: does not combine common Work Order Items #26801

Closed

ankush mentioned this pull request Feb 21, 2022

Production plan: Same item with different BOM but the work orders are getting consolidated #29585

Open

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

fix(UX): combine_items checkbox to trigger get_items and sub_assembly…

5f4a3f7

… button (backport frappe#28558)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(UX): combine_items checkbox to trigger get_items and sub_assembly button #28558

fix(UX): combine_items checkbox to trigger get_items and sub_assembly button #28558

noahjacob commented Nov 25, 2021

fix(UX): combine_items checkbox to trigger get_items and sub_assembly button #28558

fix(UX): combine_items checkbox to trigger get_items and sub_assembly button #28558

Conversation

noahjacob commented Nov 25, 2021

Issue

Fix