Ver código fonte

Merge branch 'hotfix'

version-14
Nabin Hait 9 anos atrás
pai
commit
7899fc9f6e
5 arquivos alterados com 9 adições e 7 exclusões
  1. +1
    -1
      frappe/__version__.py
  2. +5
    -4
      frappe/core/doctype/report/report.py
  3. +1
    -0
      frappe/geo/country_info.json
  4. +1
    -1
      frappe/hooks.py
  5. +1
    -1
      setup.py

+ 1
- 1
frappe/__version__.py Ver arquivo

@@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = "6.27.20"
__version__ = "6.27.21"

+ 5
- 4
frappe/core/doctype/report/report.py Ver arquivo

@@ -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()


+ 1
- 0
frappe/geo/country_info.json Ver arquivo

@@ -791,6 +791,7 @@
"code": "et",
"currency_fraction": "Santim",
"currency_fraction_units": 100,
"currency_name": "Ethiopian Birr",
"currency_symbol": "Br",
"number_format": "#,###.##",
"timezones": [


+ 1
- 1
frappe/hooks.py Ver arquivo

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


+ 1
- 1
setup.py Ver arquivo

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


Carregando…
Cancelar
Salvar