Nabin Hait 89206e74d0 fixed merge conflict

2019-04-11 12:31:14 +05:30

..

activity_cost

fix: modified date (#16520)

2019-01-30 11:46:34 +05:30

activity_type

…

dependent_task

…

project

fix(patch): update customization options if completed is not present

2019-03-07 13:03:40 +05:30

project_task

BREAKING: Task status "Closed" renamed to Task status "Completed" and ability to close, cancel projects in bulk

2019-02-26 14:30:38 +05:30

project_template

fix: linting

2019-02-26 14:30:38 +05:30

project_template_task

fix: linting

2019-02-26 14:30:38 +05:30

project_type

…

project_update

fix: Project update status code and design refactored

2019-01-17 19:21:44 +05:30

project_user

fix: Project update status code and design refactored

2019-01-17 19:21:44 +05:30

projects_settings

…

task

fixed merge conflict

2019-04-11 12:31:14 +05:30

task_depends_on

…

timesheet

Merge branch 'master' into develop

2019-03-28 13:54:34 +05:30

timesheet_detail

fix: Removed precision from multiple doctypes

2019-02-19 08:40:16 +05:30

__init__.py

…