From 50bfc3b353f5c3aacad3b0d44bf02fd19eb0703f Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Thu, 1 Jun 2017 19:00:49 +0530 Subject: [PATCH 1/3] [travis] Install node v7 (#3417) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 77e3c6662f..ef2bcbe7fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ before_install: install: - sudo apt-get purge -y mysql-common mysql-server mysql-client + - nvm install v7.10.0 - wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py - sudo python install.py --develop --user travis --without-bench-setup - sudo pip install -e ~/bench From dc455a3c24e3a6d723685e43e3314feb54aaeb5c Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 1 Jun 2017 19:02:01 +0530 Subject: [PATCH 2/3] Row with label like Opening not displaying in the General Ledger report if user has set user permissions (#3414) --- frappe/desk/query_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 096467f9f8..24a37725ad 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -287,7 +287,7 @@ def has_match(row, linked_doctypes, doctype_match_filters, ref_doctype, if_owner if dt=="User" and columns_dict[idx]==columns_dict.get("owner"): continue - if dt in match_filters and row[idx] not in match_filters[dt]: + if dt in match_filters and row[idx] not in match_filters[dt] and frappe.db.exists(dt, row[idx]): match = False break From a101f0fa0444a27cab61b69ae774eab04004462a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 1 Jun 2017 19:39:31 +0600 Subject: [PATCH 3/3] bumped to version 8.0.62 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 25952cfa6a..5be47fa47f 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = '8.0.61' +__version__ = '8.0.62' __title__ = "Frappe Framework" local = Local()