Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,816 Commits 3 Branches 0 Tags 1 GiB
75396c02d2
Commit Graph

1175 Commits

Author SHA1 Message Date
Deepesh Garg
2bf3b0fcac
Merge pull request #28272 from deepeshgarg007/ksa_vat_fixes 
fix: KSA VAT setup issues
 2021-11-08 18:08:49 +05:30
Deepesh Garg
0950459b0f
Merge pull request #28065 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 #28185 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 #28166 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) (#28152) 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 #28205 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 (#27585) 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 #27994 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 #27970 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 #27497 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 #27369 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 (#27600) 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 (#27656) 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 (#27596) 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 (#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>
 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 (#27516) (#27520) 
* 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 (#27489) 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 (#27302) 
* 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 #27288 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 #26589) (#27287) 
* 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 (#27143) 
* 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 (#27179) 
* 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 (#27167) 2021-08-26 13:27:16 +05:30
Anuja Pawar
baa548a3df
fix(regional): minor fixes and test for South Africa VAT report (#26933) 
* fix: added test and minor fixes

* fix: sider fixes

* fix: sider

* fix: test fixes

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-08-26 12:48:43 +05:30
Deepesh Garg
c30fb04e96
fix(minor): Update GSTR-1 json version (#27074) 2021-08-24 21:57:25 +05:30
Saqib
ce129a1414
feat: re-arrange company doctype fields (#27091) 2021-08-24 17:23:14 +05:30
Saqib
6cf9254ee5
fix: invalid imports (#27101) 2021-08-24 15:26:44 +05:30
Subin Tom
8b2fe9e793
fix: eway bill version changed to 1.0.0421 (#27044) 2021-08-23 11:17:31 +05:30
Deepesh Garg
2b2572b9b9
fix: Cascade deletion for Company (#26923) 
* fix: Cascade deletion for Company
 2021-08-20 14:40:12 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext (#26940) 2021-08-20 11:10:46 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Mohammed Redah
a2966db1e5
fix: change print_format_type from Server to Jinja (#26374) 2021-08-17 18:45:55 +05:30
Deepesh Garg
3f07bb7021 fix: Add mandatory depends on condition for export type field 2021-08-16 13:18:39 +05:30
Saqib
88f13fef81
fix: ZeroDivisionError on creating e-invoice for credit note (#26915) 2021-08-12 16:26:51 +05:30
Saqib
84c4161c00
fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal (#26638) 2021-08-10 16:46:44 +05:30
Saqib
2ae2580706
fix(asset): incorrect date difference calculation (#26793) 2021-08-10 16:37:48 +05:30
Anuja Pawar
08ae49cd11
fix(regional): add permissions for VAT Audit report (#26851) 
fix(regional): add permissions for VAT Audit report
 2021-08-09 17:58:52 +05:30
harshpwctech
b0f3c0f3fd
fix: JWT decoding error (#26624) 2021-08-09 13:42:05 +05:30
HENRY Florian
07e65ab589
feat: add french address template (#26316) 
* add french address template

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-09 10:32:31 +05:30
Saqib
e7fa2e5826
fix(e-invoicing): cannot generate IRNs for standalone credit notes (#26824) 2021-08-06 11:03:57 +05:30
Saqib
3a50490c04
fix: fetching of item tax from hsn code (#26736) 
* fix: fetching of item tax from hsn code
 2021-08-03 15:57:11 +05:30
Deepesh Garg
4e1a205c11 fix: Optimize item updation 2021-08-03 14:58:45 +05:30
Deepesh Garg
346bde875c Merge branch 'develop' of https://github.com/frappe/erpnext into sa-vat-report 2021-08-03 14:44:20 +05:30
Anuja
f2ee1155c0 fix: sider fixes 2021-08-02 23:13:21 +05:30
Anuja
3bcbc86291 fix: resolved conflicts in patches.txt 2021-08-02 12:58:46 +05:30
Anuja
f9fc3bbfa8 fix: added patch for custom field and minor fixes 2021-08-02 12:54:30 +05:30
Subin Tom
58118d7830
fix: missing QR Code in auto email attachment (#26598) 2021-08-02 11:34:43 +05:30
Anuja Pawar
4ec02ad91d
Merge branch 'develop' into sa-vat-report 2021-08-02 10:42:04 +05:30
Rohit Waghchaure
343143037c fix: conflicts 2021-08-01 14:45:24 +05:30
Anuja
5dcd5e48e7 fix: fixed zero tax rate issue by adding custom field 2021-07-29 00:54:48 +05:30
Afshan
42bc0a7db8
fix: documentation link for E Invoicing (#26684) 2021-07-28 13:42:53 +05:30
Afshan
868a6cb26d
fix: documentation link for E Invoicing (#26686) 2021-07-28 13:42:13 +05:30
Anuja Pawar
9302e0b6c5
Merge branch 'develop' into sa-vat-report 2021-07-27 10:18:53 +05:30
Deepesh Garg
af84ce9216
Merge pull request #26647 from deepeshgarg007/gst_sales_register_fix_v13 
fix(India): Default value for export type
 2021-07-27 10:12:33 +05:30
Deepesh Garg
1b6c75bbb1
Merge pull request #26642 from deepeshgarg007/gstr_3b_missing_cess_develop 
fix: Add missing cess amount in GSTR-3B report
 2021-07-26 19:21:29 +05:30
Deepesh Garg
61d014d249
Merge pull request #26644 from deepeshgarg007/gstr_3b_missing_cess_v13 
fix: Add missing cess amount in GSTR-3B report
 2021-07-26 19:20:50 +05:30
Deepesh Garg
cba847b051 fix: Test case for GSTR-3b report 2021-07-26 18:46:27 +05:30
Deepesh Garg
a661667e2a fix(India): Default value for export type 2021-07-26 18:46:14 +05:30
Anuja Pawar
abc63cffa8 fix: suggested changes 2021-07-26 18:11:38 +05:30
Deepesh Garg
5fe7d80a64 fix: GST Reports timeout issue 2021-07-26 17:13:28 +05:30
Deepesh Garg
19589b1e21 fix: GST Reports timeout issue 2021-07-26 17:05:48 +05:30
Deepesh Garg
c468e4a93d fix: Add missing cess amount in GSTR-3B report 2021-07-26 16:58:07 +05:30
Deepesh Garg
00fd319531 fix: Add missing cess amount in GSTR-3B report 2021-07-26 16:52:54 +05:30
Deepesh Garg
3e109840f9
Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales 
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
 2021-07-21 10:52:10 +05:30
Subin Tom
b24a149dbc test: Updated test case for Eway bill 2021-07-19 14:37:12 +05:30
Anuja Pawar
2bbf48e835
Merge branch 'develop' into sa-vat-report 2021-07-18 11:13:25 +05:30
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30
Anuja Pawar
259947dae9
Merge branch 'develop' into sa-vat-report 2021-07-14 20:47:41 +05:30
Anuja Pawar
b43974a9a6 fix: more sider fixes 2021-07-14 20:37:48 +05:30
Anuja Pawar
c5d7a13513 fix: sider & translation fixes 2021-07-14 15:49:22 +05:30
Anuja Pawar
b37ff0d3cf fix: sider fixes 2021-07-14 15:06:56 +05:30
Frappe
1dfb5eb535 feat: South Africa VAT report 2021-07-14 12:33:45 +05:30
Deepesh Garg
7ff6865817
Merge pull request #26470 from deepeshgarg007/new_company_error_v13 
fix: Errors on parallel requests creation of company for India
 2021-07-13 20:30:06 +05:30
Deepesh Garg
1ee63f31e5 Merge branch 'develop' of https://github.com/frappe/erpnext into bootstrapped_gst_setup_develop 2021-07-13 16:51:47 +05:30
Deepesh Garg
779d2afa60 fix: Update account heads in GST test cases 2021-07-13 16:50:04 +05:30
Deepesh Garg
269510b98f fix: Regional settings setup 2021-07-13 16:48:22 +05:30
Deepesh Garg
a72589cb7e fix: Add accounts and templates for reverse charge 2021-07-13 16:48:06 +05:30
Deepesh Garg
0380cca3b7 fix: Add GST accounts to GST Settings 2021-07-13 16:47:38 +05:30
Deepesh Garg
96300fa791 fix: Add validation for GST Settings 2021-07-13 16:47:38 +05:30
Deepesh Garg
8ed1afd93d fix: Remove redundant get_doc 2021-07-13 16:47:38 +05:30
Deepesh Garg
8fd2d8b5d0 fix: Ignore validations for Tax Setup 2021-07-13 16:47:38 +05:30
Deepesh Garg
a90e5fd2e1 fix: Issues on new company setup 2021-07-13 16:47:38 +05:30
Deepesh Garg
fea29ae8cb fix: Use update flag for company dependant fixtures 2021-07-13 16:05:05 +05:30
Deepesh Garg
7be9f8dab1 fix: Error on creation of company for India 2021-07-13 16:04:56 +05:30
Deepesh Garg
0bad696faf fix: Unable to download GSTR-1 json 2021-07-13 15:46:58 +05:30
Deepesh Garg
fc9714b871 fix: Unable to download GSTR-1 json 2021-07-13 15:45:34 +05:30
Subin Tom
5265ba39f0 feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill 2021-07-13 14:58:17 +05:30
Saqib
fe4f58d0f6
fix(e-invoicing): allow export invoice even if no taxes applied (#26405) 2021-07-09 15:32:54 +05:30
Saqib
8e8434a78a
fix: omit item discount amount for e-invoicing (#26353) (#26407) 2021-07-09 15:32:28 +05:30
Saqib
77e00403c8
fix: omit item discount amount for e-invoicing (#26353) 2021-07-09 14:41:03 +05:30
Saqib
b199702977
fix(e-invoicing): allow export invoice even if no taxes applied (#26363) 2021-07-09 14:37:34 +05:30
Saqib
0b320b5909
Merge pull request #25798 from GangaManoj/asset-repair-refactor 
refactor: Asset Repair
 2021-07-07 12:44:50 +05:30
Nabin Hait
11d56903e7
Merge pull request #25415 from deepeshgarg007/bootstraped_gst_setup 
feat(India): Bootstrapped GST Setup
 2021-07-06 21:44:30 +05:30
Deepesh Garg
63096014a7 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-07-02 20:30:18 +05:30
Afshan
b6076f772d fix: only "Tax" type accounts should be shown for selection in GST Settings 2021-07-02 15:39:16 +05:30
Afshan
20f73d4c58 fix: only "Tax" type accounts should be shown for selection in GST Settings 2021-07-02 15:34:26 +05:30
Saqib
4b69563a56
Merge branch 'develop' into asset-repair-refactor 2021-06-28 11:07:58 +05:30
Deepesh Garg
ebc46c1e09 fix: Update account heads in GST test cases 2021-06-28 10:52:38 +05:30
Deepesh Garg
2dc90dd8ac fix: Export invoices not visible in GSTR-1 report 2021-06-24 10:37:19 +05:30
Deepesh Garg
673470705b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-06-23 11:33:15 +05:30
Saqib
4b4eb990a9
Merge branch 'develop' into asset-repair-refactor 2021-06-22 16:21:13 +05:30
Deepesh Garg
cfdda21dd2 fix: Export invoices not visible in GSTR-1 report 2021-06-22 13:03:22 +05:30
GangaManoj
da8da9fa4e fix: Replace edit_dates with flags.increase_in_asset_life 2021-06-19 14:00:26 +05:30
GangaManoj
2b93e54e1f fix(Asset Repair): Fix depreciation_amount calculation 2021-06-19 13:45:37 +05:30
Saqib Ansari
2be7e90e78 fix(e-invoicing): IRN generation for export invoices with round off 2021-06-16 19:00:34 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Deepesh Garg
4afda3c89c fix(India): Taxable value for invoices with additional discount 2021-06-14 20:43:42 +05:30
Deepesh Garg
856484aeb0 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount 2021-06-14 11:29:41 +05:30
Ankush Menat
a424c0c023
test(perf): eliminate repeat creation of HSN codes (bp #25947) 2021-06-11 16:49:39 +05:30
Ankush Menat
5bb89b0ead
test(perf): eliminate repeat creation of HSN codes (#25947) 2021-06-11 15:57:01 +05:30
Saqib
9a67141bfb
fix(einvoicing): service item check (#26010) 2021-06-10 18:48:55 +05:30
Deepesh Garg
88176e65e4 fix: Check for gst_hsn_code 2021-06-10 17:31:28 +05:30
Deepesh Garg
701cba7f03 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount 2021-06-10 12:04:38 +05:30
Deepesh Garg
bf5f87c2fe
Merge pull request #25969 from deepeshgarg007/inernal_transfer_invoices_ignore 
fix: Ignore internal transfer invoices from GST Reports
 2021-06-09 13:32:52 +05:30
Saqib Ansari
18eed58fc5 fix(e-invoicing): service item check 2021-06-08 20:52:14 +05:30
Deepesh Garg
7a20c3b92a fix: Ignore internal transfer inoices from GST Reports 2021-06-06 19:23:21 +05:30
Deepesh Garg
ca34eec2d6 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-06-02 13:26:27 +05:30
Deepesh Garg
b3ed807b70 fix: Regional settings setup 2021-06-02 13:26:21 +05:30
Deepesh Garg
c6dcc9d94a fix(India): Taxable value for invoices with additional discount 2021-06-01 13:13:04 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Deepesh Garg
48b1a82fa1 fix: Add accounts and templates for reverse charge 2021-05-29 23:54:51 +05:30
Deepesh Garg
fb9cb0fd23
Merge pull request #25866 from deepeshgarg007/itc_reversa_address 
fix(India): Show only company addresses for ITC reversal entry
 2021-05-28 18:46:09 +05:30
Deepesh Garg
b084f1d320 fix(India): Show only company addresses for ITC reversal entry 2021-05-28 12:14:56 +05:30
Deepesh Garg
20be7fb93d fix(India): Show only company addresses for ITC reversal entry 2021-05-28 11:57:38 +05:30
Suraj Shetty
19c5fd72d6 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-28 09:10:33 +05:30
Deepesh Garg
4311fdc3a1 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-05-27 17:49:23 +05:30
Deepesh Garg
36a11bf9ce
Merge pull request #25841 from nextchamp-saqib/fix(gstr-1)--incorrect-gstin-fetched-incase-of-branch-company-address 
fix(gstr-1): incorrect gstin fetched incase of branch company address
 2021-05-26 11:20:30 +05:30
Saqib Ansari
0e804e292a fix(gstr-1): incorrect gstin fetched incase of branch company address 2021-05-26 10:54:16 +05:30
krishnagirishp
5457db0601
chore: remove uses of six.PY2 in codebase (#25062) 
* remove uses of six.py2 in codebase

* changes based on pr feedback

* Update amazon_mws_api.py

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-05-23 21:13:44 +05:30
Saqib
e930456be2
fix(e-invoicing): 'NoneType' object is not iterable (#25781) 2021-05-21 16:31:12 +05:30
Deepesh Garg
181c5d240b
Merge pull request #25767 from deepeshgarg007/gst-ptach-fix-1 
fix: Do not throw error on migrate
 2021-05-20 18:40:48 +05:30
Deepesh Garg
4427390ab3 fix: Do not throw error in migrate 2021-05-20 17:19:24 +05:30
Saqib Ansari
b9ad385232 fix: remove uncessary query 2021-05-19 19:13:06 +05:30
Saqib Ansari
7fb385a89f fix: cannot bypass e-invoicing for non gst item invoices 2021-05-19 18:47:06 +05:30
Saqib
4bd641367b
fix: address template with upper filter throws jinja error (#25756) 2021-05-19 16:38:53 +05:30
Nabin Hait
8b2fef11b1 fix: merge conflict 2021-05-17 11:37:14 +05:30
Deepesh Garg
55fe85d850
feat(India): Multiple GST enhancement and fixes (#25249) 
* fix: RCM tax calculation

* feat(India): ITC Reversal via Journal Entry

* fix: Reverse Charge booking logic and validation

* fix: Addd patch for availed ITC fields

* fix: Hooks method to update availed ITC field

* fix: Cleanup and fixes in GSTR3B report

* fix: Update params in GSTR-1 report

* fix: Debit note using Sales Invoice

* fix: Setup and patch

* fix: GSTR 3B report cleanup and updates

* fix: Add method to get invoices liable to reverse charge

* fix: Add taxable value in Purchase Invoice Item

* fix: Inward supplies liable to reverse charge

* fix: Linting issues

* fix: GSTR3B report test
 2021-05-14 12:17:41 +05:30
Saqib
9226cd3932
feat(india): reduced rate of depreciation as per IT Act (#25648) 
* feat(india): reduced rate of depreciation as per IT Act

* refactor: check date difference instead of month difference

* feat: add test for regional feature
 2021-05-10 12:36:56 +05:30
Suraj Shetty
ec6b652cd4 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-10 09:18:25 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual (#25613) 
* chore: replace assertEquals with alias assertEqual

assertEquals has been deprecated.

ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases

* chore: sider fixes
 2021-05-07 20:28:51 +05:30
Saqib
d502f76319
feat(e-invoicing): e-way bill validity field (#25555) 2021-05-06 16:10:55 +05:30
Deepesh Garg
0ae702aab9 Merge branch 'develop' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-05-02 22:37:04 +05:30
Deepesh Garg
1bac72b74d fix: Add GST accounts to GST Settings 2021-05-02 22:29:48 +05:30
Deepesh Garg
72e602ae54 fix: Add validation for GST Settings 2021-05-02 18:22:29 +05:30
Deepesh Garg
a66184fe3c fix: Remove redundant get_doc 2021-05-02 12:22:16 +05:30
Deepesh Garg
204ea1027f fix: Ignore validations for Tax Setup 2021-04-30 16:35:52 +05:30
barredterra
5b9d3f15a2 docs: replace whitespace indent in docstring with tabs 2021-04-27 12:34:10 +02:00
Raffael Meyer
b2be91e731
Merge branch 'develop' into datev_fixes 2021-04-27 12:21:14 +02:00
Saqib
b643776c53
feat(e-invoicing): auto calculate distance for e-way bill generations (#25480) 2021-04-26 17:12:20 +05:30
Sagar Vora
71342320ce
fix(Italy): multiple fixes in import supplier invoice (#25466) 
* fix(Italy): remove incorrect method, use defined variable

* fix: show attach section after save; use db_set
 2021-04-26 15:32:28 +05:30
Deepesh Garg
ab7664e595
Merge pull request #25444 from deepeshgarg007/gstr_backward_compatiability 
fix: Backward compatibility for GSTR-1 report
 2021-04-26 15:09:55 +05:30
Walstan Baptista
4a805b5622
chore: frappe.whitelist for doc methods (#25465) 2021-04-24 14:23:08 +05:30
Deepesh Garg
eed60bf035 fix: Backward compatibility for GSTR-1 report 2021-04-22 17:11:22 +05:30
Deepesh Garg
66a71bdd1a fix: Issues on new company setup 2021-04-21 20:42:20 +05:30
Raffael Meyer
9ee6e4feb8
Merge branch 'develop' into improve_taxes_setup 2021-04-18 18:34:41 +02:00
barredterra
476fff149b Merge branch 'develop' into improve_taxes_setup 2021-04-17 18:41:31 +02:00
Ankush Menat
dedf2c1b61
fix: remove duplicate keys from dictionaries 2021-04-17 16:56:08 +05:30
Saqib
75e13f7bb6
fix(e-invoicing): add company validation for e-invoicing (#25348) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-17 15:38:47 +05:30
Raffael Meyer
6daae681bd
Merge branch 'develop' into datev_fixes 2021-04-16 12:37:14 +02:00
Nabin Hait
2535fe9b1e fix: Resolved merge conflict 2021-04-14 13:09:50 +05:30
Saqib
dbb76a7d00
fix(e-invoicing): validations & tax calculation fixes (#25314) 
* fix: GST on freight charge in e-invoicing

* feat(india): bulk e-invoice generation (#24969)

* fix: cannot fetch e invoice settings

* fix: patch condition (#25301)

* fix: patch condition

* fix: except einvoice loading error seperately

* fix: json.loads error

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-04-13 18:49:03 +05:30
Deepesh Garg
ca412d37c8
Merge pull request #25290 from deepeshgarg007/gstr_1_taxable_value_update 
fix: Taxable value including Freight and Forwarding charges in GSTR-1 Report
 2021-04-13 17:49:56 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Deepesh Garg
2fe3056fa2
Merge pull request #24993 from frappe/ishanloya-regional 
Correct state code for 'Other Territory'
 2021-04-13 15:37:29 +05:30
Deepesh Garg
bb92929048
Merge pull request #25256 from nextchamp-saqib/italy-e-invoicing 
feat(italy): add document type field for e-invoicing
 2021-04-13 13:48:21 +05:30
Deepesh Garg
1f49335335
Merge branch 'develop' into gstr_1_taxable_value_update 2021-04-13 10:29:52 +05:30
Saqib
9320316462
feat(india): bulk e-invoice generation (#24969) 2021-04-12 17:55:46 +05:30
Deepesh Garg
719e0c1e60 fix: Taxxable value including Freight and Forwarding charges in GSTR-1 Report 2021-04-12 14:37:43 +05:30
Deepesh Garg
c36e48a869
fix: GST on freight charge in e-invoicing (#25000) 
* fix: GST on freight charge in e-invocing

* fix: Add patch for taxable value field

* fix: Handle discounts on net total

* fix: Handle all types of discounts for e-invoicing

* fix: Absolute taxable values

* fix: Use correct tax amount
 2021-04-12 10:55:43 +05:30
Deepesh Garg
81ecd0b8b6 Merge branch 'develop' of https://github.com/frappe/erpnext into delivery_note_gst_category 2021-04-10 20:54:38 +05:30
Saqib Ansari
032246dc2b feat(italy): add document type field for e-invoicing 2021-04-09 12:08:24 +05:30
barredterra
e66cf0aa44 fix: hanging indent 2021-04-08 18:26:45 +02:00
barredterra
3a12f1f1ae fix: prettier error log 2021-04-08 17:53:48 +02:00
barredterra
ea0fd31f60 Merge branch 'datev_fixes' of https://github.com/alyf-de/erpnext into datev_fixes 2021-04-08 17:25:54 +02:00
Raffael Meyer
3b4b17476a
Merge branch 'develop' into datev_fixes 2021-04-08 17:25:12 +02:00
barredterra
368a6541e9 fix: Debtor/Creditor Number is not translatable 2021-04-08 16:26:56 +02:00
Saqib Ansari
30720d2139 fix: set correct ack no. on irn generation 2021-04-08 19:06:44 +05:30
barredterra
94f293940c fix: better party export 2021-04-07 20:06:16 +02:00
barredterra
4fe2d35b2e feat: more infos for transactions 2021-04-07 20:05:41 +02:00
barredterra
b39608a02e fix: handle encoding errors 
replace unknown characters by '?'
 2021-04-07 20:04:38 +02:00
barredterra
6b2e4f2b5d feat: add custom field debtor_creditor_number to Party Account 2021-04-07 20:03:59 +02:00