Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,367 Commits 3 Branches 0 Tags 1 GiB
7586c3408e
Commit Graph

464 Commits

Author SHA1 Message Date
Afshan
7586c3408e fix: test case 2020-08-28 12:56:37 +05:30
Afshan
b719620d0c fix: handleling condition if default company doesn't exist 2020-08-26 20:55:16 +05:30
Afshan
7600960d2b fix: returned empty list if non US based company 2020-08-26 18:40:11 +05:30
Deepesh Garg
afd2dd3570 fix: Unable to submit reverse charge invoice 2020-08-20 16:52:52 +05:30
Deepesh Garg
8aed48fe31 fix: Do not update total for RCM invvoices if net taxes are zero 2020-08-19 18:59:27 +05:30
Deepesh Garg
1fb1c08872
Merge pull request #23076 from deepeshgarg007/hsn_wise_outward_v13 
fix: Tax amounts in HSN Wise Outward summary
 2020-08-19 11:43:14 +05:30
Deepesh Garg
b240cfe401 fix: Remove print statements 2020-08-19 11:41:43 +05:30
Deepesh Garg
64ebbf0907 fix: Tax amounts in HSN Wise Outward summary 2020-08-19 11:41:33 +05:30
Deepesh Garg
1c14606c06
fix: Total calculations for multicurrency RCM invoices (#23072) 2020-08-18 19:32:52 +05:30
Deepesh Garg
21a220e2a5
fix: Update state code and union territory for Daman and Diu (#22988) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-12 19:19:03 +05:30
Deepesh Garg
097d89f550
Merge pull request #22946 from deepeshgarg007/gst_export_wopay 
fix: GSTR 1 report for exports without payment of Tax
 2020-08-10 09:56:12 +05:30
Deepesh Garg
d4ecf426b7 fix: Place of supply fix 2020-08-08 22:33:18 +05:30
Deepesh Garg
5ac2fd94f0 fix: Taxable value for RCM 2020-08-08 22:28:13 +05:30
Deepesh Garg
ab611d5fd8 fix: GSTR 1 report for exports without payment of Tax 2020-08-07 14:47:40 +05:30
Marica
0c818927a5
fix: get_regional_address_details missing positional arg 'company' (#22915) 2020-08-05 16:47:41 +05:30
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
Deepesh Garg
0fa4143bac fix: Cess amount in GSTR 3B report 2020-07-15 18:17:38 +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
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts 2020-07-13 11:50:11 +05:30
Raffael Meyer
193e12f02a
fix: download button (#22652) 2020-07-12 17:26:27 +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
92a03aa5db Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-07-06 12:37:28 +05:30
Deepesh Garg
62181707ee
Merge pull request #22574 from deepeshgarg007/uae_item_tax_fix 
fix: Update item tax only if item code available
 2020-07-03 21:25:28 +05:30
Deepesh Garg
04661a4e15 fix: Update item tax only if item code available 2020-07-03 21:23:23 +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
c2523e8453
fixes: Payroll module pre relese test fixes (#22500) 
* fix: salary payment based on payments

* fix: bank remittance report

* fix: Payroll period onboarding

* fix: provident-fund-deductions report

* fix: Considered unmarked days

* fix: onboarding paYroll

* feat: quick entry in payroll entry
 2020-06-29 19:54:23 +05:30
Deepesh Garg
a74cffe7a4
Merge pull request #21047 from vishdha/feat_taxjar 
feat(ERPNext Integrations): Taxjar Integration Added
 2020-06-28 23:01:37 +05:30
Deepesh Garg
4c230ed4b0
Merge pull request #21690 from alyf-de/refactor_datev 
fix(regional): DATEV report
 2020-06-28 16:55:18 +05:30
vishdha
d3ec1c1d89 feat: Taxjar Integration Added 2020-06-24 16:37:21 +05:30
Anurag Mishra
ece9508eb5 fix: test_tax_for_payroll_period 2020-06-23 14:25:43 +05:30
Anurag Mishra
f9ca29cebd Fix: if there is no component 2020-06-23 11:57:02 +05:30
Raffael Meyer
c3e91be48e
Merge branch 'develop' into refactor_datev 2020-06-22 19:53:47 +02:00
Deepesh Garg
d79e8e82cb fix: Test cases 2020-06-22 10:00:12 +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
0511e8cc03
Merge branch 'develop' into rcm_develop 2020-06-17 15:33:29 +05:30
Anupam Kumar
0a3c34de01
address label chages (#22137) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-17 10:53:13 +05:30
Deepesh Garg
5bf6bec656 fix: Consider Overseas category in RCM 2020-06-14 13:18:08 +05:30
Deepesh Garg
3a16b033b6 Merge branch 'develop' of https://github.com/frappe/erpnext into rcm_develop 2020-06-13 22:50:14 +05:30
Deepesh Garg
9df4532d14 fix: Travis(develop) 2020-06-11 21:33:43 +05:30
Rohit Waghchaure
60c1855014 fix: import supplier invoice not working 2020-06-04 14:31:35 +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
marination
29d7a7ea05 fix: Added permission via regional setup and patch 2020-05-27 22:14:36 +05:30
marination
3da51984f2 chore: Add Import Supplier Invoice to Menu 2020-05-27 22:13:40 +05:30
Deepesh Garg
5fa207f020
fix(UAE): Incorrect VAT rate display in Sales Invoice (#21882) 2020-05-26 18:02:21 +05:30
marination
90b4452a25 fix: Supplier Invoice No not fetched in Import Supplier Invoice 2020-05-21 14:03:29 +05:30
Deepesh Garg
9a914dc592 fix: Tax amount in GSTR-1 JSON 2020-05-19 20:01:25 +05:30
Deepesh Garg
007eda7164 fix: Instate Invoice not appearing in GSTR-1 report 2020-05-19 18:59:36 +05:30
Nabin Hait
10df3d5081 fix: Get basic and hra component from db, not from cache 2020-05-14 17:15:36 +05:30