From 88ecf50668ea4988307f6bd79c9780898985a045 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 14 Apr 2016 12:35:08 +0530 Subject: [PATCH 1/4] [fix] Total row in report --- frappe/desk/query_report.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index d5a2291c19..a8e7b00dab 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -112,6 +112,8 @@ def add_total_row(result, columns): col = col.split(":") if len(col) > 1: fieldtype = col[1] + if "/" in fieldtype: + fieldtype = fieldtype.split("/")[0] else: fieldtype = col.get("fieldtype") From 5655772ff776f4a2f0e7d39532604e7cbb9fad7d Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Thu, 14 Apr 2016 17:21:24 +0530 Subject: [PATCH 2/4] Fixed bug in block modules --- frappe/core/page/modules_setup/modules_setup.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/page/modules_setup/modules_setup.js b/frappe/core/page/modules_setup/modules_setup.js index 056c2ecc8a..938fc3ced5 100644 --- a/frappe/core/page/modules_setup/modules_setup.js +++ b/frappe/core/page/modules_setup/modules_setup.js @@ -35,8 +35,8 @@ frappe.pages['modules_setup'].on_page_load = function(wrapper) { // save action page.set_primary_action('Save', function() { var hidden_list = []; - page.content.find('input[type="checkbox"]').each(function() { - if(!$(this).is(':checked')) { + page.wrapper.find('input[type="checkbox"]').each(function() { + if(!$(this).is(":checked")) { hidden_list.push($(this).attr('data-module')); } }); From 79ab8d0ecdf8e72c12a5fdb19b0c8161a08638b6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 14 Apr 2016 18:02:12 +0530 Subject: [PATCH 3/4] [fix] Get field currency for child doc --- frappe/model/meta.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/frappe/model/meta.py b/frappe/model/meta.py index 924186703c..4f4cf20044 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -280,21 +280,29 @@ def get_field_currency(df, doc=None): if not getattr(frappe.local, "field_currency", None): frappe.local.field_currency = frappe._dict() - if not frappe.local.field_currency.get((doc.doctype, doc.parent or doc.name), {}).get(df.fieldname): + if not (frappe.local.field_currency.get((doc.doctype, doc.name), {}).get(df.fieldname) or + (doc.parent and frappe.local.field_currency.get((doc.doctype, doc.parent), {}).get(df.fieldname))): + + ref_docname = doc.parent or doc.name + if ":" in cstr(df.get("options")): split_opts = df.get("options").split(":") if len(split_opts)==3: currency = frappe.db.get_value(split_opts[0], doc.get(split_opts[1]), split_opts[2]) else: currency = doc.get(df.get("options")) - if not currency and doc.parent: - currency = frappe.db.get_value(doc.parenttype, doc.parent, df.get("options")) + if doc.parent: + if currency: + ref_docname = doc.name + else: + currency = frappe.db.get_value(doc.parenttype, doc.parent, df.get("options")) if currency: - frappe.local.field_currency.setdefault((doc.doctype, doc.parent or doc.name), frappe._dict())\ + frappe.local.field_currency.setdefault((doc.doctype, ref_docname), frappe._dict())\ .setdefault(df.fieldname, currency) - return frappe.local.field_currency.get((doc.doctype, doc.parent or doc.name), {}).get(df.fieldname) + return frappe.local.field_currency.get((doc.doctype, doc.name), {}).get(df.fieldname) or \ + (doc.parent and frappe.local.field_currency.get((doc.doctype, doc.parent), {}).get(df.fieldname)) def get_field_precision(df, doc=None, currency=None): """get precision based on DocField options and fieldvalue in doc""" From 98a06e12767e71c18293a4483d27f35c6af01840 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 15 Apr 2016 11:30:38 +0600 Subject: [PATCH 4/4] bumped to version 6.27.10 --- 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 01cd383e08..9c5548f848 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.27.9" +__version__ = "6.27.10" diff --git a/frappe/hooks.py b/frappe/hooks.py index 70ec9f716c..2f8fd45ce9 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.9" +app_version = "6.27.10" app_color = "orange" source_link = "https://github.com/frappe/frappe" app_license = "MIT" diff --git a/setup.py b/setup.py index 7a1de35600..4f456ea7d7 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.9" +version = "6.27.10" requirements = parse_requirements("requirements.txt", session="") setup(