Commit Graph

450 Commits

Author SHA1 Message Date
Ankush Menat
cdac2b8c63 fix: ignore duplicate fixtures 2022-04-26 11:03:32 +05:30
Deepesh Garg
b1158bcb7c
Merge pull request #30799 from nextchamp-saqib/einv-cess-fix
fix(india): cess value not considered while validating e-invoice totals
2022-04-25 14:39:15 +05:30
Saqib Ansari
8e6c7a6bf7 fix(india): cess value not considered while validating e-invoice totals 2022-04-25 14:02:46 +05:30
Deepesh Garg
81b3342480
Merge pull request #30757 from nextchamp-saqib/einv-401-fix
fix(india): 401 & 403 client error while generating IRN
2022-04-21 18:55:26 +05:30
Saqib Ansari
ee8047aba3 fix(india): 401 & 403 client error while generating IRN 2022-04-20 14:14:29 +05:30
FinByz Tech Pvt. Ltd
54a05075f3 fix(india): transporter name is null while generating e-way bill (#30736)
(cherry picked from commit 6291b28c37f02380001ab68b3a660b2804383ab2)
2022-04-19 10:57:59 +00:00
Deepesh Garg
ddbd82af95
Merge pull request #30459 from frappe/mergify/bp/develop/pr-30385
fix(India): Auto tax fetching based on GSTIN (backport #30385)
2022-04-10 18:55:26 +05:30
Deepesh Garg
809117229d
Merge pull request #30626 from nextchamp-saqib/einv-utgst
feat(india): e-invoicing for intra-state union territory transactions
2022-04-10 18:54:17 +05:30
Deepesh Garg
02c6b898a6
Merge branch 'develop' into mergify/bp/develop/pr-30385 2022-04-09 19:57:59 +05:30
Deepesh Garg
2e00678c76
Merge pull request #30542 from deepeshgarg007/disabled_tax_category
fix: Ignore disabled tax categories
2022-04-09 19:52:31 +05:30
Saqib Ansari
45fca6bed7 feat(india): e-invoicing for intra-state union territory transactions 2022-04-07 13:09:05 +05:30
Deepesh Garg
ec6f7040f4
Merge branch 'develop' into mergify/bp/develop/pr-30385 2022-04-06 10:00:51 +05:30
Saqib Ansari
7757790572
Merge pull request #30579 from nextchamp-saqib/eway-bill-dialog-fix
fix: fetch from fields not working in eway bill dialog
2022-04-05 15:51:38 +05:30
Saqib Ansari
c8779aa446 fix: fetch from fields not working in eway bill dialog 2022-04-05 15:44:17 +05:30
Saqib Ansari
0c26f9a8c8 fix(india): cannot generate e-invoice for is_pos invoices
* If mode of payment > 18 characters, the e-invoice portal throws error
2022-04-04 12:28:09 +05:30
Deepesh Garg
485f5cfdfe fix: Resolve conflicts 2022-04-02 17:25:29 +05:30
Deepesh Garg
0f6d52c625 Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-30385 2022-04-02 17:24:19 +05:30
Deepesh Garg
9a6a181f14 fix: Ignore disabled tax categories 2022-04-01 14:46:26 +05:30
Deepesh Garg
532961fad2 fix(India): Tax fetching based on tax category 2022-03-30 19:33:44 +05:30
Deepesh Garg
03952f8819 fix(India): Auto tax fetching based on GSTIN
(cherry picked from commit 7cae669e814a958310ca1b8ee408450569c32d10)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/regional/india/setup.py
#	erpnext/selling/doctype/quotation/quotation.json
2022-03-29 04:56:49 +00:00
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Deepesh Garg
363e676a35 fix: Reset GST State number 2022-03-21 16:28:17 +05:30
Saqib Ansari
031a0dd703 fix(e-invoicing): remove batch no from e-invoices 2022-03-07 11:40:01 +05:30
Rucha Mahabal
a891c426b5
Merge branch 'develop' into remove-nonprofit 2022-02-28 09:50:45 +05:30
Deepesh Garg
fe2ced7bee fix: Regional print format addition 2022-02-25 16:57:59 +05:30
Rucha Mahabal
d647de3782
Merge branch 'develop' into remove-nonprofit 2022-02-24 17:03:52 +05:30
Ankush Menat
9c7df2eec5 fix: ignore duplicates explicitly 2022-02-23 14:27:45 +05:30
ChillarAnand
db1957ffe6 Merge branch 'develop' into remove-nonprofit 2022-02-17 13:00:58 +05:30
ChillarAnand
b5ff9b27bd refactor: Clean up non-profit setup 2022-02-17 12:37:25 +05:30
Deepesh Garg
ea20c63182
Revert "fix(India): Tax calculation for overseas suppliers" 2022-02-11 17:38:37 +05:30
ChillarAnand
325dc92d37 Merge branch 'develop' into remove-nonprofit 2022-02-03 16:38:01 +05:30
Saqib Ansari
1170bee951
Merge pull request #29480 from nextchamp-saqib/revert-drop-einvoicing
revert: "refactor!: drop e-invoicing integration from erpnext"
2022-01-31 11:35:48 +05:30
Saqib Ansari
a1f3dc4e9e chore: remove unnecessary imports 2022-01-28 16:58:13 +05:30
Deepesh Garg
e45c38337c fix(India) Tax calculation for overseas suppliers 2022-01-28 16:10:30 +05:30
Saqib
139d5e17a9 fix: do not get password if client_secret is not set (#28547) 2022-01-27 20:24:05 +05:30
Saqib
c98887d39d fix(e-invoicing): totals validation of e-invoices (#28418) 2022-01-27 20:23:46 +05:30
Saqib
eb057b6bfe fix(e-invoicing): link to error log list 2022-01-27 20:19:56 +05:30
Saqib
0b626816d0 feat(e-invoicing): dispatch address (#28084) 2022-01-27 20:19:37 +05:30
Saqib
b262f48553 fix: 'NoneType' has no attribute 'name' (#27375) 2022-01-27 20:19:22 +05:30
Saqib Ansari
1076e96b87 Revert "refactor!: remove e_invoice utils (#27167)"
This reverts commit 8ed6338336.
2022-01-27 20:10:18 +05:30
Saqib Ansari
c5782b0e71 revert: "refactor!: drop e-invoicing integration from erpnext (#26940)"
This reverts commit c335962827.
2022-01-27 20:09:56 +05:30
ChillarAnand
7086d3f3d7 Merge branch 'develop' into remove-nonprofit 2022-01-24 11:35:47 +05:30
ChillarAnand
f423de530a refactor: Code cleanup 2022-01-20 11:14:33 +05:30
Saqib Ansari
203fca45bf
fix: order of company form fields (#29287) 2022-01-14 14:59:58 +05:30
ChillarAnand
0c0a9ed96d refactor: Remove non-profit domain from ERPNext 2022-01-06 09:53:49 +05:30
Deepesh Garg
466e549842 fix(India): Tax and Charges template not getting fetched based on tax category assigned
(cherry picked from commit 7a5937a98c3d74bdb1da79c3d5a8f49ef76ded2d)
2022-01-02 13:36:41 +00:00
Deepesh Garg
12a65eef8a fix: Is Reverse Charge check in Tax Category
(cherry picked from commit b33fd6acc769dbfaa43c665c19f378e8e041d010)

# Conflicts:
#	erpnext/patches.txt
2021-12-21 08:12:08 +00:00
Deepesh Garg
d5380dd716 fix: Error on Invoice generation
(cherry picked from commit 82255293c4eb8a9f586db083d19d63c1ea435fb9)
2021-12-08 08:42:29 +00:00
Deepesh Garg
cb21dff882 fix: Error on creating invoice
(cherry picked from commit e11515a3561eac6d33d21190cac2db112ae301fb)
2021-12-07 16:51:02 +00:00
Deepesh Garg
c339240250
Merge pull request #28698 from frappe/mergify/bp/develop/pr-28654
fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice (backport #28654)
2021-12-03 14:26:43 +05:30