Merge lp:~openerp-dev/openobject-addons/trunk-bug-898113-mtr into lp:openobject-addons

[Meera Trambadia (OpenERP)]

project: fixed value error, by returning an id through context['default_project_id'] inplace of converting str to int. i.e int(context['project_id'])" --fixes=lp:898113

[Raphael Collet (OpenERP) (rco-openerp)]

The orm already handles all fields initialized with 'default_XXX' in context. You may simply remove the default value for project, and delete method _default_project.

Please check sure that the project is never initialized by putting a 'project_id' in context.

Thanks,
Raphael

review: Needs Fixing

Unmerged revisions

5839. By Meera Trambadia (OpenERP) on 2011-12-01

[FIX] project: fixed value error, by returning an id

=== modified file 'project/project.py'
--- project/project.py	2011-11-23 13:31:32 +0000
+++ project/project.py	2011-12-01 07:12:27 +0000
@@ -360,7 +360,7 @@
     working_days = %s
     resource = %s
 """       % (
-            project.id, 
+            project.id,
             project.date_start, working_days,
             '|'.join(['User_'+str(x) for x in puids])
         )
@@ -531,8 +531,8 @@
     def _default_project(self, cr, uid, context=None):
         if context is None:
             context = {}
-        if 'project_id' in context and context['project_id']:
-            return int(context['project_id'])
+        if 'default_project_id' in context and context['default_project_id']:
+            return context['default_project_id']
         return False
 
     def duplicate_task(self, cr, uid, map_ids, context=None):
@@ -907,7 +907,7 @@
                 self.do_pending(cr, uid, task.id, context=context)
             elif delegate_data['state'] == 'done':
                 self.do_close(cr, uid, task.id, context=context)
-            
+
             message = _("The task '%s' has been delegated to %s.") % (delegate_data['name'], delegate_data['user_id'][1])
             self.log(cr, uid, task.id, message)
             delegrated_tasks[task.id] = delegrated_task_id
@@ -983,7 +983,7 @@
             new_stage = vals.get('type_id')
             vals_reset_kstate = dict(vals, kanban_state='normal')
             for t in self.browse(cr, uid, ids, context=context):
-                write_vals = vals_reset_kstate if t.type_id != new_stage else vals 
+                write_vals = vals_reset_kstate if t.type_id != new_stage else vals
                 super(task,self).write(cr, uid, [t.id], write_vals, context=context)
             return True
         return super(task,self).write(cr, uid, ids, vals, context=context)
@@ -1074,7 +1074,7 @@
         if vals.get('child_ids', False) and context.get('analytic_project_copy', False):
             vals['child_ids'] = []
         return super(account_analytic_account, self).create(cr, uid, vals, context=context)
-    
+
     def unlink(self, cr, uid, ids, *args, **kwargs):
         project_obj = self.pool.get('project.project')
         analytic_ids = project_obj.search(cr, uid, [('analytic_account_id','in',ids)])