Commit Graph

153 Commits

Author SHA1 Message Date
Deepesh Garg
188273564c fix: Multiple fixes in GST 2020-07-17 11:31:15 +05:30
Deepesh Garg
52c319cfa7 fix: Update RCM only for indian countries 2020-07-16 00:23:58 +05:30
rohitwaghchaure
eb2a42d9e1
Merge pull request #22589 from deepeshgarg007/rcm_fix
fix: Do not add GST tax amount in grand total for reverse charge invoices
2020-07-14 13:42:48 +05:30
Sagar Vora
c9b4ba6de8 fix: ewaybill json had json dump of json dump, and other related fixes 2020-07-11 21:29:17 +05:30
Deepesh Garg
3c004ad798 fix(GST): Do not add tax amount in grand total for reverse charge invoices 2020-07-02 21:18:29 +05:30
Anurag Mishra
289c82243f
feat: New Payroll module (#21990)
* feat: Moved Document to Payroll Module

* feat: Moved Reports to Payroll Module

* feat: Moved Print fromat With Patch

* feat: Moved Notifiction to Payroll Module and patches

* feat: added dashboard and desk page to Payroll

* feat: Payroll Dashboard

* feat: Module onboarding

* feat: Income tax Deductions Report

* feat: Ecs Checklist Report

* feat: Provident Fund Report

* feat: Professional Fund report and commonified Code

* feat: Total Payments Based On Payment Mode Report

* fix: refactor and added chart Total Payments Based On Payment Mode

* feat: Payroll Settings

* fix: Bank remittance Report

* feat(Payroll based on): Considered unmarked days

* feat: Added Help for condition an formula in Salary structure

* fix: requested changes

* fix: rename report Ecs checklist to salary_payments_via_ecs

* fix: renamed report report/total_payments_based_on_payment_mode

* fix: added role via setup.py for regional report

* feat: added All reports to desk page

* fix: frappe.reload doc in all patches

* fix: codacy

* fix: frappe.reload_doctype for patches

* patch: is_income_tax_component and component_type for salary component

* fix: uncommented code

* test: fixture

* fix: test

* test: test_payment_days_based_on_attendance
2020-06-19 19:17:57 +05:30
Deepesh Garg
24f9a80e7d fix(India): Reverse charge mechanism for GST 2020-06-03 10:59:37 +05:30
karthikeyan5
ca46bedfcb fix(ewb): remove checksum validation for TRANSIN 2020-05-30 15:00:56 +05:30
Nabin Hait
10df3d5081 fix: Get basic and hra component from db, not from cache 2020-05-14 17:15:36 +05:30
Anurag Mishra
33793d4e0d
fix: Permission issue Employee Tax exemption (#21490) 2020-04-29 11:48:41 +05:30
Deepesh Garg
57bfd38944
Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message
fix: E-Way bill error message
2020-04-27 15:04:32 +05:30
Deepesh Garg
fe7e6f5f53 fix: Test 2020-04-27 14:05:45 +05:30
Deepesh Garg
00ea59b447 fix: Utils messsage cleanup 2020-04-27 10:50:40 +05:30
Deepesh Garg
d78cf97250
feat: Allow tax withholding category selection at invoice level (#20870)
* feat: Allow tax withholding category selection at invoice level

* fix: Linitng fixes

* feat: TDS calculation using common PAN

* fix: Add provision to deduct Lower TDS in purchase invoice

* fix: Consider only ref docs company while computing TDS

* fix: Default permission fixes

* fix: Add validation for dates in fiscal year

* fix: Undefined variable
2020-04-26 20:08:52 +05:30
Nabin Hait
58ee6c1e08
feat: Income tax slab (#21399)
* Feat: Multiple tax as per new taxation rule

* patch:for multiple tax slab, fix: payroll and exemption validation

* Test: Fixture

* feat: income tax slab with other charges and tax exempted deduction components

* fix: added missing init file

* fix: Patch fixed

* fix: Patch fixed

* fix: test fixes

* fix: validate duplicate exemption declaration

* fix: payment entry test case

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 17:45:57 +05:30
Marica
9942acd9d4
fix [ux]: Material Request Form Cleanup and UX (#20810)
* fix (ux): Material Request Form Cleanup

* fix: Get Items from popup UX

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-21 13:13:39 +05:30
Shivam Mishra
d9ce5843e5 chore: resolve conflicts 2020-04-13 13:43:04 +05:30
Raffael Meyer
9aae0c27c2
feat(regional): a central place for regional address templates (#19862)
* feat: a central place for regional address templates

* set up address templates during install

* why don't the tests run?

* fix: remove unused variables, fix cwd

* fix: .get() dicts contents

* fix: choose the right default

* fix: fieldname is template, not html

* fix: import unittest

* fix: remove unnecessary code

* fix: ensure country exists

* fix: ensure country exists

* feat: test updating an existing template

* fix(regional): DuplicateEntryError in test_update_address_template

* refactor and set 'is_default'

* fix codacy

* fix: patch gst_fixes

* fix: patch update_address_template_for_india

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 08:56:57 +05:30
Deepesh Garg
6c8efdef09 fix: User permissions in GSTR 3B report 2020-04-04 20:05:17 +05:30
Shivam Mishra
1d6395c5cf feat: add PAN details field to member for India 2020-03-30 18:14:44 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection (#20818) 2020-03-16 22:36:44 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation (#20083)
* fix: Validation for target warehouse

* feat: Get items on valuation rate in delivery note on Internal transfers

* fix: Create Inter company purchase receipt from delivery note

* feat: Inter company stock transfer on valuation rate with taxation

* fix: Add from warehouse in purchase invoice

* fix: Use get_value instead of get_cached_value

* fix: Get incoming rate instead of valuation rate

* fix: GL entry for from warehouse in purchase receipt

* fix: GL Entries fixes in purchase invoice

* fix: Address and tax fetching fixes

* fix: Add test case for stock transfer via purchase receipt

* fix: Code cleanup, added validations and test cases

* fix: Validation for supplier warehouse

* fix: Test Cases

* fix: Change validation condition

* fix: Address fixes while creating Purchase Receipt from delivery note

* fix: Set taxes while creating Purchase Receipt from Delivery Note

* fix: Update set_missing_value function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
Saqib
5e6ce88c78
fix: gst permission for gst settings & hsn code (#20500)
* fix: gst permission for gst settings & hsn code

* Fix: typo

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-02-03 15:40:35 +05:30
Deepesh Garg
cce3ac9f79 fix: Move E-Way bill button under create 2020-02-02 21:25:58 +05:30
Suraj Shetty
da2c69e836 fix(translations): Incorrect syntax 2020-01-29 15:34:06 +05:30
deepeshgarg007
c58dc873d5 fix: Get regional address details fix 2019-12-12 14:55:57 +05:30
Deepesh Garg
6e2c13f4c8 feat(regional): Auto state wise taxation for GST India (#19469)
* feat(regional): Auto state wise taxation for GST India

* fix: Update gst category on addition of GSTIN

* fix: Codacy and travis fixes

* fix: Travis

* fix(test): Update GST category only if GSTIN field available

* fix: Test Cases

* fix: Do not skip accounts if place of supply is not present

* fix: Auto GST taxation for SEZ Party types

* fix: Automatic taxation for multi state

* fix: Codacy and travis fixes

* fix: Auto GST template selection in Sales Order

* fix: Move inter state check and source state to tax category

* fix: Remove unique check from tax template

* fix: Remove unique check from tax template

* fix: Address fetching logic in Sales

* fix: fecth tax template on company address change

* fix: fetch company gstin on address change

* fix: company_gstin set value fix

* fix: Mutiple fixes and code refactor

* fix: Add missing semicolon

* fix: Company address fetching in sales invoice

* fix: Remove print statement

* fix: Import functools

* fix: Naming fixes and code cleanup

* fix: Iteritems compatibility for python 3
2019-12-10 15:55:05 +05:30
deepeshgarg007
62fbf37eb4 fix: GSTIN validation msg fix 2019-11-07 21:54:25 +05:30
Kenneth Sequeira
a54b7542f1 fix: sales invoice labels (#19267) 2019-10-10 18:50:39 +05:30
Mangesh-Khairnar
d94a389dd3 chore: remove unwanted code (#18645) 2019-08-23 16:31:09 +05:30
deepeshgarg007
a85db66146 fix: Usability fixes in accounting dimensions 2019-07-14 18:15:19 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997)
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
2019-07-03 10:34:31 +05:30
Anurag Mishra
a5527225b6 fix: requested changes 2019-06-14 15:26:19 +05:30
Deepesh Garg
459155fae1 fix: GST Validation for UIN and OIDAR (#17866)
* fix: GST Validation for UIN and OIDAR

* fix: Define GST category

* fix: Get gst category only for Customer and Supplier

* fix: GST validation

* fix: GST validation fixes
2019-06-14 12:01:34 +05:30
Prasann Shah
829172c267 [Add] GSTIN filters in hsn wise summary and itemised reports 2019-06-06 12:08:09 +05:30
Faris Ansari
a1f31e8444
feat(regional): Bank remittance report (#17524)
feat(regional): Bank remittance report
2019-05-20 15:00:48 +05:30
Nabin Hait
6b9d64ce1d
refator: Payroll processing and tax calculation (#17617)
* refactor: Payroll processing and tax calculation

* fix: payroll test cases

* fix: Codacy fixes

* fix: payroll test cases

* fix: removed unwanted code
2019-05-16 11:23:04 +05:30
Mangesh-Khairnar
6e3586423f fix: multiple changes 2019-05-15 15:50:50 +05:30
Mangesh-Khairnar
6175eb2cf9 feat: add validation for fields 2019-05-14 18:25:57 +05:30
Faris Ansari
ec7b064528 fix: Clear messages during setup fixtures 2019-05-14 16:21:09 +05:30
Mangesh-Khairnar
4df61b1495 fix: join multiple emails 2019-05-11 20:10:20 +05:30
Mangesh-Khairnar
0b2fc4fbc1 fix: multiple changes 2019-05-08 15:57:29 +05:30
Mangesh-Khairnar
27ea171187 style: change formatting 2019-05-06 16:37:34 +05:30
Mangesh-Khairnar
66a3c99800 feat: fetch custom fields for remittance creation 2019-05-06 16:26:05 +05:30
Mangesh-Khairnar
9215de02c5 feat: add india specific custom fields in company 2019-05-06 16:24:10 +05:30
Mangesh-Khairnar
c448664e6b feat: generate file name 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
08a375beb8 feat: add advice row 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
b89db7f5a8 feat: add logic to generate txt file 2019-05-05 22:37:21 +05:30
Nabin Hait
89b06132cd minor fix 2019-05-01 14:20:08 +05:30
Nabin Hait
10dae5d3c3 fix: Set GST Category fieldtype as Select in invoice 2019-05-01 14:18:37 +05:30