Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] fixes_6363

Browse Source
This commit is contained in:
pawan 2016-10-23 10:51:47 +05:30
parent 9a43a2a97b
commit 46ead70be8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/projects/doctype/project/project.json
View File

@ -270,7 +270,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "% Tasks Completed", "label": "% Completed",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
@ -1041,7 +1041,11 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 4, "max_attachments": 4,
<<<<<<< 6ef2c9faa43ba40bef00abc29cd9a5de980b2037
"modified": "2016-10-21 04:20:14.974653", "modified": "2016-10-21 04:20:14.974653",
=======
"modified": "2016-10-23 01:02:40.632849",
>>>>>>> [fix] 6363
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Project", "name": "Project",