[MERGE] add group implications, and remove superseded functionality from portal

bzr revid: rco@openerp.com-20110803090108-w564n9ufmbvy3bhx

addons/account/security/account_security.xml

@@ -4,12 +4,13 @@
     <record id="group_account_invoice" model="res.groups">
         <field name="name">Accounting / Invoicing &amp; Payments</field>
     </record>
-
     <record id="group_account_user" model="res.groups" context="{'noadmin':True}">
         <field name="name">Accounting / Accountant</field>
+        <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
     </record>
     <record id="group_account_manager" model="res.groups" context="{'noadmin':True}">
         <field name="name">Accounting / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
     </record>
 
     <record id="account_move_comp_rule" model="ir.rule">

addons/account_payment/security/account_payment_security.xml

@@ -5,6 +5,9 @@
     <record id="group_account_payment" model="res.groups">
         <field name="name">Accounting / Payments</field>
     </record>
+    <record id="account.group_account_invoice" model="res.groups">
+        <field name="implied_ids" eval="[(4, ref('group_account_payment'))]"/>
+    </record>
 
     <record id="payment_mode_comp_rule" model="ir.rule">
         <field name="name">Payment Mode company rule</field>

addons/auction/security/auction_security.xml

@@ -2,12 +2,13 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="group_auction_manager" model="res.groups">
-        <field name="name">Auction / Manager</field>
-    </record>
     <record id="group_auction_user" model="res.groups">
         <field name="name">Auction / User</field>
     </record>
+    <record id="group_auction_manager" model="res.groups">
+        <field name="name">Auction / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('group_auction_user'))]"/>
+    </record>
 
 </data>
-</openerp>
+</openerp>

addons/crm/security/crm_security.xml

@@ -2,16 +2,18 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
+        <field name="name">Sales / User - Own Leads Only</field>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">Sales / User - See All Leads</field>
+        <field name="name">Sales / User - All Leads</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
+    </record>
+
+    <record id="base.group_sale_manager" model="res.groups">
+        <field name="name">Sales / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
     <record id="crm_rule_personal_lead" model="ir.rule">

addons/event/security/event_security.xml

@@ -2,14 +2,15 @@
 <openerp>
   <data>
 
-    <record id="marketing.group_marketing_manager" model="res.groups">
-        <field name="name">Marketing / Manager</field>
-    </record>
-
     <record id="marketing.group_marketing_user" model="res.groups">
         <field name="name">Marketing / User</field>
     </record>
 
+    <record id="marketing.group_marketing_manager" model="res.groups">
+        <field name="name">Marketing / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
+    </record>
+
     <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Sales / Manager</field>
     </record>

addons/hr/security/hr_security.xml

@@ -2,12 +2,13 @@
 <openerp>
 <data noupdate="1">
 
-    <record id="base.group_hr_manager" model="res.groups">
-        <field name="name">Human Resources / Manager</field>
-    </record>
-
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / Officer</field>
     </record>
+    <record id="base.group_hr_manager" model="res.groups">
+        <field name="name">Human Resources / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
+    </record>
+
 </data>
 </openerp>

addons/idea/security/idea_security.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+<data>
 
-   	<record model="res.groups" id="base.group_tool_manager">
-        	<field name="name">Tools / Manager</field>
-   		</record>
-   	<record model="res.groups" id="base.group_tool_user">
-        	<field name="name">Tools / User</field>
-   	</record>
+    <record model="res.groups" id="base.group_tool_user">
+        <field name="name">Tools / User</field>
+    </record>
+    <record model="res.groups" id="base.group_tool_manager">
+        <field name="name">Tools / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
+    </record>
 
-	</data>
+</data>
 </openerp>
 

addons/lunch/security/lunch_security.xml

@@ -2,12 +2,13 @@
 <openerp>
 <data noupdate="0">
 
