fix: Avoid resetting Default wh fields for Manufacture Entry #29257

marination · 2022-01-12T08:56:12Z

Introducted via #28798

Issue:

Source/target is blank on some rows in a Manufacture Stock Entry
Users still want an overall reference of the warehouses involved in this mfg entry
Scrap item may have different warehouse (just one row), it should be overlooked

Fix:

Avoid resetting Default source/target warehouse in manufacture entry alone
For Repack entry users most like will not use these fields since each row has to have a different warehouse. And repack entries aren't auto generated from anywhere, like Manufacture entries are generated from Work Orders
If there's 1 entry in child_table_values, dont do anything. There's nothing to reset. Reset and set to None only if there's more than one value for a field in the table rows.

- Source/target is blank on some rows in such an entry - Users still want an overall reference of warehouses involved in mfg - scrap item may have different warehouse (just one row), should be overlooked

- Dont call reset methods if purpose is mfg in stock entry

codecov · 2022-01-12T11:09:12Z

Codecov Report

Merging #29257 (1fbe57e) into develop (11fae15) will decrease coverage by 0.13%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop   #29257      +/-   ##
===========================================
- Coverage    57.95%   57.81%   -0.14%     
===========================================
  Files         1110     1110              
  Lines        68000    68000              
===========================================
- Hits         39408    39313      -95     
- Misses       28592    28687      +95

Impacted Files	Coverage Δ
erpnext/utilities/transaction_base.py	`75.20% <ø> (-0.21%)`	⬇️
erpnext/stock/doctype/stock_entry/stock_entry.py	`80.60% <100.00%> (+0.01%)`	⬆️
...unts/report/purchase_register/purchase_register.py	`32.19% <0.00%> (-47.95%)`	⬇️
...ext/accounts/report/balance_sheet/balance_sheet.py	`36.36% <0.00%> (-21.82%)`	⬇️
...e_purchase_register/item_wise_purchase_register.py	`58.00% <0.00%> (-20.00%)`	⬇️
...t/product_bundle_balance/product_bundle_balance.py	`79.54% <0.00%> (-15.91%)`	⬇️
...em_wise_sales_register/item_wise_sales_register.py	`51.36% <0.00%> (-10.91%)`	⬇️
...it_and_loss_statement/profit_and_loss_statement.py	`71.42% <0.00%> (-3.90%)`	⬇️
.../report/bom_operations_time/bom_operations_time.py	`93.33% <0.00%> (-3.34%)`	⬇️
...t/accounts/report/sales_register/sales_register.py	`71.51% <0.00%> (-3.04%)`	⬇️
... and 29 more

marination · 2022-01-12T11:14:53Z

@Mergifyio backport version-13-hotfix

fix: Avoid resetting Default wh fields for Manufacture Entry (cherry picked from commit efcfb82)

mergify · 2022-01-12T11:15:39Z

backport version-13-hotfix

✅ Backports have been created

#29259 fix: Avoid resetting Default wh fields for Manufacture Entry (backport #29257) has been created for branch version-13-hotfix

fix: Avoid resetting Default wh fields for Manufacture Entry (cherry picked from commit efcfb82) Co-authored-by: Marica <maricadsouza221197@gmail.com>

fix: Avoid resetting Default wh fields for Manufacture Entry (cherry picked from commit efcfb82)

