Merge branch 'develop'

erpnext/__version__.py

@@ -1 +1 @@
-__version__ = '4.9.0'
+__version__ = '4.9.1'

erpnext/hooks.py

@@ -4,7 +4,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors"
 app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "4.9.0"
+app_version = "4.9.1"
 
 error_report_email = "support@erpnext.com"
 

erpnext/projects/doctype/time_log/time_log.json

@@ -1,5 +1,5 @@
 {
-  "allow_import": 1, 
+ "allow_import": 1, 
  "autoname": "naming_series:", 
  "creation": "2013-04-03 16:38:41", 
  "description": "Log of Activities performed by users against Tasks that can be used for tracking time, billing.", 
@@ -25,14 +25,6 @@
    "read_only": 0, 
    "reqd": 1
   }, 
-  {
-   "fieldname": "hours", 
-   "fieldtype": "Float", 
-   "in_list_view": 1, 
-   "label": "Hours", 
-   "permlevel": 0, 
-   "read_only": 0
-  }, 
   {
    "fieldname": "to_time", 
    "fieldtype": "Datetime", 
@@ -42,6 +34,14 @@
    "read_only": 0, 
    "reqd": 1
   }, 
+  {
+   "fieldname": "hours", 
+   "fieldtype": "Float", 
+   "in_list_view": 1, 
+   "label": "Hours", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
   {
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
@@ -151,7 +151,7 @@
  "icon": "icon-time", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-08-04 05:23:15.740050", 
+ "modified": "2014-10-22 16:53:26.993828", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Time Log", 

erpnext/selling/sales_common.js

@@ -587,16 +587,18 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
 });
 
 frappe.ui.form.on(cur_frm.doctype,"project_name", function(frm) {
-	frappe.call({
-		method:'erpnext.projects.doctype.project.project.get_cost_center_name' ,
-		args: {	project_name: frm.doc.project_name	},
-		callback: function(r, rt) {
-			if(!r.exc) { 
-				$.each(frm.doc[cur_frm.cscript.fname] || [], function(i, row) {
-					frappe.model.set_value(row.doctype, row.name, "cost_center", r.message);
-					msgprint(__("Cost Center For Item with Item Code '"+row.item_name+"' has been Changed to "+ r.message));
-				})
+	if(in_list(["Delivery Note", "Sales Invoice"], frm.doc.doctype)) {
+		frappe.call({
+			method:'erpnext.projects.doctype.project.project.get_cost_center_name' ,
+			args: {	project_name: frm.doc.project_name	},
+			callback: function(r, rt) {
+				if(!r.exc) {
+					$.each(frm.doc[cur_frm.cscript.fname] || [], function(i, row) {
+						frappe.model.set_value(row.doctype, row.name, "cost_center", r.message);
+						msgprint(__("Cost Center For Item with Item Code '"+row.item_name+"' has been Changed to "+ r.message));
+					})
+				}
 			}
-		}
-	})
+		})
+	}
 })

erpnext/utilities/doctype/address/address.py

@@ -52,6 +52,8 @@ class Address(Document):
 
 @frappe.whitelist()
 def get_address_display(address_dict):
+	if not address_dict:
+		return
 	if not isinstance(address_dict, dict):
 		address_dict = frappe.db.get_value("Address", address_dict, "*", as_dict=True) or {}
 

setup.py

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