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

Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt

setup/doctype/global_defaults/global_defaults.py

@@ -41,7 +41,8 @@ keydict = {
 	'account_url':'account_url',
 	'allow_negative_stock' : 'allow_negative_stock',
 	'maintain_same_rate' : 'maintain_same_rate',
-	'session_expiry': 'session_expiry'
+	'session_expiry': 'session_expiry',
+	'disable_rounded_total': 'disable_rounded_total',
 }
 
 class DocType:

setup/doctype/global_defaults/global_defaults.txt

@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-02-18 13:36:21", 
+  "creation": "2013-02-19 12:28:27", 
   "docstatus": 0, 
-  "modified": "2013-02-18 13:44:56", 
+  "modified": "2013-02-20 14:08:70", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -27,6 +27,8 @@
   "permlevel": 0
  }, 
  {
+  "amend": 0, 
+  "cancel": 0, 
   "create": 1, 
   "doctype": "DocPerm", 
   "name": "__common__", 
@@ -332,6 +334,13 @@
   "label": "Delivery Note Required", 
   "options": "No\nYes"
  }, 
+ {
+  "description": "If disable, 'Rounded Total' field will not be visible in any transaction", 
+  "doctype": "DocField", 
+  "fieldname": "disable_rounded_total", 
+  "fieldtype": "Check", 
+  "label": "Disable Rounded Total"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "buying", 
@@ -408,11 +417,6 @@
   "fieldtype": "Data", 
   "label": "SMS Sender Name"
  }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "doctype": "DocPerm"
- }, 
  {
   "doctype": "DocPerm"
  }

setup/doctype/item_group/item_group.py

@@ -64,6 +64,7 @@ class DocType(DocTypeNestedSet):
 			
 		self.doc.items = get_product_list_for_group(product_group = self.doc.name, limit=20)
 		self.parent_groups = get_parent_item_groups(self.doc.name)
+		self.doc.title = self.doc.name
 
 		if self.doc.slideshow:
 			from website.helpers.slideshow import get_slideshow