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

[Thibault Delavallée (OpenERP)]

[IMP] portal_project: improved 'followers' project, allowing portal users in this kind
of project to create, write and unlink tasks.
Due to some cleaning in mail_thread.message_subscribe(), the rules now apply
more cleanly.
Added tests.

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

8892. By Thibault Delavallée (OpenERP) on 2013-12-09

[MERGE] Sync with trunk

8893. By Thibault Delavallée (OpenERP) on 2013-12-10

[REV] Reverted some changes

8894. By Thibault Delavallée (OpenERP) on 2013-12-10

[CLEAN] portal_project: re-added two noupdate back in some data

8895. By Thibault Delavallée (OpenERP) on 2013-12-11

[FIX] mail_thread: fixed message_follower_ids pre-population, could receive False or None, should not use it as a list

8896. By Thibault Delavallée (OpenERP) on 2013-12-11

[FIX] portal: dmeo user should be in the right company

8897. By Thibault Delavallée (OpenERP) on 2013-12-11

[IMP] portal_porject: improved rule name

8898. By Thibault Delavallée (OpenERP) on 2013-12-11

[IMP] portal_project_issue: portal users can now create / write / unlink task in a Followers only project they follow

8899. By Thibault Delavallée (OpenERP) on 2013-12-11

[ADD] Added portal_project_gtd, adding necessary access rights for gtd-related models.

8900. By Thibault Delavallée (OpenERP) on 2013-12-11

[REM] portal_project_gtd: removed useless file

8901. By Thibault Delavallée (OpenERP) on 2013-12-11

[IMP] project_issue_sheet: analytic stuff on task is now only for regular employees. This allows to avoid adding acces rules for portal users that they should not receive.

8902. By Thibault Delavallée (OpenERP) on 2013-12-11

[FIX] portal_project_issue: fixed a rule whose model was not the correct one due to copy and paste: was task instead of issue

8903. By Thibault Delavallée (OpenERP) on 2013-12-11

[FIX] portal_project_gtd, portal_project_long_term: try to solve some issues with instal order

8904. By Thibault Delavallée (OpenERP) on 2013-12-11

[FIX] project_gtd: default value should not crash but be void if user has no read access rights

8905. By Thibault Delavallée (OpenERP) on 2013-12-11

[MERGE] Sync with trunk

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

[MERGE] Sync witu upstream (trunk)

Unmerged revisions

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

[MERGE] Sync witu upstream (trunk)

8905. By Thibault Delavallée (OpenERP) on 2013-12-11

[MERGE] Sync with trunk

8904. By Thibault Delavallée (OpenERP) on 2013-12-11

[FIX] project_gtd: default value should not crash but be void if user has no read access rights

8903. By Thibault Delavallée (OpenERP) on 2013-12-11

[FIX] portal_project_gtd, portal_project_long_term: try to solve some issues with instal order

8902. By Thibault Delavallée (OpenERP) on 2013-12-11

[FIX] portal_project_issue: fixed a rule whose model was not the correct one due to copy and paste: was task instead of issue

8901. By Thibault Delavallée (OpenERP) on 2013-12-11

[IMP] project_issue_sheet: analytic stuff on task is now only for regular employees. This allows to avoid adding acces rules for portal users that they should not receive.

8900. By Thibault Delavallée (OpenERP) on 2013-12-11

[REM] portal_project_gtd: removed useless file

8899. By Thibault Delavallée (OpenERP) on 2013-12-11

[ADD] Added portal_project_gtd, adding necessary access rights for gtd-related models.

8898. By Thibault Delavallée (OpenERP) on 2013-12-11

[IMP] portal_project_issue: portal users can now create / write / unlink task in a Followers only project they follow

8897. By Thibault Delavallée (OpenERP) on 2013-12-11

[IMP] portal_porject: improved rule name

