Merge lp:~openerp-dev/openobject-addons/trunk-project-clean-and-customer-tde into lp:openobject-addons

[Thibault Delavallée (OpenERP)]

[IMP] project, project_issue: improved 'followers' project, allowing portal users in this kind
of project to create, write and unlink tasks.

Added tests.

[lp:~openerp-dev/openobject-addons/trunk-project-clean-and-customer-tde]

9087. By Niko (OpenERP) on 2014-02-28

[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)

9133. By Thibault Delavallée (OpenERP) on 2014-02-10

[FIX] project_gtd: anonymous is dead, long live public + portal -> base

9134. By Thibault Delavallée (OpenERP) on 2014-02-10

[FIX] portal_project: updated tests

9135. By Thibault Delavallée (OpenERP) on 2014-02-10

[FIX] [TMP] mail: subscription: return when partner_ids is void, to avoid unnecessary checks

9136. By Thibault Delavallée (OpenERP) on 2014-02-10

[MOV] portal_project_long_term removed. This module only holds some access rights
that have been moved directly into project long term.

9137. By Thibault Delavallée (OpenERP) on 2014-02-10

[ADD] portal_project: added forgotten file

9138. By Thibault Delavallée (OpenERP) on 2014-02-10

[FIX] portal_project_issue: fixed tests, this is now an except_orm of access denied type
not an access error anymore

Unmerged revisions

9138. By Thibault Delavallée (OpenERP) on 2014-02-10

[FIX] portal_project_issue: fixed tests, this is now an except_orm of access denied type
not an access error anymore

9137. By Thibault Delavallée (OpenERP) on 2014-02-10

[ADD] portal_project: added forgotten file

9136. By Thibault Delavallée (OpenERP) on 2014-02-10

[MOV] portal_project_long_term removed. This module only holds some access rights
that have been moved directly into project long term.

9135. By Thibault Delavallée (OpenERP) on 2014-02-10

[FIX] [TMP] mail: subscription: return when partner_ids is void, to avoid unnecessary checks

9134. By Thibault Delavallée (OpenERP) on 2014-02-10

[FIX] portal_project: updated tests

9133. By Thibault Delavallée (OpenERP) on 2014-02-10

[FIX] project_gtd: anonymous is dead, long live public + portal -> base

9132. By Thibault Delavallée (OpenERP) on 2014-02-10

[FIX] project_issue_sheet: new issue fields defined in this
module make sens only for employees.

9131. By Thibault Delavallée (OpenERP) on 2014-02-10

[FIX] portal: demo user: added company_id, for several
access rights it solves issues. Moreover it makes sense to have a company_id on
this demo user.

9130. By Thibault Delavallée (OpenERP) on 2014-02-10

[FIX] project_gtd: added access rights for portal/public.
This is done directly in the module, as now portal and public groups
are added in base.

9129. By Thibault Delavallée (OpenERP) on 2014-02-10

[FIX] portal_project_long_term: depends on portal_project, not just portal.
This allows to have modules loading in a correct order and avoid some issues
notably in tests.

=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py	2014-01-29 19:08:34 +0000
+++ mail/mail_thread.py	2014-02-10 13:10:42 +0000
@@ -1549,6 +1549,9 @@
         """ Add partners to the records followers. """
         if context is None:
             context = {}
+        # not necessary for computation, but saves an access right check
+        if not partner_ids:
+            return True
 
         mail_followers_obj = self.pool.get('mail.followers')
         subtype_obj = self.pool.get('mail.message.subtype')
@@ -1605,6 +1608,9 @@
 
     def message_unsubscribe(self, cr, uid, ids, partner_ids, context=None):
         """ Remove partners from the records followers. """
+        # not necessary for computation, but saves an access right check
+        if not partner_ids:
+            return True
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         if set(partner_ids) == set([user_pid]):
             self.check_access_rights(cr, uid, 'read')

=== modified file 'portal/portal_demo.xml'
--- portal/portal_demo.xml	2014-01-22 18:36:30 +0000
+++ portal/portal_demo.xml	2014-02-10 13:10:42 +0000
@@ -9,6 +9,7 @@
             <field name="supplier" eval="False"/>
             <field name="customer" eval="True"/>
             <field name="notification_email_send">none</field>
+            <field name="company_id" ref="base.main_company"/>
             <field name="city">Vivegnis</field>
             <field name="zip">4683</field>
             <field name="country_id" ref="base.be"/>

