nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 03:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] fixed conflict while merging with master

Browse Source
This commit is contained in:
Nabin Hait
2013-08-21 17:51:46 +05:30
parent f68d563a68 bbc2d11d10
commit 11bd44e447
44 changed files with 167 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
stock/doctype/serial_no/serial_no.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-16 10:59:15",
"docstatus": 0,
"modified": "2013-08-21 11:22:50",
"modified": "2013-08-21 13:37:01",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -35,8 +35,7 @@
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
"report": 1,
"submit": 0
"write": 1
},
{
"doctype": "DocType",
@@ -446,23 +445,22 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"role": "Material Master Manager",
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"report": 1,
"role": "Material Manager",
"write": 0
"submit": 0
},
{
"amend": 0,
"cancel": 0,
"create": 1,
"doctype": "DocPerm",
"report": 1,
"role": "Material User",
"submit": 0
},
{
"create": 0,
"doctype": "DocPerm",
"role": "Material User",
"write": 0
"role": "Accounts User"
}
]