Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Pratik Vyas 2014-10-27 09:26:36 +05:30
commit 80e95388f5
6 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

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

2
erpnext/hooks.py
View File

@ -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_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "4.9.0" app_version = "4.9.1"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

20
erpnext/projects/doctype/time_log/time_log.json
View File

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

24
erpnext/selling/sales_common.js
View File

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

2
erpnext/utilities/doctype/address/address.py
View File

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

2
setup.py
View File

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