nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 14:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'edge'

Browse Source 
Conflicts:
	home/page/latest_updates/latest_updates.js
This commit is contained in:
Anand Doshi
2013-04-29 10:42:21 +05:30
parent 319e0f43da cdc9e2cd6f
commit c9897ff533
36 changed files with 631 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
accounts/doctype/c_form/c_form.txt
View File

@@ -1,6 +1,6 @@
[
{
"creation": "2013-01-30 12:49:46",
"creation": "2013-03-07 14:48:29",
"docstatus": 0,
"modified": "2013-02-13 11:29:18",
"modified_by": "Administrator",
@@ -24,17 +24,13 @@
"permlevel": 0
},
{
"create": 1,
"doctype": "DocPerm",
"name": "__common__",
"parent": "C-Form",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
"report": 1,
"submit": 0,
"write": 1
"submit": 0
},
{
"doctype": "DocType",
@@ -156,15 +152,6 @@
"print_hide": 0,
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "file_list",
"fieldtype": "Text",
"hidden": 1,
"label": "File List",
"print_hide": 1,
"read_only": 0
},
{
"doctype": "DocField",
"fieldname": "amended_from",
@@ -176,11 +163,28 @@
"read_only": 1
},
{
"create": 1,
"doctype": "DocPerm",
"role": "Accounts User"
"permlevel": 0,
"report": 1,
"role": "Accounts User",
"write": 1
},
{
"create": 1,
"doctype": "DocPerm",
"role": "Accounts Manager"
"permlevel": 0,
"report": 1,
"role": "Accounts Manager",
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"match": "",
"permlevel": 1,
"role": "All"
}
]

72
accounts/doctype/purchase_invoice/purchase_invoice.txt
View File

@@ -1,6 +1,6 @@
[
{
"creation": "2013-03-07 13:16:13",
"creation": "2013-04-09 10:18:10",
"docstatus": 0,
"modified": "2013-03-22 18:17:14",
"modified_by": "Administrator",
@@ -30,9 +30,7 @@
"parent": "Purchase Invoice",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
"report": 1
"read": 1
},
{
"doctype": "DocType",
@@ -758,19 +756,69 @@
"reqd": 0
},
{
"doctype": "DocField",
"fieldname": "file_list",
"fieldtype": "Text",
"hidden": 1,
"label": "File List",
"no_copy": 1,
"print_hide": 1
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"match": "",
"permlevel": 1,
"report": 0,
"role": "Accounts Manager",
"submit": 0,
"write": 0
},
{
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Accounts Manager",
"submit": 1,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"match": "",
"permlevel": 1,
"report": 0,
"role": "Accounts User",
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"match": "",
"permlevel": 1,
"role": "Purchase User",
"submit": 0
},
{
"amend": 0,
"cancel": 0,
"create": 1,
"doctype": "DocPerm",
"match": "",
"permlevel": 0,
"report": 1,
"role": "Purchase User",
"submit": 0,
"write": 1
},
{
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Accounts User",
"submit": 1,
"write": 1
@@ -778,6 +826,8 @@
{
"doctype": "DocPerm",
"match": "supplier",
"permlevel": 0,
"report": 1,
"role": "Supplier"
}
]

20
accounts/doctype/sales_invoice/sales_invoice.txt
View File

@@ -30,9 +30,7 @@
"parent": "Sales Invoice",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
"report": 1
"read": 1
},
{
"doctype": "DocType",
@@ -1285,21 +1283,13 @@
"read_only": 0,
"report_hide": 1
},
{
"doctype": "DocField",
"fieldname": "file_list",
"fieldtype": "Text",
"hidden": 1,
"label": "File List",
"no_copy": 1,
"print_hide": 1,
"read_only": 0
},
{
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"report": 1,
"role": "Accounts User",
"submit": 1,
"write": 1
@@ -1307,6 +1297,8 @@
{
"doctype": "DocPerm",
"match": "customer",
"permlevel": 0,
"report": 1,
"role": "Customer"
}
},
]