Merge branch 'develop'

This commit is contained in:
Pratik Vyas 2014-12-31 12:40:01 +05:30
commit 60bf71c569
5 changed files with 8 additions and 6 deletions

View file

@ -1 +1 @@
__version__ = "4.9.1"
__version__ = "4.9.2"

View file

@ -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"

View file

@ -3,7 +3,7 @@ app_title = "Frappe Framework"
app_publisher = "Web Notes Technologies Pvt. Ltd."
app_description = "Full Stack Web Application Framework in Python"
app_icon = "assets/frappe/images/frappe.svg"
app_version = "4.9.1"
app_version = "4.9.2"
app_color = "#3498db"
app_email = "support@frappe.io"

View file

@ -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], ""

View file

@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os
version = "4.9.1"
version = "4.9.2"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()