nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-04 00:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,638 Commits 622 Branches 1,807 Tags
21a5498d5d7e21ff1b9321aa7896a36bf64db83f
Commit Graph

866 Commits

Author SHA1 Message Date
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
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
Frappe PR Bot
986ca8815d fix: local variable 'fiscal_year_details' referenced before assignment (#27658) 2021-09-26 20:28:06 +05:30
Deepesh Garg
978028c880 fix(minor): Remove b2c limit check from CDNR Invoices (#27516) 
* fix(minor): Remove b2c limit check from CDNR Invoices

* fix: Remove unnecessary format
 2021-09-15 18:51:06 +05:30
Frappe PR Bot
247d9bf5c4 fix: Patch for updating tax withholding category dates (#27489) (#27495) 
(cherry picked from commit c53b78e712)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-15 10:30:41 +05:30
Deepesh Garg
d5f4160260 Merge pull request #27481 from deepeshgarg007/gstin_filter_issue_v13 
fix: GSTR-1 Reports not showing any data
 2021-09-14 16:59:18 +05:30
Ankush Menat
a6a564c43d chore: whitespace (#27416) 2021-09-09 19:16:21 +05:30
Subin Tom
47c548a070 Merge branch 'version-13-hotfix' into backport/version-13-hotfix/27143 2021-09-08 17:20:20 +05:30
Saqib
40fa4cf77c fix: 'NoneType' has no attribute 'name' (#27375) 2021-09-07 12:13:22 +05:30
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
20c7237de6 fix: Patch and linting errors 2021-09-02 22:01:24 +05:30
Deepesh Garg
20f1b74024 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json 2021-09-02 19:09:48 +05:30
Deepesh Garg
f9a1b6682c fix: Linting issues 2021-09-02 19:08:48 +05:30
Suraj Shetty
6751290988 fix: Use remove_all from file_manager 2021-09-02 13:20:34 +05:30
Ankush Menat
f0bcb753fb chore: whitespace trimming 2021-09-01 20:23:48 +05:30
Ankush Menat
187c3f9630 fix: invalid escape sequences in regex 2021-09-01 20:20:32 +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
Subin Tom
ead1397a75 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>
(cherry picked from commit 7004944cc0)

# Conflicts:
#	erpnext/patches.txt
 2021-08-31 13:04:37 +00:00
Frappe PR Bot
8dae084f23 chore: remove deprecated and empty QUnit tests (#27179) (#27181) 
* 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.

(cherry picked from commit ae55eab599)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-26 21:08:08 +05:30
Frappe PR Bot
ed617d0939 fix(regional): minor fixes and test for South Africa VAT report (#26933) (#27162) 2021-08-26 13:27:39 +05:30
Nabin Hait
09fb90b8ac fix: merge conflict 2021-08-25 21:23:24 +05:30
Frappe PR Bot
b3ffa0eb57 fix(minor): Update GSTR-1 json version (#27074) (#27121) 
(cherry picked from commit c30fb04e96)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-08-24 22:28:07 +05:30
Anuja Pawar
8220117500 feat(regional): South Africa VAT Audit Report (#27017) 
* feat: SA VAT Report

* fix: added party column and fixed permissions

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-08-24 22:02:05 +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
Frappe PR Bot
90818d57f1 fix: change print_format_type from Server to Jinja (#26374) (#26985) 
(cherry picked from commit a2966db1e5)

Co-authored-by: Mohammed Redah <mhbu50@gmail.com>
 2021-08-17 13:36:08 +00:00
Deepesh Garg
2aa0daf47b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into export_type_mandatory_v13 2021-08-16 14:40:13 +05:30
Deepesh Garg
5fddd27cab fix: Add mandatory depends on condition for export type field 2021-08-16 14:34:40 +05:30
Frappe PR Bot
262c1823a5 fix: ZeroDivisionError on creating e-invoice for credit note (#26919) 2021-08-12 17:11:55 +05:30
Frappe PR Bot
a7e0805039 fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal (#26879) 2021-08-10 17:16:15 +05:30
Saqib
363225d2ba fix(asset): incorrect date difference calculation (#26805) 2021-08-10 16:37:23 +05:30
Saqib
e7a77d9cb1 Merge pull request #26415 from GangaManoj/backport-asset-repair-refactor 
refactor: Asset Repair
 2021-08-09 12:46:05 +05:30
Frappe PR Bot
bba9aac9c0 feat: add french address template (bp #26316) 
* add french address template

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>

(cherry picked from commit 07e65ab589)
 2021-08-09 10:58:39 +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
c8e6c07032 fix(e-invoicing): cannot generate IRNs for standalone credit notes (#26824) (#26833) 2021-08-06 12:33:18 +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
barredterra
c6c2773e02 refactor: def instead of lambda 2021-08-03 11:22:42 +02:00
barredterra
950521299a Merge branch 'version-13-hotfix' into datev_more_info 2021-08-03 10:47:57 +02:00
Deepesh Garg
db40d88fc2 Merge pull request #26780 from nemesis189/added-dispatch-address-to-sales-v13-new 
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
 2021-08-02 21:11:50 +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
Subin Tom
a75c7c48d8 fix: missing QR Code in auto email attachment (#26599) 2021-08-02 11:34:28 +05:30
Afshan
90c5cb0a31 fix: documentation link for E Invoicing (#26685) 2021-07-28 13:42:33 +05:30
Deepesh Garg
2922fb52cc Merge pull request #26616 from deepeshgarg007/gst_sales_register_fix 
fix(India): Default value for export type
 2021-07-27 10:12:02 +05:30
Deepesh Garg
23776600f3 Merge pull request #26544 from deepeshgarg007/gstr_3b_missing_cess 
fix: Add missing cess amount in GSTR-3B report
 2021-07-26 19:20:42 +05:30
Deepesh Garg
d066eab6cd fix: Test case for GSTR-3b report 2021-07-26 18:38:50 +05:30
Deepesh Garg
328444b530 fix(India): Default value for export type 2021-07-23 20:28:02 +05:30