Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: mapping to maintenance visit gets erased #28917

Merged
merged 2 commits into from
Dec 16, 2021

Conversation

noahjacob
Copy link
Contributor

@noahjacob noahjacob commented Dec 16, 2021

Issue

  • When trying to create a Maintenance Visit via Maintenance Schedule, no items get mapped.

mapping_broken

Reason

  • When mapping to visit, the form is still in the __islocal state.

image

Fix

  • Since the items are mapped to Visit only via Schedule, added the condition frm.doc.maintenance_type == 'Unscheduled' as it would only need to be cleared if the maintenance_type is of type "Unscheduled". (When creating visit via schedule, the type is set to "Scheduled")

Notes

  • The frm.clear_table() was introduced to removed the empty row on creating a new Unscheduled Visit.

empty_row

@codecov
Copy link

codecov bot commented Dec 16, 2021

Codecov Report

Merging #28917 (30f2b10) into develop (56bc8a5) will increase coverage by 0.03%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop   #28917      +/-   ##
===========================================
+ Coverage    55.56%   55.60%   +0.03%     
===========================================
  Files         1125     1126       +1     
  Lines        66984    67199     +215     
===========================================
+ Hits         37219    37364     +145     
- Misses       29765    29835      +70     
Impacted Files Coverage Δ
...ctype/woocommerce_settings/woocommerce_settings.py 80.00% <0.00%> (-4.00%) ⬇️
...e/asset_value_adjustment/asset_value_adjustment.py 86.04% <0.00%> (-3.49%) ⬇️
.../report/bom_operations_time/bom_operations_time.py 93.33% <0.00%> (-3.34%) ⬇️
...k/doctype/quality_inspection/quality_inspection.py 62.04% <0.00%> (-3.08%) ⬇️
erpnext/stock/reorder_item.py 75.21% <0.00%> (-1.71%) ⬇️
...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/support/doctype/issue/issue.py 64.03% <0.00%> (-0.99%) ⬇️
...next/accounts/doctype/subscription/subscription.py 81.74% <0.00%> (-0.57%) ⬇️
... and 19 more

@ankush
Copy link
Member

ankush commented Dec 16, 2021

@noahjacob merging for now. Please fix the root cause (extra row) instead of using clear_table.

@ankush ankush merged commit 4cb5b62 into frappe:develop Dec 16, 2021
mergify bot pushed a commit that referenced this pull request Dec 16, 2021
* fix: mappings to maintenance visit gets erased

* test: mapping of schedule to visit

(cherry picked from commit 4cb5b62)
mergify bot pushed a commit that referenced this pull request Dec 16, 2021
* fix: mappings to maintenance visit gets erased

* test: mapping of schedule to visit

(cherry picked from commit 4cb5b62)
ankush pushed a commit that referenced this pull request Dec 16, 2021
* fix: mappings to maintenance visit gets erased

* test: mapping of schedule to visit

(cherry picked from commit 4cb5b62)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
ankush pushed a commit that referenced this pull request Dec 16, 2021
* fix: mappings to maintenance visit gets erased

* test: mapping of schedule to visit

(cherry picked from commit 4cb5b62)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022
* fix: mappings to maintenance visit gets erased

* test: mapping of schedule to visit
conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022
* fix: mappings to maintenance visit gets erased

* test: mapping of schedule to visit
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 16, 2022
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Dec 28, 2022
* 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>
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 28, 2022
* 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>
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 28, 2022
* 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>
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 28, 2022
* 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>
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Apr 17, 2023
* 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>
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Apr 17, 2023
* 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>
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Apr 17, 2023
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants