schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,847 Commits 322 Branches 1,581 Tags
ae88ba5d18dfbf6ff68518be5a66f445d7799f15
Commit Graph

169 Commits

Author SHA1 Message Date
Anand Baburajan
ae88ba5d18 fix: incorrect depr schedules after asset repair [v13] (#34520) 
* fix: incorrect schedule after repair for WDV and DD

* chore: only fix schedules for assets with calc_depr true

* fix: incorrect schedule after repair for straight line and manual
 2023-03-21 12:35:44 +05:30
Deepesh Garg
9dc0edfb8a fix: Do not force eligibilgity of itc for reverse charge 2022-11-01 16:03:32 +05:30
Deepesh Garg
fbeb86b9c0 Merge pull request #32453 from deepeshgarg007/intra_state_transfer_eway_bill_v13 
fix: e-Way bill JSON for Intra-state internal transfers
 2022-10-03 09:07:26 +05:30
Deepesh Garg
c4c52c1cd3 chore: Linting Issues 2022-10-01 16:06:31 +05:30
Deepesh Garg
b7fbf75e10 fix: e-Way bill JSON for Intra-state internal transfers 2022-10-01 15:58:31 +05:30
Maharshi Patel
a13eecc961 fix: SEZ Without Payment of Tax don't add tax rows 
taxes were added even when gst_category was SEZ and export_type was Without Payment of Tax
 2022-09-27 13:40:04 +05:30
Dany Robert
01d6df45d0 fix(india): e-way bill json for unregistered gst category 2022-07-15 11:17:41 +05:30
Maharshi Patel
82539fc18a fix: (india) (e-invoice) allow generation for UIN Holders 
e-invoice is required for UIN Holders and they should be treated as Registered Regular. there was incorrect if hasattr check that prevented UIN number validation.
 2022-07-14 15:12:51 +05:30
Deepesh Garg
9ba7290dc9 fix(India): Discounts in E-Invoicing 
(cherry picked from commit f337213f33)
 2022-07-03 08:05:21 +00:00
Deepesh Garg
a1ba8475d0 fix(India): Sales taxes and charges template fetching in quotation 
(cherry picked from commit 243625898e)
 2022-06-14 05:47:55 +00:00
Rucha Mahabal
cdb884bbf2 fix: conflicts 2022-05-31 13:11:32 +05:30
Rucha Mahabal
66deee1582 test: set country to India before running regional tests 
(cherry picked from commit 2e98e9e0b9)
 2022-05-31 13:11:32 +05:30
Rucha Mahabal
1e728df54c fix: Tax Declaration tests and amount precision 
(cherry picked from commit 00adda7c8d)
 2022-05-31 13:11:32 +05:30
Rucha Mahabal
b1e119d97d fix: component pay calculation 
(cherry picked from commit 2b65c9616f)
 2022-05-31 13:11:32 +05:30
Rucha Mahabal
de8f5f87d0 fix: HRA Exemption calculation in case of multiple salary structure assignments 
(cherry picked from commit 34925a3a8c)

# Conflicts:
#	erpnext/regional/india/utils.py
 2022-05-31 13:11:32 +05:30
Deepesh Garg
cb8453dac8 fix: Add validation for SEZ and Export invoices without payment of taxes 2022-05-13 18:12:18 +05:30
Saqib Ansari
2ab431ad36 feat(india): e-invoicing for intra-state union territory transactions 
(cherry picked from commit 45fca6bed7)
 2022-04-12 08:03:23 +00:00
Deepesh Garg
37dc11e59a fix: Ignore disabled tax categories 
(cherry picked from commit 9a6a181f14)
 2022-04-09 14:22:53 +00:00
Deepesh Garg
f213dc9999 fix(India): Tax fetching based on tax category 
(cherry picked from commit 532961fad2)
 2022-03-31 12:32:41 +00:00
Ankush Menat
c07713b860 style: bulk format code with black 
v13 port because otherwise backports will result in conflicts always
 2022-03-29 17:29:34 +05:30
Deepesh Garg
156416bcc3 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into quotation_gst 2022-03-27 17:28:42 +05:30
Deepesh Garg
cd20502c7e fix: Reset GST State number 
(cherry picked from commit 363e676a35)
 2022-03-23 18:00:47 +00:00
Deepesh Garg
7cae669e81 fix(India): Auto tax fetching based on GSTIN 2022-03-23 18:47:58 +05:30
Deepesh Garg
87decb3734 Revert "fix(India): Tax calculation for overseas suppliers" 
(cherry picked from commit ea20c63182)
 2022-02-11 12:11:09 +00:00
Deepesh Garg
dc82becbd2 fix(India) Tax calculation for overseas suppliers 
(cherry picked from commit e45c38337c)
 2022-01-30 07:44:43 +00:00
Deepesh Garg
7a5937a98c fix(India): Tax and Charges template not getting fetched based on tax category assigned 2022-01-02 17:53:15 +05:30
Deepesh Garg
b33fd6acc7 fix: Is Reverse Charge check in Tax Category 2021-12-17 15:59:21 +05:30
Deepesh Garg
82255293c4 fix: Error on Invoice generation 2021-12-08 14:06:34 +05:30
Deepesh Garg
e11515a356 fix: Error on creating invoice 2021-12-07 18:44:05 +05:30
Saqib Ansari
bcb372ab61 fix: conflicts 2021-12-03 11:46:50 +05:30
GangaManoj
e5a5d5f8e5 fix: Remove unnecessary variable 
(cherry picked from commit 828769ca70)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
#	erpnext/regional/india/utils.py
 2021-12-03 06:02:55 +00:00
GangaManoj
a50ecffb69 fix: Fix depreciation_amount calculation 
(cherry picked from commit 22cc8d2246)

# Conflicts:
#	erpnext/regional/india/utils.py
 2021-12-03 06:02:47 +00:00
Deepesh Garg
f274f4decd Merge branch 'version-13-hotfix' into tax_template_mapping 2021-12-02 17:18:22 +05:30
Deepesh Garg
56c626adbf fix: India utils code cleanup 2021-12-02 17:17:56 +05:30
mergify[bot]
b6ffe333b9 fix(regional): hsn_wise as false returns item_code (#28619) 2021-11-29 20:47:56 +05:30
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +05:30
Deepesh Garg
f8a26a9fac fix(India): GST category not getting auto updated 2021-11-19 11:03:13 +05:30
Anuja Pawar
d37ca7b3e0 fix: sider 
(cherry picked from commit f2fbcc8124)
 2021-11-08 12:24:29 +00:00
Anuja Pawar
bbea156aa6 fix: update set_value query 
(cherry picked from commit dd3cadd46b)
 2021-11-08 12:24:29 +00:00
Anuja Pawar
10606b242c fix: re-writing sql query with ORM methods 
(cherry picked from commit bc1e7bc15f)
 2021-11-08 12:24:29 +00:00
Anuja Pawar
1dbb83c03d fix: sider 
(cherry picked from commit 6a3bd882b4)
 2021-11-08 12:24:28 +00:00
Anuja Pawar
ba08b4fcb3 fix: sider 
(cherry picked from commit 4f53837624)
 2021-11-08 12:24:27 +00:00
Anuja Pawar
2c0e8c8559 fix: check if gst_category exist 
(cherry picked from commit 59c31bb124)
 2021-11-08 12:24:27 +00:00
Subin Tom
771b076448 feat: HSN wise tax breakup check in GST Settings 
(cherry picked from commit 530de12b07)
 2021-10-13 06:38:26 +00:00
Deepesh Garg
d2f5d31f98 Merge pull request #27559 from frappe-pr-bot/backport/version-13-hotfix/27524 
fix: Tax breakup based on items, missing GST fields
 2021-10-05 14:13:50 +05:30
Deepesh Garg
f0af24fc6d fix(India): Internal transfer check fix 2021-09-30 13:28:53 +05:30
mergify[bot]
6b32fa7b1c feat(regional): toggle for reduced depreciation rate as per IT Act (#27688) 2021-09-28 19:48:50 +05:30
Deepesh Garg
6eb9a114be Merge branch 'version-13-hotfix' into backport/version-13-hotfix/27524 2021-09-27 14:55:32 +05:30
Frappe PR Bot
1b9e96f760 fix: Tax Breakup table headers fix (#27596) (#27598) 
(cherry picked from commit 0ff7367f39)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-27 14:53:29 +05:30
Subin Tom
8dfdab9dc1 fix: Tax breakup based on items, missing GST fields (#27524) 
* fix: Tax breakup based on items

* fix: added gst fields,warehouse validation to pos inv,patch

* fix: tax breakup test fix, eway bill hsn fix

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit d49346ac45)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/regional/india/setup.py
 2021-09-17 05:21:40 +00:00