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

450 Commits

Author SHA1 Message Date
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
vorasmit
e5ca9f3c1b
Merge branch 'develop' into fix-hsn_wise 2021-11-29 16:33:21 +05:30
Saqib
6e3a276a75
Merge branch 'develop' into new-company-setup-fy-query 2021-11-20 15:16:26 +05:30
Subin Tom
350ed1a6c2 fix: FY query returning None for new company 2021-11-19 21:05:25 +05:30
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
Rucha Mahabal
88b5bda34b fix(India setup): setup company independent fixtures for patch 2021-11-09 16:04:52 +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
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
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
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
Anuja Pawar
bc1e7bc15f fix: re-writing sql query with ORM methods 2021-10-29 21:32:20 +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
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
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
Ganga Manoj
8cc81a96fc
Merge branch 'develop' into fix-depr-after-sale 2021-10-14 03:12:44 +05:30
Subin Tom
530de12b07 feat: HSN wise tax breakup check in GST Settings 2021-10-11 17:33:41 +05:30
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
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
Deepesh Garg
c53b78e712
fix: Patch for updating tax withholding category dates (#27489) 2021-09-14 20:28:48 +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
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
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Deepesh Garg
8b644d8889 fix: Report and JSON generation for Advances received 2021-09-01 10:28:15 +05:30
Saqib
8ed6338336
refactor!: remove e_invoice utils (#27167) 2021-08-26 13:27:16 +05:30
Saqib
ce129a1414
feat: re-arrange company doctype fields (#27091) 2021-08-24 17:23:14 +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
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
harshpwctech
b0f3c0f3fd
fix: JWT decoding error (#26624) 2021-08-09 13:42:05 +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
Subin Tom
58118d7830
fix: missing QR Code in auto email attachment (#26598) 2021-08-02 11:34:43 +05:30
Rohit Waghchaure
343143037c fix: conflicts 2021-08-01 14:45:24 +05:30
Deepesh Garg
a661667e2a fix(India): Default value for export type 2021-07-26 18:46:14 +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
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +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
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
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
4b69563a56
Merge branch 'develop' into asset-repair-refactor 2021-06-28 11:07:58 +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
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
Saqib Ansari
18eed58fc5 fix(e-invoicing): service item check 2021-06-08 20:52:14 +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