Makarand Bauskar 98b52a7245 resolved merge conflicts on develop (#10185) ...

* resolved merge conflicts on develop

* [minor] removed the validate_activity

2017-07-31 15:09:52 +05:30

..

doctype

resolved merge conflicts on develop (#10185)

2017-07-31 15:09:52 +05:30

report

added roles in the report

2017-03-06 14:26:09 +05:30

web_form

Merge pull request #6007 from KanchanChauhan/task-json-fixed

2016-08-06 13:42:50 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30

utils.py

[Enhancement] Time log wages and multiple active salary structure

2016-06-27 16:46:39 +05:30