Merge branch 'master' into develop

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__ = "7.0.25"
+__version__ = "7.0.26"
 
 local = Local()
 

frappe/change_log/v7/v7_0_0.md

@@ -0,0 +1,36 @@
+#### UI
+- Editable Grids
+- Image Field in DocType, form and list
+- Dashboard, Heatmap, Graphs on Form View
+- Document Flow in forms
+- List views: remembers user settings
+
+#### Celery to RQ
+
+#### Quick Entry
+
+#### Razorpay Integration
+
+#### Passwords
+
+#### Portals
+- Statics (`www` folder): directly served from templates
+- New Routing
+- Web Forms
+
+#### Limits
+- Expiry, space etc
+- Usage Info Page
+
+#### Minor
+- **Rename:** Bulk Email is now Email Queue
+- `frappe.require` is async
+- `flot.js` replaced by `c3.js`
+- Most popular links on the top
+- Standard Replies configurable
+- Timeline permisions (not based on user permissions)
+- "Track Seen" feature in doctypes
+- Moved: "Edit Profile" page is now in frappe (moved from ERPNext)
+- Cleanup UI for chat
+- New default user icons (based on initials)
+- Multiple assign (add a document to multiple users)

frappe/model/db_query.py

@@ -333,6 +333,8 @@ class DatabaseQuery(object):
 		self.match_filters = []
 		self.match_conditions = []
 		only_if_shared = False
+		if not self.user:
+			self.user = frappe.session.user
 
 		if not self.tables: self.extract_tables()