[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu

addons/project/project.py

@@ -479,7 +479,7 @@ def Project():
 """       % (
             project.id,
             project.date_start or time.strftime('%Y-%m-%d'), working_days,
-            '|'.join(['User_'+str(x) for x in puids])
+            '|'.join(['User_'+str(x) for x in puids]) or 'None'
         )
         vacation = calendar_id and tuple(resource_pool.compute_vacation(cr, uid, calendar_id, context=context)) or False
         if vacation:
@@ -789,7 +789,7 @@ class task(osv.osv):
             }),
         'progress': fields.function(_hours_get, string='Working Time Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time",
             store = {
-                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours','state'], 10),
+                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours', 'state', 'stage_id'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
         'delay_hours': fields.function(_hours_get, string='Delay Hours', multi='hours', help="Computed as difference between planned hours by the project manager and the total hours of the task.",

addons/project/static/src/js/project.js

@@ -32,12 +32,6 @@ openerp.project = function(openerp) {
             if (self.dataset.model === 'project.project') {
                 self.project_display_members_names();
             }
-        },
-        on_record_moved: function(record, old_group, old_index, new_group, new_index){
-            var self = this;
-            this._super.apply(this, arguments);
-            if(new_group.state.folded)
-                new_group.do_action_toggle_fold();
         }
     });