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 |
|
ChillarAnand
|
325dc92d37
|
Merge branch 'develop' into remove-nonprofit
|
2022-02-03 16:38:01 +05:30 |
|
ChillarAnand
|
899ca8b384
|
refactor: Code cleanup
|
2022-02-03 15:24:45 +05:30 |
|
Deepesh Garg
|
233e6449fc
|
fix: Zero rated exports in GSTR-3B report
|
2022-02-03 12:13:43 +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 |
|
Deepesh Garg
|
92416d80e6
|
Merge branch 'develop' into overseas_gst_tax
|
2022-01-29 18:48:23 +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 Ansari
|
2c100a5313
|
Merge branch 'develop' into revert-drop-einvoicing
|
2022-01-28 14:34:29 +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 |
|
Ankush Menat
|
b05287dea0
|
fix: drop six code (#29479)
|
2022-01-27 20:08:05 +05:30 |
|
ChillarAnand
|
7086d3f3d7
|
Merge branch 'develop' into remove-nonprofit
|
2022-01-24 11:35:47 +05:30 |
|
ChillarAnand
|
4bdf6248aa
|
refactor: Remove regional setup for non-profit
|
2022-01-24 11:06:11 +05:30 |
|
ChillarAnand
|
f423de530a
|
refactor: Code cleanup
|
2022-01-20 11:14:33 +05:30 |
|
Deepesh Garg
|
3438e1f0c4
|
Merge pull request #29175 from rtdany10/patch-14
fix: seperate custom field creation for KSA
|
2022-01-15 20:52:57 +05:30 |
|
Deepesh Garg
|
ae95439c7e
|
Merge pull request #29208 from deepeshgarg007/nil_exempt_non_gst_gstr_1
fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report
|
2022-01-14 19:43:40 +05:30 |
|
Saqib Ansari
|
203fca45bf
|
fix: order of company form fields (#29287)
|
2022-01-14 14:59:58 +05:30 |
|
Deepesh Garg
|
55c445cd37
|
fix: JSON for nil/exempt and non gst
|
2022-01-13 22:39:57 +05:30 |
|
Deepesh Garg
|
7d85755595
|
fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report
|
2022-01-10 12:50:34 +05:30 |
|
Dany Robert
|
63a4c1d926
|
chore: linter style
|
2022-01-06 18:48:02 +05:30 |
|
Dany Robert
|
00b2dede14
|
fix: function name issue
|
2022-01-06 18:42:56 +05:30 |
|
Dany Robert
|
90eb046ce6
|
fix: remove unwanted fields from KSA setup
|
2022-01-06 18:15:40 +05:30 |
|
Deepesh Garg
|
fe929304cf
|
fix: Currency in KSA VAT report
(cherry picked from commit 1d87e9d8f67e3611993d638f2d422fe66acf2c00)
|
2022-01-06 10:53:14 +00:00 |
|
ChillarAnand
|
0c0a9ed96d
|
refactor: Remove non-profit domain from ERPNext
|
2022-01-06 09:53:49 +05:30 |
|
Saqib Ansari
|
f4db474be0
|
fix: minor issues (#29130)
|
2022-01-04 19:12:19 +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 |
|
Saqib
|
ae71b704ff
|
Merge pull request #28783 from nextchamp-saqib/hsn-wise-summary-report-fix
fix: hsn-wise summary is incorrect if an invoice has repeated item code
|
2021-12-13 22:39:32 +05:30 |
|
Saqib Ansari
|
6a239c8ea3
|
test: test_hsn_summary_for_invoice_with_duplicate_items
|
2021-12-13 20:58:35 +05:30 |
|
Saqib Ansari
|
e74739a677
|
fix: hsn-wise summary is incorrect if an invoice has repeated item code
|
2021-12-12 19:53:33 +05:30 |
|
Deepesh Garg
|
121f8ae865
|
Merge pull request #28776 from rtdany10/ksa-vat-updates
feat(Regional): KSA E-Invoing optimizations and POS support
|
2021-12-08 22:32:24 +05:30 |
|
Deepesh Garg
|
d5380dd716
|
fix: Error on Invoice generation
(cherry picked from commit 82255293c4eb8a9f586db083d19d63c1ea435fb9)
|
2021-12-08 08:42:29 +00:00 |
|
Dany Robert
|
4a316550f4
|
chore: POS invoice format changes
|
2021-12-08 07:25:41 +00:00 |
|
Deepesh Garg
|
948b67b744
|
Merge branch 'develop' into ksa-vat-updates
|
2021-12-08 09:38:11 +05:30 |
|
Dany Robert
|
3e97492da4
|
fix: replace frappe.get_all
|
2021-12-08 08:03:30 +05:30 |
|
Dany Robert
|
ca85094728
|
chore: switch to frappe.db.set_value
|
2021-12-08 07:52:06 +05:30 |
|
Deepesh Garg
|
cb21dff882
|
fix: Error on creating invoice
(cherry picked from commit e11515a3561eac6d33d21190cac2db112ae301fb)
|
2021-12-07 16:51:02 +00:00 |
|
Dany Robert
|
45fce5a64b
|
chore: linters
|
2021-12-07 18:29:16 +05:30 |
|
Dany Robert
|
a0aeacee8e
|
fix: reload doc
|
2021-12-07 12:39:39 +00:00 |
|
Dany Robert
|
bb3119cd1f
|
feat(Regional): enable KSA print formats on setup
|
2021-12-07 11:05:41 +00:00 |
|
Dany Robert
|
293d981af9
|
feat(Regional): POS Invoice format for KSA
|
2021-12-07 11:03:22 +00:00 |
|
Dany Robert
|
09f178ceee
|
fix: disable ksa vat invoice by default
|
2021-12-07 11:01:37 +00:00 |
|
Dany Robert
|
d06c4b50cd
|
feat: create QR field in POS Invoice
|
2021-12-07 12:29:59 +05:30 |
|
Dany Robert
|
f0fee5672f
|
chore: change QR field label
|
2021-12-07 12:18:32 +05:30 |
|
Dany Robert
|
6a6d6f7f8b
|
fix: localize QR fieldname
|
2021-12-07 12:17:45 +05:30 |
|
Dany Robert
|
ebd4179295
|
fix: get doctype from doc instead of hardcoding SI
|
2021-12-07 12:15:58 +05:30 |
|
Dany Robert
|
276bf73974
|
feat: create QR Code field if not existing
|
2021-12-07 12:11:43 +05:30 |
|
Saqib
|
7511a9ed31
|
fix(ksa): qrcode for invoices with special chars (#28715)
|
2021-12-03 16:13:44 +05:30 |
|
Deepesh Garg
|
a8f283bb20
|
Merge pull request #28708 from deepeshgarg007/ksa_qr_invoice_total
fix: Invoice amount in KSA E Invoice QR Code
|
2021-12-03 15:18:15 +05:30 |
|
Deepesh Garg
|
f2ffddf059
|
fix: Invocie amount in KSA E Invoice QR Code
|
2021-12-03 14:32:52 +05:30 |
|
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 |
|
Rucha Mahabal
|
0b1808e1ee
|
fix(Non Profit): fetch memberships for 80G certificate by from date only (#28700)
|
2021-12-03 11:46:14 +05:30 |
|
Saqib
|
9c60c45acf
|
fix: Create Depreciation Schedules for existing Assets accurately (#28675)
|
2021-12-03 11:30:47 +05:30 |
|
Saqib
|
7314aee394
|
fix: qrcode image name for invoices with special chars (#28699)
|
2021-12-03 11:29:51 +05:30 |
|
Deepesh Garg
|
35e2bd89c0
|
fix: India utils code cleanup
(cherry picked from commit 56c626adbfbd04e7e9063f6500ec380f7bfb3da4)
|
2021-12-03 04:12:43 +00:00 |
|
GangaManoj
|
828769ca70
|
fix: Remove unnecessary variable
|
2021-12-02 01:09:15 +05:30 |
|
GangaManoj
|
22cc8d2246
|
fix: Fix depreciation_amount calculation
|
2021-12-01 21:46:09 +05:30 |
|
Deepesh Garg
|
641f033337
|
Merge pull request #28385 from vorasmit/fix-hsn_wise
fix(regional): `hsn_wise` as false returns `item_code`
|
2021-11-29 18:08:34 +05:30 |
|
Deepesh Garg
|
2bed4140f3
|
Merge pull request #28605 from deepeshgarg007/ksa-e-invoice-new
refactor(KSA VAT): QR Code as per ZATKA specification
|
2021-11-29 16:46:14 +05:30 |
|