Makarand Bauskar 98b52a7245 resolved merge conflicts on develop (#10185) ... * resolved merge conflicts on develop * [minor] removed the validate_activity		2017-07-31 15:09:52 +05:30
..
activity_cost	[minor] added default standard filters (#6854)	2016-11-07 17:19:19 +05:30
activity_type	Add disable check for Activity Type (#10120)	2017-07-28 14:32:45 +05:30
dependent_task	Remember last selected value for link field	2016-11-03 14:49:27 +05:30
project	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_task	Remember last selected value for link field	2016-11-03 14:49:27 +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_user	[fix] make grids editable	2016-07-11 13:01:58 +05:30
task	[fix] company graph based on base currency	2017-07-18 18:22:16 +05:30
task_depends_on	Dependent task dates gets updated with parent dates	2017-02-27 14:55:03 +05:30
timesheet	resolved merge conflicts on develop (#10185)	2017-07-31 15:09:52 +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