* feat: added QI link in Job Card Dashboard (backport frappe#28643) * feat: Show Zero Values filter in consolidated financial statement (cherry picked from commit 9610086) * fix: ensure that reposting is finished before freezing stock/account (cherry picked from commit d37541d) * test: stock frozen validation (cherry picked from commit 75bc404) * fix: incorrect outgoing rates when material_consumption enabled (cherry picked from commit 7f3e6d1) * test: added tests for manufacture stock entry when material_consumption is enabled (cherry picked from commit 35346de) * fix: actual tax conversion in case of multicurrency invoices (backport frappe#28539) * 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: Paid showing in AR/AP report * fix: Better Error logging fordeferred revenue/expense booking (cherry picked from commit 67a001d) * fix: Commit joural entries (cherry picked from commit 0ba4fce) * fix: Log error before throwing exception (cherry picked from commit 3c64e20) * fix: mapping to maintenance visit gets erased (backport frappe#28917) * fix: ignore mandatory fields while creating WO from SO (backport frappe#28772) * refactor: map serial from schedule if only one (backport frappe#28745) * fix: TDS Monthly payable report (backport frappe#28764) * fix: Maintenance Visit purposes tables is not visible on submission (backport frappe#28792) * fix: misleading "Set Default X" fields after saving (backport frappe#28798) * fix: Fix depreciation_amount calculation (cherry picked from commit 22cc8d2) # Conflicts: # erpnext/regional/india/utils.py * fix: Create Depreciation Schedules properly for existing Assets (cherry picked from commit 5c3d4ca) * fix: Modify has_pro_rata() to include existing assets (cherry picked from commit de00200) * fix: Test if depreciation schedules are set up properly for existing assets (cherry picked from commit 774ac85) # Conflicts: # erpnext/assets/doctype/asset/test_asset.py * fix: Remove unnecessary variable (cherry picked from commit 828769c) * fix: conflicts * fix: conflicts * feat: Add Serial No field (cherry picked from commit 1aed8c4) * fix: Rename item to item_code (cherry picked from commit abb5355) * feat: Add 'Add Serial No' button in the Stock Items table (cherry picked from commit 4668bb4) * fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair (cherry picked from commit 1393f97) * fix: Replace 'item' with 'item_code' in tests (cherry picked from commit c9e79ef) * fix: Create stock item (cherry picked from commit eea80b6) * fix: Create setUpClass (cherry picked from commit efac7b0) * fix: Add test for consumption of serialized Assets (cherry picked from commit 6b75d14) * fix: Remove unused import (cherry picked from commit b28f137) * fix: Change order of import statements (cherry picked from commit c94f1ed) * Merge pull request frappe#29257 from marination/fix-reset-wh-defaults fix: Avoid resetting Default wh fields for Manufacture Entry (cherry picked from commit efcfb82) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Ankush Menat <ankush@frappe.io> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com> Co-authored-by: GangaManoj <ganga.manoj98@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>

* feat: added QI link in Job Card Dashboard (backport frappe#28643) * feat: Show Zero Values filter in consolidated financial statement (cherry picked from commit 9610086) * fix: ensure that reposting is finished before freezing stock/account (cherry picked from commit d37541d) * test: stock frozen validation (cherry picked from commit 75bc404) * fix: incorrect outgoing rates when material_consumption enabled (cherry picked from commit 7f3e6d1) * test: added tests for manufacture stock entry when material_consumption is enabled (cherry picked from commit 35346de) * fix: actual tax conversion in case of multicurrency invoices (backport frappe#28539) * 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: Paid showing in AR/AP report * fix: Better Error logging fordeferred revenue/expense booking (cherry picked from commit 67a001d) * fix: Commit joural entries (cherry picked from commit 0ba4fce) * fix: Log error before throwing exception (cherry picked from commit 3c64e20) * fix: mapping to maintenance visit gets erased (backport frappe#28917) * fix: ignore mandatory fields while creating WO from SO (backport frappe#28772) * refactor: map serial from schedule if only one (backport frappe#28745) * fix: TDS Monthly payable report (backport frappe#28764) * fix: Maintenance Visit purposes tables is not visible on submission (backport frappe#28792) * fix: misleading "Set Default X" fields after saving (backport frappe#28798) * fix: Fix depreciation_amount calculation (cherry picked from commit 22cc8d2) * fix: Create Depreciation Schedules properly for existing Assets (cherry picked from commit 5c3d4ca) * fix: Modify has_pro_rata() to include existing assets (cherry picked from commit de00200) * fix: Test if depreciation schedules are set up properly for existing assets (cherry picked from commit 774ac85) * fix: Remove unnecessary variable (cherry picked from commit 828769c) * fix: conflicts * fix: conflicts * feat: Add Serial No field (cherry picked from commit 1aed8c4) * fix: Rename item to item_code (cherry picked from commit abb5355) * feat: Add 'Add Serial No' button in the Stock Items table (cherry picked from commit 4668bb4) * fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair (cherry picked from commit 1393f97) * fix: Replace 'item' with 'item_code' in tests (cherry picked from commit c9e79ef) * fix: Create stock item (cherry picked from commit eea80b6) * fix: Create setUpClass (cherry picked from commit efac7b0) * fix: Add test for consumption of serialized Assets (cherry picked from commit 6b75d14) * fix: Remove unused import (cherry picked from commit b28f137) * fix: Change order of import statements (cherry picked from commit c94f1ed) * Merge pull request frappe#29257 from marination/fix-reset-wh-defaults fix: Avoid resetting Default wh fields for Manufacture Entry (cherry picked from commit efcfb82) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Ankush Menat <ankush@frappe.io> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com> Co-authored-by: GangaManoj <ganga.manoj98@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>

* feat: added QI link in Job Card Dashboard (backport frappe#28643) * feat: Show Zero Values filter in consolidated financial statement (cherry picked from commit 9610086) * fix: ensure that reposting is finished before freezing stock/account (cherry picked from commit d37541d) * test: stock frozen validation (cherry picked from commit 75bc404) * fix: incorrect outgoing rates when material_consumption enabled (cherry picked from commit 7f3e6d1) * test: added tests for manufacture stock entry when material_consumption is enabled (cherry picked from commit 35346de) * fix: actual tax conversion in case of multicurrency invoices (backport frappe#28539) * 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: Paid showing in AR/AP report * fix: Better Error logging fordeferred revenue/expense booking (cherry picked from commit 67a001d) * fix: Commit joural entries (cherry picked from commit 0ba4fce) * fix: Log error before throwing exception (cherry picked from commit 3c64e20) * fix: mapping to maintenance visit gets erased (backport frappe#28917) * fix: ignore mandatory fields while creating WO from SO (backport frappe#28772) * refactor: map serial from schedule if only one (backport frappe#28745) * fix: TDS Monthly payable report (backport frappe#28764) * fix: Maintenance Visit purposes tables is not visible on submission (backport frappe#28792) * fix: misleading "Set Default X" fields after saving (backport frappe#28798) * fix: Fix depreciation_amount calculation (cherry picked from commit 22cc8d2) # Conflicts: # erpnext/regional/india/utils.py * fix: Create Depreciation Schedules properly for existing Assets (cherry picked from commit 5c3d4ca) * fix: Modify has_pro_rata() to include existing assets (cherry picked from commit de00200) * fix: Test if depreciation schedules are set up properly for existing assets (cherry picked from commit 774ac85) # Conflicts: # erpnext/assets/doctype/asset/test_asset.py * fix: Remove unnecessary variable (cherry picked from commit 828769c) * fix: conflicts * fix: conflicts * feat: Add Serial No field (cherry picked from commit 1aed8c4) * fix: Rename item to item_code (cherry picked from commit abb5355) * feat: Add 'Add Serial No' button in the Stock Items table (cherry picked from commit 4668bb4) * fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair (cherry picked from commit 1393f97) * fix: Replace 'item' with 'item_code' in tests (cherry picked from commit c9e79ef) * fix: Create stock item (cherry picked from commit eea80b6) * fix: Create setUpClass (cherry picked from commit efac7b0) * fix: Add test for consumption of serialized Assets (cherry picked from commit 6b75d14) * fix: Remove unused import (cherry picked from commit b28f137) * fix: Change order of import statements (cherry picked from commit c94f1ed) * Merge pull request frappe#29257 from marination/fix-reset-wh-defaults fix: Avoid resetting Default wh fields for Manufacture Entry (cherry picked from commit efcfb82) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Ankush Menat <ankush@frappe.io> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com> Co-authored-by: GangaManoj <ganga.manoj98@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>

* feat: added QI link in Job Card Dashboard (backport frappe#28643) * feat: Show Zero Values filter in consolidated financial statement (cherry picked from commit 9610086) * fix: ensure that reposting is finished before freezing stock/account (cherry picked from commit d37541d) * test: stock frozen validation (cherry picked from commit 75bc404) * fix: incorrect outgoing rates when material_consumption enabled (cherry picked from commit 7f3e6d1) * test: added tests for manufacture stock entry when material_consumption is enabled (cherry picked from commit 35346de) * fix: actual tax conversion in case of multicurrency invoices (backport frappe#28539) * 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: Paid showing in AR/AP report * fix: Better Error logging fordeferred revenue/expense booking (cherry picked from commit 67a001d) * fix: Commit joural entries (cherry picked from commit 0ba4fce) * fix: Log error before throwing exception (cherry picked from commit 3c64e20) * fix: mapping to maintenance visit gets erased (backport frappe#28917) * fix: ignore mandatory fields while creating WO from SO (backport frappe#28772) * refactor: map serial from schedule if only one (backport frappe#28745) * fix: TDS Monthly payable report (backport frappe#28764) * fix: Maintenance Visit purposes tables is not visible on submission (backport frappe#28792) * fix: misleading "Set Default X" fields after saving (backport frappe#28798) * fix: Fix depreciation_amount calculation (cherry picked from commit 22cc8d2) * fix: Create Depreciation Schedules properly for existing Assets (cherry picked from commit 5c3d4ca) * fix: Modify has_pro_rata() to include existing assets (cherry picked from commit de00200) * fix: Test if depreciation schedules are set up properly for existing assets (cherry picked from commit 774ac85) * fix: Remove unnecessary variable (cherry picked from commit 828769c) * fix: conflicts * fix: conflicts * feat: Add Serial No field (cherry picked from commit 1aed8c4) * fix: Rename item to item_code (cherry picked from commit abb5355) * feat: Add 'Add Serial No' button in the Stock Items table (cherry picked from commit 4668bb4) * fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair (cherry picked from commit 1393f97) * fix: Replace 'item' with 'item_code' in tests (cherry picked from commit c9e79ef) * fix: Create stock item (cherry picked from commit eea80b6) * fix: Create setUpClass (cherry picked from commit efac7b0) * fix: Add test for consumption of serialized Assets (cherry picked from commit 6b75d14) * fix: Remove unused import (cherry picked from commit b28f137) * fix: Change order of import statements (cherry picked from commit c94f1ed) * Merge pull request frappe#29257 from marination/fix-reset-wh-defaults fix: Avoid resetting Default wh fields for Manufacture Entry (cherry picked from commit efcfb82) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Ankush Menat <ankush@frappe.io> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: Subin Tom <subintom2@gmail.com> Co-authored-by: GangaManoj <ganga.manoj98@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>

github-actions bot added the needs-tests This PR needs automated unit-tests. label Jan 12, 2022

fix: Avoid resetting Default wh fields for Manufacture Entry

07e2d14

- Source/target is blank on some rows in such an entry - Users still want an overall reference of warehouses involved in mfg - scrap item may have different warehouse (just one row), should be overlooked

marination force-pushed the fix-reset-wh-defaults branch from bd1577d to 07e2d14 Compare January 12, 2022 08:59

test: Reset default field in stock entry depending on purpose

a04c09c

marination requested review from ankush, deepeshgarg007, nextchamp-saqib and rohitwaghchaure as code owners January 12, 2022 09:10

marination removed the needs-tests This PR needs automated unit-tests. label Jan 12, 2022

fix: Check for mfg entry in stock entry itself

baf9345

- Dont call reset methods if purpose is mfg in stock entry

marination removed request for rohitwaghchaure, ankush, nextchamp-saqib and deepeshgarg007 January 12, 2022 10:44

fix: Tests

1fbe57e

marination force-pushed the fix-reset-wh-defaults branch from df7904f to 1fbe57e Compare January 12, 2022 10:48

marination added the backport version-13-hotfix label Jan 12, 2022

marination added this to the v13.19 milestone Jan 12, 2022

marination merged commit efcfb82 into frappe:develop Jan 12, 2022

mergify bot pushed a commit that referenced this pull request Jan 12, 2022

Merge pull request #29257 from marination/fix-reset-wh-defaults

d01e794

fix: Avoid resetting Default wh fields for Manufacture Entry (cherry picked from commit efcfb82)

mergify bot mentioned this pull request Jan 12, 2022

fix: Avoid resetting Default wh fields for Manufacture Entry (backport #29257) #29259

Merged

rohitwaghchaure mentioned this pull request Jan 23, 2022

chore: change log for v13.19.0 #29415

Merged

KrithiRamani pushed a commit to KrithiRamani/erpnext that referenced this pull request Mar 14, 2022

Merge pull request frappe#29257 from marination/fix-reset-wh-defaults

6774a82

fix: Avoid resetting Default wh fields for Manufacture Entry (cherry picked from commit efcfb82)

fproldan pushed a commit to fproldan/erpnext that referenced this pull request Dec 28, 2022

Merge pull request frappe#29257 from marination/fix-reset-wh-defaults

8b137da

fix: Avoid resetting Default wh fields for Manufacture Entry (cherry picked from commit efcfb82)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Avoid resetting Default wh fields for Manufacture Entry #29257

fix: Avoid resetting Default wh fields for Manufacture Entry #29257

marination commented Jan 12, 2022

codecov bot commented Jan 12, 2022

marination commented Jan 12, 2022

mergify bot commented Jan 12, 2022

fix: Avoid resetting Default wh fields for Manufacture Entry #29257

fix: Avoid resetting Default wh fields for Manufacture Entry #29257

Conversation

marination commented Jan 12, 2022

codecov bot commented Jan 12, 2022

Codecov Report

marination commented Jan 12, 2022

mergify bot commented Jan 12, 2022

✅ Backports have been created