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

[Sunil Sharma(OpenERP)]

Hello,

  [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

  [ADD] project_long_term: added code to copy phase
  [ADD] added pyhon test cases for copy of contract templates task, phase, issues

Thanks
Sunil Sharma (SSH)

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

8922. By Sunil Sharma(OpenERP) on 2014-04-09

[MRG]:lp:openobject-addons

8923. By Sunil Sharma(OpenERP) on 2014-04-09

[imp]:improve import file name

8924. By Sunil Sharma(OpenERP) on 2014-04-11

[MRG]:lp:openobject-addons

8925. By Sunil Sharma(OpenERP) on 2014-04-11

[imp]:improve import file name for project_long_term

8926. By Sunil Sharma(OpenERP) on 2014-04-14

[MRG]:lp:openobject-addons

8927. By Sunil Sharma(OpenERP) on 2014-04-14

[imp] improve copy_data method because test case warning generating

8928. By Sunil Sharma(OpenERP) on 2014-04-15

[imp]:improve issue view

8929. By Sunil Sharma(OpenERP) on 2014-04-15

[mrg]:lp:openobject-addons

8930. By Sunil Sharma(OpenERP) on 2014-04-16

[mrg]:lp:openobject-addons

8931. By Sunil Sharma(OpenERP) on 2014-04-17

[MRG]:openobject-addons

8932. By Sunil Sharma(OpenERP) on 2014-04-24

[MRG]:lp:openobject-addons

8933. By Sunil Sharma(OpenERP) on 2014-04-25

[MRG]:lp:openobject-addons

8934. By Sunil Sharma(OpenERP) on 2014-04-25

[REM]:remove test case for project long term

8935. By Sunil Sharma(OpenERP) on 2014-04-28

[REM]:remove file

8936. By Sunil Sharma(OpenERP) on 2014-04-28

[MRG]:lp:openobject-addons

8937. By Sunil Sharma(OpenERP) on 2014-05-01

[imp]:improve project as template then duplicate project state set as template

8938. By Sunil Sharma(OpenERP) on 2014-05-01

[MRG]:lp:openobject-addons

8939. By Sunil Sharma(OpenERP) on 2014-05-01

[imp]:improve code for project set as template then duplicate project set as template

8940. By Sunil Sharma(OpenERP) on 2014-05-01

[imp]:improve test cases for project

8941. By Sunil Sharma(OpenERP) on 2014-05-01

[rem]:remove change project set as template then copy set as template

8942. By Sunil Sharma(OpenERP) on 2014-05-02

[MRG]:lp:openobject-addons

8943. By Sunil Sharma(OpenERP) on 2014-05-15

[mrg]:lp:openobject-addons

8944. By Sunil Sharma(OpenERP) on 2014-05-15

[imp]:remove unused comments

Unmerged revisions

8944. By Sunil Sharma(OpenERP) on 2014-05-15

[imp]:remove unused comments

8943. By Sunil Sharma(OpenERP) on 2014-05-15

[mrg]:lp:openobject-addons

8942. By Sunil Sharma(OpenERP) on 2014-05-02

[MRG]:lp:openobject-addons

8941. By Sunil Sharma(OpenERP) on 2014-05-01

[rem]:remove change project set as template then copy set as template

8940. By Sunil Sharma(OpenERP) on 2014-05-01

[imp]:improve test cases for project

8939. By Sunil Sharma(OpenERP) on 2014-05-01

[imp]:improve code for project set as template then duplicate project set as template

8938. By Sunil Sharma(OpenERP) on 2014-05-01

[MRG]:lp:openobject-addons

8937. By Sunil Sharma(OpenERP) on 2014-05-01

[imp]:improve project as template then duplicate project state set as template

8936. By Sunil Sharma(OpenERP) on 2014-04-28

[MRG]:lp:openobject-addons

8935. By Sunil Sharma(OpenERP) on 2014-04-28

[REM]:remove file

=== modified file 'portal_project/tests/test_access_rights.py'
--- portal_project/tests/test_access_rights.py	2014-01-16 10:39:10 +0000
+++ portal_project/tests/test_access_rights.py	2014-05-15 13:02:45 +0000
@@ -19,13 +19,13 @@
 #
 ##############################################################################
 
-from openerp.addons.project.tests.test_project_base import TestProjectBase
+from openerp.addons.project.tests.common import TestProject
 from openerp.exceptions import AccessError
 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	2014-05-13 11:18:37 +0000
+++ project/project.py	2014-05-15 13:02:45 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from datetime import datetime, date
+from datetime import date, datetime
 from lxml import etree
 import time
 
@@ -180,6 +180,7 @@
         res = {}
         attachment = self.pool.get('ir.attachment')
         task = self.pool.get('project.task')
+        context['active_test'] = False
         for id in ids:
             project_attachments = attachment.search(cr, uid, [('res_model', '=', 'project.project'), ('res_id', '=', id)], context=context, count=True)
             task_ids = task.search(cr, uid, [('project_id', '=', id)], context=context)
@@ -187,9 +188,16 @@
             res[id] = (project_attachments or 0) + (task_attachments or 0)
         return res
     def _task_count(self, cr, uid, ids, field_name, arg, context=None):
-        res={}
-        for tasks in self.browse(cr, uid, ids, context):
-            res[tasks.id] = len(tasks.task_ids)
+        """ :deprecated: this method will be removed with OpenERP v8. Use tasks
+                         fields instead. """
+        if context is None:
+            context = {}
+        res = dict.fromkeys(ids, 0)
+        ctx = context.copy()
+        ctx['active_test'] = False
+        task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)], context=ctx)
+        for task in self.pool.get('project.task').browse(cr, uid, task_ids, context):
+            res[task.project_id.id] += 1
         return res
     def _get_alias_models(self, cr, uid, context=None):
         """ Overriden in project_issue to offer more options """
