Merge branch 'v4.x.x'

.travis.yml

@@ -10,7 +10,7 @@ install:
   - sudo service mysql stop
   - sudo apt-get install python-software-properties
   - sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
-  - sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu precise main'
+  - sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu precise main'
   - sudo apt-get update
   - sudo apt-get purge -y mysql-common
   - sudo apt-get install mariadb-server mariadb-common libmariadbclient-dev

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "4.14.0"
+__version__ = "4.14.1"

frappe/hooks.py

@@ -4,7 +4,7 @@ app_title = "Frappe Framework"
 app_publisher = "Web Notes Technologies Pvt. Ltd."
 app_description = "Full Stack Web Application Framework in Python"
 app_icon = "assets/frappe/images/frappe.svg"
-app_version = "4.14.0"
+app_version = "4.14.1"
 app_color = "#3498db"
 app_email = "support@frappe.io"
 

frappe/model/document.py

@@ -285,11 +285,13 @@ class Document(BaseDocument):
 				if cstr(modified) and cstr(modified) != cstr(self._original_modified):
 					conflict = True
 			else:
-				tmp = frappe.db.get_value(self.doctype, self.name,
-					["modified", "docstatus"], as_dict=True)
+				tmp = frappe.db.sql("""select modified, docstatus from `tab{0}`
+					where name = %s for update""".format(self.doctype), self.name, as_dict=True)
 
 				if not tmp:
 					frappe.throw(_("Record does not exist"))
+				else:
+					tmp = tmp[0]
 
 				modified = cstr(tmp.modified)
 

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "4.14.0"
+version = "4.14.1"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()