Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 3161916..84fddef 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1 +1 @@
-__version__ = '4.9.0'
+__version__ = '4.9.1'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index a1a98f6..6f4a41e 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -4,7 +4,7 @@
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"
diff --git a/erpnext/projects/doctype/time_log/time_log.json b/erpnext/projects/doctype/time_log/time_log.json
index ee34da0..0eed1fc 100644
--- a/erpnext/projects/doctype/time_log/time_log.json
+++ b/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.",
@@ -26,14 +26,6 @@
"reqd": 1
},
{
- "fieldname": "hours",
- "fieldtype": "Float",
- "in_list_view": 1,
- "label": "Hours",
- "permlevel": 0,
- "read_only": 0
- },
- {
"fieldname": "to_time",
"fieldtype": "Datetime",
"in_list_view": 1,
@@ -43,6 +35,14 @@
"reqd": 1
},
{
+ "fieldname": "hours",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Hours",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"permlevel": 0,
@@ -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",
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 66e935a..fd16258 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -587,16 +587,18 @@
});
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));
+ })
+ }
}
- }
- })
+ })
+ }
})
diff --git a/erpnext/utilities/doctype/address/address.py b/erpnext/utilities/doctype/address/address.py
index 8fd5cb1..172ce23 100644
--- a/erpnext/utilities/doctype/address/address.py
+++ b/erpnext/utilities/doctype/address/address.py
@@ -52,6 +52,8 @@
@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 {}
diff --git a/setup.py b/setup.py
index c95b14d..5bdcc94 100644
--- a/setup.py
+++ b/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()