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
Shreya Shah
394b7a2fa3
Rename Offer Letter to Job Offer ( #12934 )
2018-02-16 10:49:34 +05:30
Nabin Hait
8a562266ad
Update set_b2c_limit.py
2018-02-15 18:40:18 +05:30
Nabin Hait
0c7ce02e54
Update set_b2c_limit.py
2018-02-15 18:12:27 +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
Achilles Rasquinha
0bf19a1ac5
Merge pull request #12931 from achillesrasquinha/py3-iteritems
...
Py3 iteritems
2018-02-15 13:49:43 +05:30
Achilles Rasquinha
c94df80d88
Merge pull request #12925 from netchampfaris/enable-translatable-patch
...
Patch to enable translatable
2018-02-15 12:18:26 +05:30
Achilles Rasquinha
714c7465fb
Updated Python 3 fixes
2018-02-15 11:31:05 +05:30
Faris Ansari
1e422f2383
Patch to enable translatable
2018-02-14 22:18:55 +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
Achilles Rasquinha
361366ebe6
Python 3 fixes. ( #12916 )
...
* Fixed iteritems and exceptions
* python3-fixes
* fixed iteritems
2018-02-14 17:08:59 +05:30
Saurabh
2735701aab
resolved merge conflicts
2018-02-14 11:51:09 +05:30
Faris Ansari
5a91989665
Remove total_projected_qty ( #12889 )
2018-02-13 16:00:52 +05:30
Shreya Shah
d9a585bdad
Leave workflow patch fixes ( #12823 )
...
* modified patch for leave application workflow
* removed leave approval field from leave application doctype
* fetch lwp and attendance only if workflow field exists
* modified test cases
* modified files with leave application
* docstatus draft for rejected applications
* modified leave application calendar
* test fixed
* run patch only if any record exists
2018-02-12 16:02:57 +05:30
Nabin Hait
e21e59614f
Fixed merge conflict
2018-02-12 15:59:55 +05:30
Nabin Hait
b02c109e1d
Cleanup and fixes on GSTR-2
2018-02-05 16:09:51 +05:30
Nabin Hait
2ef1f84041
Fixed merge conflict
2018-02-03 09:14:53 +05:30
rohitwaghchaure
32a5f38595
Merge pull request #12633 from vishdha/issue_12388
...
[fix] Sales order link to purchase order not working fixed
2018-01-31 17:30:43 +05:30
Nabin Hait
ec2c9ec897
Merge branch 'master' into develop
2018-01-31 15:39:16 +05:30
Nabin Hait
7918b92d95
Invalid date value comparison, fixes for mariadb 10.2.3+
2018-01-31 15:30:03 +05:30
vishdha
df1653827f
[fix] Patch for material request to purchase order added
2018-01-31 15:11:24 +05:30
Nabin Hait
e37e5d6134
minor fix in patch for mariadb version
2018-01-31 15:00:18 +05:30
Nabin Hait
bc640fe6a6
minor fix in old patch
2018-01-30 19:26:28 +05:30
Nabin Hait
927d13fadb
Minor fix in old patch
2018-01-30 15:59:44 +05:30
vishdha
e03e4a581f
[fix] Fetch correct Tax Details
2018-01-29 22:55:23 +05:30
Saurabh
d581ff40ea
Merge branch 'master' into develop
2018-01-29 17:42:37 +05:30
Saurabh
e1e690541c
set payment term name in payment_terms ( #12693 )
2018-01-29 17:39:56 +05:30
Saurabh
03f6b3e588
resolved merge conflicts
2018-01-29 16:25:33 +05:30
Nabin Hait
cfa9d1adb7
Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date ( #12685 )
...
* Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date
* Payment Terms patch for credit days defined in customer group
2018-01-29 16:07:21 +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
Shreya
1416567139
patch fix for leave-workflow
2018-01-25 17:06:14 +05:30
Shreya
61cf49dd07
workflow patch fix
2018-01-24 18:50:01 +05:30
rohitwaghchaure
8df0556af5
Merge pull request #12587 from shreyashah115/leave-workflow
...
Refactor Leave Application
2018-01-24 15:04:17 +05:30
Shreya
a8a952deff
check if workflow_state_name already exists
2018-01-24 15:00:54 +05:30
Rushabh Mehta
29bc14d242
[fix] ficher_des_ecritures patch
2018-01-24 14:39:04 +05:30
Shreya
a309a871b5
Codacy fix
2018-01-24 13:56:16 +05:30
Shreya
a400e7b568
Fixed as per the review
2018-01-24 13:30:20 +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
Shreya
5164997db7
delete column status
2018-01-22 14:13:03 +05:30
Shreya
dd66bc03c7
fixes
2018-01-22 12:28:38 +05:30
Shreya
fc0e8e5c6a
modified patches.txt
2018-01-22 12:26:41 +05:30
Shreya
117ddac033
patch to create workflow for existing leave applications
2018-01-22 12:26:41 +05:30
Rohit Waghchaure
c987500e08
Merge branch 'master' into develop
2018-01-19 13:29:57 +05:30
Rohit Waghchaure
95adb60a8f
Fix patch
2018-01-18 15:52:52 +05:30
Saurabh
35d8ce4fbd
resolved merge conflicts
2018-01-12 16:58:32 +05:30
Manas Solanki
bba5fd7a38
Assessment module addition ( #12417 )
...
* add academic session details in the Assessmet Plan
* add the academic session and few details in the assessment result
* fix codacy
2018-01-12 16:21:09 +05:30
joezsweet
3aaed03dfb
reload item_barcode
2018-01-11 11:31:31 +01:00
joezsweet
1be684fd87
codici fix
2018-01-11 09:03:26 +01:00
joezsweet
b6fb8d2143
fix patch, reload doc
2018-01-11 08:44:59 +01:00
joezsweet
9116666288
fix patch
2018-01-10 23:11:13 +01:00
