Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
Rohit Waghchaure
eb1e3181a4
fix: conflicts while merging brnach version-13 to develop
2021-08-17 10:53:19 +05:30
Rohit Waghchaure
7167fd00bc
Merge branch 'version-13-hotfix' into merged-v13-hotfix-into-pre-release
2021-08-10 23:30:16 +05:30
Frappe PR Bot
1a39d1a311
fix: cost center & account validation in Sales/Purchase Taxes and Charges ( #26881 )
2021-08-10 19:38:39 +05:30
Anuja Pawar
0e337be065
fix: cost center & account validation in Sales/Purchase Taxes and Charges ( #25929 )
2021-08-10 17:26:35 +05:30
Rohit Waghchaure
f571e42aa4
Merge branch 'version-13-hotfix' into merge-version-13-hotfix-into-v13-pre-9
2021-08-10 01:06:23 +05:30
Anupam
b1350af1f6
fix: setup wizard
2021-07-28 23:54:46 +05:30
Deepesh Garg
2686d04800
fix: Typo and remove duplicate function
2021-07-18 17:54:35 +05:30
Nabin Hait
11475487fb
fix: merge conflict
2021-07-16 15:58:50 +05:30
Deepesh Garg
2de11fbbc4
fix: Test Cases
2021-07-13 16:50:35 +05:30
Deepesh Garg
779d2afa60
fix: Update account heads in GST test cases
2021-07-13 16:50:04 +05:30
Deepesh Garg
2908f2ee20
fix: Revert Changes
2021-07-13 16:49:21 +05:30
Deepesh Garg
0dfea4d134
fix: Test Cases
2021-07-13 16:49:21 +05:30
Deepesh Garg
22683cf19b
fix: Tests
2021-07-13 16:49:21 +05:30
Deepesh Garg
b71497067d
chore: Add comments
2021-07-13 16:49:21 +05:30
Deepesh Garg
ed54e4e276
fix: Check for tax category
2021-07-13 16:48:44 +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
8fd2d8b5d0
fix: Ignore validations for Tax Setup
2021-07-13 16:47:38 +05:30
Deepesh Garg
e166c264b4
fix: Update country-wise-tax JSON and tax setup
2021-07-13 16:47:38 +05:30
Deepesh Garg
3031535a24
fix: Add tax categories on company setup
2021-07-13 16:47:36 +05:30
Nabin Hait
470c7e773f
fix: merge conflict
2021-07-12 12:45:49 +05:30
Deepesh Garg
9b6d9a41f4
fix: Test Cases
2021-07-05 17:08:27 +05:30
Deepesh Garg
ebc46c1e09
fix: Update account heads in GST test cases
2021-06-28 10:52:38 +05:30
Deepesh Garg
1e5482cedd
fix: Revert Changes
2021-06-26 23:49:32 +05:30
Deepesh Garg
0bfffddac4
fix: Test Cases
2021-06-23 15:37:17 +05:30
Deepesh Garg
35e11fbea6
fix: Tests
2021-06-23 13:17:01 +05:30
Deepesh Garg
208b5f9e73
chore: Add comments
2021-06-23 12:44:56 +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
Nabin Hait
27299cfcc5
Merge branch 'version-13-hotfix' into version-13-pre-release
2021-06-10 19:45:38 +05:30
barredterra
f259bf48aa
refactor: make tax category
2021-06-02 13:20:03 +02:00
barredterra
e3557ff131
Merge branch 'version-13-hotfix' into item-tax-templates
2021-06-02 12:17:27 +02:00
Deepesh Garg
7c7c084159
fix: Check for tax category
2021-06-02 14:12:28 +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
Raffael Meyer
80540d38ba
fix: add_deduct_tax in Purchase Taxes setup ( #25871 )
2021-05-31 15:36:20 +05:30
Deepesh Garg
48b1a82fa1
fix: Add accounts and templates for reverse charge
2021-05-29 23:54:51 +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
barredterra
86ee3ebb09
feat: create tax category during taxes setup
2021-05-27 14:16:26 +02:00
barredterra
46d39d27aa
fix: validate company in taxes setup
2021-05-27 14:16:01 +02:00
Nabin Hait
e38192cb6d
fix: merge conflict
2021-05-11 11:15:09 +05:30
Nabin Hait
0e41295c0e
perf: Performance enhancement on setup wizard ( #25606 )
...
* perf: Performance enhancement on setup wizard
* fix: create departments without updating nsm
2021-05-06 19:14:06 +05:30
Nabin Hait
134eaa5786
perf: Performance enhancement on setup wizard ( #25605 )
...
* perf: Performance enhancement on setup wizard
* fix: create departments without updating nsm
2021-05-06 19:13:54 +05:30
Deepesh Garg
204ea1027f
fix: Ignore validations for Tax Setup
2021-04-30 16:35:52 +05:30
Deepesh Garg
50997709d5
fix: Update country-wise-tax JSON and tax setup
2021-04-21 20:41:57 +05:30
Deepesh Garg
2acc66db2c
fix: Add tax categories on company setup
2021-04-21 11:49:02 +05:30
Raffael Meyer
fb68aba30d
Merge branch 'develop' into improve_taxes_setup
2021-03-11 13:17:44 +01:00
Rucha Mahabal
be2c1fca7b
feat(Non Profit): 80G Certificates and Donations ( #24657 )
...
* feat: 80G Certificates
* feat: add non-profit custom fields for India
* feat: 80G Certificate print format for memberships
* feat: Donation doctype and API endpoint to capture donations via razorpay
* chore: Rename Membership Settings to Non Profit Settings
* chore: clean up Non Profit Settings
- Rename fields, better labels
- patch for renaming
* feat: Webhook secret generation for Razorpay donations in Non-Profit Settings
* feat: Payment Entry for donations
- added Donor as Party Type
- setting for automating payment entries for donations created via web form
* fix: linter and sider issues
* fix: translation syntax
* feat: PAN Details custom field for Indian donors
* feat: 80G certificates for Donations with Print Format
* fix: sider
* feat: validations for donor and donation
- create donor for website user from donations
- validate donor email
* feat: extract member name from subscription notes
* test: Donation
* test: Tax Exemption 80G Certificate
* chore: styling fixes
* fix: tests
* fix: sider
* feat: extract PAN number from additional subscription notes
* feat: Add creation user field in Non Profit Settings
fix: Payment Entry not generating for memberships and donations
* feat: update desk page
* fix: tests
2021-03-11 13:19:44 +05:30
barredterra
ebd1d08e55
refactor: taxes setup
...
Better structure of input data.
2021-03-08 19:53:50 +01:00
barredterra
25afad3dc1
refactor: extend taxes and charges setup
...
Add option to specify taxes and charges template depending on the CoA used. Differentiate between purchase, sales and item taxes. Maintain flexibility by using wildcards.
2021-03-04 21:11:31 +01:00
