Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/hr/doctype/appraisal/appraisal.txt b/hr/doctype/appraisal/appraisal.txt
index c7eab6a..dd7ad19 100644
--- a/hr/doctype/appraisal/appraisal.txt
+++ b/hr/doctype/appraisal/appraisal.txt
@@ -5,7 +5,7 @@
{
u'creation': '2012-11-16 10:33:39',
u'docstatus': 0,
- u'modified': '2012-11-16 10:35:01',
+ u'modified': '2012-11-16 15:22:59',
u'modified_by': u'Administrator',
u'owner': u'ashwini@webnotestech.com'
},
@@ -309,11 +309,12 @@
# DocPerm
{
+ 'create': 1,
u'doctype': u'DocPerm',
'match': u'owner',
'permlevel': 0,
'role': u'Employee',
- 'submit': 1,
+ 'submit': 0,
'write': 1
},
diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py
index 7e668d0..a6358fa 100644
--- a/stock/doctype/item/item.py
+++ b/stock/doctype/item/item.py
@@ -165,9 +165,6 @@
if self.doc.is_pro_applicable == 'Yes' and self.doc.is_stock_item == 'No':
msgprint("As Production Order can be made for this Item, then Is Stock Item Should be 'Yes' as we maintain it's stock. Refer Manufacturing and Inventory section.", raise_exception=1)
- if self.doc.is_stock_item == "Yes" and not self.doc.default_warehouse:
- msgprint("Please set Default Warehouse for Stock Item", raise_exception=1)
-
if self.doc.has_serial_no == 'Yes' and self.doc.is_stock_item == 'No':
msgprint("'Has Serial No' can not be 'Yes' for non-stock item", raise_exception=1)
diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index 8ac86d8..54c8ab6 100644
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -5,7 +5,7 @@
{
u'creation': '2012-10-26 16:49:39',
u'docstatus': 0,
- u'modified': '2012-11-16 12:35:02',
+ u'modified': '2012-11-16 16:50:57',
u'modified_by': u'Administrator',
u'owner': u'Administrator'
},
@@ -225,7 +225,7 @@
u'doctype': u'DocField',
'fieldname': u'default_warehouse',
'fieldtype': u'Link',
- 'label': u'Default Warehouse',
+ 'label': u'Default Reserved Warehouse',
'oldfieldname': u'default_warehouse',
'oldfieldtype': u'Link',
'options': u'Warehouse',