-   	<record model="res.groups" id="base.group_tool_manager">
-        	<field name="name">Tools / Manager</field>
-   		</record>
-   	<record model="res.groups" id="base.group_tool_user">
-        	<field name="name">Tools / User</field>
-   	</record>
-    
+    <record model="res.groups" id="base.group_tool_user">
+        <field name="name">Tools / User</field>
+    </record>
+    <record model="res.groups" id="base.group_tool_manager">
+        <field name="name">Tools / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
+    </record>
+
 </data>
 </openerp>

addons/marketing/security/marketing_security.xml

@@ -4,10 +4,11 @@
     <record id="marketing.group_marketing_user" model="res.groups">
         <field name="name">Marketing / User</field>
     </record>
-    
+
     <record id="marketing.group_marketing_manager" model="res.groups">
         <field name="name">Marketing / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
     </record>
-    
+
 </data>
 </openerp>

addons/mrp/security/mrp_security.xml

@@ -2,12 +2,13 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="group_mrp_manager" model="res.groups">
-        <field name="name">Manufacturing / Manager</field>
-    </record>
     <record id="group_mrp_user" model="res.groups">
         <field name="name">Manufacturing / User</field>
     </record>
+    <record id="group_mrp_manager" model="res.groups">
+        <field name="name">Manufacturing / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('group_mrp_user'))]"/>
+    </record>
 
     <!-- restrict access to menu -->
     <record model='ir.ui.menu' id="mrp_Sched_all">

addons/point_of_sale/security/point_of_sale_security.xml

@@ -2,11 +2,13 @@
 <openerp>
 <data noupdate="1">
 
-    <record id="group_pos_manager" model="res.groups">
-        <field name="name">Point of Sale / Manager</field>
-    </record>
     <record id="group_pos_user" model="res.groups">
         <field name="name">Point of Sale / User</field>
     </record>
+    <record id="group_pos_manager" model="res.groups">
+        <field name="name">Point of Sale / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('group_pos_user'))]"/>
+    </record>
+
 </data>
 </openerp>

addons/portal/portal.py

@@ -37,10 +37,6 @@ class portal(osv.osv):
         'group_id': fields.many2one('res.groups', required=True, ondelete='cascade',
             string='Group',
             help='The group extended by this portal'),
