summaryrefslogtreecommitdiff
path: root/addons/analytic_contract_project
diff options
context:
space:
mode:
authorpso (OpenERP) <pso@tinyerp.com>2012-07-25 18:23:32 +0530
committerpso (OpenERP) <pso@tinyerp.com>2012-07-25 18:23:32 +0530
commite5da0e191b1c3d778f7d6d2ba4f2ff0fc726ecbd (patch)
tree4314f65784b65fdcbdd88f3c556c57ccdc4db3d8 /addons/analytic_contract_project
parent082513a80587c3732f13a89edda7c5ba4fcd8410 (diff)
parentac580aeae09c2bc76e7c5c090567b7bc7ba24b25 (diff)
[MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
Diffstat (limited to 'addons/analytic_contract_project')
-rw-r--r--addons/analytic_contract_project/__openerp__.py4
-rw-r--r--addons/analytic_contract_project/analytic_contract_project.py3
2 files changed, 4 insertions, 3 deletions
diff --git a/addons/analytic_contract_project/__openerp__.py b/addons/analytic_contract_project/__openerp__.py
index 7ad28c911ba..4e4f621663c 100644
--- a/addons/analytic_contract_project/__openerp__.py
+++ b/addons/analytic_contract_project/__openerp__.py
@@ -20,14 +20,14 @@
##############################################################################
{
- "name" : "Contract On Project",
+ "name" : "Contract on Project",
"version": "1.1",
"author" : "OpenERP SA",
'category': 'Hidden',
"website" : "http://www.openerp.com",
"depends" : ["project", "account_analytic_analysis"],
"description": """
- Add "Contract Data" in project view.
+Add "Contract Data" in project view.
""",
"init_xml" : [],
"update_xml": ["analytic_contract_project_view.xml"],
diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py
index 6221617637e..1ffab1246c9 100644
--- a/addons/analytic_contract_project/analytic_contract_project.py
+++ b/addons/analytic_contract_project/analytic_contract_project.py
@@ -78,6 +78,7 @@ class task(osv.osv):
def create(self, cr, uid, vals, context=None):
task_id = super(task, self).create(cr, uid, vals, context=context)
task_browse = self.browse(cr, uid, task_id, context=context)
- self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task <em>%s</em> has been <b>created</b>.") % (task_browse.name), context=context)
+ if task_browse.project_id.analytic_account_id:
+ self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task <em>%s</em> has been <b>created</b>.") % (task_browse.name), context=context)
return task_id
task()