Saurabh 824b388631 Resolved merge conflicts

2018-08-07 13:01:11 +05:30

..

activity_cost

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

activity_type

Fix travis (#11882)

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

dependent_task

[minor] remove in_dialog old property

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

project

Resolved merge conflicts

2018-08-07 13:01:11 +05:30

project_task

[fix] Add Overdue status in Project Task

2018-07-05 19:38:59 +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

fixed inconsistent tab error (#13339)

2018-03-20 14:07:25 +05:30

project_user

[minor] remove in_dialog old property

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

projects_settings

Optionally allow overlap on Timesheet #12893 (#13018)

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

task

Fixed web form perm for tasks

2018-07-23 17:58:40 +05:30

task_depends_on

[minor] remove in_dialog old property

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

timesheet

test TDS calculation (#14919)

2018-07-19 14:34:05 +05:30

timesheet_detail

Rename occurrences for Production Order to Work Order (#13944)

2018-05-07 15:27:21 +05:30

__init__.py

moved modules inside erpnext folder

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