-        'other_group_ids': fields.many2many('res.groups',
-            'portal_group_rel', 'portal_id', 'group_id',
-            string='Other User Groups',
-            help="Those groups are assigned to the portal's users"),
         'url': fields.char('URL', size=64,
             help="The url where portal users can connect to the server"),
         'menu_action_id': fields.many2one('ir.actions.act_window', readonly=True,
@@ -70,8 +66,8 @@ class portal(osv.osv):
         portal_id = super(portal, self).create(cr, uid, values, context)
         
         # assign menu action and widgets to users
-        if values.get('users') or values.get('other_group_ids') or values.get('menu_action_id'):
-            self._assign_menu_and_groups(cr, uid, [portal_id], context)
+        if values.get('users') or values.get('menu_action_id'):
+            self._assign_menu(cr, uid, [portal_id], context)
         if values.get('users') or values.get('widget_ids'):
             self._assign_widgets(cr, uid, [portal_id], context)
         
@@ -83,8 +79,8 @@ class portal(osv.osv):
         super(portal, self).write(cr, uid, ids, values, context)
         
         # assign menu action and widgets to users
-        if values.get('users') or values.get('other_group_ids') or values.get('menu_action_id'):
-            self._assign_menu_and_groups(cr, uid, ids, context)
+        if values.get('users') or values.get('menu_action_id'):
+            self._assign_menu(cr, uid, ids, context)
         if values.get('users') or values.get('widget_ids'):
             self._assign_widgets(cr, uid, ids, context)
         
@@ -117,18 +113,15 @@ class portal(osv.osv):
         
         return True
 
-    def _assign_menu_and_groups(self, cr, uid, ids, context=None):
-        """ assign portal menu and other groups to users of portals (ids) """
+    def _assign_menu(self, cr, uid, ids, context=None):
+        """ assign portal menu to users of portals (ids) """
         user_obj = self.pool.get('res.users')
         for p in self.browse(cr, uid, ids, context):
-            # user groups = portal group + other groups
-            group_ids = [p.group_id.id] + [g.id for g in p.other_group_ids]
-            user_values = {'groups_id': [(6, 0, group_ids)]}
             # user menu action = portal menu action if set in portal
             if p.menu_action_id:
-                user_values['menu_id'] = p.menu_action_id.id
-            user_ids = [u.id for u in p.users if u.id != 1]
-            user_obj.write(cr, uid, user_ids, user_values, context)
+                user_ids = [u.id for u in p.users if u.id != 1]
+                user_values = {'menu_id': p.menu_action_id.id}
+                user_obj.write(cr, uid, user_ids, user_values, context)
 
     def _assign_widgets(self, cr, uid, ids, context=None):
         """ assign portal widgets to users of portals (ids) """

addons/portal/portal_view.xml

@@ -43,10 +43,19 @@ the portal's users.
             <field name="arch" type="xml">
                 <page string="Users" position="before">
                     <page string="Portal">
-                        <group colspan="2" col="2">
+                        <group colspan="4" col="2">
                             <separator string="Website" colspan="2"/>
                             <field name="url" widget="url"/>
                         </group>
+                        <group colspan="2" col="2">
+                            <separator string="Widgets assigned to Users" colspan="2"/>
+                            <field name="widget_ids" nolabel="1" colspan="2">
+                                <tree string="Widgets" editable="bottom">
+                                    <field name="sequence"/>
+                                    <field name="widget_id"/>
+                                </tree>
+                            </field>
+                        </group>
                         <group colspan="2" col="2">
                             <separator string="Portal Menu" colspan="2"/>
                             <field name="override_menu"/>
@@ -56,18 +65,6 @@ the portal's users.
                             <button name="do_create_menu" type="object"
                                 string="Create Parent Menu"/>
                         </group>
-                        <separator string="Other Groups assigned to Users" colspan="2"/>
-                        <separator string="Widgets assigned to Users" colspan="2"/>
-                        <!-- load group_id in order to exclude it from other_group_ids -->
-                        <field name="group_id" invisible="1"/>
-                        <field name="other_group_ids" nolabel="1" colspan="2"
-                            domain="[('id', '!=', group_id)]"/>
-                        <field name="widget_ids" nolabel="1" colspan="2">
-                            <tree string="Widgets" editable="bottom">
-                                <field name="sequence"/>
-                                <field name="widget_id"/>
-                            </tree>
-                        </field>
                     </page>
                 </page>
             </field>

addons/portal/security/portal_security.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record id="group_portal_manager" model="res.groups">
-            <field name="name">Portal / Manager</field>
-            <field name="comment">Portal managers have access to the portal definitions, and can easily configure the users, access rights and menus of portal users.</field>
-        </record>
         <record id="group_portal_officer" model="res.groups">
             <field name="name">Portal / Officer</field>
             <field name="comment">Portal officers can create new portal users with the portal wizard.</field>
         </record>
+        <record id="group_portal_manager" model="res.groups">
+            <field name="name">Portal / Manager</field>
+            <field name="comment">Portal managers have access to the portal definitions, and can easily configure the users, access rights and menus of portal users.</field>
+            <field name="implied_ids" eval="[(4, ref('group_portal_officer'))]"/>
+        </record>
     </data>
 </openerp>

addons/project/security/project_security.xml

@@ -2,14 +2,15 @@
 <openerp>
 <data noupdate="1">
 
-    <record id="group_project_manager" model="res.groups">
-        <field name="name">Project / Manager</field>
-    </record>
-
     <record id="group_project_user" model="res.groups">
         <field name="name">Project / User</field>
     </record>
 
+    <record id="group_project_manager" model="res.groups">
+        <field name="name">Project / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('group_project_user'))]"/>
+    </record>
+
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>