@@ -202,7 +210,10 @@
                 ('followers', 'Private project: followers Only')]
 
     def attachment_tree_view(self, cr, uid, ids, context):
-        task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)])
+        if context is None:
+            context = {}
+        context['active_test'] = False
+        task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)], context=context)
         domain = [
              '|',
              '&', ('res_model', '=', 'project.project'), ('res_id', 'in', ids),
@@ -217,7 +228,7 @@
             'view_mode': 'kanban,tree,form',
             'view_type': 'form',
             'limit': 80,
-            'context': "{'default_res_model': '%s','default_res_id': %d}" % (self._name, res_id)
+            'context': "{'default_res_model': '%s','default_res_id': %d, 'active_test': False}" % (self._name, res_id)
         }
 
     # Lambda indirection method to avoid passing a copy of the overridable method when declaring the field
@@ -256,9 +267,8 @@
             }),
         'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'task_count': fields.function(_task_count, type='integer', string="Tasks",),
-        'task_ids': fields.one2many('project.task', 'project_id',
-                                    domain=[('stage_id.fold', '=', False)]),
+        'task_count': fields.function(_task_count, type='integer', string="Open Tasks",
+                                      deprecated="This field will be removed in OpenERP v8. Use tasks one2many field instead."),
         'color': fields.integer('Color Index'),
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
                                     help="Internal email associated with this project. Incoming emails are automatically synchronized"
@@ -310,7 +320,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)
@@ -325,104 +335,117 @@
         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 = {}
-
-        context['active_test'] = False
-        default['state'] = 'open'
+        current_project = self.browse(cr, uid, id, context=context)
         default['line_ids'] = []
-        default['tasks'] = []
-
-        # Don't prepare (expensive) data to copy children (analytic accounts),
-        # they are discarded in analytic.copy(), and handled in duplicate_template() 
-        default['child_ids'] = []
-
-        proj = self.browse(cr, uid, id, context=context)
-        if not default.get('name', False):
-            default.update(name=_("%s (copy)") % (proj.name))
+        # 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':
+            default['tasks'] = self.pool['project.task'].duplicate_task(cr, uid, current_project.tasks, context=context)
+        else:
+            default['tasks'] = []
+        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
         res = super(project, self).copy(cr, uid, id, default, context)
-        self.map_tasks(cr, uid, id, res, context=context)
+        current_project = self.browse(cr, uid, id, context=context)
+        # 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(cr, uid, attach.id, {
+                    'name': '%s %s' % (attach.name, fields.datetime.now()),
+                    'res_id': res,
+                    'res_model': 'project.project',
+                    'res_name': default['name']
+                }, context=context)
         return res
 
     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({'active_test': False})
+        state = 'template' if template_state else 'open'
+        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):
@@ -688,39 +711,58 @@
         return {'value': vals}
 
     def duplicate_task(self, cr, uid, map_ids, context=None):
