Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
		
						commit
						e2aeaf9892
					
				| @ -1,160 +1,129 @@ | |||||||
| # DocType, Timesheet Detail |  | ||||||
| [ | [ | ||||||
| 
 |  { | ||||||
| 	# These values are common in all dictionaries |   "owner": "Administrator",  | ||||||
| 	{ |   "docstatus": 0,  | ||||||
| 		'creation': '2012-03-27 14:36:07', |   "creation": "2012-11-30 18:13:54",  | ||||||
| 		'docstatus': 0, |   "modified_by": "Administrator",  | ||||||
| 		'modified': '2012-03-27 14:36:07', |   "modified": "2012-12-03 09:33:28" | ||||||
| 		'modified_by': u'Administrator', |  },  | ||||||
| 		'owner': u'Administrator' |  { | ||||||
| 	}, |   "autoname": "TSD.#####",  | ||||||
| 
 |   "name": "__common__",  | ||||||
| 	# These values are common for all DocType |   "doctype": "DocType",  | ||||||
| 	{ |   "module": "Projects" | ||||||
| 		'autoname': u'TSD.#####', |  },  | ||||||
| 		'colour': u'White:FFF', |  { | ||||||
| 		'doctype': 'DocType', |   "name": "__common__",  | ||||||
| 		'module': u'Projects', |   "parent": "Timesheet Detail",  | ||||||
| 		'name': '__common__', |   "doctype": "DocField",  | ||||||
| 		'section_style': u'Simple', |   "parenttype": "DocType",  | ||||||
| 		'server_code_error': u' ', |   "parentfield": "fields" | ||||||
| 		'version': 15 |  },  | ||||||
| 	}, |  { | ||||||
| 
 |   "name": "Timesheet Detail",  | ||||||
| 	# These values are common for all DocField |   "doctype": "DocType" | ||||||
| 	{ |  },  | ||||||
| 		'doctype': u'DocField', |  { | ||||||
| 		'name': '__common__', |   "oldfieldtype": "Time",  | ||||||
| 		'parent': u'Timesheet Detail', |   "doctype": "DocField",  | ||||||
| 		'parentfield': u'fields', |   "label": "Actual Start Time",  | ||||||
| 		'parenttype': u'DocType' |   "oldfieldname": "act_start_time",  | ||||||
| 	}, |   "width": "160px",  | ||||||
| 
 |   "fieldname": "act_start_time",  | ||||||
| 	# DocType, Timesheet Detail |   "fieldtype": "Time",  | ||||||
| 	{ |   "reqd": 1,  | ||||||
| 		'doctype': 'DocType', |   "permlevel": 0 | ||||||
| 		'name': u'Timesheet Detail' |  },  | ||||||
| 	}, |  { | ||||||
| 
 |   "oldfieldtype": "Time",  | ||||||
| 	# DocField |   "doctype": "DocField",  | ||||||
| 	{ |   "label": "Actual End Time",  | ||||||
| 		'doctype': u'DocField', |   "oldfieldname": "act_end_time",  | ||||||
| 		'fieldname': u'act_start_time', |   "width": "160px",  | ||||||
| 		'fieldtype': u'Time', |   "fieldname": "act_end_time",  | ||||||
| 		'label': u'Actual Start Time', |   "fieldtype": "Time",  | ||||||
| 		'oldfieldname': u'act_start_time', |   "reqd": 1,  | ||||||
| 		'oldfieldtype': u'Time', |   "permlevel": 0 | ||||||
| 		'permlevel': 0, |  },  | ||||||
| 		'reqd': 1, |  { | ||||||
| 		'width': u'160px' |   "search_index": 0,  | ||||||
| 	}, |   "doctype": "DocField",  | ||||||
| 
 |   "label": "Activity Type",  | ||||||
| 	# DocField |   "width": "200px",  | ||||||
| 	{ |   "options": "Activity Type",  | ||||||
| 		'doctype': u'DocField', |   "fieldname": "activity_type",  | ||||||
| 		'fieldname': u'act_end_time', |   "fieldtype": "Link",  | ||||||
| 		'fieldtype': u'Time', |   "reqd": 1,  | ||||||
| 		'label': u'Actual End Time', |   "permlevel": 0 | ||||||
| 		'oldfieldname': u'act_end_time', |  },  | ||||||
| 		'oldfieldtype': u'Time', |  { | ||||||
| 		'permlevel': 0, |   "oldfieldtype": "Text",  | ||||||
| 		'reqd': 1, |   "doctype": "DocField",  | ||||||
| 		'width': u'160px' |   "label": "Additional Info",  | ||||||
| 	}, |   "oldfieldname": "other_details",  | ||||||
| 
 |   "width": "200px",  | ||||||
| 	# DocField |   "fieldname": "other_details",  | ||||||
| 	{ |   "fieldtype": "Text",  | ||||||
| 		'doctype': u'DocField', |   "permlevel": 0 | ||||||
| 		'fieldname': u'activity_type', |  },  | ||||||
| 		'fieldtype': u'Link', |  { | ||||||
| 		'label': u'Activity Type', |   "oldfieldtype": "Data",  | ||||||
| 		'options': u'Activity Type', |   "doctype": "DocField",  | ||||||
| 		'permlevel': 0, |   "label": "Total Hours (Actual)",  | ||||||
| 		'reqd': 1, |   "oldfieldname": "act_total_hrs",  | ||||||
| 		'search_index': 0, |   "width": "100px",  | ||||||
| 		'width': u'200px' |   "fieldname": "act_total_hrs",  | ||||||
| 	}, |   "fieldtype": "Data",  | ||||||
| 
 |   "permlevel": 1 | ||||||
| 	# DocField |  },  | ||||||
| 	{ |  { | ||||||
| 		'doctype': u'DocField', |   "oldfieldtype": "Data",  | ||||||
| 		'fieldname': u'other_details', |   "doctype": "DocField",  | ||||||
| 		'fieldtype': u'Text', |   "label": "Customer Name",  | ||||||
| 		'label': u'Additional Info', |   "oldfieldname": "customer_name",  | ||||||
| 		'oldfieldname': u'other_details', |   "width": "150px",  | ||||||
| 		'oldfieldtype': u'Text', |   "options": "Customer",  | ||||||
| 		'permlevel': 0, |   "fieldname": "customer_name",  | ||||||
| 		'width': u'200px' |   "fieldtype": "Link",  | ||||||
| 	}, |   "permlevel": 0 | ||||||
| 
 |  },  | ||||||
| 	# DocField |  { | ||||||
| 	{ |   "permlevel": 0,  | ||||||
| 		'doctype': u'DocField', |   "oldfieldtype": "Link",  | ||||||
| 		'fieldname': u'act_total_hrs', |   "doctype": "DocField",  | ||||||
| 		'fieldtype': u'Data', |   "label": "Project",  | ||||||
| 		'label': u'Total Hours (Actual)', |   "oldfieldname": "project_name",  | ||||||
| 		'oldfieldname': u'act_total_hrs', |   "width": "150px",  | ||||||
| 		'oldfieldtype': u'Data', |   "fieldname": "project_name",  | ||||||
| 		'permlevel': 1, |   "fieldtype": "Link",  | ||||||
| 		'width': u'100px' |   "search_index": 1,  | ||||||
| 	}, |   "reqd": 0,  | ||||||
| 
 |   "options": "Project",  | ||||||
| 	# DocField |   "in_filter": 1 | ||||||
| 	{ |  },  | ||||||
| 		'doctype': u'DocField', |  { | ||||||
| 		'fieldname': u'customer_name', |   "oldfieldtype": "Link",  | ||||||
| 		'fieldtype': u'Link', |   "doctype": "DocField",  | ||||||
| 		'label': u'Customer Name', |   "label": "Task Id",  | ||||||
| 		'oldfieldname': u'customer_name', |   "oldfieldname": "task_id",  | ||||||
| 		'oldfieldtype': u'Data', |   "width": "150px",  | ||||||
| 		'options': u'Customer', |   "options": "Task",  | ||||||
| 		'permlevel': 0, |   "fieldname": "task_id",  | ||||||
| 		'width': u'150px' |   "fieldtype": "Link",  | ||||||
| 	}, |   "search_index": 1,  | ||||||
| 
 |   "permlevel": 0,  | ||||||
| 	# DocField |   "in_filter": 1 | ||||||
| 	{ |  },  | ||||||
| 		'doctype': u'DocField', |  { | ||||||
| 		'fieldname': u'project_name', |   "oldfieldtype": "Link",  | ||||||
| 		'fieldtype': u'Link', |   "doctype": "DocField",  | ||||||
| 		'in_filter': 1, |   "label": "Task Name",  | ||||||
| 		'label': u'Project', |   "oldfieldname": "task_name",  | ||||||
| 		'oldfieldname': u'project_name', |   "width": "250px",  | ||||||
| 		'oldfieldtype': u'Link', |   "fieldname": "task_name",  | ||||||
| 		'options': u'Project', |   "fieldtype": "Data",  | ||||||
| 		'permlevel': 0, |   "search_index": 0,  | ||||||
| 		'reqd': 0, |   "reqd": 0,  | ||||||
| 		'search_index': 1, |   "permlevel": 0 | ||||||
| 		'width': u'150px' |  } | ||||||
| 	}, |  | ||||||
| 
 |  | ||||||
| 	# DocField |  | ||||||
| 	{ |  | ||||||
| 		'doctype': u'DocField', |  | ||||||
| 		'fieldname': u'task_id', |  | ||||||
| 		'fieldtype': u'Link', |  | ||||||
| 		'in_filter': 1, |  | ||||||
| 		'label': u'Task Id', |  | ||||||
| 		'oldfieldname': u'task_id', |  | ||||||
| 		'oldfieldtype': u'Link', |  | ||||||
| 		'options': u'Task', |  | ||||||
| 		'permlevel': 0, |  | ||||||
| 		'search_index': 1, |  | ||||||
| 		'width': u'150px' |  | ||||||
| 	}, |  | ||||||
| 
 |  | ||||||
| 	# DocField |  | ||||||
| 	{ |  | ||||||
| 		'doctype': u'DocField', |  | ||||||
| 		'fieldname': u'task_name', |  | ||||||
| 		'fieldtype': u'Link', |  | ||||||
| 		'label': u'Task Name', |  | ||||||
| 		'oldfieldname': u'task_name', |  | ||||||
| 		'oldfieldtype': u'Link', |  | ||||||
| 		'permlevel': 0, |  | ||||||
| 		'reqd': 0, |  | ||||||
| 		'search_index': 0, |  | ||||||
| 		'width': u'250px' |  | ||||||
| 	} |  | ||||||
| ] | ] | ||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user