=== modified file 'portal_project/__openerp__.py'
--- portal_project/__openerp__.py	2013-10-27 12:31:04 +0000
+++ portal_project/__openerp__.py	2014-02-10 13:10:42 +0000
@@ -36,7 +36,9 @@
         'security/ir.model.access.csv',
         'portal_project_view.xml',
     ],
-    'demo': [],
+    'demo': [
+        'project_demo.xml',
+    ],
     'installable': True,
     'auto_install': True,
     'category': 'Hidden',

=== modified file 'portal_project/project.py'
--- portal_project/project.py	2013-05-07 09:36:36 +0000
+++ portal_project/project.py	2014-02-10 13:10:42 +0000
@@ -23,7 +23,7 @@
 
 
 class portal_project(osv.Model):
-    """ Update of mail_mail class, to add the signin URL to notifications. """
+    """ Update of project_project class, to add the portal option in the visibility selection. """
     _inherit = 'project.project'
 
     def _get_visibility_selection(self, cr, uid, context=None):

=== added file 'portal_project/project_demo.xml'
--- portal_project/project_demo.xml	1970-01-01 00:00:00 +0000
+++ portal_project/project_demo.xml	2014-02-10 13:10:42 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record model="project.project" id="project.project_project_4">
+            <field name="privacy_visibility">portal</field>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'portal_project/security/ir.model.access.csv'
--- portal_project/security/ir.model.access.csv	2013-12-02 15:09:25 +0000
+++ portal_project/security/ir.model.access.csv	2014-02-10 13:10:42 +0000
@@ -1,8 +1,9 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_project,project,project.model_project_project,base.group_portal,1,0,0,0
-access_task,task,project.model_project_task,base.group_portal,1,0,0,0
+access_task,task,project.model_project_task,base.group_portal,1,1,1,1
 access_task_type,task_type,project.model_project_task_type,base.group_portal,1,0,0,0
 access_task_work,task_work,project.model_project_task_work,base.group_portal,1,0,0,0
+access_task_history,task_history,project.model_project_task_history,base.group_portal,1,1,1,0
 access_project_category,project_category,project.model_project_category,base.group_portal,1,0,0,0
 access_account_analytic_account,account_analytic_account,analytic.model_account_analytic_account,base.group_portal,1,0,0,0
 access_project_public,project,project.model_project_project,base.group_public,1,0,0,0

=== modified file 'portal_project/security/portal_security.xml'
--- portal_project/security/portal_security.xml	2013-12-02 15:09:25 +0000
+++ portal_project/security/portal_security.xml	2014-02-10 13:10:42 +0000
@@ -13,7 +13,7 @@
             <field name="groups" eval="[(4, ref('base.group_user'))]"/>
         </record>
 
-        <record id="portal_project_rule" model="ir.rule">
+        <record model="ir.rule" id="portal_project_rule">
             <field name="name">Project: portal users: public, portal or following</field>
             <field name="model_id" ref="project.model_project_project"/>
             <field name="domain_force">['|',
@@ -42,8 +42,8 @@
                                         ]</field>
         </record>
 
-        <record id="portal_task_rule" model="ir.rule">
-            <field name="name">Project/Task: portal users: public or (portal and colleagues following) or (followers and following)</field>
+        <record model="ir.rule" id="portal_task_rule_read">
+            <field name="name">Project/Task: portal: read: public or (portal and colleagues following) or (followers and following)</field>
             <field name="model_id" ref="project.model_project_task"/>
             <field name="domain_force">['|', '|',
                                             ('project_id.privacy_visibility', 'in', ['public']),
@@ -55,6 +55,19 @@
                                                 ('message_follower_ids', 'in', [user.partner_id.id]),
                                         ]</field>
             <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+        <record model="ir.rule" id="portal_task_rule_create_write">
+            <field name="name">Project/Task: portal: create/write/unlink: followers and following</field>
+            <field name="model_id" ref="project.model_project_task"/>
+            <field name="domain_force">['&amp;',
+                                            ('project_id.privacy_visibility', '=', 'followers'),
+                                            ('message_follower_ids', 'in', [user.partner_id.id])
+                                        ]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+            <field name="perm_read" eval="False"/>
         </record>
 
         <record model="ir.rule" id="task_public_rule">

=== 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-02-10 13:10:42 +0000
@@ -43,6 +43,7 @@
         self.user_portal_id = self.res_users.create(cr, uid, {
             'name': 'Chell Portal',
             'login': 'chell',
+            'email': '[e-mail]',
             'alias_name': 'chell',
             'groups_id': [(6, 0, [self.group_portal_id])]
         })
