From da9bbf8f096669b760394b4e4a7b0f64f5e0b260 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 29 Dec 2014 12:17:30 +0530 Subject: [PATCH 1/2] [fix] [file manager] unicode issue in get_file_name() --- frappe/utils/file_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/file_manager.py b/frappe/utils/file_manager.py index 0da0052a67..4b296fcb14 100644 --- a/frappe/utils/file_manager.py +++ b/frappe/utils/file_manager.py @@ -251,7 +251,7 @@ def get_content_hash(content): def get_file_name(fname, optional_suffix): n_records = frappe.db.sql("select name from `tabFile Data` where file_name=%s", fname) - if len(n_records) > 0 or os.path.exists(get_files_path(fname.encode('utf-8'))): + if len(n_records) > 0 or os.path.exists(get_files_path(fname).encode('utf-8')): f = fname.rsplit('.', 1) if len(f) == 1: partial, extn = f[0], "" From f13b45a89d5e3450430205ada555f8c4e556969b Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 29 Dec 2014 12:35:53 +0530 Subject: [PATCH 2/2] [minor] Added currency RON - Romanian New Leu --- frappe/country_info.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/country_info.json b/frappe/country_info.json index 1624f330f4..292573c686 100644 --- a/frappe/country_info.json +++ b/frappe/country_info.json @@ -1946,9 +1946,11 @@ }, "Romania": { "code": "ro", - "currency_fraction": "Ban", + "currency": "RON", + "currency_fraction": "Bani", "currency_fraction_units": 100, - "currency_symbol": "L", + "currency_name": "Romanian New Leu", + "currency_symbol": "lei", "number_format": "#,###.##", "timezones": [ "Europe/Bucharest"