Merge lp:~openerp-dev/openobject-addons/trunk-project-copy-tde into lp:openobject-addons

[Thibault Delavallée (OpenERP)]

[IMP] project: better copy/duplication
- when duplicating a classic project: do not duplicate tasks
- when duplicating a tmeplate project: duplicate its tasks and attachments (+ cleaned a bit the
various methods used)
- when creating a template contract: create a template project

[lp:~openerp-dev/openobject-addons/trunk-project-copy-tde]

8908. By Thibault Delavallée (OpenERP) on 2013-09-19

[FIX] project: added active_test fto find deactivated tasks

8909. By Thibault Delavallée (OpenERP) on 2013-09-19

[REF] project: base test file is now in common.py

8910. By Turkesh Patel (openERP) on 2013-10-03

[MRG] merge with lp:openobject-addons

8911. By Turkesh Patel (openERP) on 2013-10-07

[MRG] merge with lp:openobject-addons

Unmerged revisions

8911. By Turkesh Patel (openERP) on 2013-10-07

[MRG] merge with lp:openobject-addons

8910. By Turkesh Patel (openERP) on 2013-10-03

[MRG] merge with lp:openobject-addons

8909. By Thibault Delavallée (OpenERP) on 2013-09-19

[REF] project: base test file is now in common.py

8908. By Thibault Delavallée (OpenERP) on 2013-09-19

[FIX] project: added active_test fto find deactivated tasks

8907. By Thibault Delavallée (OpenERP) on 2013-09-18

[IMP] project: better copy/duplication
- when duplicating a classic project: do not duplicate tasks
- when duplicating a tmeplate project: duplicate its tasks and attachments (+ cleaned a bit the
various methods used)
- when creating a template contract: create a template project

=== modified file 'portal_project/tests/test_access_rights.py'
--- portal_project/tests/test_access_rights.py	2013-07-10 13:29:54 +0000
+++ portal_project/tests/test_access_rights.py	2013-10-07 10:05:06 +0000
@@ -19,12 +19,12 @@
 #
 ##############################################################################
 
-from openerp.addons.project.tests.test_project_base import TestProjectBase
+from openerp.addons.project.tests.common import TestProject
 from openerp.osv.orm import except_orm
 from openerp.tools import mute_logger
 
 
-class TestPortalProjectBase(TestProjectBase):
+class TestPortalProjectBase(TestProject):
 
     def setUp(self):
         super(TestPortalProjectBase, self).setUp()

=== modified file 'project/project.py'
--- project/project.py	2013-09-19 14:23:38 +0000
+++ project/project.py	2013-10-07 10:05:06 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from datetime import datetime, date
+from datetime import date, datetime
 from lxml import etree
 import time
 
@@ -314,7 +314,7 @@
     ]
 
     def set_template(self, cr, uid, ids, context=None):
-        return self.setActive(cr, uid, ids, value=False, context=context)
+        return self.set_template_state(cr, uid, ids, True, context=context)
 
     def set_done(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'close'}, context=context)
@@ -329,99 +329,115 @@
         return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
     def reset_project(self, cr, uid, ids, context=None):