-        mapper = lambda t: map_ids.get(t.id, t.id)
-        for task in self.browse(cr, uid, map_ids.values(), context):
-            new_child_ids = set(map(mapper, task.child_ids))
-            new_parent_ids = set(map(mapper, task.parent_ids))
-            if new_child_ids or new_parent_ids:
-                task.write({'parent_ids': [(6,0,list(new_parent_ids))],
-                            'child_ids':  [(6,0,list(new_child_ids))]})
+        mapping = {}
+        task_obj = self.pool['project.task']
+        for task in map_ids:
+            mapping[task.id] = task_obj.copy(cr, uid, task.id, context=context)
+            task_obj.update_parents_and_childs(cr, uid, mapping.values(), mapping, context=context)
+        return [(6, 0, mapping.values())]
+
+    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 and parent.id not in mapping.values()]
+            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 and child.id not in mapping.values()]
+            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})
+
+        if default and 'description_pad' in default:
+            default.pop('description_pad')
+
+        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'):
+            default['name'] = _("%s (copy)") % current_task.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 = {}
-        if not context.get('copy', False):
-            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)
+        res = super(task, self).copy(cr, uid, id, default, context)
+        # handle attachments: copy them instead of just keeping the links
+        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(cr, uid, attach.id, {
+                'name': '%s %s' % (attach.name, fields.datetime.now()),
+                'res_id': res,
+                'res_model': 'project.task',
+                'res_name': self.browse(cr, uid, res, context=context).name,
+            }, context=context)
+        return res
 
     def _is_template(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
@@ -1174,6 +1216,7 @@
     _columns = {
         'use_tasks': fields.boolean('Tasks',help="If checked, this contract will be available in the project menu and you will be able to manage tasks or track issues"),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
+        'project_id': fields.many2one('project.project', 'Project', ondelete='set null'),
     }
 
     def on_change_template(self, cr, uid, ids, template_id, date_start=False, context=None):
@@ -1195,15 +1238,19 @@
         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',
             }
+            template_project = project_pool.search(cr, uid, [('analytic_account_id','=', vals.get('template_id'))], context=context)
+            if template_project:
+                return project_pool.copy(cr, uid, template_project[0], project_values, context=context)
             return project_pool.create(cr, uid, project_values, context=context)
-        return False
+        return project_id and project_id[0]
 
     def create(self, cr, uid, vals, context=None):
         if context is None:
@@ -1211,7 +1258,8 @@
         if vals.get('child_ids', False) and context.get('analytic_project_copy', False):
             vals['child_ids'] = []
         analytic_account_id = super(account_analytic_account, self).create(cr, uid, vals, context=context)
-        self.project_create(cr, uid, analytic_account_id, vals, context=context)
+        project_id = self.project_create(cr, uid, analytic_account_id, vals, context=context)
+        self.write(cr, uid, [analytic_account_id], {'project_id': project_id})
         return analytic_account_id
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -1223,7 +1271,7 @@
                 vals_for_project['name'] = account.name
             if not vals.get('type'):
                 vals_for_project['type'] = account.type
-            self.project_create(cr, uid, account.id, vals_for_project, context=context)
+            vals['project_id'] = self.project_create(cr, uid, account.id, vals_for_project, context=context)
         return super(account_analytic_account, self).write(cr, uid, ids, vals, context=context)
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
 
=== modified file 'project/project_view.xml'
--- project/project_view.xml	2014-05-08 15:34:32 +0000
+++ project/project_view.xml	2014-05-15 13:02:45 +0000
@@ -244,7 +244,7 @@
                     <field name="date"/>
                     <field name="color"/>
                     <field name="task_count"/>
-                    <field name="task_ids"/>
+                    <field name="tasks"/>
                     <field name="alias_id"/>
                     <field name="doc_count"/>
                     <templates>
@@ -265,7 +265,7 @@
                                     </div>
                                     <div class="oe_kanban_project_list">
                                         <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px">
-                                            <t t-raw="record.task_ids.raw_value.length"/> Tasks
+                                            <t t-raw="record.tasks.raw_value.length"/> Tasks
                                         </a>
                                     </div>
                                     <div class="oe_kanban_project_list">
@@ -608,6 +608,12 @@
                     <field name="use_tasks"/>
                     <label for="use_tasks"/>
                 </xpath>
+                <field name="company_id" position="after">
+                    <p attrs="{'invisible': [('project_id','=',False)]}" colspan="4">
+                        To manage tasks and/or issues, go to the related project:
+                        <field name="project_id" readonly="1" required="0" class="oe_inline" nolabel="1"/>.
+                    </p>
+                </field>
             </field>
         </record>
 
 
