diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index 8cdc2b7..26ffe2f 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -1,4 +1,7 @@
 erpnext.updates = [
+	["21st January, 2013", [
+		"Number Formatting: Added Number Format to Global Defaults & Currency",
+	]],
 	["18th January, 2013", [
 		"Buying: Added Price List to purchase cycle",
 	]],
diff --git a/setup/doctype/global_defaults/global_defaults.py b/setup/doctype/global_defaults/global_defaults.py
index 1d93e24..042b9a3 100644
--- a/setup/doctype/global_defaults/global_defaults.py
+++ b/setup/doctype/global_defaults/global_defaults.py
@@ -21,20 +21,21 @@
 
 keydict = {
 	"fiscal_year": "current_fiscal_year",
-    'company': 'default_company',
-    'currency': 'default_currency',
-    'price_list_name': 'default_price_list',
+	'company': 'default_company',
+	'currency': 'default_currency',
+	'price_list_name': 'default_price_list',
 	'price_list_currency': 'default_price_list_currency',
-    'item_group': 'default_item_group',
-    'customer_group': 'default_customer_group',
-    'cust_master_name': 'cust_master_name', 
-    'supplier_type': 'default_supplier_type',
-    'supp_master_name': 'supp_master_name', 
-    'territory': 'default_territory',
-    'stock_uom': 'default_stock_uom',
-    'fraction_currency': 'default_currency_fraction',
-    'valuation_method': 'default_valuation_method',
+	'item_group': 'default_item_group',
+	'customer_group': 'default_customer_group',
+	'cust_master_name': 'cust_master_name', 
+	'supplier_type': 'default_supplier_type',
+	'supp_master_name': 'supp_master_name', 
+	'territory': 'default_territory',
+	'stock_uom': 'default_stock_uom',
+	'fraction_currency': 'default_currency_fraction',
+	'valuation_method': 'default_valuation_method',
 	'date_format': 'date_format',
+	'number_format': 'number_format',
 	'currency_format':'default_currency_format',
 	'account_url':'account_url',
 	'allow_negative_stock' : 'allow_negative_stock',
diff --git a/setup/doctype/global_defaults/global_defaults.txt b/setup/doctype/global_defaults/global_defaults.txt
index e4b36a9..6854fc7 100644
--- a/setup/doctype/global_defaults/global_defaults.txt
+++ b/setup/doctype/global_defaults/global_defaults.txt
@@ -1,228 +1,237 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:23", 
   "docstatus": 0, 
-  "creation": "2012-10-26 16:49:40", 
+  "modified": "2013-01-21 16:32:30", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-12 14:13:31"
+  "owner": "Administrator"
  }, 
  {
-  "in_create": 1, 
-  "allow_print": 1, 
-  "module": "Setup", 
-  "read_only": 1, 
+  "allow_copy": 1, 
   "allow_email": 1, 
-  "issingle": 1, 
-  "name": "__common__", 
+  "allow_print": 1, 
   "doctype": "DocType", 
   "hide_toolbar": 0, 
-  "allow_copy": 1
+  "in_create": 1, 
+  "issingle": 1, 
+  "module": "Setup", 
+  "name": "__common__", 
+  "read_only": 1
  }, 
  {
-  "name": "__common__", 
-  "parent": "Global Defaults", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Global Defaults", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Global Defaults", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 0, 
+  "submit": 0
  }, 
  {
-  "name": "Global Defaults", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Global Defaults"
  }, 
  {
   "doctype": "DocField", 
-  "label": "General", 
   "fieldname": "general", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "General"
  }, 
  {
   "description": "Session Expiry in Hours e.g. 06:00", 
   "doctype": "DocField", 
-  "label": "Session Expiry", 
   "fieldname": "session_expiry", 
-  "fieldtype": "Data"
+  "fieldtype": "Data", 
+  "label": "Session Expiry"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Company", 
   "fieldname": "company", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Company"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default Company", 
   "fieldname": "default_company", 
   "fieldtype": "Link", 
-  "reqd": 0, 
-  "options": "Company"
+  "label": "Default Company", 
+  "options": "Company", 
+  "reqd": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Current Fiscal Year", 
   "fieldname": "current_fiscal_year", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Fiscal Year"
+  "label": "Current Fiscal Year", 
+  "options": "Fiscal Year", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Date Format", 
   "fieldname": "date_format", 
   "fieldtype": "Select", 
+  "label": "Date Format", 
   "options": "yyyy-mm-dd\ndd-mm-yyyy\ndd/mm/yyyy\nmm/dd/yyyy\nmm-dd-yyyy"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
+  "fieldname": "number_format", 
+  "fieldtype": "Select", 
+  "label": "Number Format", 
+  "options": "\n#,###.##\n#.###,##\n# ###.##\n#,##,###.##\n######"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "column_break1", 
-  "fieldtype": "Column Break"
+  "fieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
   "default": "INR", 
   "doctype": "DocField", 
-  "label": "Default Currency", 
   "fieldname": "default_currency", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "link:Currency"
+  "label": "Default Currency", 
+  "options": "link:Currency", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default Currency Format", 
   "fieldname": "default_currency_format", 
   "fieldtype": "Select", 
+  "label": "Default Currency Format", 
   "options": "Lacs\nMillions"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default Currency Fraction", 
   "fieldname": "default_currency_fraction", 
-  "fieldtype": "Data"
+  "fieldtype": "Data", 
+  "label": "Default Currency Fraction"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Stock", 
   "fieldname": "stock", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Stock"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
-  "fieldtype": "Column Break"
+  "fieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default Item Group", 
   "fieldname": "default_item_group", 
   "fieldtype": "Link", 
+  "label": "Default Item Group", 
   "options": "Item Group"
  }, 
  {
   "doctype": "DocField", 
-  "label": "IGHelp", 
   "fieldname": "ighelp", 
   "fieldtype": "HTML", 
+  "label": "IGHelp", 
   "options": "<a href=\"#!Sales Browser/Item Group\">To manage Item Groups, click here</a>"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default Stock UOM", 
   "fieldname": "default_stock_uom", 
   "fieldtype": "Link", 
+  "label": "Default Stock UOM", 
   "options": "UOM"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default Valuation Method", 
   "fieldname": "default_valuation_method", 
   "fieldtype": "Select", 
+  "label": "Default Valuation Method", 
   "options": "FIFO\nMoving Average"
  }, 
  {
   "description": "Applicable only if valuation method is moving average", 
   "doctype": "DocField", 
-  "label": "Allow Negative Stock", 
   "fieldname": "allow_negative_stock", 
-  "fieldtype": "Check"
+  "fieldtype": "Check", 
+  "label": "Allow Negative Stock"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default Warehouse Type", 
   "fieldname": "default_warehouse_type", 
   "fieldtype": "Link", 
+  "label": "Default Warehouse Type", 
   "options": "Warehouse Type"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Raise Purchase Request when stock reaches re-order level", 
   "fieldname": "auto_indent", 
-  "fieldtype": "Check"
+  "fieldtype": "Check", 
+  "label": "Raise Purchase Request when stock reaches re-order level"
  }, 
  {
   "default": "1", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
-  "fieldtype": "Column Break"
+  "fieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
   "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", 
-  "label": "Allowance Percent", 
   "fieldname": "tolerance", 
-  "fieldtype": "Currency"
+  "fieldtype": "Currency", 
+  "label": "Allowance Percent"
  }, 
  {
   "description": "Stock level frozen up to this date, nobody can do / modify entry except authorized person", 
   "doctype": "DocField", 
-  "label": "Stock Frozen Upto", 
   "fieldname": "stock_frozen_upto", 
-  "fieldtype": "Date"
+  "fieldtype": "Date", 
+  "label": "Stock Frozen Upto"
  }, 
  {
   "description": "Users with this role are allowed to do / modify stock entry before frozen date", 
   "doctype": "DocField", 
-  "label": "Authorized Role (Frozen Entry)", 
   "fieldname": "stock_auth_role", 
   "fieldtype": "Link", 
+  "label": "Authorized Role (Frozen Entry)", 
   "options": "Role"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Accounts", 
   "fieldname": "accounts", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Accounts"
  }, 
  {
   "description": "Accounting entry frozen up to this date, nobody can do / modify entry except authorized person", 
   "doctype": "DocField", 
-  "label": "Accounts Frozen Upto", 
   "fieldname": "acc_frozen_upto", 
-  "fieldtype": "Date"
+  "fieldtype": "Date", 
+  "label": "Accounts Frozen Upto"
  }, 
  {
   "description": "Users with this role are allowed to do / modify accounting entry before frozen date", 
   "doctype": "DocField", 
-  "label": "Authourized Role (Frozen Entry)", 
   "fieldname": "bde_auth_role", 
   "fieldtype": "Link", 
+  "label": "Authourized Role (Frozen Entry)", 
   "options": "Role"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Credit Controller", 
   "fieldname": "credit_controller", 
   "fieldtype": "Link", 
+  "label": "Credit Controller", 
   "options": "Role"
  }, 
  {
@@ -232,197 +241,187 @@
  }, 
  {
   "doctype": "DocField", 
-  "label": "Account Info", 
   "fieldname": "account_info", 
   "fieldtype": "HTML", 
+  "label": "Account Info", 
   "options": "<div class=\"help-box\">For more accounting defaults, Open <a href=\"#!List/Company\">Company</a></div>"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Selling", 
   "fieldname": "selling", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Selling"
  }, 
  {
   "default": "Customer Name", 
   "doctype": "DocField", 
-  "label": "Customer Master created by ", 
   "fieldname": "cust_master_name", 
   "fieldtype": "Select", 
+  "label": "Customer Master created by ", 
   "options": "Customer Name\nNaming Series"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default Customer Group", 
   "fieldname": "default_customer_group", 
   "fieldtype": "Link", 
+  "label": "Default Customer Group", 
   "options": "Customer Group"
  }, 
  {
   "doctype": "DocField", 
-  "label": "CGHelp", 
   "fieldname": "cghelp", 
   "fieldtype": "HTML", 
+  "label": "CGHelp", 
   "options": "<a href=\"#!Sales Browser/Customer Group\">To manage Customer Groups, click here</a>"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default Territory", 
   "fieldname": "default_territory", 
   "fieldtype": "Link", 
+  "label": "Default Territory", 
   "options": "Territory"
  }, 
  {
   "doctype": "DocField", 
-  "label": "TerritoryHelp", 
   "fieldname": "territoryhelp", 
   "fieldtype": "HTML", 
+  "label": "TerritoryHelp", 
   "options": "<a href=\"#!Sales Browser/Territory\">To manage Territory, click here</a>"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break5", 
-  "fieldtype": "Column Break"
+  "fieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default Price List", 
   "fieldname": "default_price_list", 
   "fieldtype": "Link", 
+  "label": "Default Price List", 
   "options": "Price List"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default Price List Currency", 
   "fieldname": "default_price_list_currency", 
   "fieldtype": "Link", 
+  "label": "Default Price List Currency", 
   "options": "Currency"
  }, 
  {
   "default": "No", 
   "doctype": "DocField", 
-  "label": "Sales Order Required", 
   "fieldname": "so_required", 
   "fieldtype": "Select", 
+  "label": "Sales Order Required", 
   "options": "No\nYes"
  }, 
  {
   "default": "No", 
   "doctype": "DocField", 
-  "label": "Delivery Note Required", 
   "fieldname": "dn_required", 
   "fieldtype": "Select", 
+  "label": "Delivery Note Required", 
   "options": "No\nYes"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Buying", 
   "fieldname": "buying", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Buying"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default Supplier Type", 
   "fieldname": "default_supplier_type", 
   "fieldtype": "Link", 
+  "label": "Default Supplier Type", 
   "options": "Supplier Type"
  }, 
  {
   "default": "Supplier Name", 
   "doctype": "DocField", 
-  "label": "Supplier Master created by ", 
   "fieldname": "supp_master_name", 
   "fieldtype": "Select", 
+  "label": "Supplier Master created by ", 
   "options": "Supplier Name\nNaming Series"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break6", 
-  "fieldtype": "Column Break"
+  "fieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
   "default": "No", 
   "doctype": "DocField", 
-  "label": "Purchase Order Required", 
   "fieldname": "po_required", 
   "fieldtype": "Select", 
+  "label": "Purchase Order Required", 
   "options": "No\nYes"
  }, 
  {
   "default": "No", 
   "doctype": "DocField", 
-  "label": "Purchase Receipt Required", 
   "fieldname": "pr_required", 
   "fieldtype": "Select", 
+  "label": "Purchase Receipt Required", 
   "options": "No\nYes"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Maintain same rate throughout purchase cycle", 
   "fieldname": "maintain_same_rate", 
-  "fieldtype": "Check"
+  "fieldtype": "Check", 
+  "label": "Maintain same rate throughout purchase cycle"
  }, 
  {
   "doctype": "DocField", 
-  "label": "HR", 
   "fieldname": "hr", 
   "fieldtype": "Section Break", 
+  "label": "HR", 
   "options": "<div style=\"padding-top: 8px;\" class=\"columnHeading\">HR</div>"
  }, 
  {
   "description": "Employee record is created using selected field. ", 
   "doctype": "DocField", 
-  "label": "Employee Records to be created by ", 
   "fieldname": "emp_created_by", 
   "fieldtype": "Select", 
+  "label": "Employee Records to be created by ", 
   "options": "\nNaming Series\nEmployee Number"
  }, 
  {
   "doctype": "DocField", 
-  "label": "System", 
   "fieldname": "system", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "System"
  }, 
  {
   "doctype": "DocField", 
-  "label": "SMS Sender Name", 
   "fieldname": "sms_sender_name", 
-  "fieldtype": "Data"
- }, 
- {
-  "amend": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "role": "System Manager", 
-  "cancel": 0, 
-  "permlevel": 0
+  "fieldtype": "Data", 
+  "label": "SMS Sender Name"
  }, 
  {
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "permlevel": 0, 
   "role": "System Manager", 
-  "permlevel": 0
+  "write": 1
  }, 
  {
   "doctype": "DocPerm", 
-  "write": 1, 
+  "permlevel": 1, 
   "role": "System Manager", 
-  "permlevel": 1
+  "write": 1
  }, 
  {
   "doctype": "DocPerm", 
-  "role": "All", 
-  "permlevel": 1
+  "permlevel": 1, 
+  "role": "All"
  }, 
  {
   "doctype": "DocPerm", 
-  "write": 1, 
+  "permlevel": 2, 
   "role": "System Manager", 
-  "permlevel": 2
+  "write": 1
  }
 ]
\ No newline at end of file