Commit Graph

1133 Commits

Author SHA1 Message Date
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 () 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 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 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 () 2021-12-03 16:13:44 +05:30
Deepesh Garg
a8f283bb20
Merge pull request 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 from frappe/mergify/bp/develop/pr-28654
fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice (backport )
2021-12-03 14:26:43 +05:30
Rucha Mahabal
0b1808e1ee
fix(Non Profit): fetch memberships for 80G certificate by from date only () 2021-12-03 11:46:14 +05:30
Saqib
9c60c45acf
fix: Create Depreciation Schedules for existing Assets accurately () 2021-12-03 11:30:47 +05:30
Saqib
7314aee394
fix: qrcode image name for invoices with special chars () 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 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 from deepeshgarg007/ksa-e-invoice-new
refactor(KSA VAT): QR Code as per ZATKA specification
2021-11-29 16:46:14 +05:30
vorasmit
e5ca9f3c1b
Merge branch 'develop' into fix-hsn_wise 2021-11-29 16:33:21 +05:30
Deepesh Garg
af6fc29770 fix: KSA print format for invoices not having item codes 2021-11-29 16:18:35 +05:30
Deepesh Garg
f3f7ed6f0d fix: Translations 2021-11-29 13:43:56 +05:30
Ahmad
31b9b84fdf fix: KSA VAT QR Code arabic conversion 2021-11-29 13:43:02 +05:30
Ahmad
de784d8bfe refactor: comments removed 2021-11-29 13:43:02 +05:30
Ahmad
d1746caa02 refactor(KSA VAT): QR Code as per ZATKA specification 2021-11-29 13:43:02 +05:30
Ankush Menat
f862339024 fix: use get_all instead of get_list for child tables 2021-11-29 13:04:29 +05:30
Deepesh Garg
056e3b199c
Merge pull request from nemesis189/new-company-setup-fy-query
fix: FY query returning None for new company
2021-11-22 19:23:07 +05:30
Deepesh Garg
e8370147e8
Merge pull request from deepeshgarg007/ksa_print_format
fix: KSA Invoice print format for multicurrency invoices
2021-11-22 16:34:34 +05:30
Deepesh Garg
73c56510d8 fix: Delete KSA vat setting on deleting company 2021-11-22 14:21:53 +05:30
Deepesh Garg
42c40b33bc fix: KSA Invoice print format for multicurrency invoices 2021-11-22 13:20:43 +05:30
Deepesh Garg
8701f537bb
Merge pull request from nextchamp-saqib/fix-qrcode-generation-ksa
fix: bug with qrcode generation due to default print format name
2021-11-22 10:37:27 +05:30
Saqib
6e3a276a75
Merge branch 'develop' into new-company-setup-fy-query 2021-11-20 15:16:26 +05:30
Saqib Ansari
ac27391a1f fix: bug with qrcode generation due to default print format name 2021-11-20 11:22:19 +05:30
Subin Tom
350ed1a6c2 fix: FY query returning None for new company 2021-11-19 21:05:25 +05:30
Deepesh Garg
ff65399ae9 fix: Add test for gst category check
(cherry picked from commit cdbc991e3f97c7ed3e120b2e4720298402d1de77)
2021-11-19 06:51:58 +00:00
Deepesh Garg
a38aca5a54 fix(India): GST category not getting auto updated
(cherry picked from commit f8a26a9fac2c91b036f1dd4033f3fb4797285043)
2021-11-19 06:51:58 +00:00
Deepesh Garg
ccbb8c82b3
Merge branch 'develop' into fix-hsn_wise 2021-11-14 10:37:36 +05:30
Smit Vora
520f33b02f fix(regional): hsn_wise as false returns item_code 2021-11-14 08:10:53 +05:30
Deepesh Garg
0dca97eb9f fix(India): Sales Invoice with duplicate items not showing correct taxable value 2021-11-10 21:07:48 +05:30
Rucha Mahabal
88b5bda34b fix(India setup): setup company independent fixtures for patch 2021-11-09 16:04:52 +05:30
Deepesh Garg
2bf3b0fcac
Merge pull request from deepeshgarg007/ksa_vat_fixes
fix: KSA VAT setup issues
2021-11-08 18:08:49 +05:30
Deepesh Garg
0950459b0f
Merge pull request from Anuja-pawar/gst-category
fix(minor): check if gst_category exists while validating GSTIN
2021-11-08 17:53:10 +05:30
Deepesh Garg
07e7b92383
Merge pull request from vorasmit/ewaybill-fix
fix(regional): incorrect `totalValue` in ewaybill JSON
2021-11-08 17:52:07 +05:30
Deepesh Garg
c81d4734c4 fix: KSA VAT setup issues 2021-11-08 17:14:03 +05:30
Deepesh Garg
419e03954c
Merge pull request from Havenir/ksa-vat
feat(Print Format): KSA VAT Invoice
2021-11-08 15:27:02 +05:30
ahmadpak
8df50cf1e0 update(Print Format): Sales Invoice
- KSA VAT Invoice
Customer Identification Number Added
2021-11-08 09:29:33 +03:00
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Raffael Meyer
114028e473
feat: replace newline in remarks (DATEV report) () 2021-11-04 21:44:24 +05:30
Anuja Pawar
3c4484fbf9
Merge branch 'develop' into gst-category 2021-11-02 23:30:16 +05:30
Anuja Pawar
f2fbcc8124 fix: sider 2021-11-02 23:29:06 +05:30
Deepesh Garg
11e90cc0be
Merge pull request from deepeshgarg007/lower_deduction_validation_fix
fix: Error on LDC creation
2021-11-02 20:27:18 +05:30
Deepesh Garg
66348e1a03 fix: Error on LDC creation 2021-11-02 20:26:40 +05:30
Saqib
ec0a72423a
fix: Calculate depreciation_amount accurately () 2021-11-02 18:45:03 +05:30
Smit Vora
e2d866d6a2 fix: regional(India) totalValue for ewaybill 2021-11-01 15:55:19 +05:30
Anuja Pawar
dd3cadd46b fix: update set_value query 2021-11-01 11:38:02 +05:30
ahmadpak
2a5beec885 new (Print Format): KSA VAT Invoice 2021-10-30 17:18:45 +03:00
Anuja Pawar
f9e7dc3f62
Merge branch 'develop' into gst-category 2021-10-29 21:32:49 +05:30
Anuja Pawar
bc1e7bc15f fix: re-writing sql query with ORM methods 2021-10-29 21:32:20 +05:30
Deepesh Garg
199fc52917
Merge pull request from rtdany10/patch-8
fix: incorrect VAT Amount in UAT VAT 201 report
2021-10-29 14:42:02 +05:30
Anuja Pawar
d23b7a77b8
Merge branch 'develop' into gst-category 2021-10-28 23:22:03 +05:30
Saqib
2e61c5eb55
Merge branch 'develop' into fix-depr-after-sale 2021-10-27 15:12:51 +05:30
Afshan
f0bdf9426b
Merge branch 'develop' into gst-category 2021-10-27 14:13:26 +05:30
Deepesh Garg
7ab7753bfa Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes 2021-10-26 20:56:40 +05:30
Ganga Manoj
0515b4b6f6
Merge branch 'develop' into fix-depr-after-sale 2021-10-25 19:11:19 +05:30
Deepesh Garg
cd4b20313e fix: Test case fixes and linting issues 2021-10-25 11:21:55 +05:30
Deepesh Garg
e3ae8d5a1e fix: Move PAN field from standard doctype to fixtures for India 2021-10-24 17:24:25 +05:30
Deepesh Garg
bf13d183d8 fix: Replace section code with tax withholding category in LDC 2021-10-23 19:00:03 +05:30
Anuja Pawar
6a3bd882b4 fix: sider 2021-10-22 20:44:49 +05:30
Anuja Pawar
4f53837624 fix: sider 2021-10-22 20:43:54 +05:30
Anuja Pawar
59c31bb124 fix: check if gst_category exist 2021-10-22 19:26:31 +05:30
Dany Robert
4c499e804a
fix: wrong vat amount 2021-10-19 14:12:59 +05:30
Dany Robert
1aa34d1780
fix: incorrect VAT Amount in UAT VAT 201 report 2021-10-18 18:46:45 +05:30
Deepesh Garg
30e6f4dfed
Merge pull request from deepeshgarg007/gstr_1_interstate_internal_transfer
fix (India): Interstate internal transfer invoices not visible in GSTR-1
2021-10-18 08:52:41 +05:30
Deepesh Garg
d9d42b13ab fix: Interstate internal transfer invoices not visible in GSTR-1 2021-10-16 17:09:37 +05:30
Ganga Manoj
8cc81a96fc
Merge branch 'develop' into fix-depr-after-sale 2021-10-14 03:12:44 +05:30
Deepesh Garg
bd8dda2de4
Merge pull request from nemesis189/taxjar-nexus-update
fix: TaxJar update - added nexus list, making api call only for nexus
2021-10-13 15:08:48 +05:30
Deepesh Garg
bd8cfb2e30 fix: Move product tax category folder to taxjar settings 2021-10-13 13:40:53 +05:30
Subin Tom
fc4facc5dc added new section in gst settings page 2021-10-11 18:19:58 +05:30
Subin Tom
530de12b07 feat: HSN wise tax breakup check in GST Settings 2021-10-11 17:33:41 +05:30
Deepesh Garg
1aba3592fa
Merge pull request from Havenir/ksa-vat
feat(regional): KSA E-Invoicing and VAT Report
2021-10-11 12:16:51 +05:30
Ahmad
cb2213ef0c refactor: make strings translate 2021-10-10 21:17:59 +02:00
Deepesh Garg
da47fe2cfb fix(India): Internal transfer check fix
(cherry picked from commit f0af24fc6d26040fa34fd7248bf38301897d9ca1)
2021-10-03 08:09:39 +00:00
Saqib Ansari
83cc597594 fix: do not set length for date field 2021-09-30 12:37:04 +05:30
Saqib
a84cd2674c
Merge branch 'develop' into trim-custom-field-length 2021-09-29 19:56:56 +05:30
Saqib Ansari
f1fcb385f5 patch: trim sales invoice custom field lengths 2021-09-29 19:56:02 +05:30
Saqib
424efd41e5
feat(regional): toggle for reduced depreciation rate as per IT Act () 2021-09-28 18:12:02 +05:30
Ganga Manoj
28bdd6d2e3
Merge branch 'develop' into fix-depr-after-sale 2021-09-27 22:18:04 +05:30
Saqib Ansari
a7df4227da fix: trim sales invoice custom field lengths 2021-09-27 13:56:16 +05:30
Subin Tom
54754f4eb8 fix: updated patch, add fields only if fields are checked 2021-09-27 12:51:54 +05:30
Saqib
f8c1c73953
fix: local variable 'fiscal_year_details' referenced before assignment () 2021-09-26 16:27:56 +05:30
GangaManoj
700e78d69b fix: Remove extra brackets 2021-09-21 07:11:40 +05:30
Ganga Manoj
eb8122baba
Merge branch 'develop' into fix-depr-after-sale 2021-09-21 06:29:41 +05:30
GangaManoj
3c8879e777 fix: Calculate depreciation_amount accurately 2021-09-21 06:07:06 +05:30
Subin Tom
0ff7367f39
fix: Tax Breakup table headers fix () 2021-09-20 16:13:36 +05:30
GangaManoj
164a2ad28d fix: Calculate depreciation_left accurately 2021-09-20 04:33:30 +05:30
Subin Tom
d49346ac45
fix: Tax breakup based on items, missing GST fields ()
* 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>
2021-09-17 10:39:03 +05:30
Ahmad
0ab57d49c1 fix: pre-commit hooks 2021-09-17 01:54:59 +05:00
Ahmad
9dae36b81d fix: pre-commit hooks 2021-09-17 01:51:32 +05:00
Ahmad
4ec733fcc0 fix: pre-commit hooks 2021-09-17 01:46:45 +05:00
Ahmad
f1e5a64c61 refactor (regional): KSA utils 2021-09-17 01:33:32 +05:00
Ahmad
05321d7f4e
Update erpnext/regional/saudi_arabia/utils.py
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-17 01:28:52 +05:00
Ahmad
95b3b9c8f5
Update erpnext/regional/saudi_arabia/utils.py
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-17 01:27:37 +05:00
Ahmad
940db71a82 fix: indentations 2021-09-17 01:14:41 +05:00
Frappe PR Bot
29dab0699c
fix(minor): Remove b2c limit check from CDNR Invoices () ()
* fix(minor): Remove b2c limit check from CDNR Invoices