=== modified file 'project/tests/__init__.py'
--- project/tests/__init__.py	2013-07-10 10:15:08 +0000
+++ project/tests/__init__.py	2014-05-15 13:02:45 +0000
@@ -20,9 +20,11 @@
 ##############################################################################
 
 from . import test_project_flow
+from . import test_contract_task_copy
 
 checks = [
     test_project_flow,
+    test_contract_task_copy,
 ]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== 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	2014-05-15 13:02:45 +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
 
=== added file 'project/tests/test_contract_task_copy.py'
--- project/tests/test_contract_task_copy.py	1970-01-01 00:00:00 +0000
+++ project/tests/test_contract_task_copy.py	2014-05-15 13:02:45 +0000
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013-TODAY OpenERP S.A. <http://www.openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.addons.project.tests.common import TestProject
+from openerp.osv.orm import except_orm
+
+class TestContractTaskCopy(TestProject):
+
+    def test_contract_task_copy(self):
+        """Testing Contract task copy"""
+        cr, uid, = self.cr, self.uid,
+
+        # Usefull models
+        contract_obj = self.registry('account.analytic.account')
+        project_obj = self.registry('project.project')
+        task_obj = self.registry('project.task')
+
+        # In order to test Contract project create new Contract Template.
+        contract_template_id = contract_obj.create(cr, uid, {
+            'name': 'Contract Template',
+            'use_tasks': '1',
+            'type': 'template'
+            })
+
+        # Create Task for project of this contract template.
+        contract_template_set = contract_obj.browse(cr, uid, contract_template_id)
+        task_id = task_obj.create(cr, uid, {
+            'name': 'Project task',
+            'project_id': contract_template_set.project_id.id
+            })
+
+        # Create contract based on this template.
+        contract_id = contract_obj.create(cr, uid, {
+            'name': 'Template of Contract',
+            'template_id' : contract_template_id,
+            'use_tasks': '1',
+            })
+
+        # Check that task for the contract project have been created same as the template.
+        contract = contract_obj.browse(cr, uid, contract_id)
+        self.assertTrue(len(contract.project_id.tasks) ==  1, "The no of task of contracts does not match.")
 
=== modified file 'project/tests/test_project_flow.py'
--- project/tests/test_project_flow.py	2013-12-06 12:57:51 +0000
+++ project/tests/test_project_flow.py	2014-05-15 13:02:45 +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.exceptions import AccessError
 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):
 
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py	2014-05-08 15:25:36 +0000
+++ project_issue/project_issue.py	2014-05-15 13:02:45 +0000
@@ -312,8 +312,18 @@
             default = {}
         default = default.copy()
         default.update(name=_('%s (copy)') % (issue['name']))
-        return super(project_issue, self).copy(cr, uid, id, default=default,
-                context=context)
+        res = super(project_issue, self).copy(cr, uid, id, default, context)
+        # handle attachments: copy them instead of just keeping the links
+        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(cr, uid, attach.id, {
+                'name': '%s %s' % (attach.name, fields.datetime.now()),
+                'res_id': res,
+                'res_model': 'project.issue',
+                'res_name': default['name'],
+            }, context=context)
+        return res
 
     def create(self, cr, uid, vals, context=None):
         if context is None:
@@ -474,13 +484,32 @@
             project_id: Issue.search_count(cr,uid, [('project_id', '=', project_id), ('stage_id.fold', '=', False)], context=context)
             for project_id in ids
         }
+
+    def _get_attached_docs(self, cr, uid, ids, field_name, arg, context):
+        attachment_obj = self.pool['ir.attachment']
+        issue_obj = self.pool['project.issue']
+        res = super(project, self)._get_attached_docs(cr, uid, ids, field_name, arg=arg, context=context)
+        for id in res:
+            issue_ids = issue_obj.search(cr, uid, [('project_id', '=', id)], context=context)
+            issue_attachments = attachment_obj.search(cr, uid, [('res_model', '=', 'project.issue'), ('res_id', 'in', issue_ids)], context=context, count=True)
+            res[id] += issue_attachments
+        return res
+
+    def attachment_tree_view(self, cr, uid, ids, context):
+        res = super(project, self).attachment_tree_view(cr, uid, ids, context=context)
+        issue_ids = self.pool['project.issue'].search(cr, uid, [('project_id', 'in', ids)], context=context)
+        res['domain'].insert(0, '|')
+        res['domain'] += ['&', ('res_model', '=', 'project.issue'), ('res_id', 'in', issue_ids)]
+        return res
+
     _columns = {
         'project_escalation_id': fields.many2one('project.project', 'Project Escalation',
             help='If any issue is escalated from the current Project, it will be listed under the project selected here.',
             states={'close': [('readonly', True)], 'cancelled': [('readonly', True)]}),
         'issue_count': fields.function(_issue_count, type='integer', string="Issues",),
         'issue_ids': fields.one2many('project.issue', 'project_id',
-                                     domain=[('stage_id.fold', '=', False)])
+                                     domain=[('stage_id.fold', '=', False)]),
+        'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int'),
     }
 
     def _check_escalation(self, cr, uid, ids, context=None):
