From 0663ec4a9c8cbd1b193863f3b4db63b4c5d4c4b1 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Fri, 27 Dec 2013 17:57:28 +0530
Subject: [PATCH] Merge fixes: removed patches, removed Warehouse User

---
 .../4_0/move_warehouse_user_to_restrictions.py |  5 +++--
 erpnext/stock/doctype/warehouse/warehouse.txt  | 18 +-----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

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 4e6a2ed1f9..8622239c4d 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 @@ 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")
\ 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 627e9dd8f2..629a508d80 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"
  }, 
@@ -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",