fix: actual tax conversion in case of multicurrency invoices #28539
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@Mergifyio backport version-13-hotfix |
🟠 Waiting for conditions to match
|
|
@Mergifyio backport version-12-hotfix |
🟠 Waiting for conditions to match
|
mergify bot
pushed a commit
that referenced
this pull request
Dec 2, 2021
(cherry picked from commit 4889661)
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Dec 2, 2021
(cherry picked from commit 4889661)
✅ Backports have been created
|
conncampbell
pushed a commit
to conncampbell/erpnext
that referenced
this pull request
Jan 9, 2022
conncampbell
pushed a commit
to conncampbell/erpnext
that referenced
this pull request
Jan 9, 2022
fproldan
added a commit
to fproldan/erpnext
that referenced
this pull request
Dec 15, 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Steps to replicate:
This happens because Actual Taxes are re-calculated based on the current exchange rate. And the expression for the same is incorrect.