* fix: Remove unnecessary format

(cherry picked from commit 978028c880445362afc0cfca9118424174541cc7)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-09-15 19:12:02 +05:30
Deepesh Garg
c53b78e712
fix: Patch for updating tax withholding category dates () 2021-09-14 20:28:48 +05:30
Ahmad
8a42570c96 refactor(regional): moved methos to region specific utils for KSA 2021-09-14 14:45:23 +05:00
Ahmad
de01066ef5
Update erpnext/regional/saudi_arabia/setup.py
Method name updated

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-14 14:29:45 +05:00
Ahmad
0950713e4c
Update erpnext/regional/saudi_arabia/setup.py
Method name updated

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-14 14:29:33 +05:00
Ahmad
6985ca210e
Refactor erpnext/regional/__init__.py
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-14 14:28:57 +05:00
Ahmad
b5b61b3a3d
Update erpnext/regional/report/ksa_vat/ksa_vat.py
String made translatable

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-14 14:26:44 +05:00
Deepesh Garg
6dfcc1e2ae fix: Remove print and debug 2021-09-07 11:08:30 +05:30
Deepesh Garg
e1f55df4d7 fix: GSTR-1 Reports not showing any data 2021-09-07 11:07:22 +05:30
Ahmad
87380d021d feat(regional): QR Code generation for Saudi Arabia Sales Invoices 2021-09-06 23:36:55 +05:00
Ahmad
cb0c2d1477 feat(Regional): KSA VAT Report 2021-09-06 23:25:20 +05:00
Ankush Menat
73b3a2f685
chore: whitespace 2021-09-03 21:57:38 +05:30
Deepesh Garg
a06a70d1a4 fix: Patch error and tests 2021-09-03 13:13:37 +05:30
Deepesh Garg
2b34028acd fix: Patch and linting errors 2021-09-03 13:13:37 +05:30
Deepesh Garg
e1fffdb262 fix: Linting issues 2021-09-02 19:10:49 +05:30
Deepesh Garg
c85242e03d Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop 2021-09-02 18:59:59 +05:30
Deepesh Garg
e8a5dc371b fix: Add payment entry custom fields 2021-09-02 18:56:04 +05:30
Chillar Anand
915b34391c
chore: Clean up imports ()
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Ankush Menat
dea5c34d8d
chore: whitespace 2021-09-01 19:59:22 +05:30
Ankush Menat
81eb6fde07
Merge pull request from ankush/strict_linting
chore: cleanup linting errors and introduce strict linting checks
2021-09-01 19:32:49 +05:30
Raffael Meyer
605f73b4d4
feat: add voucher-specific data to DATEV export (bp ) ()
* feat: add voucher-specific data to datev export

* refactor: def instead of lambda
2021-09-01 19:27:54 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Ankush Menat
e46567192a
fix: invalid escape sequences in regex 2021-09-01 16:57:17 +05:30
Deepesh Garg
8b644d8889 fix: Report and JSON generation for Advances received 2021-09-01 10:28:15 +05:30
Deepesh Garg
5e22405c45 feat: CDNR Unreg json generation 2021-09-01 10:26:55 +05:30
Subin Tom
7004944cc0
feat: Taxjar Integration update ()
* feat: Taxjar Integration update

* added taxable_amount,taxable_amount fields in setup.py

* Update taxjar_integration.py

Sider issues fix

* Sider issues fix

* Sider issues fix

* sider issue fix: unused import

* sider issue fix

* Update erpnext/erpnext_integrations/taxjar_integration.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>

* Removed permission for 'All'

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-31 18:33:16 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests ()
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
2021-08-26 20:43:06 +05:30
Saqib
8ed6338336
refactor!: remove e_invoice utils () 2021-08-26 13:27:16 +05:30