Nabin Hait 2490ea0b91 Fixed merge conflict

2016-09-01 12:29:31 +05:30

..

activity_cost

[enhancement] Int, Currency, Float, Percent as not null and default to 0

2015-11-19 13:23:36 +05:30

activity_type

[Enhancement] Added billing hours for account user in timesheet

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

dependent_task

[fix] make grids editable

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

project

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

project_task

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

project_user

[fix] make grids editable

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

task

[Fix] Time sheet rename issues

2016-07-11 15:00:38 +05:30

task_depends_on

[fix] make grids editable

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

timesheet

Fixed merge conflict

2016-09-01 12:29:31 +05:30

timesheet_detail

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

__init__.py

moved modules inside erpnext folder

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