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

setup/doctype/global_defaults/global_defaults.txt

@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:23", 
   "docstatus": 0, 
-  "modified": "2013-01-24 11:48:48", 
+  "modified": "2013-01-24 13:55:09", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -94,12 +94,12 @@
   "options": "\n#,###.##\n#.###,##\n# ###.##\n#,##,###.##\n######"
  }, 
  {
-  "description": "Precision for Float fields (quantities, discounts, percentages etc)", 
+  "description": "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.", 
   "doctype": "DocField", 
   "fieldname": "float_precision", 
   "fieldtype": "Select", 
   "label": "Float Precision", 
-  "options": "2\n3\n4\n5\n6"
+  "options": "\n2\n3\n4\n5\n6"
  }, 
  {
   "doctype": "DocField", 

startup/__init__.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 # ERPNext - web based ERP (http://erpnext.com)
 # Copyright (C) 2012 Web Notes Technologies Pvt Ltd
 # 
@@ -17,6 +19,13 @@
 # default settings that can be made for a profile.
 from __future__ import unicode_literals
 
+lang_names = {
+	"हिंदी": "hi",
+	"English": "en"
+}
+
+lang_list = ["en", "hi"]
+
 product_name = "ERPNext"
 profile_defaults = {
 	"Company": "company",