refactor: map serial from schedule if only one #28745

noahjacob · 2021-12-06T07:08:26Z

Before

Serial No was not mapped while creating a Visit from a Maintenance Schedule.

Changes

Serial No is now mapped while creating a Visit from a Maintenance Schedule if there is only one serial number.

erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py

codecov · 2021-12-06T07:29:13Z

Codecov Report

Merging #28745 (eb522a3) into develop (37c318a) will increase coverage by 13.92%.
The diff coverage is 80.00%.

@@             Coverage Diff              @@
##           develop   #28745       +/-   ##
============================================
+ Coverage    41.34%   55.27%   +13.92%     
============================================
  Files         1120     1121        +1     
  Lines        66673    66763       +90     
============================================
+ Hits         27567    36904     +9337     
+ Misses       39106    29859     -9247

Impacted Files	Coverage Δ
...ctype/maintenance_schedule/maintenance_schedule.py	`76.29% <80.00%> (+14.72%)`	⬆️
erpnext/stock/doctype/warehouse/warehouse.py	`43.22% <0.00%> (-9.76%)`	⬇️
erpnext/stock/doctype/bin/bin.py	`87.27% <0.00%> (-4.54%)`	⬇️
...e/asset_value_adjustment/asset_value_adjustment.py	`86.04% <0.00%> (-3.49%)`	⬇️
...value/warehouse_wise_item_balance_age_and_value.py	`92.40% <0.00%> (-2.54%)`	⬇️
...ctype/accounting_dimension/accounting_dimension.py	`64.06% <0.00%> (-1.57%)`	⬇️
...e/period_closing_voucher/period_closing_voucher.py	`88.23% <0.00%> (-1.48%)`	⬇️
erpnext/tests/utils.py	`97.01% <0.00%> (-1.10%)`	⬇️
...ice_creation_tool/opening_invoice_creation_tool.py	`60.13% <0.00%> (-0.70%)`	⬇️
erpnext/regional/saudi_arabia/utils.py	`23.75% <0.00%> (-0.70%)`	⬇️
... and 333 more

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

noahjacob requested review from marination and rohitwaghchaure as code owners December 6, 2021 07:08

noahjacob requested a review from ankush December 6, 2021 07:08

ankush reviewed Dec 6, 2021

View reviewed changes

erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py Outdated Show resolved Hide resolved

refactor: map serial from schedule if only one

eb522a3

noahjacob force-pushed the maint_batch_map branch from c45af6b to eb522a3 Compare December 6, 2021 08:13

ankush added the backport version-13-hotfix label Dec 6, 2021

ankush approved these changes Dec 6, 2021

View reviewed changes

ankush merged commit ef53eb7 into frappe:develop Dec 6, 2021

mergify bot mentioned this pull request Dec 6, 2021

refactor: map serial from schedule if only one (backport #28745) #28747

Merged

rohitwaghchaure mentioned this pull request Dec 21, 2021

chore: change log for v13.17.0 #28989

Merged

deepeshgarg007 mentioned this pull request Jul 18, 2022

List of V14 features & enhancements #31620

Closed

fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 16, 2022

refactor: map serial from schedule if only one (backport frappe#28745)

a7640db

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: map serial from schedule if only one #28745

refactor: map serial from schedule if only one #28745

noahjacob commented Dec 6, 2021

codecov bot commented Dec 6, 2021 •

edited

refactor: map serial from schedule if only one #28745

refactor: map serial from schedule if only one #28745

Conversation

noahjacob commented Dec 6, 2021

Before

Changes

codecov bot commented Dec 6, 2021 • edited

Codecov Report

codecov bot commented Dec 6, 2021 •

edited