Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/setup/doctype/global_defaults/global_defaults.py b/setup/doctype/global_defaults/global_defaults.py
index 94dbf0b..42abf99 100644
--- a/setup/doctype/global_defaults/global_defaults.py
+++ b/setup/doctype/global_defaults/global_defaults.py
@@ -32,12 +32,10 @@
'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',
'float_precision': 'float_precision',
- 'currency_format':'default_currency_format',
'account_url':'account_url',
'allow_negative_stock' : 'allow_negative_stock',
'maintain_same_rate' : 'maintain_same_rate',
diff --git a/setup/doctype/global_defaults/global_defaults.txt b/setup/doctype/global_defaults/global_defaults.txt
index 59942be..b8f4db0 100644
--- a/setup/doctype/global_defaults/global_defaults.txt
+++ b/setup/doctype/global_defaults/global_defaults.txt
@@ -1,8 +1,8 @@
[
{
- "creation": "2013-01-10 16:34:23",
+ "creation": "2013-01-24 14:20:19",
"docstatus": 0,
- "modified": "2013-01-24 13:55:09",
+ "modified": "2013-01-25 11:51:16",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -27,6 +27,8 @@
"permlevel": 0
},
{
+ "amend": 0,
+ "cancel": 0,
"create": 1,
"doctype": "DocPerm",
"name": "__common__",
@@ -88,21 +90,6 @@
},
{
"doctype": "DocField",
- "fieldname": "number_format",
- "fieldtype": "Select",
- "label": "Number Format",
- "options": "\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.",
- "doctype": "DocField",
- "fieldname": "float_precision",
- "fieldtype": "Select",
- "label": "Float Precision",
- "options": "\n2\n3\n4\n5\n6"
- },
- {
- "doctype": "DocField",
"fieldname": "column_break1",
"fieldtype": "Column Break",
"width": "50%"
@@ -118,16 +105,18 @@
},
{
"doctype": "DocField",
- "fieldname": "default_currency_format",
+ "fieldname": "number_format",
"fieldtype": "Select",
- "label": "Default Currency Format",
- "options": "Lacs\nMillions"
+ "label": "Number Format",
+ "options": "\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.",
"doctype": "DocField",
- "fieldname": "default_currency_fraction",
- "fieldtype": "Data",
- "label": "Default Currency Fraction"
+ "fieldname": "float_precision",
+ "fieldtype": "Select",
+ "label": "Float Precision",
+ "options": "\n2\n3\n4\n5\n6"
},
{
"doctype": "DocField",
diff --git a/setup/doctype/setup_control/setup_control.py b/setup/doctype/setup_control/setup_control.py
index d8227ad..00cf1de 100644
--- a/setup/doctype/setup_control/setup_control.py
+++ b/setup/doctype/setup_control/setup_control.py
@@ -69,8 +69,6 @@
def_args = {
'current_fiscal_year':curr_fiscal_year,
'default_currency': args.get('currency'),
- "default_fraction_currency": webnotes.conn.get_value("Currency",
- args.get("currency"), "fraction"),
'default_company':args.get('company_name'),
'default_valuation_method':'FIFO',
'default_stock_uom':'Nos',
@@ -82,9 +80,7 @@
'pr_required':'No',
'emp_created_by':'Naming Series',
'cust_master_name':'Customer Name',
- 'supp_master_name':'Supplier Name',
- 'default_currency_format': \
- (args.get('currency')=='INR') and 'Lacs' or 'Millions'
+ 'supp_master_name':'Supplier Name'
}
# Set
diff --git a/utilities/cleanup_data.py b/utilities/cleanup_data.py
index 92c41a3..8c3b00a 100644
--- a/utilities/cleanup_data.py
+++ b/utilities/cleanup_data.py
@@ -134,8 +134,6 @@
flds = {
'default_company': '',
'default_currency': '',
- 'default_currency_format': 'Lacs',
- 'default_currency_fraction': '',
'current_fiscal_year': '',
'date_format': 'dd-mm-yyyy',
'sms_sender_name': '',