Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Conflicts:
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	selling/doctype/quotation/quotation.txt
	selling/doctype/quotation_item/quotation_item.txt
	selling/doctype/sales_order_item/sales_order_item.txt
	stock/doctype/delivery_note_item/delivery_note_item.txt
	stock/doctype/item/item.txt

setup/doctype/global_defaults/global_defaults.txt

@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-04-01 15:05:24", 
+  "creation": "2013-05-02 17:53:24", 
   "docstatus": 0, 
-  "modified": "2013-05-02 15:05:21", 
+  "modified": "2013-05-22 15:57:26", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -27,6 +27,8 @@
   "permlevel": 0
  }, 
  {
+  "amend": 0, 
+  "cancel": 0, 
   "create": 1, 
   "doctype": "DocPerm", 
   "name": "__common__", 
@@ -170,7 +172,8 @@
   "fieldname": "item_naming_by", 
   "fieldtype": "Select", 
   "label": "Item Naming By", 
-  "options": "Item Code\nNaming Series"
+  "options": "Item Code\nNaming Series", 
+  "read_only": 0
  }, 
  {
   "doctype": "DocField", 
@@ -212,14 +215,6 @@
   "label": "Allow Negative Stock", 
   "read_only": 0
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "default_warehouse_type", 
-  "fieldtype": "Link", 
-  "label": "Default Warehouse Type", 
-  "options": "Warehouse Type", 
-  "read_only": 0
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "auto_indent", 
@@ -227,6 +222,21 @@
   "label": "Raise Material Request when stock reaches re-order level", 
   "read_only": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "reorder_email_notify", 
+  "fieldtype": "Check", 
+  "label": "Notify by Email on creation of automatic Material Request"
+ }, 
+ {
+  "default": "Hourly", 
+  "doctype": "DocField", 
+  "fieldname": "reorder_level_checking_frequency", 
+  "fieldtype": "Select", 
+  "hidden": 1, 
+  "label": "Reorder Level Checking Frequency", 
+  "options": "Hourly\nDaily"
+ }, 
  {
   "default": "1", 
   "doctype": "DocField", 
@@ -235,6 +245,14 @@
   "read_only": 0, 
   "width": "50%"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "default_warehouse_type", 
+  "fieldtype": "Link", 
+  "label": "Default Warehouse Type", 
+  "options": "Warehouse Type", 
+  "read_only": 0
+ }, 
  {
   "description": "Percentage you are allowed to receive or deliver more against the quantity ordered. <p>For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units</p>", 
   "doctype": "DocField", 
@@ -274,7 +292,8 @@
   "fieldtype": "Check", 
   "label": "Auto Inventory Accounting", 
   "no_copy": 0, 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
   "description": "Accounting entry frozen up to this date, nobody can do / modify entry except authorized person", 
@@ -507,11 +526,6 @@
   "label": "SMS Sender Name", 
   "read_only": 0
  }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "doctype": "DocPerm"
- }, 
  {
   "doctype": "DocPerm"
  }

setup/doctype/item_group/item_group.py

@@ -81,3 +81,4 @@ class DocType(DocTypeNestedSet):
 		if self.doc.slideshow:
 			from website.helpers.slideshow import get_slideshow
 			get_slideshow(self)
+