mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-05 06:28:29 +00:00
timesheet patch update
This commit is contained in:
@@ -68,7 +68,7 @@ def get_events(start, end):
|
||||
}, as_dict=True, update={"allDay": 0})
|
||||
|
||||
for d in data:
|
||||
d.title = d.name + ": " + d.activity_type
|
||||
d.title = d.name + ": " + (d.activity_type or "[Activity Type not set]")
|
||||
if d.task:
|
||||
d.title += " for Task: " + d.task
|
||||
if d.project:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-02-26 14:58:28",
|
||||
"creation": "2013-03-04 02:39:45",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-03-01 17:48:09",
|
||||
"modified": "2013-03-04 02:48:12",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -31,7 +31,6 @@
|
||||
"parenttype": "DocType",
|
||||
"permlevel": 0,
|
||||
"read": 1,
|
||||
"report": 1,
|
||||
"write": 1
|
||||
},
|
||||
{
|
||||
@@ -164,6 +163,12 @@
|
||||
"permlevel": 0,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "column_break_16",
|
||||
"fieldtype": "Column Break",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "file_list",
|
||||
@@ -185,18 +190,13 @@
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
"cancel": 0,
|
||||
"create": 1,
|
||||
"doctype": "DocPerm",
|
||||
"match": "owner",
|
||||
"role": "Projects User",
|
||||
"submit": 1
|
||||
"role": "Projects User"
|
||||
},
|
||||
{
|
||||
"amend": 1,
|
||||
"cancel": 1,
|
||||
"doctype": "DocPerm",
|
||||
"role": "Projects Manager",
|
||||
"submit": 0
|
||||
"role": "Projects Manager"
|
||||
}
|
||||
]
|
||||
Reference in New Issue
Block a user