Ameya Shenoy
1cc7500be9
Merge branch 'master' into develop
2018-05-22 09:18:38 +00:00
Zarrar
93a186aa11
fetch customer_gstin or billing_address_gstin optionally ( #14075 )
2018-05-22 09:16:42 +05:30
Saurabh
2ca83d61ea
Resolve merge conflicts from enterprise_sprint branch
2018-05-14 21:15:46 +05:30
Saurabh
b9d3385fec
calculate TDS on Sales Invoice Amount
2018-05-14 20:42:08 +05:30
Saurabh
2d8a7ee81f
Bootstrap 'TDS' via fixture
2018-05-14 20:41:38 +05:30
Nabin Hait
abd0325acd
Fixed merge conflict
2018-05-05 12:19:14 +05:30
Shreya Shah
88aa3ec275
[Report] HSN-wise-summary of outward supplies ( #13803 )
...
* hsn wise summary report
* renamed
* added total amount column
* moved total amount column
2018-05-04 18:33:14 +05:30
Shreya Shah
55daa9cd24
fix taxable amount for same items ( #13927 )
2018-05-04 18:01:23 +05:30
Rushabh Mehta
369afce43c
[patch] ignore validations while creating custom fields for gst via patch
2018-04-26 10:10:03 +05:30
Faris Ansari
d7a3b78fdf
[py3] Cast dict_keys to list ( #13663 )
2018-04-16 14:39:37 +05:30
Nabin Hait
642d39098a
Fixed merge conflict
2018-04-13 14:38:57 +05:30
rohitwaghchaure
2c111b7b14
Minor fix ( #13600 )
2018-04-11 02:20:06 -08:00
Manas Solanki
b2f9af71d2
Update setup.py
2018-04-05 21:35:29 +05:30
Pawan Mehta
f41963536e
Group email fields together and add IFSC Code ( #13535 )
...
* [fix] #13534
* change field order cell no
2018-04-05 14:54:51 +05:30
Nabin Hait
2b682c82e8
Fixed merge conflict
2018-04-04 11:40:16 +05:30
Vishal Dhayagude
2505c74d64
Place of Supply set on save Delivery Note if Customer Address Present ( #13492 )
2018-04-04 11:05:21 +05:30
Nabin Hait
b9c82b9790
Fixed merge conflict
2018-03-27 14:25:27 +05:30
Nabin Hait
f620dae8ca
Null issue fixed in gstr reports
2018-03-27 14:15:36 +05:30
Nabin Hait
0357fbc9c1
commonfied regional function for checking delete permission
2018-03-09 13:19:52 +05:30
Nabin Hait
096c05ca6f
Fixes for regional feature of Nepal
2018-03-09 13:11:00 +05:30
theopen-institute
38cbd71352
prevent deletion of sales invoices if country is nepal
2018-03-09 12:39:40 +05:30
Nabin Hait
cf72d7f135
Fixed merge conflict
2018-02-22 14:47:26 +05:30
Charles-Henri Decultot
b8c088edb7
Transaction Log for France ( #12795 )
...
* Regional overrides for France
* Addition of tests and documentation
2018-02-21 11:07:33 +05:30
Nabin Hait
b95ecd7fcd
Gstr reports ( #12940 )
...
* GSTR1 for B2B (#12296 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings
* Update gstr_1.py
* GSTR1 for B2B, B2CL and B2CS (#12459 )
* [Report] GSTR - 1 CDNR Report (#12554 )
* [wip] cdnr
* [WIP] cdnr with optional data
* [wip] Export GSTR-1
* [minor] Minor changes in export
* [new] Custom field added for GST
* [fix] Minor changes in GSTR1 Report
* [minor] Minor changes in gstr1
* [fix] Codacy Fixed
* Update setup.py
* [wip] Gstr2
* [fix] Fetch correct Tax Details
* [minor] ITC data append to row
* [fix] CDNR negative value
* Cleanup and fixes on GSTR-2
* Minor fixes in gstr reports (#12848 )
* [new] B2C limit fetch from GST Settings (#12905 )
* [new] b2c limit fetch from gst setting
* [fix] Patch Added for b2c limit
* Update gstr_1.py
* Update utils.py
* Cusotm fields related GSTR2
* minor fixes
* minor fixes
* some more fixes
* Added duplicate patch and some tests as not required on develop
2018-02-16 13:19:04 +05:30
Nabin Hait
44658d44c5
Update gstr_1.py
2018-02-15 17:24:15 +05:30
saurabh-bhosale
307063e64e
[Fix] Invalid Syntax in gstr_1.py ( #12946 )
...
* [Fix] Added missing parenthesis in gstr_1.py
* Minor change
2018-02-15 17:13:35 +05:30
Vishal Dhayagude
bd59a53173
[new] B2C limit fetch from GST Settings ( #12905 )
...
* [new] b2c limit fetch from gst setting
* [fix] Patch Added for b2c limit
* Update gstr_1.py
2018-02-15 14:22:11 +05:30
Nabin Hait
e6d65bc2a1
Fixed translations and tests ( #12900 )
...
* Fixed translations and tests
* minor fixes
* minor test fixes
2018-02-14 17:44:06 +05:30
Nabin Hait
a8d10b7332
Update setup.py
2018-02-12 16:54:13 +05:30
Nabin Hait
b0819b528f
Minor fixes in gstr reports ( #12848 )
2018-02-09 15:30:55 +05:30
Nabin Hait
b02c109e1d
Cleanup and fixes on GSTR-2
2018-02-05 16:09:51 +05:30
vishdha
1910530e41
[fix] CDNR negative value
2018-01-30 12:19:56 +05:30
vishdha
109b408d11
[fix] minor changes in gst field alignment
2018-01-30 12:11:13 +05:30
vishdha
963dd1e4bc
[minor] ITC data append to row
2018-01-30 11:51:57 +05:30
vishdha
e03e4a581f
[fix] Fetch correct Tax Details
2018-01-29 22:55:23 +05:30
vishdha
98e33c31cd
[wip] Gstr2
2018-01-29 22:54:38 +05:30
Vishal Dhayagude
c463c0684d
[Report] GSTR - 1 CDNR Report ( #12554 )
...
* [wip] cdnr
* [WIP] cdnr with optional data
* [wip] Export GSTR-1
* [minor] Minor changes in export
* [new] Custom field added for GST
* [fix] Minor changes in GSTR1 Report
* [minor] Minor changes in gstr1
* [fix] Codacy Fixed
* Update setup.py
2018-01-26 11:27:22 +05:30
Rushabh Mehta
29bc14d242
[fix] ficher_des_ecritures patch
2018-01-24 14:39:04 +05:30
Charles-Henri Decultot
90657fb566
FEC report for France ( #12446 )
...
* FEC report for France
* Codacy correction
2018-01-23 15:40:14 +05:30
Manas Solanki
e5e5d8271f
Update utils.py
2018-01-15 12:22:28 +05:30
rohitwaghchaure
0a2d83d40c
[Fix] gst_state field issue ( #12481 )
2018-01-15 11:55:25 +05:30
Nabin Hait
a49f720ee3
GSTR1 for B2B, B2CL and B2CS ( #12459 )
2018-01-12 11:59:59 +05:30
Vishal Dhayagude
a48f69eb83
[minor] Modified GSTR1 report to identify missing GST Account in GST Settings ( #12426 )
...
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings
* Update gstr_1.py
2018-01-11 12:26:52 +05:30
Nabin Hait
619c42b934
GSTR1 for B2B ( #12296 )
2018-01-10 17:48:03 +05:30
rohitwaghchaure
526b0bc4e9
[minor] Code cleanup ( #12278 )
2018-01-01 16:16:16 +05:30
rohitwaghchaure
c9ed09440c
Re-execute uae vat patch ( #12230 )
2017-12-28 18:42:22 +05:30
rohitwaghchaure
d45266881a
[Enhance] New print format for UAE/KSA for vat/excise ( #12202 )
...
* [Enhance] New print format for UAE/KSA for vat/excise
* Fixed spelling
2017-12-28 14:20:13 +05:30
Rohit Waghchaure
cfafb21842
[Fix] Setup wizard UAE/KSA
2017-12-25 12:12:07 +05:30
rohitwaghchaure
e3b5c0f727
[fix] Regional print format showing for other countries users ( #12045 )
2017-12-16 10:53:53 +05:30
Jignesh Greycube
7f13283b66
Renamed Tax Breakup Label to In Words ( #12016 )
...
Detailed Invoice Print format, Renamed "Tax Breakup" Label to "In Words"
2017-12-15 11:59:30 +05:30
