Nabin Hait 7f3da5dbb1 Fixed merge conflict

2016-11-28 14:23:51 +05:30

..

activity_cost

[minor] added default standard filters (#6854)

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

activity_type

[Enhancement] Added billing hours for account user in timesheet

2016-08-26 13:17:46 +05:30

dependent_task

Remember last selected value for link field

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

project

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +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

Merge pull request #6784 from RobertSchouten/calendar_fix

2016-11-17 14:45:59 +05:30

task_depends_on

[fix] make grids editable

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

timesheet

Fixed merge conflict

2016-11-28 14:23:51 +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