@@ -117,7 +118,7 @@
         # Test: all project tasks readable
         self.project_task.read(cr, self.user_portal_id, task_ids, ['name'])
         # Test: no project task writable
-        self.assertRaises(AccessError, self.project_task.write, cr, self.user_portal_id, task_ids, {'description': 'TestDescription'})
+        self.assertRaises(except_orm, self.project_task.write, cr, self.user_portal_id, task_ids, {'description': 'TestDescription'})
 
         # Do: Donovan reads project -> ok (public)
         self.project_project.read(cr, self.user_public_id, pigs_id, ['name'])
@@ -147,7 +148,8 @@
         # Test: no project task searchable
         self.assertRaises(AccessError, self.project_task.search, cr, self.user_none_id, [('project_id', '=', pigs_id)])
 
-        # Data: task follower
+        # Data: project/task follower
+        self.project_project.message_subscribe_users(cr, self.user_projectmanager_id, [self.project_pigs_id], [self.user_portal_id])
         self.project_task.message_subscribe_users(cr, self.user_projectuser_id, [self.task_1_id, self.task_3_id], [self.user_portal_id])
 
         # Do: Chell reads project -> ok (portal ok public)
@@ -164,7 +166,8 @@
         task_ids = self.project_task.search(cr, self.user_public_id, [('project_id', '=', pigs_id)])
         self.assertFalse(task_ids, 'access rights: public user should not see tasks of a portal project')
 
-        # Data: task follower cleaning
+        # Data: project/task follower cleaning
+        self.project_project.message_unsubscribe_users(cr, self.user_projectmanager_id, [self.project_pigs_id], [self.user_portal_id])
         self.project_task.message_unsubscribe_users(cr, self.user_projectuser_id, [self.task_1_id, self.task_3_id], [self.user_portal_id])
 
         # ----------------------------------------
@@ -245,5 +248,21 @@
         self.assertEqual(set(task_ids), test_task_ids,
                          'access rights: employee user should not see followed + assigned tasks of a follower project')
 
-        # Do: Donovan reads project -> ko (public ko follower even if follower)
+        # Do: Portal creates a task in project -> ok (follower ok follower)
+        task_id = self.project_task.create(
+            cr, self.user_portal_id,
+            {'name': 'PortalTask',
+             'project_id': self.project_pigs_id},
+            {'mail_create_nolog': True}
+        )
+        task = self.project_task.browse(cr, self.user_portal_id, task_id)
+        self.assertEqual(task.name, 'PortalTask', 'access rights: issue when trying to create a task')
+        # Test: followed + can update it
+        self.project_task.write(cr, self.user_portal_id, [task_id], {'name': 'NewPortalTask'})
+        task.refresh()
+        self.assertEqual(task.name, 'NewPortalTask', 'access rights: issue when trying to write on a follower task with a follower')
+        # Test: unlink it
+        self.project_task.unlink(cr, self.user_portal_id, [task_id])
+
+        # Do: Donovan reads project -> ko (anonymous ko follower even if follower)
         self.assertRaises(except_orm, self.project_project.read, cr, self.user_public_id, pigs_id, ['name'])

=== modified file 'portal_project_issue/security/ir.model.access.csv'
--- portal_project_issue/security/ir.model.access.csv	2013-12-02 15:09:25 +0000
+++ portal_project_issue/security/ir.model.access.csv	2014-02-10 13:10:42 +0000
@@ -1,4 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_issues,project_issue,project_issue.model_project_issue,base.group_portal,1,0,0,0
+access_issues,project_issue,project_issue.model_project_issue,base.group_portal,1,1,1,1
 access_case_section,crm_case_section,crm.model_crm_case_section,base.group_portal,1,0,0,0
 access_issues_public,project_issue,project_issue.model_project_issue,base.group_public,1,0,0,0
\ No newline at end of file

=== modified file 'portal_project_issue/security/portal_security.xml'
--- portal_project_issue/security/portal_security.xml	2013-12-02 15:09:25 +0000
+++ portal_project_issue/security/portal_security.xml	2014-02-10 13:10:42 +0000
@@ -2,7 +2,17 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="portal_issue_rule" model="ir.rule">
+        <record model="ir.rule" id="project_issue.issue_user_rule">
+            <field name="name">Project/Issue: employees: public, portal, employee or (followers and following)</field>
+            <field name="domain_force">['|',
+                                            ('project_id.privacy_visibility', 'in', ['public', 'portal', 'employees']),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.partner_id.id]),
+                                        ]</field>
+        </record>
+
+        <record model="ir.rule" id="portal_issue_rule_read">
             <field name="name">Project/Issue: portal users: public or (portal and colleagues following) or (followers and following)</field>
             <field name="model_id" ref="project_issue.model_project_issue"/>
             <field name="domain_force">['|', '|',
@@ -15,16 +25,19 @@
                                                 ('message_follower_ids', 'in', [user.partner_id.id]),
                                         ]</field>
             <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
         </record>
