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

[merge]

Browse Source
This commit is contained in:
Rushabh Mehta 2013-04-24 10:08:39 +05:30
parent f1cfbeaa5c
commit 333d438c32
2 changed files with 1 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
stock/doctype/item/item.txt
View File

@ -878,92 +878,17 @@
"read_only": 0
},
{
<<<<<<< HEAD
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 1,
"report": 0,
"role": "Material Manager",
"write": 0
},
{
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Material Manager",
"write": 0
=======
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"role": "Material Master Manager",
"write": 1
>>>>>>> 59a6cd6c44481b56566131557bdcccaa865527cd
},
{
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
<<<<<<< HEAD
"permlevel": 1,
"report": 0,
"role": "Material User",
"write": 0
},
{
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Material User",
"write": 0
},
{
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Material Master Manager",
"write": 1
=======
"role": "Material Manager",
"write": 0
>>>>>>> 59a6cd6c44481b56566131557bdcccaa865527cd
},
{
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
<<<<<<< HEAD
"permlevel": 1,
"report": 0,
"role": "Material Master Manager",
"write": 0
},
{
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "System Manager",
"write": 1
},
{
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 1,
"report": 0,
"role": "System Manager",
=======
"role": "Material User",
>>>>>>> 59a6cd6c44481b56566131557bdcccaa865527cd
"write": 0
}
]

1
website/doctype/website_settings/website_settings.txt
View File

@ -1,4 +1,5 @@
[
{
"creation": "2013-03-26 06:51:18",
"docstatus": 0,
"modified": "2013-04-17 11:51:24",