Merge fixes: removed patches, removed Warehouse User
diff --git a/erpnext/patches/4_0/move_warehouse_user_to_restrictions.py b/erpnext/patches/4_0/move_warehouse_user_to_restrictions.py
index 4e6a2ed..8622239 100644
--- a/erpnext/patches/4_0/move_warehouse_user_to_restrictions.py
+++ b/erpnext/patches/4_0/move_warehouse_user_to_restrictions.py
@@ -8,5 +8,6 @@
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")
\ No newline at end of file
+
+ webnotes.delete_doc("DocType", "Warehouse User")
+ webnotes.reload_doc("stock", "doctype", "warehouse")
\ No newline at end of file
diff --git a/erpnext/stock/doctype/warehouse/warehouse.txt b/erpnext/stock/doctype/warehouse/warehouse.txt
index 627e9dd..629a508 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.txt
+++ b/erpnext/stock/doctype/warehouse/warehouse.txt
@@ -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"
},
@@ -81,22 +81,6 @@
"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",
"fieldname": "warehouse_contact_info",