commit 1ca0b74e033046dbbc5b5b970e0e6097818b90e8
author Nabin Hait <nabinhait@gmail.com> Thu Mar 12 16:13:47 2015 +0530
committer Nabin Hait <nabinhait@gmail.com> Thu Mar 12 16:13:47 2015 +0530
tree e723d6ad8c20154c89c231a9292868bea61e321d
parent 9ac71c0b1727c534ed67abe6d2ecee4a35a35eb1
parent 2c25a4396f87250d547c6597b03a541900b287dd

Merge pull request #2945 from neilLasrado/workstation

warehouse removed from workstation master

erpnext/manufacturing/doctype/workstation/workstation.json

diff --git a/erpnext/manufacturing/doctype/workstation/workstation.json b/erpnext/manufacturing/doctype/workstation/workstation.json
index b65560c..9a8833e 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.json
+++ b/erpnext/manufacturing/doctype/workstation/workstation.json
@@ -41,17 +41,6 @@
    "precision": ""
   }, 
   {
-   "fieldname": "warehouse", 
-   "fieldtype": "Link", 
-   "in_list_view": 1, 
-   "label": "Warehouse", 
-   "oldfieldname": "warehouse", 
-   "oldfieldtype": "Link", 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "reqd": 1
-  }, 
-  {
    "default": "", 
    "fieldname": "holiday_list", 
    "fieldtype": "Link", 
@@ -134,13 +123,13 @@
    "options": "Workstation Working Hour", 
    "permlevel": 0, 
    "precision": "", 
-   "reqd": 1
+   "reqd": 0
   }
  ], 
  "icon": "icon-wrench", 
  "idx": 1, 
- "modified": "2015-02-23 09:43:35.903827", 
- "modified_by": "Administrator", 
+ "modified": "2015-03-10 15:12:52.857454", 
+ "modified_by": "neil@frappe.io", 
  "module": "Manufacturing", 
  "name": "Workstation", 
  "owner": "Administrator",