=== modified file 'portal/portal_demo.xml'
--- portal/portal_demo.xml	2014-01-22 18:36:30 +0000
+++ portal/portal_demo.xml	2014-02-10 10:02:38 +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 10:02:38 +0000
@@ -22,7 +22,7 @@
 
 {
     'name': 'Portal Project',
-    'version': '0.1',
+    'version': '1.0',
     'category': 'Tools',
     'complexity': 'easy',
     'description': """
@@ -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 10:02:38 +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 10:02:38 +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 10:02:38 +0000
@@ -1,13 +1,14 @@
 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
-access_task_public,task,project.model_project_task,base.group_public,1,0,0,0
-access_task_type_public,task_type,project.model_project_task_type,base.group_public,1,0,0,0
-access_task_work_public,task_work,project.model_project_task_work,base.group_public,1,0,0,0
-access_project_category_public,project_category,project.model_project_category,base.group_public,1,0,0,0
-access_account_analytic_account_public,account_analytic_account,analytic.model_account_analytic_account,base.group_public,1,0,0,0
\ No newline at end of file
+access_project_anonymous,project,project.model_project_project,base.group_public,1,0,0,0
+access_task_anonymous,task,project.model_project_task,base.group_public,1,0,0,0
+access_task_type_anonymous,task_type,project.model_project_task_type,base.group_public,1,0,0,0
+access_task_work_anonymous,task_work,project.model_project_task_work,base.group_public,1,0,0,0
+access_project_category_anonymous,project_category,project.model_project_category,base.group_public,1,0,0,0
+access_account_analytic_account_anonymous,account_analytic_account,analytic.model_account_analytic_account,base.group_public,1,0,0,0
\ No newline at end of file

=== 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 10:02:38 +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 10:02:38 +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])]
         })
@@ -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'])

=== added directory 'portal_project_gtd'
=== added file 'portal_project_gtd/__init__.py'
--- portal_project_gtd/__init__.py	1970-01-01 00:00:00 +0000
+++ portal_project_gtd/__init__.py	2014-02-10 10:02:38 +0000
@@ -0,0 +1,20 @@
+# -*- 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/>.
+#
+##############################################################################

=== added file 'portal_project_gtd/__openerp__.py'
--- portal_project_gtd/__openerp__.py	1970-01-01 00:00:00 +0000
+++ portal_project_gtd/__openerp__.py	2014-02-10 10:02:38 +0000
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+{
+    'name': 'Portal Project GTD',
+    'version': '1.0',
+    'category': 'Tools',
+    'complexity': 'easy',
+    'description': """
+This module adds necessary security rules and access rights for project GTD and portal.
+=======================================================================================
+    """,
+    'author': 'OpenERP SA',
+    'depends': ['project_gtd', 'portal_project'],
+    'data': [
+        'security/ir.model.access.csv',
+    ],
+    'installable': True,
+    'auto_install': True,
+    'category': 'Hidden',
+}

=== added directory 'portal_project_gtd/security'
=== added file 'portal_project_gtd/security/ir.model.access.csv'
--- portal_project_gtd/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ portal_project_gtd/security/ir.model.access.csv	2014-02-10 10:02:38 +0000
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_gtd_context_portal,project.gtd.context.portal,project_gtd.model_project_gtd_context,portal.group_portal,1,0,0,0
+access_project_gtd_timebox_portal,project.gtd.timebox.portal,project_gtd.model_project_gtd_timebox,portal.group_portal,1,0,0,0
+access_project_gtd_context_anonymous,project.gtd.context.anonymous,project_gtd.model_project_gtd_context,portal.group_anonymous,1,0,0,0
+access_project_gtd_timebox_anonymous,project.gtd.timebox.anonymous,project_gtd.model_project_gtd_timebox,portal.group_anonymous,1,0,0,0
\ No newline at end of file

=== 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 10:02:38 +0000
@@ -1,4 +1,5 @@
 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
+<<<<<<< TREE
+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
+access_issues_anonymous,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 10:02:38 +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_long_term/__openerp__.py'
--- portal_project_long_term/__openerp__.py	2013-03-21 09:06:26 +0000
+++ portal_project_long_term/__openerp__.py	2014-02-10 10:02:38 +0000
@@ -30,7 +30,7 @@
 =============================================================================================
     """,
     'author': 'OpenERP SA',
-    'depends': ['project_long_term', 'portal'],
+    'depends': ['project_long_term', 'portal_project'],
     'data': [
         'security/portal_security.xml',
         'security/ir.model.access.csv',

=== 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 10:02:38 +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_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 10:02:38 +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):