-        return self.setActive(cr, uid, ids, value=True, context=context)
-
-    def map_tasks(self, cr, uid, old_project_id, new_project_id, context=None):
-        """ copy and map tasks from old to new project """
-        if context is None:
-            context = {}
-        map_task_id = {}
-        task_obj = self.pool.get('project.task')
-        proj = self.browse(cr, uid, old_project_id, context=context)
-        for task in proj.tasks:
-            map_task_id[task.id] =  task_obj.copy(cr, uid, task.id, {}, context=context)
-        self.write(cr, uid, [new_project_id], {'tasks':[(6,0, map_task_id.values())]})
-        task_obj.duplicate_task(cr, uid, map_task_id, context=context)
-        return True
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        if context is None:
-            context = {}
+        return self.set_template_state(cr, uid, ids, False, context=context)
+
+    def copy_data(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
+        current_project = self.browse(cr, uid, id, context=context)
+        default['line_ids'] = []
+        # update name
+        if not default.get('name'):
+            default.update(name=_("%s (copy %s)") % (current_project.name, fields.datetime.now()))
+        # handle tasks
+        if current_project.state == 'template':
+            mapping = {}
+            for task in current_project.tasks:
+                mapping[task.id] = self.pool['project.task'].copy(cr, uid, task.id, context=context)
+            self.pool['project.task'].update_parents_and_childs(cr, uid, mapping.values(), mapping, context=context)
+            default['tasks'] = [(6, 0, mapping.values())]
+        else:
+            default['tasks'] = []
+        # handle attachments: copy them instead of just keeping the links
+        if current_project.state == 'template':
+            attach_obj = self.pool['ir.attachment']
+            attach_ids = attach_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', id)], context=context)
+            for attach in attach_obj.browse(cr, uid, attach_ids, context=context):
+                attach_obj.copy_data(cr, uid, attach.id, {
+                    'name': '%s %s' % (attach.name, fields.datetime.now())
+                }, context=context)
+        return super(project, self).copy_data(cr, uid, id, default, context)
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        if context is None:
+            context = {}
         context['active_test'] = False
-        default['state'] = 'open'
-        default['line_ids'] = []
-        default['tasks'] = []
-        proj = self.browse(cr, uid, id, context=context)
-        if not default.get('name', False):
-            default.update(name=_("%s (copy)") % (proj.name))
-        res = super(project, self).copy(cr, uid, id, default, context)
-        self.map_tasks(cr, uid, id, res, context=context)
-        return res
+        return super(project, self).copy(cr, uid, id, default, context)
 
     def duplicate_template(self, cr, uid, ids, context=None):
+        return self.create_from_template(cr, uid, ids, context=context)
+
+    def create_from_template(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+        context['copy'] = True  # compatibility with some old ugly code in account
         data_obj = self.pool.get('ir.model.data')
-        result = []
-        for proj in self.browse(cr, uid, ids, context=context):
-            parent_id = context.get('parent_id', False)
-            context.update({'analytic_project_copy': True})
-            new_date_start = time.strftime('%Y-%m-%d')
-            new_date_end = False
-            if proj.date_start and proj.date:
-                start_date = date(*time.strptime(proj.date_start,'%Y-%m-%d')[:3])
-                end_date = date(*time.strptime(proj.date,'%Y-%m-%d')[:3])
-                new_date_end = (datetime(*time.strptime(new_date_start,'%Y-%m-%d')[:3])+(end_date-start_date)).strftime('%Y-%m-%d')
-            context.update({'copy':True})
-            new_id = self.copy(cr, uid, proj.id, default = {
-                                    'name':_("%s (copy)") % (proj.name),
-                                    'state':'open',
-                                    'date_start':new_date_start,
-                                    'date':new_date_end,
-                                    'parent_id':parent_id}, context=context)
-            result.append(new_id)
-
-            child_ids = self.search(cr, uid, [('parent_id','=', proj.analytic_account_id.id)], context=context)
-            parent_id = self.read(cr, uid, new_id, ['analytic_account_id'])['analytic_account_id'][0]
+
+        new_projects = []
+        for template in self.browse(cr, uid, ids, context=context):
+            date_start = date.today()
+            date_end = False
+            if template.date and template.date_start:
+                date_end = date_start + (datetime.strptime(template.date, tools.DEFAULT_SERVER_DATETIME_FORMAT).date() - datetime.strptime(template.date_start, tools.DEFAULT_SERVER_DATETIME_FORMAT).date())
+            project_id = self.copy(cr, uid, template.id, default={
+                'state': 'open',
+                'date_start': date_start,
+                'date': date_end,
+                'parent_id': context.get('parent_id', False),
+            }, context=context)
+            new_projects.append(project_id)
+
+            child_ids = self.search(cr, uid, [('parent_id', '=', template.analytic_account_id.id)], context=context)
             if child_ids:
-                self.duplicate_template(cr, uid, child_ids, context={'parent_id': parent_id})
+                project_account_id = self.browse(cr, uid, project_id, ['analytic_account_id'], context=context).analytic_account_id.id
+                self.duplicate_template(cr, uid, child_ids, context={'parent_id': project_account_id})
 
-        if result and len(result):
-            res_id = result[0]
-            form_view_id = data_obj._get_id(cr, uid, 'project', 'edit_project')
-            form_view = data_obj.read(cr, uid, form_view_id, ['res_id'])
-            tree_view_id = data_obj._get_id(cr, uid, 'project', 'view_project')
-            tree_view = data_obj.read(cr, uid, tree_view_id, ['res_id'])
-            search_view_id = data_obj._get_id(cr, uid, 'project', 'view_project_project_filter')
-            search_view = data_obj.read(cr, uid, search_view_id, ['res_id'])
+        if new_projects:
+            try:
+                form_view_id = data_obj.get_object_reference(cr, uid, 'project', 'edit_project')[1]
+            except ValueError:
+                form_view_id = False
+            try:
+                tree_view_id = data_obj.get_object_reference(cr, uid, 'project', 'view_project')[1]
+            except ValueError:
+                tree_view_id = False
+            try:
+                search_view_id = data_obj.get_object_reference(cr, uid, 'project', 'view_project_project_filter')[1]
+            except ValueError:
+                search_view_id = False
             return {
                 'name': _('Projects'),
                 'view_type': 'form',
                 'view_mode': 'form,tree',
                 'res_model': 'project.project',
                 'view_id': False,
-                'res_id': res_id,
-                'views': [(form_view['res_id'],'form'),(tree_view['res_id'],'tree')],
+                'res_id': new_projects[0],
+                'views': [(form_view_id, 'form'), (tree_view_id, 'tree')],
                 'type': 'ir.actions.act_window',
-                'search_view_id': search_view['res_id'],
+                'search_view_id': search_view_id,
                 'nodestroy': True
             }
+        return False
 
     # set active value for a project, its sub projects and its tasks
     def setActive(self, cr, uid, ids, value=True, context=None):
-        task_obj = self.pool.get('project.task')
-        for proj in self.browse(cr, uid, ids, context=None):
-            self.write(cr, uid, [proj.id], {'state': value and 'open' or 'template'}, context)
-            cr.execute('select id from project_task where project_id=%s', (proj.id,))
-            tasks_id = [x[0] for x in cr.fetchall()]
-            if tasks_id:
-                task_obj.write(cr, uid, tasks_id, {'active': value}, context=context)
-            child_ids = self.search(cr, uid, [('parent_id','=', proj.analytic_account_id.id)])
-            if child_ids:
-                self.setActive(cr, uid, child_ids, value, context=None)
+        return self.set_template_state(cr, uid, ids, not value, context=context)
+
+    def set_template_state(self, cr, uid, ids, template_state=False, context=None):
+        """ (Re)set the project as template.
+            :param boolean template_state: True => 'template', False => 'open'
+        """
+        if context is None:
+            context = {}
+        active_ctx = dict(context, {'active_test': False})
+        state = 'open' if template_state else 'template'
+        self.write(cr, uid, ids, {'state': state}, context=context)
+        task_ids = self.pool['project.task'].search(cr, uid, [('project_id', 'in', ids)], context=active_ctx)  # search instead of browse because of active_flag - active_test context key seems buggy with cache
+        self.pool['project.task'].write(cr, uid, task_ids, {'active': state == 'open'}, context=context)
+        parent_ids = [project.analytic_account_id.id for project in self.browse(cr, uid, ids, context=context)]
+        child_project_ids = self.search(cr, uid, [('parent_id', 'in', parent_ids)], context=context)
+        if child_project_ids:
+            return self.set_template_state(cr, uid, child_project_ids, state, context=context)
         return True
 
     def _schedule_header(self, cr, uid, ids, force_members=True, context=None):
@@ -684,49 +700,36 @@
             vals['date_start'] = fields.datetime.now()
         return {'value': vals}
 
-    def duplicate_task(self, cr, uid, map_ids, context=None):
-        for new in map_ids.values():
-            task = self.browse(cr, uid, new, context)
-            child_ids = [ ch.id for ch in task.child_ids]
-            if task.child_ids:
-                for child in task.child_ids:
-                    if child.id in map_ids.keys():
-                        child_ids.remove(child.id)
-                        child_ids.append(map_ids[child.id])
-
-            parent_ids = [ ch.id for ch in task.parent_ids]
-            if task.parent_ids:
-                for parent in task.parent_ids:
-                    if parent.id in map_ids.keys():
-                        parent_ids.remove(parent.id)
-                        parent_ids.append(map_ids[parent.id])
-            #FIXME why there is already the copy and the old one
-            self.write(cr, uid, new, {'parent_ids':[(6,0,set(parent_ids))], 'child_ids':[(6,0, set(child_ids))]})
+    def update_parents_and_childs(self, cr, uid, ids, mapping, context=None):
+        for task in self.browse(cr, uid, ids, context=context):
+            new_parent_ids = [mapping[parent.id] for parent in task.parent_ids if parent.id in mapping]
+            new_parent_ids += [parent.id for parent in task.parent_ids if parent.id not in mapping]
+            new_child_ids = [mapping[child.id] for child in task.child_ids if child.id in mapping]
+            new_child_ids += [child.id for child in task.child_ids if child.id not in mapping]
+            self.write(cr, uid, [task.id], {'parent_ids': [(6, 0, new_parent_ids)], 'child_ids': [(6, 0, new_child_ids)]}, context=context)
+        return True
 
     def copy_data(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
-        default = default or {}
-        default.update({'work_ids':[], 'date_start': False, 'date_end': False, 'date_deadline': False})
-        if not default.get('remaining_hours', False):
-            default['remaining_hours'] = float(self.read(cr, uid, id, ['planned_hours'])['planned_hours'])
-        default['active'] = True
-        if not default.get('name', False):
-            default['name'] = self.browse(cr, uid, id, context=context).name or ''
-            if not context.get('copy',False):
-                new_name = _("%s (copy)") % (default.get('name', ''))
-                default.update({'name':new_name})
+        current_task = self.browse(cr, uid, id, context=context)
+        if not 'stage' in default:
+            default['stage_id'] = self._get_default_stage_id(cr, uid, context=context)
+        default.update({
+            'active': True,
+            'work_ids': [],
+            'date_start': False,
+            'date_end': False,
+            'date_deadline': False,
+        })
+        if 'remaining_hours' not in default:
+            default['remaining_hours'] = float(current_task.planned_hours)
+        if not default.get('name'):
+            new_name = current_task.name
+            if not context.get('copy'):
+                new_name = _("%s (copy)") % new_name
+            default['name'] = new_name
         return super(task, self).copy_data(cr, uid, id, default, context)
-    
-    def copy(self, cr, uid, id, default=None, context=None):
-        if context is None:
-            context = {}
-        if default is None:
-            default = {}
-        stage = self._get_default_stage_id(cr, uid, context=context)
-        if stage:
-            default['stage_id'] = stage
-        return super(task, self).copy(cr, uid, id, default, context)
 
     def _is_template(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
@@ -1222,12 +1225,13 @@
         This function is called at the time of analytic account creation and is used to create a project automatically linked to it if the conditions are meet.
         '''
         project_pool = self.pool.get('project.project')
-        project_id = project_pool.search(cr, uid, [('analytic_account_id','=', analytic_account_id)])
+        project_id = project_pool.search(cr, uid, [('analytic_account_id', '=', analytic_account_id)])
         if not project_id and self._trigger_project_creation(cr, uid, vals, context=context):
             project_values = {
                 'name': vals.get('name'),
                 'analytic_account_id': analytic_account_id,
-                'type': vals.get('type','contract'),
+                'type': vals.get('type', 'contract'),
+                'state': 'template' if vals.get('type') == 'template' else 'open',
             }
             return project_pool.create(cr, uid, project_values, context=context)
         return False

=== renamed file 'project/tests/test_project_base.py' => 'project/tests/common.py'
--- project/tests/test_project_base.py	2013-08-27 13:30:58 +0000
+++ project/tests/common.py	2013-10-07 10:05:06 +0000
@@ -22,10 +22,10 @@
 from openerp.addons.mail.tests.common import TestMail
 
 
-class TestProjectBase(TestMail):
+class TestProject(TestMail):
 
     def setUp(self):
-        super(TestProjectBase, self).setUp()
+        super(TestProject, self).setUp()
         cr, uid = self.cr, self.uid
 
         # Usefull models

=== modified file 'project/tests/test_project_flow.py'
--- project/tests/test_project_flow.py	2013-07-10 13:29:54 +0000
+++ project/tests/test_project_flow.py	2013-10-07 10:05:06 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.addons.project.tests.test_project_base import TestProjectBase
+from openerp.addons.project.tests.common import TestProject
 from openerp.osv.orm import except_orm
 from openerp.tools import mute_logger
 
@@ -49,7 +49,7 @@
 Integrator at Agrolait"""
 
 
-class TestProjectFlow(TestProjectBase):
+class TestProjectFlow(TestProject):
 
     @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
     def test_00_project_process(self):