addons/purchase/security/purchase_security.xml

@@ -2,11 +2,12 @@
 <openerp>
 <data noupdate="1">
 
-    <record id="group_purchase_manager" model="res.groups">
-        <field name="name">Purchase / Manager</field>
-    </record>
     <record id="group_purchase_user" model="res.groups">
-        <field name="name">Purchase / User</field>
+        <field name="name">Purchases / User</field>
+    </record>
+    <record id="group_purchase_manager" model="res.groups">
+        <field name="name">Purchases / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('group_purchase_user'))]"/>
     </record>
 
     <record model="ir.rule" id="purchase_order_comp_rule">

addons/purchase_requisition/security/purchase_tender.xml

@@ -2,14 +2,15 @@
 <openerp>
 <data noupdate="1">
 
-    <record id="group_purchase_requisition_manager" model="res.groups">
-        <field name="name">Purchase Requisition / Manager</field>
-    </record>
-    
     <record id="group_purchase_requisition_user" model="res.groups">
         <field name="name">Purchase Requisition / User</field>
     </record>
 
+    <record id="group_purchase_requisition_manager" model="res.groups">
+        <field name="name">Purchase Requisition / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('group_purchase_requisition_user'))]"/>
+    </record>
+    
     <record model="ir.rule" id="purchase_requisition_comp_rule">
         <field name="name">Purchase Requisition multi-company</field>
         <field name="model_id" ref="model_purchase_requisition"/>

addons/sale/security/sale_security.xml

@@ -2,9 +2,6 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User - Own Leads Only</field>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
@@ -12,6 +9,12 @@
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
         <field name="name">Sales / User - All Leads</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
+    </record>
+
+    <record id="base.group_sale_manager" model="res.groups">
+        <field name="name">Sales / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
     <record model="ir.ui.menu" id="base.menu_base_partner">

addons/stock/security/stock_security.xml

@@ -2,12 +2,13 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="group_stock_manager" model="res.groups">
-        <field name="name">Warehouse / Manager</field>
-    </record>
     <record id="group_stock_user" model="res.groups">
         <field name="name">Warehouse / User</field>
     </record>
+    <record id="group_stock_manager" model="res.groups">
+        <field name="name">Warehouse / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('group_stock_user'))]"/>
+    </record>
 
 <!-- multi -->
 

addons/subscription/security/subcription_security.xml

@@ -2,12 +2,13 @@
 <openerp>
 <data noupdate="0">
 
-   	<record model="res.groups" id="base.group_tool_manager">
-        	<field name="name">Tools / Manager</field>
-   		</record>
-   	<record model="res.groups" id="base.group_tool_user">
-        	<field name="name">Tools / User</field>
-   	</record>
-   	
+    <record model="res.groups" id="base.group_tool_user">
+        <field name="name">Tools / User</field>
+    </record>
+    <record model="res.groups" id="base.group_tool_manager">
+        <field name="name">Tools / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
+    </record>
+
 </data>
 </openerp>

addons/survey/security/survey_security.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="0">
-       	<record model="res.groups" id="base.group_tool_manager">
-            	<field name="name">Tools / Manager</field>
-       		</record>
-       	<record model="res.groups" id="base.group_tool_user">
-            	<field name="name">Tools / User</field>
-       	</record>
-       	<record model="res.groups" id="base.group_survey_user">
-            	<field name="name">Survey / User</field>
-       	</record>
+        <record model="res.groups" id="base.group_tool_user">
+            <field name="name">Tools / User</field>
+        </record>
+        <record model="res.groups" id="base.group_tool_manager">
+            <field name="name">Tools / Manager</field>
+            <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
+        </record>
+        <record model="res.groups" id="base.group_survey_user">
+            <field name="name">Survey / User</field>
+        </record>
     </data>
 </openerp>