Merge fixes: removed patches, removed Warehouse User
This commit is contained in:
parent
61bf425935
commit
0663ec4a9c
@ -8,5 +8,6 @@ def execute():
|
||||
from webnotes.core.page.user_properties import user_properties
|
||||
for warehouse, profile in webnotes.conn.sql("""select parent, user from `tabWarehouse User`"""):
|
||||
user_properties.add(profile, "Warehouse", warehouse)
|
||||
|
||||
webnotes.delete_doc("DocType", "Warehouse User")
|
||||
|
||||
webnotes.delete_doc("DocType", "Warehouse User")
|
||||
webnotes.reload_doc("stock", "doctype", "warehouse")
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-03-07 18:50:32",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-12-20 19:24:40",
|
||||
"modified": "2013-12-27 17:55:48",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -80,22 +80,6 @@
|
||||
"label": "Parent Account",
|
||||
"options": "Account"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "column_break_4",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Allow For Users",
|
||||
"read_only": 0
|
||||
},
|
||||
{
|
||||
"description": "If set, data entry is only allowed for specified users. Else, entry is allowed for all users with requisite permissions.",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "warehouse_users",
|
||||
"fieldtype": "Table",
|
||||
"label": "Warehouse Users",
|
||||
"options": "Warehouse User",
|
||||
"read_only": 0
|
||||
},
|
||||
{
|
||||
"description": "For Reference Only.",
|
||||
"doctype": "DocField",
|
||||
|
Loading…
x
Reference in New Issue
Block a user