From c7ede7e985ed5a7d3db0b4f5918768157a59f622 Mon Sep 17 00:00:00 2001 From: shreyas Date: Tue, 31 May 2016 18:21:55 +0530 Subject: [PATCH 1/3] [Fix] Disallow users from editing a standard report --- frappe/core/doctype/report/report.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py index 1c1e117b13..b7f63b7c91 100644 --- a/frappe/core/doctype/report/report.py +++ b/frappe/core/doctype/report/report.py @@ -20,14 +20,15 @@ class Report(Document): if frappe.session.user=="Administrator" and getattr(frappe.local.conf, 'developer_mode',0)==1: self.is_standard = "Yes" + if self.is_standard == "No" and frappe.db.get_value("Report", self.name, "is_standard") == "Yes": + frappe.throw(_("Cannot edit a standard report. Please duplicate and create a new report")) + if self.is_standard == "Yes" and frappe.session.user!="Administrator": - frappe.msgprint(_("Only Administrator can save a standard report. Please rename and save."), - raise_exception=True) + frappe.throw(_("Only Administrator can save a standard report. Please rename and save.")) if self.report_type in ("Query Report", "Script Report") \ and frappe.session.user!="Administrator": - frappe.msgprint(_("Only Administrator allowed to create Query / Script Reports"), - raise_exception=True) + frappe.throw(_("Only Administrator allowed to create Query / Script Reports")) def on_update(self): self.export_doc() From 927be36eb0836bd8a56291ef52f1b0d8e297b114 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 1 Jun 2016 12:06:55 +0530 Subject: [PATCH 2/3] Update country_info.json --- frappe/geo/country_info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/geo/country_info.json b/frappe/geo/country_info.json index 82631185de..65b23dba0b 100644 --- a/frappe/geo/country_info.json +++ b/frappe/geo/country_info.json @@ -791,6 +791,7 @@ "code": "et", "currency_fraction": "Santim", "currency_fraction_units": 100, + "currency_name": "Ethiopian Birr", "currency_symbol": "Br", "number_format": "#,###.##", "timezones": [ From 6704fef89db07d3ec68ade53a705027b9ba4efea Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 3 Jun 2016 12:19:00 +0600 Subject: [PATCH 3/3] bumped to version 6.27.21 --- frappe/__version__.py | 2 +- frappe/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/__version__.py b/frappe/__version__.py index 46a1a946dc..0fb7878698 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.27.20" +__version__ = "6.27.21" diff --git a/frappe/hooks.py b/frappe/hooks.py index 94b7f2581f..dfb0685e1c 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies" app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node" app_icon = "octicon octicon-circuit-board" -app_version = "6.27.20" +app_version = "6.27.21" app_color = "orange" source_link = "https://github.com/frappe/frappe" app_license = "MIT" diff --git a/setup.py b/setup.py index 724d41521f..afe470c8ed 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.27.20" +version = "6.27.21" requirements = parse_requirements("requirements.txt", session="") setup(