fixes to currency number formatting - will pick first from currency master and also made explict options for number formatting
diff --git a/setup/doctype/currency/currency.txt b/setup/doctype/currency/currency.txt
index fc00900..679e6a6 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 b8f4db0..6bdeb84 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.",