marination bc9eaac342 fix: Clear merge conflicts ...

- 'get_project_template' was removed a month back
- in 'make_project' insert the project directly as a check for it is there in the beginning.

2021-01-14 13:47:40 +05:30

..

activity_cost

fix: modified date (#16520)

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

activity_type

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

dependent_task

fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350)

2020-09-18 18:27:24 +05:30

project

fix: Clear merge conflicts

2021-01-14 13:47:40 +05:30

project_template

fix: sider

2020-12-28 15:40:23 +05:30

project_template_task

fix: patch and columns

2021-01-07 15:16:15 +05:30

project_type

Added Project Type new doctype to be added as link field for Project Type field in project instead of select field (#9929)

2017-07-26 17:55:25 +05:30

project_update

fix: Project update status code and design refactored

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

project_user

feat: column width increased for view attachments field (#314)

2020-02-11 15:21:48 +05:30

projects_settings

Optionally allow overlap on Timesheet #12893 (#13018)

2018-02-22 11:05:49 +05:30

task

Merge branch 'develop' into naming-series-proj

2021-01-12 19:57:55 +05:30

task_depends_on

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

task_type

feat: Task type (#17311)

2019-04-20 23:37:49 +05:30

timesheet

chore: Fix Tests, use project name instead of project_name field

2020-11-16 12:48:40 +05:30

timesheet_detail

fix: Removed precision from multiple doctypes

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

__init__.py

moved modules inside erpnext folder

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