Merge branch 'develop'

frappe/__version__.py

@@ -1 +1 @@
-__version__ = "4.7.0"
+__version__ = "4.7.1"

frappe/core/doctype/custom_field/custom_field.json

@@ -1,4 +1,5 @@
 {
+ "allow_import": 1, 
  "creation": "2013-01-10 16:34:01", 
  "description": "Adds a custom field to a DocType", 
  "docstatus": 0, 
@@ -267,7 +268,7 @@
  ], 
  "icon": "icon-glass", 
  "idx": 1, 
- "modified": "2014-11-07 12:59:28.734894", 
+ "modified": "2014-12-11 10:51:31.220942", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "Custom Field", 

frappe/core/doctype/custom_script/custom_script.json

@@ -1,4 +1,5 @@
 {
+ "allow_import": 1, 
  "autoname": "CustomScript.####", 
  "creation": "2013-01-10 16:34:01", 
  "description": "Adds a custom script (client or server) to a DocType", 
@@ -48,7 +49,7 @@
  ], 
  "icon": "icon-glass", 
  "idx": 1, 
- "modified": "2014-06-19 06:55:02.522204", 
+ "modified": "2014-12-11 10:51:42.905807", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "Custom Script", 

frappe/core/doctype/property_setter/property_setter.json

@@ -1,4 +1,5 @@
 {
+ "allow_import": 1, 
  "creation": "2013-01-10 16:34:04", 
  "description": "Property Setter overrides a standard DocType or Field property", 
  "docstatus": 0, 
@@ -85,7 +86,7 @@
  ], 
  "icon": "icon-glass", 
  "idx": 1, 
- "modified": "2014-07-24 02:04:26.838056", 
+ "modified": "2014-12-11 10:51:52.727473", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "Property Setter", 

frappe/core/doctype/todo/todo.json

@@ -1,5 +1,6 @@
 {
-  "allow_copy": 0, 
+ "allow_copy": 0, 
+ "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "TDI.########", 
  "creation": "2012-07-03 13:30:35", 
@@ -170,7 +171,7 @@
  "in_dialog": 0, 
  "issingle": 0, 
  "max_attachments": 0, 
- "modified": "2014-06-30 05:40:15.471434", 
+ "modified": "2014-12-11 10:52:00.765033", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "ToDo", 

frappe/hooks.py

@@ -3,7 +3,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.7.0"
+app_version = "4.7.1"
 app_color = "#3498db"
 app_email = "support@frappe.io"
 

setup.py

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