-
-        <record model="ir.rule" id="project_issue.issue_user_rule">
-            <field name="name">Project/Issue: employees: public, portal, employee or (followers and following)</field>
-            <field name="domain_force">['|',
-                                            ('project_id.privacy_visibility', 'in', ['public', 'portal', 'employees']),
-                                            '&amp;',
-                                                ('project_id.privacy_visibility', '=', 'followers'),
-                                                ('message_follower_ids', 'in', [user.partner_id.id]),
+        <record model="ir.rule" id="portal_issue_rule_create_write">
+            <field name="name">Project/Issue: portal: create/write/unlink: followers and following</field>
+            <field name="model_id" ref="project_issue.model_project_issue"/>
+            <field name="domain_force">['&amp;',
+                                            ('project_id.privacy_visibility', '=', 'followers'),
+                                            ('message_follower_ids', 'in', [user.partner_id.id])
                                         ]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+            <field name="perm_read" eval="False"/>
         </record>
 
         <record model="ir.rule" id="issue_public_rule">

=== modified file 'portal_project_issue/tests/test_access_rights.py'
--- portal_project_issue/tests/test_access_rights.py	2014-01-16 10:39:10 +0000
+++ portal_project_issue/tests/test_access_rights.py	2014-02-10 13:10:42 +0000
@@ -86,7 +86,7 @@
         # Test: all project issues readable
         self.project_issue.read(cr, self.user_portal_id, issue_ids, ['name'])
         # Test: no project issue writable
-        self.assertRaises(AccessError, self.project_issue.write, cr, self.user_portal_id, issue_ids, {'description': 'TestDescription'})
+        self.assertRaises(except_orm, self.project_issue.write, cr, self.user_portal_id, issue_ids, {'description': 'TestDescription'})
 
         # Do: Donovan reads project -> ok (public ok public)
         # Test: all project issues visible

=== removed directory 'portal_project_long_term'
=== removed file 'portal_project_long_term/__init__.py'
--- portal_project_long_term/__init__.py	2013-03-07 10:50:31 +0000
+++ portal_project_long_term/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-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/>.
-#
-##############################################################################

=== removed file 'portal_project_long_term/__openerp__.py'
--- portal_project_long_term/__openerp__.py	2013-03-21 09:06:26 +0000
+++ portal_project_long_term/__openerp__.py	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-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/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Portal Project Long Term',
-    'version': '1.0',
-    'category': 'Tools',
-    'complexity': 'easy',
-    'description': """
-This module adds necessary security rules and access rights for project long term and portal.
-=============================================================================================
-    """,
-    'author': 'OpenERP SA',
-    'depends': ['project_long_term', 'portal'],
-    'data': [
-        'security/portal_security.xml',
-        'security/ir.model.access.csv',
-    ],
-    'installable': True,
-    'auto_install': True,
-    'category': 'Hidden',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed directory 'portal_project_long_term/security'
=== removed file 'portal_project_long_term/security/ir.model.access.csv'
--- portal_project_long_term/security/ir.model.access.csv	2013-10-08 11:35:45 +0000
+++ portal_project_long_term/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_issues,project_phase,project_long_term.model_project_phase,base.group_portal,1,0,0,0
-access_issues_public,project_phase_public,project_long_term.model_project_phase,base.group_public,1,0,0,0

=== modified file 'project_gtd/project_gtd.py'
--- project_gtd/project_gtd.py	2013-10-27 12:31:04 +0000
+++ project_gtd/project_gtd.py	2014-02-10 13:10:42 +0000
@@ -21,10 +21,12 @@
 
 import sys
 
+from openerp import tools
 from openerp.osv import fields, osv
-from openerp import tools
+from openerp.osv.orm import except_orm
 from openerp.tools.translate import _
 
+
 class project_gtd_context(osv.osv):
     _name = "project.gtd.context"
     _description = "Context"
@@ -66,8 +68,11 @@
         return super(project_task,self).copy_data(cr, uid, id, default, context)
 
     def _get_context(self, cr, uid, context=None):
-        ids = self.pool.get('project.gtd.context').search(cr, uid, [], context=context)
-        return ids and ids[0] or False
+        try:
+            ids = self.pool.get('project.gtd.context').search(cr, uid, [], context=context)
+            return ids and ids[0] or False
+        except except_orm:
+            return False
 
     _defaults = {
         'context_id': _get_context

=== modified file 'project_gtd/security/ir.model.access.csv'
--- project_gtd/security/ir.model.access.csv	2011-12-19 16:54:40 +0000
+++ project_gtd/security/ir.model.access.csv	2014-02-10 13:10:42 +0000
@@ -3,3 +3,7 @@
 access_project_gtd_timebox_user,project.gtd.timebox project user,model_project_gtd_timebox,project.group_project_user,1,0,0,0
 access_project_gtd_context_manager,project.gtd.context project manager,model_project_gtd_context,project.group_project_manager,1,1,1,1
 access_project_gtd_timebox_manager,project.gtd.timebox project manager,model_project_gtd_timebox,project.group_project_manager,1,1,1,1
+access_project_gtd_context_portal,project.gtd.context.portal,project_gtd.model_project_gtd_context,base.group_portal,1,0,0,0
+access_project_gtd_timebox_portal,project.gtd.timebox.portal,project_gtd.model_project_gtd_timebox,base.group_portal,1,0,0,0
+access_project_gtd_context_public,project.gtd.context.public,project_gtd.model_project_gtd_context,base.group_public,1,0,0,0
+access_project_gtd_timebox_public,project.gtd.timebox.public,project_gtd.model_project_gtd_timebox,base.group_public,1,0,0,0
\ No newline at end of file

=== modified file 'project_issue_sheet/project_issue_sheet.py'
--- project_issue_sheet/project_issue_sheet.py	2013-10-27 12:31:04 +0000
+++ project_issue_sheet/project_issue_sheet.py	2014-02-10 13:10:42 +0000
@@ -26,8 +26,8 @@
     _inherit = 'project.issue'
     _description = 'project issue'
     _columns = {
-        'timesheet_ids': fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
-        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'), 
+        'timesheet_ids': fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets', groups="base.group_user"),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', groups="base.group_user"), 
     }
     
     def on_change_project(self, cr, uid, ids, project_id, context=None):

=== modified file 'project_long_term/__openerp__.py'
--- project_long_term/__openerp__.py	2012-11-29 22:26:45 +0000
+++ project_long_term/__openerp__.py	2014-02-10 13:10:42 +0000
@@ -51,6 +51,7 @@
     ],
     'data': [
         'security/ir.model.access.csv',
+        'security/security.xml',
         'project_long_term_view.xml',
         'project_long_term_workflow.xml',
         'wizard/project_compute_phases_view.xml',

=== modified file 'project_long_term/security/ir.model.access.csv'
--- project_long_term/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ project_long_term/security/ir.model.access.csv	2014-02-10 13:10:42 +0000
@@ -1,9 +1,10 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_project_phase,project.phase,model_project_phase,project.group_project_user,1,1,1,0
+access_project_phase_portal,project.phase.portal,model_project_phase,base.group_portal,1,0,0,0
+access_project_phase_public,project.phase.public,model_project_phase,base.group_public,1,0,0,0
+access_project_phase_manager,project.phase manager,model_project_phase,project.group_project_manager,1,1,1,1
 access_project_user_allocation,project.user.allocation,model_project_user_allocation,project.group_project_user,1,0,0,0
-access_project_phase_manager,project.phase manager,model_project_phase,project.group_project_manager,1,1,1,1
 access_project_user_allocation_manager,project.user.allocation manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
 access_resource_resource_user,user.user user,resource.model_resource_resource,project.group_project_user,1,0,0,0
 access_resource_resource_manager,user.user manager,resource.model_resource_resource,project.group_project_manager,1,1,1,1
-access_project_user_allocation_manager,project.user.allocation.manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
-access_project_resource_calendar_attendance,resource.calendar.attendance,resource.model_resource_calendar_attendance,project.group_project_manager,1,0,0,0
+access_project_resource_calendar_attendance,resource.calendar.attendance,resource.model_resource_calendar_attendance,project.group_project_manager,1,0,0,0
\ No newline at end of file

=== renamed file 'portal_project_long_term/security/portal_security.xml' => 'project_long_term/security/security.xml'