Nabin Hait 5079c9ef47 Fixed merge conflict

2017-02-22 15:31:31 +05:30

..

activity_cost

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +05:30

activity_type

[Minor] Read permissions to Employee on Activity Type and Appraisal Template

2016-12-13 14:16:57 +05:30

dependent_task

Remember last selected value for link field

2016-11-03 14:49:27 +05:30

project

Added fields in global search

2017-02-20 13:38:31 +05:30

project_task

Remember last selected value for link field

2016-11-03 14:49:27 +05:30

project_user

[fix] make grids editable

2016-07-11 13:01:58 +05:30

task

Added fields in global search

2017-02-20 13:38:31 +05:30

task_depends_on

[fix] make grids editable

2016-07-11 13:01:58 +05:30

timesheet

Fixed merge conflict

2017-02-22 15:31:31 +05:30

timesheet_detail

set remember last selected value as true for company field

2016-11-03 16:19:34 +05:30

__init__.py

moved modules inside erpnext folder

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