Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,551 Commits 3 Branches 0 Tags 1 GiB
d35b37881b
Commit Graph

1110 Commits

Author SHA1 Message Date
Raffael Meyer
6453fb4cea
refactor!: remove DATEV integration (#30584) 
The DATEV integration follows the trend and moves into a separate app.

- the DATEV Integration will be maintained at https://github.com/alyf-de/erpnext_datev (version-14 branch)
- the German Compliance and Localization will be maintained at https://github.com/alyf-de/erpnext_germany
 2022-04-13 09:24:19 +00:00
Deepesh Garg
79b90118e1
Merge branch 'develop' into gst_download_json_key_error 2022-04-11 17:15:04 +05:30
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
Deepesh Garg
b532ade383 fix: Download JSON for GSTR-1 report 2022-04-08 17:14:10 +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
2451452434
Merge branch 'develop' into e-inv-paid-invoice-fix 2022-04-05 13:12:08 +05:30
Ankush Menat
a896895a9e fix: bulk fix (~330) missing translations 2022-04-04 13:59:51 +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
Deepesh Garg
e33d4713cd
Update erpnext/regional/saudi_arabia/utils.py 
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-14 18:35:49 +05:30
Deepesh Garg
1faca0eb5a
Merge branch 'develop' into vat_amount_in_ksa 2022-03-14 17:36:16 +05:30
Deepesh Garg
be56efad26 fix: Itemised tax rate updation 2022-03-14 17:17:01 +05:30
Deepesh Garg
3cc2e53b08 fix: Linting Issue 2022-03-14 16:27:04 +05:30
Deepesh Garg
b37559c535 fix: KSA E-Invoice QR Code showing wrong VAT amount 2022-03-14 16:13:35 +05:30
Deepesh Garg
5ae610bd32
Merge pull request #30039 from deepeshgarg007/gstr_3b_nil_exempt_fixed 
fix: Nil and Exempted values in GSTR-3B Report
 2022-03-13 20:00:48 +05:30
Chillar Anand
fe4b6771b5
refactor: Remove dead code (#30140) 2022-03-09 17:16:05 +05:30
Deepesh Garg
45eed7167c
Merge pull request #29654 from alyf-de/revert-bu-schluessel 
revert: BU Schlüssel (a21f76f)
 2022-03-09 16:48:54 +05:30
Saqib Ansari
031a0dd703 fix(e-invoicing): remove batch no from e-invoices 2022-03-07 11:40:01 +05:30
Deepesh Garg
abe580e8b0 fix: Nil and Exempted values in GSTR-3B Report 2022-03-01 17:37:38 +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
Deepesh Garg
83a60a2a17
Merge pull request #29869 from deepeshgarg007/gstr_1_gstin_filter 
fix: GSTIN filter for GSTR-1 report
 2022-02-19 19:41:49 +05:30
Deepesh Garg
a28ec89507
Update gstr_1.js 2022-02-19 19:35:57 +05:30
Deepesh Garg
e1f8f034c2 Merge branch 'develop' of https://github.com/frappe/erpnext into patch_fixes 2022-02-17 23:20:29 +05:30
Deepesh Garg
87b074ac09 fix: GSTIN filter for GSTR-1 report 2022-02-17 22:01:00 +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
615dd9decd fix: Patch fixes 2022-02-13 19:24:10 +05:30
Deepesh Garg
19e281a54f
Merge pull request #29700 from vorasmit/gstr-1-fixes 
fix(India): Report GSTR-1 minor fixes
 2022-02-12 17:16:24 +05:30
Deepesh Garg
ea20c63182
Revert "fix(India): Tax calculation for overseas suppliers" 2022-02-11 17:38:37 +05:30
barredterra
5811d9e318 fix: encode filters for URI 2022-02-09 17:53:33 +01:00
Sagar Vora
2bc157a95c fix: cleaner implementation for get_invoice_type 2022-02-09 17:48:24 +05:30
Smit Vora
6e679a5ad2 fix(India): Report GSTR-1 minor fixes 2022-02-09 17:48:24 +05:30
Raffael Meyer
9fde0f0a9c
Merge branch 'develop' into revert-bu-schluessel 2022-02-07 17:18:33 +01:00
Chillar Anand
768e6b2e0e
Merge branch 'develop' into remove-nonprofit 2022-02-07 10:29:25 +05:30
barredterra
363ed9ccba revert: BU Schlüssel (a21f76f) 2022-02-05 14:06:18 +01:00