@@ -494,6 +523,17 @@
         (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id'])
     ]
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        default['issue_ids'] = []
+        res = super(project, self).copy(cr, uid, id, default, context=context)
+        issue_obj = self.pool['project.issue']
+        current_project = self.browse(cr, uid, id, context=context)
+        # copy issues
+        if current_project.state == 'template':
+            issue_ids = issue_obj.search(cr, uid, [('project_id','=', id)], context=context)
+            for issue in issue_obj.browse(cr, uid, issue_ids, context=context):
+                issue_obj.copy(cr, uid, issue.id, default={'project_id': res, 'name': issue.name}, context=context)
+        return res
 
 class account_analytic_account(osv.Model):
     _inherit = 'account.analytic.account'
 
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml	2014-05-08 15:34:32 +0000
+++ project_issue/project_issue_view.xml	2014-05-15 13:02:45 +0000
@@ -316,7 +316,7 @@
                     <a t-if="record.use_issues.raw_value" style="margin-right: 10px"
                         name="%(act_project_project_2_project_issue_all)d" type="action">
                         <t t-raw="record.issue_ids.raw_value.length"/>
-                        <span t-if="record.issue_ids.raw_value.length == 1">Issue</span>
+                        <span t-if="record.issue_ids.raw_value.length &lt;= 1">Issue</span>
                         <span t-if="record.issue_ids.raw_value.length > 1">Issues</span>
                     </a>
                 </xpath>
 
=== added directory 'project_issue/tests'
=== added file 'project_issue/tests/__init__.py'
--- project_issue/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ project_issue/tests/__init__.py	2014-05-15 13:02:45 +0000
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013-TODAY OpenERP S.A. <http://www.openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import test_contract_issue_copy
+
+checks = [
+    test_contract_issue_copy,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'project_issue/tests/test_contract_issue_copy.py'
--- project_issue/tests/test_contract_issue_copy.py	1970-01-01 00:00:00 +0000
+++ project_issue/tests/test_contract_issue_copy.py	2014-05-15 13:02:45 +0000
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013-TODAY OpenERP S.A. <http://www.openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.addons.mail.tests.common import TestMail
+from openerp.tools import mute_logger
+
+
+class TestIssue(TestMail):
+    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
+    
+    def setUp(self):
+        super(TestIssue, self).setUp()
+        
+    def test_00_issue_process(self):
+        """ Testing project issue from contract templates"""
+        cr, uid = self.cr, self.uid   
+             
+        # Usefull models
+        project_project = self.registry('project.project')
+        project_issue = self.registry('project.issue')
+        account_analytic_account = self.registry('account.analytic.account')
+        
+        # In order to test Contract project create a new Contract Template.
+        template_id = account_analytic_account.create(cr, uid, {
+            'name': 'Template Contract',
+            'type': 'template',
+            'use_issues': 1,
+        })
+        
+        # I create Issue for project of this template.
+        template_contract = account_analytic_account.browse(cr, uid, template_id)
+        project_issue_id = project_issue.create(cr, uid, {
+            'name': 'Test Issue',
+            'project_id': template_contract.project_id.id
+        })
+        template_contract.refresh()
+        
+        self.assertTrue(len(template_contract.project_id.issue_ids) == 1, "project of the contract should have one issue")
+        # I create a contract based on this template.
+        contract_id = account_analytic_account.create(cr, uid, {
+            'name': 'Contract Project',
+            'use_issues': 1,
+            'template_id': template_id,
+        })
+
+        # I check that issues for the contract project have been created same as the template.
+        contract = account_analytic_account.browse(cr, uid, contract_id)
+        self.assertTrue(len(contract.project_id.issue_ids) == 1, "The no of issue of contracts does not match with the no of issue of contract template.")