Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,016 Commits 3 Branches 0 Tags
Commit Graph

1040 Commits

Author SHA1 Message Date
deepeshgarg007
c62518c094 Merge branch 'develop' of https://github.com/frappe/erpnext into gstr-3b-pos-fixes 2019-06-14 13:14:51 +05:30
deepeshgarg007
8f04f6c631 fix: GSTR-3b Report fixes 2019-06-14 13:08:09 +05:30
Deepesh Garg
b095d0a0c5 fix: GSTR-2 Report fixes (#17903) 2019-06-14 12:02:36 +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
Rushabh Mehta
35bb7b8761 Merge pull request #17369 from alyf-de/datev_report 
feat(regional): Report for German tax consultants (DATEV)
 2019-06-14 12:00:04 +05:30
Deepesh Garg
b9102bba48 fix: GSTR-1 Report fixes (#17885) 2019-06-10 17:39:23 +05:30
Prasann Shah
829172c267 [Add] GSTIN filters in hsn wise summary and itemised reports 2019-06-06 12:08:09 +05:30
Deepesh Garg
7fc8b2fa50 fix: GSTR-1 Report B2B fixes (#17751) 
* fix: GSTR-1 Report fixes

* fix: Simply add tax if item tax is not specified
 2019-05-27 13:30:52 +05:30
rohitwaghchaure
0432d3844b
Merge pull request #17700 from rohitwaghchaure/italian_localization_issue_for_invoices_develop 
fix: removed translation for customer type and tax charge type
 2019-05-22 13:23:25 +05:30
Rohit Waghchaure
68a1456672 fix: removed translation for customer type and tax charge type 2019-05-22 13:22:39 +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
deepeshgarg007
19c8802971 fix: Precision fixes in gstr3b-report 2019-05-09 12:15:56 +05:30
deepeshgarg007
2097916d9e fix: Invoice type fixes in gstr-1 report 2019-05-09 12:15:29 +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
218d551c99
Merge pull request #17105 from nabinhait/gst-category-fieldtype 
fix: Set GST Category fieldtype as Select in invoice
 2019-05-02 12:43:09 +05:30
Aditya Hase
8b8e3e7890
Merge pull request #17424 from adityahase/fix-py3-misc 
fix: Python 3 compatibility fixes
 2019-05-01 16:45:11 +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
Aditya Hase
234d35781c fix: Python 3 compatibility fixes 
import reduce from functools

Undefined variable
 2019-05-01 11:52:37 +05:30
Aditya Hase
97ad454525 fix(py3): Undefined variable 2019-05-01 11:50:05 +05:30
Nabin Hait
49446ba760 fix: test cases 2019-04-25 19:54:49 +05:30
Nabin Hait
04e7bf464f refactor: Employee Tax Exemption 2019-04-25 18:53:39 +05:30
Deepesh Garg
2ef7022385
fix: Remove print statements (#17333) 2019-04-22 19:25:18 +05:30
Deepesh Garg
15a7b7ce71
fix: GSTR 3b report fixes (#17317) 
* fix: GSTR-3b report total taxable value fixes

* fix: Test Cases
 2019-04-22 15:22:36 +05:30
Nabin Hait
0050652be9
Merge pull request #17265 from deepeshgarg007/gstr1-fixes-develop 
fix: GSTR-1 B2C Small report fix
 2019-04-17 17:32:29 +05:30
deepeshgarg007
9f873e97fa fix: Remove print statement 2019-04-16 20:58:22 +05:30
deepeshgarg007
c354a17383 fix: Code cleanup 2019-04-16 20:56:49 +05:30
deepeshgarg007
e5a869bc45 fix: GSTR-1 B2CS report fix 2019-04-16 20:08:12 +05:30
Deepesh Garg
1b0edbc8b3
fix: GSTR3b 3b template fix (#17224) 2019-04-13 18:37:08 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Nabin Hait
2c869bd486
Merge pull request #17101 from hrwX/india_setup 
fix(India): Add HSN/SAC in setup
 2019-04-04 11:02:11 +05:30
Himanshu
c930cb10fa
fix: remove duplicate doctype 2019-04-04 11:01:10 +05:30
Nabin Hait
3149596b53
Merge pull request #17102 from hrwX/hsn_india_v12 
fix(India): HSN Code
 2019-04-04 10:49:55 +05:30
rohitwaghchaure
fb48686d82
Merge pull request #17118 from rohitwaghchaure/_incorrect_prezzototale 
fix: incorrect PrezzoTotale
 2019-04-03 16:33:56 +05:30
Rohit Waghchaure
a2f71cdeec fix: incorrect PrezzoTotale 2019-04-03 16:10:14 +05:30
rohitwaghchaure
c0435f21c2
Merge pull request #17098 from rohitwaghchaure/incorrect_calculation_of_imponibile_importo_develop 
fix: incorrect  calcualtion of ImponibileImporto if tax rate is zero
 2019-04-01 23:15:17 +05:30
rohitwaghchaure
b035bf7f39
Merge pull request #17095 from rohitwaghchaure/incorrect_calculation_of_imponibile_importo 
fix: incorrect calcualtion of ImponibileImporto if tax rate is zero
 2019-04-01 23:14:56 +05:30
Himanshu Warekar
656d8e4557 fix(India): HSN Code 2019-04-01 19:38:43 +05:30
Himanshu Warekar
624477cb21 fix(India): Add HSN/SAC in setup 2019-04-01 19:25:28 +05:30