Merge pull request #2158 from rmehta/translated
transations-08-sep-2014
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.json b/erpnext/setup/doctype/sales_partner/sales_partner.json
index 2d4c0ac..f20433d 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.json
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.json
@@ -1,5 +1,6 @@
{
"allow_import": 1,
+ "allow_rename": 1,
"autoname": "field:partner_name",
"creation": "2013-04-12 15:34:06",
"description": "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.",
@@ -199,7 +200,7 @@
"icon": "icon-user",
"idx": 1,
"in_create": 0,
- "modified": "2014-08-19 06:42:33.103060",
+ "modified": "2014-09-05 14:54:57.014940",
"modified_by": "Administrator",
"module": "Setup",
"name": "Sales Partner",
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py
index 1151b1a..d3942e4 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.py
@@ -171,19 +171,26 @@
global_defaults.save()
+ number_format = get_country_info(args.get("country")).get("number_format", "#,###.##")
+
+ # replace these as float number formats, as they have 0 precision
+ # and are currency number formats and not for floats
+ if number_format=="#.###":
+ number_format = "#.###,##"
+ elif number_format=="#,###":
+ number_format = "#,###.##"
+
system_settings = frappe.get_doc("System Settings", "System Settings")
system_settings.update({
"language": args.get("language"),
"time_zone": args.get("timezone"),
"float_precision": 3,
'date_format': frappe.db.get_value("Country", args.get("country"), "date_format"),
- 'number_format': get_country_info(args.get("country")).get("number_format", "#,###.##"),
+ 'number_format': number_format,
'enable_scheduler': 1
})
-
system_settings.save()
-
accounts_settings = frappe.get_doc("Accounts Settings")
accounts_settings.auto_accounting_for_stock = 1
accounts_settings.save()