schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,060 Commits 322 Branches 1,581 Tags
fbfaf75b66b0bbf57b5c4c1abffb996724f90a96
Commit Graph

134 Commits

Author SHA1 Message Date
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +05:30
Deepesh Garg
f8a26a9fac fix(India): GST category not getting auto updated 2021-11-19 11:03:13 +05:30
Anuja Pawar
d37ca7b3e0 fix: sider 
(cherry picked from commit f2fbcc8124)
 2021-11-08 12:24:29 +00:00
Anuja Pawar
bbea156aa6 fix: update set_value query 
(cherry picked from commit dd3cadd46b)
 2021-11-08 12:24:29 +00:00
Anuja Pawar
10606b242c fix: re-writing sql query with ORM methods 
(cherry picked from commit bc1e7bc15f)
 2021-11-08 12:24:29 +00:00
Anuja Pawar
1dbb83c03d fix: sider 
(cherry picked from commit 6a3bd882b4)
 2021-11-08 12:24:28 +00:00
Anuja Pawar
ba08b4fcb3 fix: sider 
(cherry picked from commit 4f53837624)
 2021-11-08 12:24:27 +00:00
Anuja Pawar
2c0e8c8559 fix: check if gst_category exist 
(cherry picked from commit 59c31bb124)
 2021-11-08 12:24:27 +00:00
Subin Tom
771b076448 feat: HSN wise tax breakup check in GST Settings 
(cherry picked from commit 530de12b07)
 2021-10-13 06:38:26 +00:00
Deepesh Garg
d2f5d31f98 Merge pull request #27559 from frappe-pr-bot/backport/version-13-hotfix/27524 
fix: Tax breakup based on items, missing GST fields
 2021-10-05 14:13:50 +05:30
Deepesh Garg
f0af24fc6d fix(India): Internal transfer check fix 2021-09-30 13:28:53 +05:30
mergify[bot]
6b32fa7b1c feat(regional): toggle for reduced depreciation rate as per IT Act (#27688) 2021-09-28 19:48:50 +05:30
Deepesh Garg
6eb9a114be Merge branch 'version-13-hotfix' into backport/version-13-hotfix/27524 2021-09-27 14:55:32 +05:30
Frappe PR Bot
1b9e96f760 fix: Tax Breakup table headers fix (#27596) (#27598) 
(cherry picked from commit 0ff7367f39)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-27 14:53:29 +05:30
Subin Tom
8dfdab9dc1 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>
(cherry picked from commit d49346ac45)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/regional/india/setup.py
 2021-09-17 05:21:40 +00:00
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-03 18:57:43 +05:30
Deepesh Garg
6a9dcf2558 fix: Patch error and tests 2021-09-03 12:40:13 +05:30
Deepesh Garg
22dc317f20 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json 2021-09-01 10:23:25 +05:30
Frappe PR Bot
6814509f07 fix: eway bill version changed to 1.0.0421 (#27077) 2021-08-23 15:43:06 +05:30
Frappe PR Bot
2fd823ffb6 fix: Cascade deletion for Company (#26923) (#27053) 
* fix: Cascade deletion for Company

(cherry picked from commit 2b2572b9b9)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-08-20 15:20:50 +05:30
Ankush Menat
9bb69e711a chore: whitespace cleanup from codebase 2021-08-19 14:33:03 +05:30
Saqib
363225d2ba fix(asset): incorrect date difference calculation (#26805) 2021-08-10 16:37:23 +05:30
GangaManoj
fcbd79b7d3 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-asset-repair-refactor 2021-08-06 18:12:24 +05:30
Frappe PR Bot
2e352834a2 fix: fetching of item tax from hsn code (#26736) (#26792) 
* fix: fetching of item tax from hsn code

(cherry picked from commit 3a50490c04)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-08-06 10:59:29 +05:30
Subin Tom
6ba11a382a test: Updated test case for Eway bill 2021-08-02 20:36:46 +05:30
Subin Tom
8800aaaee7 feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill 2021-08-02 20:36:37 +05:30
Deepesh Garg
dfadae6a92 fix: Report and JSON generation for Advances received 2021-07-15 15:36:54 +05:30
GangaManoj
bd1796cbb6 fix: Replace edit_dates with flags.increase_in_asset_life 2021-07-09 22:36:04 +05:30
GangaManoj
ae8cb335b6 fix(Asset Repair): Fix depreciation_amount calculation 2021-07-09 22:36:04 +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
c6dcc9d94a fix(India): Taxable value for invoices with additional discount 2021-06-01 13:13:04 +05:30
Suraj Shetty
19c5fd72d6 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-28 09:10:33 +05:30
Deepesh Garg
4427390ab3 fix: Do not throw error in migrate 2021-05-20 17:19:24 +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
Nabin Hait
10c61376e3 fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Saqib
9320316462 feat(india): bulk e-invoice generation (#24969) 2021-04-12 17:55:46 +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
walstanb
ab673d9e4b fix: minor changes 2021-03-27 12:54:49 +05:30
walstanb
52403c537b fix: check if gst account exists before appending 2021-03-27 12:54:49 +05:30
Deepesh Garg
004f9e6b0c fix: Add method for regional round off account back 2021-03-16 13:09:59 +05:30
Deepesh Garg
93f925fb98 fix: Unequal debit and credit issue on RCM Invoice (#24836) 
* fix: Unequal debit and credit issue on RCM Invoice

* fix: Travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-03-15 18:04:42 +05:30
Ankush Menat
7c4c42ad67 refactor: move regex patterns to global variables 2021-03-03 14:56:19 +05:30
Ankush Menat
a44df63a91 fix: Add warning for invalid GST invoice numbers 
GST Invoice numbers should be 16 characters alphanumeric with dash(/) or
slash(-) only. Add check for doc.name before saving and warn about
naming series.
 2021-03-03 11:26:12 +05:30
Nabin Hait
866cf70d3a fix: validate pan 2021-02-22 21:35:00 +05:30
Deepesh Garg
bb8cd1cdaa feat: Basic validation for indian PAN No. in Supplier (#24687) 2021-02-22 19:28:45 +05:30
Deepesh Garg
6a5ef261f2 feat: Normal rounding for GST Taxes (#24488) 
* feat: Normal rounding for GST Taxes

* fix: Add test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-19 14:30:23 +05:30
Deepesh Garg
b4be292217 fix: Item valuation for internal stock transfers (#24200) 
* fix: Item valuation for internal stocktransfers

* fix: Consider conversion factor for invoices

* fix: Add missing set warehouse fields

* fix: Add validations and other fixes

* fix: Fixes in flow

* fix: Internal sales item link in Purchase Invoice

* fix: Debugging

* fix: Debug travis

* fix: Remove commented code

* fix: Rate forcing in sales order

* fix: Unreallized profit in Sales Register

* fix: Item wise gst sales register fix

* fix: From warehouse in Purchase Order

* fix: Target field in Sales Invoice

* fix: remove self

* fix: GST Purchasse register and other fixes

* fix: Add shipping_address to no field map

* fix: Ref doc map

* fix: Test Cases

* fix: address mapping between sales and purchase document

* fix: Import Error

* fix: Tax updation for internal invoices

* fix: Purchase Order and Invoice linking

* fix: Internal Party validation fix

* fix: validation

* fix(india): GST Taxes for intra state transfer

* fix(india): GST Taxes for intra state transfer

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-01-28 13:09:56 +05:30
Anurag Mishra
1e396dcb2a fix: validated GST state 2021-01-13 14:01:57 +05:30
Deepesh Garg
b074334dcf fix: Typo in tax category doctype query 2020-12-17 18:46:59 +05:30