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.

Sign up for GitHub

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

Jump to bottom

fix: TDS Monthly payable report #28764

Merged
merged 1 commit into from
Dec 12, 2021
Merged

fix: TDS Monthly payable report #28764

merged 1 commit into from
Dec 12, 2021

Conversation

deepeshgarg007
Copy link
Member

@deepeshgarg007 deepeshgarg007 commented Dec 6, 2021 •
edited

Invoices, where TDS is deducted manually without mentioning the Tax Withholding Category, are not shown in the TDS Monthly Payable report. This PR fixes that issue.

Steps to test:

  1. Create a Purchase Invoice and uncheck apply tax withholding
  2. Add an item and deduct tax manually using the same account head mentioned in the Tax Withholding Category.
  3. Save and submit the invoice.

Check the TDS payable monthly report, the submitted invoice should be visible even though tax withholding category is not mentioned in the invoice.

@deepeshgarg007
Copy link
Member Author

@Mergifyio backport version-13-hotfix

@mergify
Copy link
Contributor

mergify bot commented Dec 12, 2021

backport version-13-hotfix

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@deepeshgarg007 deepeshgarg007 merged commit a6fba7f into frappe:develop Dec 12, 2021
@mergify
Copy link
Contributor

mergify bot commented Dec 12, 2021

backport version-13-hotfix

✅ Backports have been created

@mergify mergify bot mentioned this pull request Dec 12, 2021
Merged
deepeshgarg007 added a commit that referenced this pull request Dec 12, 2021
@deepeshgarg007
Merge pull request #28835 from frappe/mergify/bp/version-13-hotfix/pr…
24b37de 
…-28764

fix: TDS Monthly payable report (backport #28764)
@rohitwaghchaure rohitwaghchaure mentioned this pull request Dec 21, 2021
Merged
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 16, 2022
@fproldan
fix: TDS Monthly payable report (backport frappe#28764)
f8f7add
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Dec 28, 2022
@fproldan @deepeshgarg007
@ankush @noahjacob @nemesis189 @GangaManoj @nextchamp-saqib @marination
Bump to v13.17.0 (#524)
fe734c8 
* 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
@fproldan @deepeshgarg007
@ankush @noahjacob @nemesis189 @GangaManoj @nextchamp-saqib @marination
Bump to v13.17.0 (#524)
06ba0f3 
* 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
@fproldan @deepeshgarg007
@ankush @noahjacob @nemesis189 @GangaManoj @nextchamp-saqib @marination
Bump to v13.17.0 (#524)
d04952a 
* 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
@fproldan @deepeshgarg007
@ankush @noahjacob @nemesis189 @GangaManoj @nextchamp-saqib @marination
Bump to v13.17.0 (#524)
e112c2f 
* 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
@fproldan @deepeshgarg007
@ankush @noahjacob @nemesis189 @GangaManoj @nextchamp-saqib @marination
Bump to v13.17.0 (#524) (#550)
e1634a6 
* 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
@fproldan @deepeshgarg007
@ankush @noahjacob @nemesis189 @GangaManoj @nextchamp-saqib @marination
Bump to v13.17.0 (#524) (#552)
b7eff24 
* 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
@fproldan @deepeshgarg007
@ankush @noahjacob @nemesis189 @GangaManoj @nextchamp-saqib @marination
Bump to v13.17.0 (#524) (#551)
8024662 
* 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
Reviewers

@nextchamp-saqib nextchamp-saqib Awaiting requested review from nextchamp-saqib

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@deepeshgarg007