From 671538ff8cf98b1972df90551af87af003914b1c Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 28 Jan 2013 10:42:32 +0530
Subject: [PATCH] fixes to currency number formatting - will pick first from
 currency master and also made explict options for number formatting

---
 setup/doctype/currency/currency.txt               | 11 ++++++-----
 setup/doctype/global_defaults/global_defaults.txt |  8 +++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/setup/doctype/currency/currency.txt b/setup/doctype/currency/currency.txt
index fc009005155..679e6a6c769 100644
--- a/setup/doctype/currency/currency.txt
+++ b/setup/doctype/currency/currency.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-27 16:31:07", 
+  "creation": "2013-01-28 10:06:02", 
   "docstatus": 0, 
-  "modified": "2013-01-27 13:32:26", 
+  "modified": "2013-01-28 10:37:18", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -77,11 +77,12 @@
   "label": "Symbol"
  }, 
  {
-  "description": "How should the number be formatted?\n#,###.## or #.###,## etc.", 
+  "description": "How should this currency be formatted? If not set, will use system defaults", 
   "doctype": "DocField", 
   "fieldname": "number_format", 
-  "fieldtype": "Data", 
-  "label": "Number Format"
+  "fieldtype": "Select", 
+  "label": "Number Format", 
+  "options": "\n#,###.##\n#.###,##\n# ###.##\n#,##,###.##\n#.###\n#,###"
  }, 
  {
   "cancel": 1, 
diff --git a/setup/doctype/global_defaults/global_defaults.txt b/setup/doctype/global_defaults/global_defaults.txt
index b8f4db0a90c..6bdeb84cbe0 100644
--- a/setup/doctype/global_defaults/global_defaults.txt
+++ b/setup/doctype/global_defaults/global_defaults.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-24 14:20:19", 
+  "creation": "2013-01-28 10:06:02", 
   "docstatus": 0, 
-  "modified": "2013-01-25 11:51:16", 
+  "modified": "2013-01-28 10:36:35", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -27,8 +27,6 @@
   "permlevel": 0
  }, 
  {
-  "amend": 0, 
-  "cancel": 0, 
   "create": 1, 
   "doctype": "DocPerm", 
   "name": "__common__", 
@@ -108,7 +106,7 @@
   "fieldname": "number_format", 
   "fieldtype": "Select", 
   "label": "Number Format", 
-  "options": "\n#,###.##\n#.###,##\n# ###.##\n#,##,###.##\n######"
+  "options": "\n#,###.##\n#.###,##\n# ###.##\n#,##,###.##\n#.###\n#,###"
  }, 
  {
   "description": "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.",