From 2582be64928631cc07a1e2701ea5f5c581074184 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 5 Apr 2011 12:17:12 +0200
Subject: [PATCH 01/50] add wizard to add/remove groups to portal users

bzr revid: rco@openerp.com-20110405101712-nfednzpixzim86i4
---
 addons/portal/__init__.py     | 24 ++++++++++++++
 addons/portal/__openerp__.py  | 46 +++++++++++++++++++++++++++
 addons/portal/portal_view.xml | 52 ++++++++++++++++++++++++++++++
 addons/portal/wizard.py       | 59 +++++++++++++++++++++++++++++++++++
 addons/portal/wizard_view.xml | 51 ++++++++++++++++++++++++++++++
 5 files changed, 232 insertions(+)
 create mode 100644 addons/portal/__init__.py
 create mode 100644 addons/portal/__openerp__.py
 create mode 100644 addons/portal/portal_view.xml
 create mode 100644 addons/portal/wizard.py
 create mode 100644 addons/portal/wizard_view.xml

diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
new file mode 100644
index 00000000000..5aea1cf958f
--- /dev/null
+++ b/addons/portal/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+
+import portal
+import wizard
+
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
new file mode 100644
index 00000000000..012403a1a52
--- /dev/null
+++ b/addons/portal/__openerp__.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 Tiny SPRL (<http://tiny.be>).
+#
+#    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",
+    "version" : "0.2",
+    "depends" : ["base"],
+    "author" : "OpenERP SA",
+    "category": 'Tools',
+    "description": """
+This module defines 'portals' to customize the access to your OpenERP database
+for external users.
+
+A portal defines customized user menu and access rights for a group of users
+(the ones associated to that portal).  It also associates user groups to the
+portal users (adding a group in the portal automatically adds it to the portal
+users, etc).  That feature is very handy when used in combination with the
+module 'share'.
+    """,
+    'website': 'http://www.openerp.com',
+    'demo_xml': [],
+    'data': ['portal_view.xml', 'wizard_view.xml'],
+    'installable': True,
+    'certificate' : '',
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
new file mode 100644
index 00000000000..74872f61a67
--- /dev/null
+++ b/addons/portal/portal_view.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- menu Administration/Portals -->
+        <menuitem name="Portals" id="portal_menu" parent="base.menu_administration"/>
+
+        <!-- menu Administration/Portals/Portals -->
+        <record id="portal_list_action" model="ir.actions.act_window">
+            <field name="name">Portals</field>
+            <field name="res_model">res.portal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help">
+A portal helps defining specific views and rules for a group of users (the
+portal group).  A portal is associated to a menu; when changed, the portal menu
+is assigned to the portal's users.  Groups can be added to or removed from the
+portal's users.
+            </field>
+        </record>
+        <menuitem name="Portals" id="portal_list_menu"
+            parent="portal_menu" sequence="1" action="portal_list_action"/>
+
+        <!-- portal form view -->
+        <record id="portal_form" model="ir.ui.view">
+            <field name="name">Portal Form</field>
+            <field name="model">res.portal</field>
+            <field name="type">form</field>
+            <field name="priority" eval="16"/>
+            <field name="arch" type="xml">
+                <form string="Portal Form">
+                    <field name="group_id" on_change="onchange_group(group_id)"/>
+                    <notebook>
+                        <page string="Users">
+                            <field name="user_ids" nolabel="1" colspan="3"
+                                context="{'menu_id': menu_action_id}"/>
+                            <group name="user_panel" colspan="1"/>
+                            <!-- wizards insert buttons inside the group 'user_panel' -->
+                        </page>
+                        <page string="Menu">
+                            <field name="menu_action_id"/>
+                            <newline/>
+                            <field name="parent_menu_id"
+                                context="{'ir.ui.menu.full_list': True}"/>
+                            <button name="do_create_menu" type="object"
+                                string="Create Parent Menu"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
new file mode 100644
index 00000000000..410aa806c67
--- /dev/null
+++ b/addons/portal/wizard.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 Tiny SPRL (<http://tiny.be>).
+#
+#    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 osv import osv, fields
+from tools.translate import _
+
+class groups_wizard(osv.osv_memory):
+    _name = 'res.portal.groups'
+    _description = 'Portal Groups Wizard'
+    _columns = {
+        'portal_id': fields.many2one('res.portal', required=True, readonly=True,
+            string='Portal'),
+        'add_group_ids': fields.many2many('res.groups',
+            'portal_groups_add', 'portal_groups_id', 'group_ids',
+            string='Add Groups'),
+        'remove_group_ids': fields.many2many('res.groups',
+            'portal_groups_remove', 'portal_groups_id', 'group_ids',
+            string='Remove Groups'),
+    }
+    _defaults = {
+        'portal_id': (lambda self,cr,uid,context: context and context.get('active_id'))
+    }
+    
+    def do_apply(self, cr, uid, ids, context=None, *args):
+        assert len(ids) == 1
+        wizard = self.browse(cr, uid, ids[0], context)
+        
+        # select all portal users except admin
+        user_ids = [u.id for u in wizard.portal_id.user_ids if u.id != 1]
+        
+        # apply group adds and removals to portal users
+        add_gids = [(4, g.id) for g in wizard.add_group_ids]
+        rem_gids = [(3, g.id) for g in wizard.remove_group_ids]
+        user_values = {'groups_id': add_gids + rem_gids}
+        self.pool.get('res.users').write(cr, uid, user_ids, user_values, context)
+        
+        # return an empty dictionary to close the wizard window
+        return {}
+
+groups_wizard()
+
diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
new file mode 100644
index 00000000000..f748292ede6
--- /dev/null
+++ b/addons/portal/wizard_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- groups wizard action -->
+        <record id="groups_wizard_action" model="ir.actions.act_window">
+            <field name="name">Add/Remove Groups</field>
+            <field name="res_model">res.portal.groups</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <!-- groups wizard form -->
+        <record id="groups_wizard_form" model="ir.ui.view">
+            <field name="name">Portal Groups Wizard</field>
+            <field name="model">res.portal.groups</field>
+            <field name="type">form</field>
+            <field name="priority" eval="16"/>
+            <field name="arch" type="xml">
+                <form string="Portal Groups Wizard">
+                    <group colspan="4">
+                        <field name="portal_id"/>
+                    </group>
+                    <separator string="Add Groups" colspan="2"/>
+                    <separator string="Remove Groups" colspan="2"/>
+                    <field name="add_group_ids" nolabel="1" colspan="2"/>
+                    <field name="remove_group_ids" nolabel="1" colspan="2"/>
+                    <separator colspan="4"/>
+                    <label colspan="2"/>
+                    <button special="cancel"
+                        string="Cancel" icon="gtk-cancel"/>
+                    <button name="do_apply" type="object"
+                        string="Apply" icon="gtk-apply"/>
+                </form>
+            </field>
+        </record>
+
+        <!-- add a button in the portal form view -->
+        <record id="portal_form_with_groups_wizard" model="ir.ui.view">
+            <field name="name">Portal Form</field>
+            <field name="model">res.portal</field>
+            <field name="inherit_id" ref="portal_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='user_panel']" position="inside">
+                    <button name="%(groups_wizard_action)d" type="action"
+                        string="Add/Remove Groups"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>

From ba74dc3810e9194ecb2fdc98b4eae0206c9756ae Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 6 Apr 2011 12:25:34 +0200
Subject: [PATCH 02/50] add portal widgets; they are automatically assigned to
 users

bzr revid: rco@openerp.com-20110406102534-33r4tae093sbfu96
---
 addons/portal/portal.py       | 62 +++++++++++++++++++++++++++++++++--
 addons/portal/portal_view.xml | 27 +++++++++++----
 2 files changed, 79 insertions(+), 10 deletions(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index f5137e5afdf..046dc986bf4 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -39,6 +39,9 @@ class portal(osv.osv):
         'parent_menu_id': fields.many2one('ir.ui.menu',
             string='Parent Menu',
             help=_('The menu action opens the submenus of this menu item')),
+        'widget_ids': fields.one2many('res.portal.widget', 'portal_id',
+            string='Widgets',
+            help=_('Widgets assigned to portal users')),
     }
     _sql_constraints = [
         ('unique_group', 'UNIQUE(group_id)', _('Portals must have distinct groups.'))
@@ -66,7 +69,14 @@ class portal(osv.osv):
             for id in get_many2many(values['user_ids']):
                 values['user_ids'].append((1, id, user_values))
         
-        return super(portal, self).create(cr, uid, values, context)
+        # create portal
+        portal_id = super(portal, self).create(cr, uid, values, context)
+        
+        # assign widgets to users
+        if 'user_ids' in values:
+            self._assign_widgets_to_users(cr, uid, portal_id, context)
+        
+        return portal_id
     
     def name_get(self, cr, uid, ids, context=None):
         portals = self.browse(cr, uid, ids, context)
@@ -90,7 +100,7 @@ class portal(osv.osv):
         # if 'menu_action_id' has changed, set menu_id on users
         if 'menu_action_id' in values:
             user_values = {'menu_id': values['menu_action_id']}
-            user_ids = [u.id for p in portals for u in p.user_ids]
+            user_ids = [u.id for p in portals for u in p.user_ids if u.id != 1]
             self.pool.get('res.users').write(cr, uid, user_ids, user_values, context)
         
         # if parent_menu_id has changed, apply the change on menu_action_id
@@ -100,6 +110,10 @@ class portal(osv.osv):
             action_values = {'domain': [('parent_id', '=', values['parent_menu_id'])]}
             act_window_obj.write(cr, uid, action_ids, action_values, context)
         
+        # assign portal widgets to users, if widgets or users changed
+        if ('user_ids' in values) or ('widget_ids' in values):
+            self._assign_widgets_to_users(cr, uid, ids, context)
+        
         return True
     
     def _create_menu_action(self, cr, uid, values, context=None):
@@ -135,7 +149,19 @@ class portal(osv.osv):
             self.write(cr, uid, [p.id], {'parent_menu_id': menu_id}, context)
         
         return True
-    
+
+    def _assign_widgets_to_users(self, cr, uid, ids, context=None):
+        """ assign portal widgets to users for the given portal ids """
+        widget_user_obj = self.pool.get('res.widget.user')
+        portals = self.browse(cr, uid, ids, context)
+        for p in portals:
+            for w in p.widget_ids:
+                values = {'sequence': w.sequence, 'widget_id': w.widget_id.id}
+                for u in p.user_ids:
+                    if u.id == 1: continue
+                    values['user_id'] = u.id
+                    widget_user_obj.create(cr, uid, values, context)
+
     def onchange_group(self, cr, uid, ids, group_id, context=None):
         """ update the users list when the group changes """
         user_ids = False
@@ -174,6 +200,36 @@ users()
 
 
 
+class portal_widget(osv.osv):
+    """
+        Similar to res.widget.user (res_widget.py), but with a portal instead.
+        New users in a portal are assigned the portal's widgets.
+    """
+    _name='res.portal.widget'
+    _description = 'Portal Widgets'
+    _order = 'sequence'
+    _columns = {
+        'sequence': fields.integer('Sequence'),
+        'portal_id': fields.many2one('res.portal', select=1,
+            string='Portal'),
+        'widget_id': fields.many2one('res.widget', required=True, ondelete='cascade',
+            string='Widget'),
+    }
+
+    def create(self, cr, uid, values, context=None):
+        domain = [('portal_id', '=', values.get('portal_id')),
+                  ('widget_id', '=', values.get('widget_id'))]
+        existing = self.search(cr, uid, domain, context=context)
+        if existing:
+            res = existing[0]
+        else:
+            res = super(portal_widget, self).create(cr, uid, values, context=context)
+        return res
+
+portal_widget()
+
+
+
 # utils
 def get_browse_id(obj):
     """ return the id of a browse() object, or None """
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 74872f61a67..402c6ad14ac 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -36,13 +36,26 @@ portal's users.
                             <group name="user_panel" colspan="1"/>
                             <!-- wizards insert buttons inside the group 'user_panel' -->
                         </page>
-                        <page string="Menu">
-                            <field name="menu_action_id"/>
-                            <newline/>
-                            <field name="parent_menu_id"
-                                context="{'ir.ui.menu.full_list': True}"/>
-                            <button name="do_create_menu" type="object"
-                                string="Create Parent Menu"/>
+                        <page string="Menu &amp; Widgets">
+                            <group colspan="2" col="2">
+                                <separator string="Portal Menu" colspan="2"/>
+                                <group colspan="2" col="2">
+                                    <field name="menu_action_id"/>
+                                    <field name="parent_menu_id"
+                                        context="{'ir.ui.menu.full_list': True}"/>
+                                </group>
+                                <button name="do_create_menu" type="object"
+                                    string="Create Parent Menu"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Portal Widgets" colspan="2"/>
+                                <field name="widget_ids" nolabel="1" rowspan="7">
+                                    <tree string="Widgets" editable="bottom">
+                                        <field name="sequence"/>
+                                        <field name="widget_id"/>
+                                    </tree>
+                                </field>
+                            </group>
                         </page>
                     </notebook>
                 </form>

From c3c735400f7d2fec428e6b45fd3c3488d50ff0f3 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 20 Apr 2011 10:09:10 +0200
Subject: [PATCH 03/50] refactor portal; it now '_inherits' from res.groups

bzr revid: rco@openerp.com-20110420080910-frx67xxjz0tqm2y8
---
 addons/portal/__init__.py     |   1 -
 addons/portal/__openerp__.py  |   2 +-
 addons/portal/portal.py       | 134 +++++++++-------------------------
 addons/portal/portal_view.xml |  74 ++++++++++---------
 addons/portal/wizard.py       |  59 ---------------
 addons/portal/wizard_view.xml |  51 -------------
 6 files changed, 75 insertions(+), 246 deletions(-)
 delete mode 100644 addons/portal/wizard.py
 delete mode 100644 addons/portal/wizard_view.xml

diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index 5aea1cf958f..0d6d510dbe6 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -20,5 +20,4 @@
 ##############################################################################
 
 import portal
-import wizard
 
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 012403a1a52..ca664c6b4d3 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -38,7 +38,7 @@ module 'share'.
     """,
     'website': 'http://www.openerp.com',
     'demo_xml': [],
-    'data': ['portal_view.xml', 'wizard_view.xml'],
+    'data': ['portal_view.xml'],
     'installable': True,
     'certificate' : '',
 }
diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 046dc986bf4..979b0599a83 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -23,16 +23,18 @@ from osv import osv, fields
 from tools.translate import _
 
 class portal(osv.osv):
+    """
+        A portal is a group of users with specific menu, widgets, and typically
+        restricted access rights.
+    """
     _name = 'res.portal'
     _description = 'Portal'
-    _rec_name = 'group_id'
+    _inherits = {'res.groups': 'group_id'}
+    
     _columns = {
-        'group_id': fields.many2one('res.groups', required=True,
-            string='Portal Group',
-            help=_('This group defines the users associated to this portal')),
-        'user_ids': fields.related('group_id', 'users',
-            type='many2many', relation='res.users', store=False,
-            string='Portal Users'),
+        'group_id': fields.many2one('res.groups', required=True, ondelete='cascade',
+            string='Group',
+            help=_('The group extended by this portal')),
         'menu_action_id': fields.many2one('ir.actions.actions', readonly=True,
             string='Menu Action',
             help=_("What replaces the standard menu for the portal's users")),
@@ -43,86 +45,56 @@ class portal(osv.osv):
             string='Widgets',
             help=_('Widgets assigned to portal users')),
     }
-    _sql_constraints = [
-        ('unique_group', 'UNIQUE(group_id)', _('Portals must have distinct groups.'))
-    ]
     
-    def copy(self, cr, uid, id, default={}, context=None):
-        """ override copy(): group_id and menu_action_id must be different """
-        # copy the former group_id
-        groups_obj = self.pool.get('res.groups')
-        group_id = self.browse(cr, uid, id, context).group_id.id
-        default['group_id'] = groups_obj.copy(cr, uid, group_id, {}, context)
-        default['menu_action_id'] = None
-        return super(portal, self).copy(cr, uid, id, default, context)
+    def copy(self, cr, uid, id, values={}, context=None):
+        """ override copy(): menu_action_id must be different """
+        values['menu_action_id'] = None
+        return super(portal, self).copy(cr, uid, id, values, context)
     
     def create(self, cr, uid, values, context=None):
-        """ extend create() to assign the portal group and menu to users """
+        """ extend create() to assign the portal menu to users """
+        if context is None:
+            context = {}
+        
         # first create the 'menu_action_id'
         assert not values.get('menu_action_id')
         values['menu_action_id'] = self._create_menu_action(cr, uid, values, context)
         
-        if 'user_ids' in values:
-            # set menu action of users
-            user_values = {'menu_id': values['menu_action_id']}
-            # values['user_ids'] should match [(6, 0, IDs)]
-            for id in get_many2many(values['user_ids']):
-                values['user_ids'].append((1, id, user_values))
-        
-        # create portal
+        # create portal (admin should not be included)
+        context['noadmin'] = True
         portal_id = super(portal, self).create(cr, uid, values, context)
         
-        # assign widgets to users
-        if 'user_ids' in values:
-            self._assign_widgets_to_users(cr, uid, portal_id, context)
+        # assign menu action and widgets to users
+        self._assign_menu_to_users(cr, uid, [portal_id], context)
+        self._assign_widgets_to_users(cr, uid, [portal_id], context)
         
         return portal_id
     
-    def name_get(self, cr, uid, ids, context=None):
-        portals = self.browse(cr, uid, ids, context)
-        return [(p.id, p.group_id.name) for p in portals]
-    
-    def name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=100):
-        # first search for group names that match
-        groups_obj = self.pool.get('res.groups')
-        group_names = groups_obj.name_search(cr, uid, name, args, operator, context, limit)
-        # then search for portals that match the groups found so far
-        domain = [('group_id', 'in', [gn[0] for gn in group_names])]
-        ids = self.search(cr, uid, domain, context=context)
-        return self.name_get(cr, uid, ids, context)
-    
     def write(self, cr, uid, ids, values, context=None):
         """ extend write() to reflect menu and groups changes on users """
         # first apply portal changes
         super(portal, self).write(cr, uid, ids, values, context)
-        portals = self.browse(cr, uid, ids, context)
         
-        # if 'menu_action_id' has changed, set menu_id on users
-        if 'menu_action_id' in values:
-            user_values = {'menu_id': values['menu_action_id']}
-            user_ids = [u.id for p in portals for u in p.user_ids if u.id != 1]
-            self.pool.get('res.users').write(cr, uid, user_ids, user_values, context)
+        # assign menu action and widgets to users
+        self._assign_menu_to_users(cr, uid, ids, context)
+        self._assign_widgets_to_users(cr, uid, ids, context)
         
         # if parent_menu_id has changed, apply the change on menu_action_id
         if 'parent_menu_id' in values:
             act_window_obj = self.pool.get('ir.actions.act_window')
+            portals = self.browse(cr, uid, ids, context)
             action_ids = [p.menu_action_id.id for p in portals]
             action_values = {'domain': [('parent_id', '=', values['parent_menu_id'])]}
             act_window_obj.write(cr, uid, action_ids, action_values, context)
         
-        # assign portal widgets to users, if widgets or users changed
-        if ('user_ids' in values) or ('widget_ids' in values):
-            self._assign_widgets_to_users(cr, uid, ids, context)
-        
         return True
     
     def _create_menu_action(self, cr, uid, values, context=None):
         # create a menu action that opens the menu items below parent_menu_id
         groups_obj = self.pool.get('res.groups')
-        group_name = groups_obj.browse(cr, uid, values['group_id'], context).name
         actions_obj = self.pool.get('ir.actions.act_window')
         action_values = {
-            'name': group_name + ' Menu',
+            'name': values['name'] + ' Menu',
             'type': 'ir.actions.act_window',
             'usage': 'menu',
             'res_model': 'ir.ui.menu',
@@ -150,11 +122,17 @@ class portal(osv.osv):
         
         return True
 
+    def _assign_menu_to_users(self, cr, uid, ids, context=None):
+        """ assign portal menu action to users for the given portal ids """
+        user_obj = self.pool.get('res.users')
+        for p in self.browse(cr, uid, ids, context):
+            user_values = {'menu_id': p.menu_action_id.id}
+            user_obj.write(cr, uid, [u.id for u in p.users], user_values, context)
+
     def _assign_widgets_to_users(self, cr, uid, ids, context=None):
         """ assign portal widgets to users for the given portal ids """
         widget_user_obj = self.pool.get('res.widget.user')
-        portals = self.browse(cr, uid, ids, context)
-        for p in portals:
+        for p in self.browse(cr, uid, ids, context):
             for w in p.widget_ids:
                 values = {'sequence': w.sequence, 'widget_id': w.widget_id.id}
                 for u in p.user_ids:
@@ -162,16 +140,6 @@ class portal(osv.osv):
                     values['user_id'] = u.id
                     widget_user_obj.create(cr, uid, values, context)
 
-    def onchange_group(self, cr, uid, ids, group_id, context=None):
-        """ update the users list when the group changes """
-        user_ids = False
-        if group_id:
-            group = self.pool.get('res.groups').browse(cr, uid, group_id, context)
-            user_ids = [u.id for u in group.users]
-        return {
-            'value': {'user_ids': user_ids}
-        }
-    
     def _res_xml_id(self, cr, uid, module, xml_id):
         """ return the resource id associated to the given xml_id """
         data_obj = self.pool.get('ir.model.data')
@@ -182,24 +150,6 @@ portal()
 
 
 
-class users(osv.osv):
-    _name = 'res.users'
-    _inherit = 'res.users'
-    
-    def default_get(self, cr, uid, fields, context=None):
-        """ override default value of menu_id for portal users """
-        defs = super(users, self).default_get(cr, uid, fields, context)
-        
-        # the value of 'menu_id' is passed in context by the portal form view
-        if ('menu_id' in context) and ('menu_id' in fields):
-            defs['menu_id'] = context['menu_id']
-        
-        return defs
-
-users()
-
-
-
 class portal_widget(osv.osv):
     """
         Similar to res.widget.user (res_widget.py), but with a portal instead.
@@ -230,17 +180,3 @@ portal_widget()
 
 
 
-# utils
-def get_browse_id(obj):
-    """ return the id of a browse() object, or None """
-    return (obj and obj.id or None)
-
-def get_browse_ids(objs):
-    """ return the ids of a list of browse() objects """
-    return map(get_browse_id, objs)
-
-def get_many2many(arg):
-    """ get the list of ids from a many2many 'values' field """
-    assert len(arg) == 1 and arg[0][0] == 6             # arg = [(6, _, IDs)]
-    return arg[0][2]
-
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 402c6ad14ac..bc7bb2700ca 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -10,55 +10,59 @@
             <field name="res_model">res.portal</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <!-- a context is necessary to get the right portal form view -->
+            <field name="context">{'form_view_ref': 'portal.portal_form_view'}</field>
             <field name="help">
 A portal helps defining specific views and rules for a group of users (the
-portal group).  A portal is associated to a menu; when changed, the portal menu
-is assigned to the portal's users.  Groups can be added to or removed from the
-portal's users.
+portal group).  A portal menu, widgets and specific groups may be assigned to
+the portal's users.
             </field>
         </record>
         <menuitem name="Portals" id="portal_list_menu"
             parent="portal_menu" sequence="1" action="portal_list_action"/>
 
+        <!-- portal tree view -->
+        <record id="portal_list_view" model="ir.ui.view">
+            <field name="name">Portal List</field>
+            <field name="model">res.portal</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Portals">
+                    <field name="name" string="Portal Name"/>
+                </tree>
+            </field>
+        </record>
+
         <!-- portal form view -->
-        <record id="portal_form" model="ir.ui.view">
+        <record id="portal_form_view" model="ir.ui.view">
             <field name="name">Portal Form</field>
             <field name="model">res.portal</field>
             <field name="type">form</field>
-            <field name="priority" eval="16"/>
+            <field name="inherit_id" ref="base.view_groups_form"/>
             <field name="arch" type="xml">
-                <form string="Portal Form">
-                    <field name="group_id" on_change="onchange_group(group_id)"/>
-                    <notebook>
-                        <page string="Users">
-                            <field name="user_ids" nolabel="1" colspan="3"
-                                context="{'menu_id': menu_action_id}"/>
-                            <group name="user_panel" colspan="1"/>
-                            <!-- wizards insert buttons inside the group 'user_panel' -->
-                        </page>
-                        <page string="Menu &amp; Widgets">
+                <page string="Users" position="before">
+                    <page string="Portal">
+                        <group colspan="2" col="2">
+                            <separator string="Portal Menu" colspan="2"/>
                             <group colspan="2" col="2">
-                                <separator string="Portal Menu" colspan="2"/>
-                                <group colspan="2" col="2">
-                                    <field name="menu_action_id"/>
-                                    <field name="parent_menu_id"
-                                        context="{'ir.ui.menu.full_list': True}"/>
-                                </group>
-                                <button name="do_create_menu" type="object"
-                                    string="Create Parent Menu"/>
+                                <field name="menu_action_id"/>
+                                <field name="parent_menu_id"
+                                    context="{'ir.ui.menu.full_list': True}"/>
                             </group>
-                            <group colspan="2" col="2">
-                                <separator string="Portal Widgets" colspan="2"/>
-                                <field name="widget_ids" nolabel="1" rowspan="7">
-                                    <tree string="Widgets" editable="bottom">
-                                        <field name="sequence"/>
-                                        <field name="widget_id"/>
-                                    </tree>
-                                </field>
-                            </group>
-                        </page>
-                    </notebook>
-                </form>
+                            <button name="do_create_menu" type="object"
+                                string="Create Parent Menu"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Portal Widgets" colspan="2"/>
+                            <field name="widget_ids" nolabel="1" rowspan="7">
+                                <tree string="Widgets" editable="bottom">
+                                    <field name="sequence"/>
+                                    <field name="widget_id"/>
+                                </tree>
+                            </field>
+                        </group>
+                    </page>
+                </page>
             </field>
         </record>
     </data>
diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
deleted file mode 100644
index 410aa806c67..00000000000
--- a/addons/portal/wizard.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 Tiny SPRL (<http://tiny.be>).
-#
-#    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 osv import osv, fields
-from tools.translate import _
-
-class groups_wizard(osv.osv_memory):
-    _name = 'res.portal.groups'
-    _description = 'Portal Groups Wizard'
-    _columns = {
-        'portal_id': fields.many2one('res.portal', required=True, readonly=True,
-            string='Portal'),
-        'add_group_ids': fields.many2many('res.groups',
-            'portal_groups_add', 'portal_groups_id', 'group_ids',
-            string='Add Groups'),
-        'remove_group_ids': fields.many2many('res.groups',
-            'portal_groups_remove', 'portal_groups_id', 'group_ids',
-            string='Remove Groups'),
-    }
-    _defaults = {
-        'portal_id': (lambda self,cr,uid,context: context and context.get('active_id'))
-    }
-    
-    def do_apply(self, cr, uid, ids, context=None, *args):
-        assert len(ids) == 1
-        wizard = self.browse(cr, uid, ids[0], context)
-        
-        # select all portal users except admin
-        user_ids = [u.id for u in wizard.portal_id.user_ids if u.id != 1]
-        
-        # apply group adds and removals to portal users
-        add_gids = [(4, g.id) for g in wizard.add_group_ids]
-        rem_gids = [(3, g.id) for g in wizard.remove_group_ids]
-        user_values = {'groups_id': add_gids + rem_gids}
-        self.pool.get('res.users').write(cr, uid, user_ids, user_values, context)
-        
-        # return an empty dictionary to close the wizard window
-        return {}
-
-groups_wizard()
-
diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
deleted file mode 100644
index f748292ede6..00000000000
--- a/addons/portal/wizard_view.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- groups wizard action -->
-        <record id="groups_wizard_action" model="ir.actions.act_window">
-            <field name="name">Add/Remove Groups</field>
-            <field name="res_model">res.portal.groups</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <!-- groups wizard form -->
-        <record id="groups_wizard_form" model="ir.ui.view">
-            <field name="name">Portal Groups Wizard</field>
-            <field name="model">res.portal.groups</field>
-            <field name="type">form</field>
-            <field name="priority" eval="16"/>
-            <field name="arch" type="xml">
-                <form string="Portal Groups Wizard">
-                    <group colspan="4">
-                        <field name="portal_id"/>
-                    </group>
-                    <separator string="Add Groups" colspan="2"/>
-                    <separator string="Remove Groups" colspan="2"/>
-                    <field name="add_group_ids" nolabel="1" colspan="2"/>
-                    <field name="remove_group_ids" nolabel="1" colspan="2"/>
-                    <separator colspan="4"/>
-                    <label colspan="2"/>
-                    <button special="cancel"
-                        string="Cancel" icon="gtk-cancel"/>
-                    <button name="do_apply" type="object"
-                        string="Apply" icon="gtk-apply"/>
-                </form>
-            </field>
-        </record>
-
-        <!-- add a button in the portal form view -->
-        <record id="portal_form_with_groups_wizard" model="ir.ui.view">
-            <field name="name">Portal Form</field>
-            <field name="model">res.portal</field>
-            <field name="inherit_id" ref="portal_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='user_panel']" position="inside">
-                    <button name="%(groups_wizard_action)d" type="action"
-                        string="Add/Remove Groups"/>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>

From 1a29e6c9d6cc8c7b78cfa15c8a919cb270de7af0 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 20 Apr 2011 15:45:31 +0200
Subject: [PATCH 04/50] [IMP] add functional boolean field to create/remove
 menu action

bzr revid: rco@openerp.com-20110420134531-s2jp5yfmoa3cwok1
---
 addons/portal/portal.py       | 96 ++++++++++++++++++++++++-----------
 addons/portal/portal_view.xml | 13 +++--
 2 files changed, 73 insertions(+), 36 deletions(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 979b0599a83..b9b857d09d1 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -46,7 +46,7 @@ class portal(osv.osv):
             help=_('Widgets assigned to portal users')),
     }
     
-    def copy(self, cr, uid, id, values={}, context=None):
+    def copy(self, cr, uid, id, values, context=None):
         """ override copy(): menu_action_id must be different """
         values['menu_action_id'] = None
         return super(portal, self).copy(cr, uid, id, values, context)
@@ -56,17 +56,15 @@ class portal(osv.osv):
         if context is None:
             context = {}
         
-        # first create the 'menu_action_id'
-        assert not values.get('menu_action_id')
-        values['menu_action_id'] = self._create_menu_action(cr, uid, values, context)
-        
         # create portal (admin should not be included)
         context['noadmin'] = True
         portal_id = super(portal, self).create(cr, uid, values, context)
         
         # assign menu action and widgets to users
-        self._assign_menu_to_users(cr, uid, [portal_id], context)
-        self._assign_widgets_to_users(cr, uid, [portal_id], context)
+        if values.get('users') or values.get('menu_action_id'):
+            self._assign_menu_to_users(cr, uid, [portal_id], context)
+        if values.get('users') or values.get('widget_ids'):
+            self._assign_widgets_to_users(cr, uid, [portal_id], context)
         
         return portal_id
     
@@ -76,33 +74,40 @@ class portal(osv.osv):
         super(portal, self).write(cr, uid, ids, values, context)
         
         # assign menu action and widgets to users
-        self._assign_menu_to_users(cr, uid, ids, context)
-        self._assign_widgets_to_users(cr, uid, ids, context)
+        if values.get('users') or values.get('menu_action_id'):
+            self._assign_menu_to_users(cr, uid, ids, context)
+        if values.get('users') or values.get('widget_ids'):
+            self._assign_widgets_to_users(cr, uid, ids, context)
         
         # if parent_menu_id has changed, apply the change on menu_action_id
         if 'parent_menu_id' in values:
             act_window_obj = self.pool.get('ir.actions.act_window')
             portals = self.browse(cr, uid, ids, context)
-            action_ids = [p.menu_action_id.id for p in portals]
-            action_values = {'domain': [('parent_id', '=', values['parent_menu_id'])]}
-            act_window_obj.write(cr, uid, action_ids, action_values, context)
+            action_ids = [p.menu_action_id.id for p in portals if p.menu_action_id]
+            if action_ids:
+                action_values = {'domain': [('parent_id', '=', values['parent_menu_id'])]}
+                act_window_obj.write(cr, uid, action_ids, action_values, context)
         
         return True
     
-    def _create_menu_action(self, cr, uid, values, context=None):
-        # create a menu action that opens the menu items below parent_menu_id
-        groups_obj = self.pool.get('res.groups')
-        actions_obj = self.pool.get('ir.actions.act_window')
-        action_values = {
-            'name': values['name'] + ' Menu',
-            'type': 'ir.actions.act_window',
-            'usage': 'menu',
-            'res_model': 'ir.ui.menu',
-            'view_type': 'tree',
-            'view_id': self._res_xml_id(cr, uid, 'base', 'view_menu'),
-            'domain': [('parent_id', '=', values.get('parent_menu_id', False))],
-        }
-        return actions_obj.create(cr, uid, action_values, context)
+    def create_menu_action(self, cr, uid, id, context=None):
+        """ create, if necessary, a menu action that opens the menu items below
+            parent_menu_id """
+        p = self.browse(cr, uid, id, context)
+        if not p.menu_action_id:
+            actions_obj = self.pool.get('ir.actions.act_window')
+            parent_id = p.parent_menu_id.id if p.parent_menu_id else False
+            action_values = {
+                'name': p.name + ' Menu',
+                'type': 'ir.actions.act_window',
+                'usage': 'menu',
+                'res_model': 'ir.ui.menu',
+                'view_type': 'tree',
+                'view_id': self._res_xml_id(cr, uid, 'base', 'view_menu'),
+                'domain': [('parent_id', '=', parent_id)],
+            }
+            action_id = actions_obj.create(cr, uid, action_values, context)
+            self.write(cr, uid, [id], {'menu_action_id': action_id}, context)
     
     def do_create_menu(self, cr, uid, ids, context=None):
         """ create a parent menu for the given portals """
@@ -112,7 +117,7 @@ class portal(osv.osv):
         for p in self.browse(cr, uid, ids, context):
             # create a menuitem under 'portal.portal_menu'
             menu_values = {
-                'name': p.group_id.name + ' Menu',
+                'name': p.name + ' Menu',
                 'parent_id': menu_root,
                 'groups_id': [(6, 0, [p.group_id.id])],
             }
@@ -126,8 +131,9 @@ class portal(osv.osv):
         """ assign portal menu action to users for the given portal ids """
         user_obj = self.pool.get('res.users')
         for p in self.browse(cr, uid, ids, context):
-            user_values = {'menu_id': p.menu_action_id.id}
-            user_obj.write(cr, uid, [u.id for u in p.users], user_values, context)
+            if p.menu_action_id:
+                user_values = {'menu_id': p.menu_action_id.id}
+                user_obj.write(cr, uid, [u.id for u in p.users], user_values, context)
 
     def _assign_widgets_to_users(self, cr, uid, ids, context=None):
         """ assign portal widgets to users for the given portal ids """
@@ -150,6 +156,38 @@ portal()
 
 
 
+class portal_override_menu(osv.osv):
+    """
+        extend res.portal with a boolean field 'Override Users Menu', that
+        triggers the creation or removal of menu_action_id
+    """
+    _name = 'res.portal'
+    _inherit = 'res.portal'
+    
+    def _get_override_menu(self, cr, uid, ids, field_name, arg, context=None):
+        assert field_name == 'override_menu'
+        result = {}
+        for p in self.browse(cr, uid, ids, context):
+            result[p.id] = bool(p.menu_action_id)
+        return result
+    
+    def _set_override_menu(self, cr, uid, id, field_name, field_value, arg, context=None):
+        assert field_name == 'override_menu'
+        if field_value:
+            self.create_menu_action(cr, uid, id, context)
+        else:
+            self.write(cr, uid, [id], {'menu_action_id': False}, context)
+    
+    _columns = {
+        'override_menu': fields.function(
+            _get_override_menu, fnct_inv=_set_override_menu,
+            type='boolean', method=True, string='Override Users Menu Action'),
+    }
+
+portal_override_menu()
+
+
+
 class portal_widget(osv.osv):
     """
         Similar to res.widget.user (res_widget.py), but with a portal instead.
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index bc7bb2700ca..64b713bf771 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -42,13 +42,12 @@ the portal's users.
             <field name="arch" type="xml">
                 <page string="Users" position="before">
                     <page string="Portal">
-                        <group colspan="2" col="2">
-                            <separator string="Portal Menu" colspan="2"/>
-                            <group colspan="2" col="2">
-                                <field name="menu_action_id"/>
-                                <field name="parent_menu_id"
-                                    context="{'ir.ui.menu.full_list': True}"/>
-                            </group>
+                        <group colspan="2" col="4">
+                            <separator string="Portal Menu" colspan="4"/>
+                            <field name="menu_action_id"/>
+                            <field name="override_menu"/>
+                            <field name="parent_menu_id"
+                                context="{'ir.ui.menu.full_list': True}"/>
                             <button name="do_create_menu" type="object"
                                 string="Create Parent Menu"/>
                         </group>

From 973feed5bc8b43b2a819203200fddcf9055d8917 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 20 Apr 2011 16:17:17 +0200
Subject: [PATCH 05/50] [IMP] improve comments

bzr revid: rco@openerp.com-20110420141717-a4vraqd6wc2be9mx
---
 addons/portal/portal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index b9b857d09d1..b8843c71a3b 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -37,7 +37,7 @@ class portal(osv.osv):
             help=_('The group extended by this portal')),
         'menu_action_id': fields.many2one('ir.actions.actions', readonly=True,
             string='Menu Action',
-            help=_("What replaces the standard menu for the portal's users")),
+            help=_("If set, replaces the standard menu for the portal's users")),
         'parent_menu_id': fields.many2one('ir.ui.menu',
             string='Parent Menu',
             help=_('The menu action opens the submenus of this menu item')),

From 33f70eaac2fe626038036b798de29daf1bb551ef Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 20 Apr 2011 16:58:10 +0200
Subject: [PATCH 06/50] [IMP] move method create_menu_action() to where it is
 used

bzr revid: rco@openerp.com-20110420145810-2tdtnrkf6z7nkzgy
---
 addons/portal/portal.py | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index b8843c71a3b..5775a9b9bc3 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -90,25 +90,6 @@ class portal(osv.osv):
         
         return True
     
-    def create_menu_action(self, cr, uid, id, context=None):
-        """ create, if necessary, a menu action that opens the menu items below
-            parent_menu_id """
-        p = self.browse(cr, uid, id, context)
-        if not p.menu_action_id:
-            actions_obj = self.pool.get('ir.actions.act_window')
-            parent_id = p.parent_menu_id.id if p.parent_menu_id else False
-            action_values = {
-                'name': p.name + ' Menu',
-                'type': 'ir.actions.act_window',
-                'usage': 'menu',
-                'res_model': 'ir.ui.menu',
-                'view_type': 'tree',
-                'view_id': self._res_xml_id(cr, uid, 'base', 'view_menu'),
-                'domain': [('parent_id', '=', parent_id)],
-            }
-            action_id = actions_obj.create(cr, uid, action_values, context)
-            self.write(cr, uid, [id], {'menu_action_id': action_id}, context)
-    
     def do_create_menu(self, cr, uid, ids, context=None):
         """ create a parent menu for the given portals """
         menu_obj = self.pool.get('ir.ui.menu')
@@ -178,6 +159,25 @@ class portal_override_menu(osv.osv):
         else:
             self.write(cr, uid, [id], {'menu_action_id': False}, context)
     
+    def create_menu_action(self, cr, uid, id, context=None):
+        """ create, if necessary, a menu action that opens the menu items below
+            parent_menu_id """
+        p = self.browse(cr, uid, id, context)
+        if not p.menu_action_id:
+            actions_obj = self.pool.get('ir.actions.act_window')
+            parent_id = p.parent_menu_id.id if p.parent_menu_id else False
+            action_values = {
+                'name': p.name + ' Menu',
+                'type': 'ir.actions.act_window',
+                'usage': 'menu',
+                'res_model': 'ir.ui.menu',
+                'view_type': 'tree',
+                'view_id': self._res_xml_id(cr, uid, 'base', 'view_menu'),
+                'domain': [('parent_id', '=', parent_id)],
+            }
+            action_id = actions_obj.create(cr, uid, action_values, context)
+            self.write(cr, uid, [id], {'menu_action_id': action_id}, context)
+    
     _columns = {
         'override_menu': fields.function(
             _get_override_menu, fnct_inv=_set_override_menu,

From be0459535e1d0184f8cb895e5aeb0da16b0d883d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 21 Apr 2011 12:32:02 +0200
Subject: [PATCH 07/50] add other groups assigned to users

bzr revid: rco@openerp.com-20110421103202-karucbmuorv4caah
---
 addons/portal/portal.py       | 35 ++++++++++++++++++++++-------------
 addons/portal/portal_view.xml | 34 ++++++++++++++++------------------
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 5775a9b9bc3..e8184c6eed6 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -35,6 +35,10 @@ 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")),
         'menu_action_id': fields.many2one('ir.actions.actions', readonly=True,
             string='Menu Action',
             help=_("If set, replaces the standard menu for the portal's users")),
@@ -61,23 +65,23 @@ 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('menu_action_id'):
-            self._assign_menu_to_users(cr, uid, [portal_id], context)
+        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('widget_ids'):
-            self._assign_widgets_to_users(cr, uid, [portal_id], context)
+            self._assign_widgets(cr, uid, [portal_id], context)
         
         return portal_id
     
     def write(self, cr, uid, ids, values, context=None):
-        """ extend write() to reflect menu and groups changes on users """
+        """ extend write() to reflect changes on users """
         # first apply portal changes
         super(portal, self).write(cr, uid, ids, values, context)
         
         # assign menu action and widgets to users
-        if values.get('users') or values.get('menu_action_id'):
-            self._assign_menu_to_users(cr, uid, ids, context)
+        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('widget_ids'):
-            self._assign_widgets_to_users(cr, uid, ids, context)
+            self._assign_widgets(cr, uid, ids, context)
         
         # if parent_menu_id has changed, apply the change on menu_action_id
         if 'parent_menu_id' in values:
@@ -108,16 +112,21 @@ class portal(osv.osv):
         
         return True
 
-    def _assign_menu_to_users(self, cr, uid, ids, context=None):
-        """ assign portal menu action to users for the given portal ids """
+    def _assign_menu_and_groups(self, cr, uid, ids, context=None):
+        """ assign portal menu and other groups 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_obj.write(cr, uid, [u.id for u in p.users], user_values, context)
+                user_values['menu_id'] = p.menu_action_id.id
+            user_ids = [u.id for u in p.users]
+            user_obj.write(cr, uid, user_ids, user_values, context)
 
-    def _assign_widgets_to_users(self, cr, uid, ids, context=None):
-        """ assign portal widgets to users for the given portal ids """
+    def _assign_widgets(self, cr, uid, ids, context=None):
+        """ assign portal widgets to users of portals (ids) """
         widget_user_obj = self.pool.get('res.widget.user')
         for p in self.browse(cr, uid, ids, context):
             for w in p.widget_ids:
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 64b713bf771..d6270a028b9 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -42,24 +42,22 @@ the portal's users.
             <field name="arch" type="xml">
                 <page string="Users" position="before">
                     <page string="Portal">
-                        <group colspan="2" col="4">
-                            <separator string="Portal Menu" colspan="4"/>
-                            <field name="menu_action_id"/>
-                            <field name="override_menu"/>
-                            <field name="parent_menu_id"
-                                context="{'ir.ui.menu.full_list': True}"/>
-                            <button name="do_create_menu" type="object"
-                                string="Create Parent Menu"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Portal Widgets" colspan="2"/>
-                            <field name="widget_ids" nolabel="1" rowspan="7">
-                                <tree string="Widgets" editable="bottom">
-                                    <field name="sequence"/>
-                                    <field name="widget_id"/>
-                                </tree>
-                            </field>
-                        </group>
+                        <separator string="Portal Menu" colspan="4"/>
+                        <field name="menu_action_id"/>
+                        <field name="override_menu"/>
+                        <field name="parent_menu_id"
+                            context="{'ir.ui.menu.full_list': True}"/>
+                        <button name="do_create_menu" type="object"
+                            string="Create Parent Menu"/>
+                        <separator string="Other Groups assigned to Users" colspan="2"/>
+                        <separator string="Widgets assigned to Users" colspan="2"/>
+                        <field name="other_group_ids" nolabel="1" colspan="2" rowspan="7"/>
+                        <field name="widget_ids" nolabel="1" colspan="2" rowspan="7">
+                            <tree string="Widgets" editable="bottom">
+                                <field name="sequence"/>
+                                <field name="widget_id"/>
+                            </tree>
+                        </field>
                     </page>
                 </page>
             </field>

From 8914ee5c9c4b065bea4bbdf162cce20564ab0585 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 21 Apr 2011 13:25:52 +0200
Subject: [PATCH 08/50] [IMP] add tooltip to override_menu

bzr revid: rco@openerp.com-20110421112552-bbgd8h5xvilh1bk6
---
 addons/portal/portal.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index e8184c6eed6..b8853cbc63d 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -190,7 +190,8 @@ class portal_override_menu(osv.osv):
     _columns = {
         'override_menu': fields.function(
             _get_override_menu, fnct_inv=_set_override_menu,
-            type='boolean', method=True, string='Override Users Menu Action'),
+            type='boolean', method=True, string='Override Users Menu Action',
+            help=_('Enable this option to create the Menu Action')),
     }
 
 portal_override_menu()

From 2f5f7deac827faf27af3b44f2dd4fb73e5ea0478 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 21 Apr 2011 13:43:38 +0200
Subject: [PATCH 09/50] simple XML fix

bzr revid: rco@openerp.com-20110421114338-gwd8oqh9how6rqj8
---
 addons/portal/portal_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index d6270a028b9..5ce74633498 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -51,8 +51,8 @@ the portal's users.
                             string="Create Parent Menu"/>
                         <separator string="Other Groups assigned to Users" colspan="2"/>
                         <separator string="Widgets assigned to Users" colspan="2"/>
-                        <field name="other_group_ids" nolabel="1" colspan="2" rowspan="7"/>
-                        <field name="widget_ids" nolabel="1" colspan="2" rowspan="7">
+                        <field name="other_group_ids" nolabel="1" colspan="2"/>
+                        <field name="widget_ids" nolabel="1" colspan="2">
                             <tree string="Widgets" editable="bottom">
                                 <field name="sequence"/>
                                 <field name="widget_id"/>

From 238023a80c8cd33d07fa8e3928bbd3aecbdee749 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 21 Apr 2011 14:02:10 +0200
Subject: [PATCH 10/50] [FIX] prevent deletion of menu items used in portals

bzr revid: rco@openerp.com-20110421120210-d7utp6hpy4kpxilz
---
 addons/portal/portal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index b8853cbc63d..84707648027 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -42,7 +42,7 @@ class portal(osv.osv):
         'menu_action_id': fields.many2one('ir.actions.actions', readonly=True,
             string='Menu Action',
             help=_("If set, replaces the standard menu for the portal's users")),
-        'parent_menu_id': fields.many2one('ir.ui.menu',
+        'parent_menu_id': fields.many2one('ir.ui.menu', ondelete='restrict',
             string='Parent Menu',
             help=_('The menu action opens the submenus of this menu item')),
         'widget_ids': fields.one2many('res.portal.widget', 'portal_id',

From 3428ee445002a18a835534141279f464fabd8208 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 22 Apr 2011 11:37:04 +0200
Subject: [PATCH 11/50] document what seems like a bug

bzr revid: rco@openerp.com-20110422093704-5cl094pmm82kbbx6
---
 addons/portal/portal.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 84707648027..69e2ae113f8 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -40,6 +40,7 @@ class portal(osv.osv):
             string='Other User Groups',
             help=_("Those groups are assigned to the portal's users")),
         'menu_action_id': fields.many2one('ir.actions.actions', readonly=True,
+            # ISSUE: 'ondelete' constraints do not seem effective on this field...
             string='Menu Action',
             help=_("If set, replaces the standard menu for the portal's users")),
         'parent_menu_id': fields.many2one('ir.ui.menu', ondelete='restrict',

From fb809c78e477901ac47285222275fc3e7fffe13b Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 22 Apr 2011 11:45:02 +0200
Subject: [PATCH 12/50] make the model of menu_action_id more specific
 (ir.actions.act_window)

bzr revid: rco@openerp.com-20110422094502-31v10hshi31ulpgz
---
 addons/portal/portal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 69e2ae113f8..b111d79f4b5 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -39,7 +39,7 @@ class portal(osv.osv):
             'portal_group_rel', 'portal_id', 'group_id',
             string='Other User Groups',
             help=_("Those groups are assigned to the portal's users")),
-        'menu_action_id': fields.many2one('ir.actions.actions', readonly=True,
+        'menu_action_id': fields.many2one('ir.actions.act_window', readonly=True,
             # ISSUE: 'ondelete' constraints do not seem effective on this field...
             string='Menu Action',
             help=_("If set, replaces the standard menu for the portal's users")),

From 622b95ab7ed2317dbfba762c44648d3dc066c956 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 22 Apr 2011 16:41:22 +0200
Subject: [PATCH 13/50] [IMP] first sketch of wizard to create users from
 partner contacts

bzr revid: rco@openerp.com-20110422144122-w0hq230zj8imva77
---
 addons/portal/__init__.py    |  1 +
 addons/portal/__openerp__.py |  2 +-
 addons/portal/wizard.py      | 79 ++++++++++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 addons/portal/wizard.py

diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index 0d6d510dbe6..5aea1cf958f 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -20,4 +20,5 @@
 ##############################################################################
 
 import portal
+import wizard
 
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index ca664c6b4d3..012403a1a52 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -38,7 +38,7 @@ module 'share'.
     """,
     'website': 'http://www.openerp.com',
     'demo_xml': [],
-    'data': ['portal_view.xml'],
+    'data': ['portal_view.xml', 'wizard_view.xml'],
     'installable': True,
     'certificate' : '',
 }
diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
new file mode 100644
index 00000000000..e325e407531
--- /dev/null
+++ b/addons/portal/wizard.py
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 Tiny SPRL (<http://tiny.be>).
+#
+#    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 osv import osv, fields
+from tools.translate import _
+from base.res.res_user import _lang_get
+
+
+
+class user_wizard(osv.osv_memory):
+    """
+        A wizard to create a portal user from a res.partner.address.  The use
+        case of the wizard is to provide access to a customer or supplier.
+    """
+    _name = 'res.portal.user_wizard'
+    _description = 'Portal User Wizard'
+    
+    _columns = {
+        'name': fields.char(size=64, required=True,
+            string='User Name',
+            help="The new user's real name"),
+        'login': fields.char(size=64, required=True,
+            string='Login',
+            help="Used to log into the system"),
+        'email': fields.char(size=64, required=True,
+            string='E-mail',
+            help="A welcome e-mail will be sent to the new user, "
+                 "with the necessary information to connect to OpenERP"),
+        'lang': fields.selection(_lang_get, required=True,
+            string='Language',
+            help="The language for the user's user interface"),
+        'address_id': fields.many2one('res.partner.address', readonly=True,
+            string='Address'),
+        'portal_id': fields.many2one('res.portal', required=True,
+            string='Portal',
+            help="The Portal that the new user must belong to"),
+    }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        """ define the default name, login, email, address_id from the active
+            res.partner.address record """
+        # get existing defaults
+        defs = super(user_wizard, self).default_get(cr, uid, fields, context)
+        
+        # override name, login, email, address_id, and lang
+        if context and ('active_id' in context):
+            address_obj = self.pool.get('res.partner.address')
+            address = address_obj.browse(cr, uid, context['active_id'], context)
+            defs['name'] = address.name
+            defs['login'] = address.email
+            defs['email'] = address.email
+            defs['address_id'] = address.id
+            if address.partner_id and address.partner_id.lang:
+                defs['lang'] = address.partner_id.lang
+        
+        return defs
+
+user_wizard()
+
+
+

From a89d8990c41a515029851228cfac93d72e191aca Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 22 Apr 2011 17:22:49 +0200
Subject: [PATCH 14/50] add wizard view

bzr revid: rco@openerp.com-20110422152249-wwbhp1eog44uviu7
---
 addons/portal/wizard.py       |  4 ++++
 addons/portal/wizard_view.xml | 37 +++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 addons/portal/wizard_view.xml

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index e325e407531..95fc43e78e4 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -73,6 +73,10 @@ class user_wizard(osv.osv_memory):
         
         return defs
 
+    def onchange_email(self, cr, uid, ids, email):
+        """ assign email on login """
+        return {'value': {'login': email}}
+
 user_wizard()
 
 
diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
new file mode 100644
index 00000000000..5719da7c0de
--- /dev/null
+++ b/addons/portal/wizard_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- User Wizard on res.partner.address -->
+        <act_window id="portal_user_wizard_action"
+            name="Create Portal User"
+            src_model="res.partner.address"
+            res_model="res.portal.user_wizard"
+            view_type="form" view_mode="form"
+            key2="client_action_multi" target="new"/>
+
+        <!-- user_wizard view -->
+        <record id="portal_user_wizard_view" model="ir.ui.view">
+            <field name="name">Create Portal User</field>
+            <field name="model">res.portal.user_wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create Portal User">
+                    <group colspan="2" col="2">
+                        <field name="name"/>
+                        <field name="login"/>
+                        <field name="email" widget="email"
+                            on_change="onchange_email(email)"/>
+                        <field name="lang"/>
+                        <field name="address_id"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <field name="portal_id"/>
+                    </group>
+                    <label colspan="2"/>
+                    <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                    <button string="Create User" name="proceed" type="object" icon="gtk-ok"/>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>

From 8ac55c38cb70f2966389b717cb721b8e5c4c78e0 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 26 Apr 2011 10:41:30 +0200
Subject: [PATCH 15/50] [IMP] wizard: remove field login, add email validation

bzr revid: rco@openerp.com-20110426084130-5ltcxfcx1cz3meec
---
 addons/portal/wizard.py       | 17 ++++++++++-------
 addons/portal/wizard_view.xml |  4 +---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index 95fc43e78e4..5dd8a62b0a5 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import osv, fields
+from tools.misc import email_re
 from tools.translate import _
 from base.res.res_user import _lang_get
 
@@ -37,9 +38,6 @@ class user_wizard(osv.osv_memory):
         'name': fields.char(size=64, required=True,
             string='User Name',
             help="The new user's real name"),
-        'login': fields.char(size=64, required=True,
-            string='Login',
-            help="Used to log into the system"),
         'email': fields.char(size=64, required=True,
             string='E-mail',
             help="A welcome e-mail will be sent to the new user, "
@@ -54,6 +52,10 @@ class user_wizard(osv.osv_memory):
             help="The Portal that the new user must belong to"),
     }
     
+    _constraints = [
+        (lambda self,*args: self._check_email(*args), 'Invalid email address', ['email']),
+    ]
+
     def default_get(self, cr, uid, fields, context=None):
         """ define the default name, login, email, address_id from the active
             res.partner.address record """
@@ -65,7 +67,6 @@ class user_wizard(osv.osv_memory):
             address_obj = self.pool.get('res.partner.address')
             address = address_obj.browse(cr, uid, context['active_id'], context)
             defs['name'] = address.name
-            defs['login'] = address.email
             defs['email'] = address.email
             defs['address_id'] = address.id
             if address.partner_id and address.partner_id.lang:
@@ -73,9 +74,11 @@ class user_wizard(osv.osv_memory):
         
         return defs
 
-    def onchange_email(self, cr, uid, ids, email):
-        """ assign email on login """
-        return {'value': {'login': email}}
+    def _check_email(self, cr, uid, ids):
+        """ check syntax of email address """
+        for wizard in self.browse(cr, uid, ids):
+            if not email_re.match(wizard.email): return False
+        return True
 
 user_wizard()
 
diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
index 5719da7c0de..996605d9816 100644
--- a/addons/portal/wizard_view.xml
+++ b/addons/portal/wizard_view.xml
@@ -18,9 +18,7 @@
                 <form string="Create Portal User">
                     <group colspan="2" col="2">
                         <field name="name"/>
-                        <field name="login"/>
-                        <field name="email" widget="email"
-                            on_change="onchange_email(email)"/>
+                        <field name="email"/>
                         <field name="lang"/>
                         <field name="address_id"/>
                     </group>

From 9e514bb8875d2a849804c6c4665dbbb16474a626 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 26 Apr 2011 16:59:57 +0200
Subject: [PATCH 16/50] Complete wizard to create user and send email

bzr revid: rco@openerp.com-20110426145957-gkalri0eb0sg9q60
---
 addons/portal/wizard.py       | 81 ++++++++++++++++++++++++++++++++++-
 addons/portal/wizard_view.xml |  2 +-
 2 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index 5dd8a62b0a5..3c5a5983d2d 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -19,13 +19,32 @@
 #
 ##############################################################################
 
+import logging
+import random
+
 from osv import osv, fields
-from tools.misc import email_re
+from tools.misc import email_re, email_send
 from tools.translate import _
+
 from base.res.res_user import _lang_get
 
 
 
+ROOT_UID = 1
+
+# character sets for passwords, excluding 0, O, o, 1, I, l
+_PASSU = 'ABCDEFGHIJKLMNPQRSTUVWXYZ'
+_PASSL = 'abcdefghijkmnpqrstuvwxyz'
+_PASSD = '23456789'
+
+def random_password():
+    # get 3 uppercase letters, 3 lowercase letters, 2 digits, and shuffle them
+    chars = map(random.choice, [_PASSU] * 3 + [_PASSL] * 3 + [_PASSD] * 2)
+    random.shuffle(chars)
+    return ''.join(chars)
+
+
+
 class user_wizard(osv.osv_memory):
     """
         A wizard to create a portal user from a res.partner.address.  The use
@@ -54,6 +73,7 @@ class user_wizard(osv.osv_memory):
     
     _constraints = [
         (lambda self,*args: self._check_email(*args), 'Invalid email address', ['email']),
+        (lambda self,*args: self._check_exist(*args), 'User login already exists', ['email']),
     ]
 
     def default_get(self, cr, uid, fields, context=None):
@@ -80,6 +100,65 @@ class user_wizard(osv.osv_memory):
             if not email_re.match(wizard.email): return False
         return True
 
+    def _check_exist(self, cr, uid, ids):
+        """ check whether login (email) already in use """
+        user_obj = self.pool.get('res.users')
+        for wizard in self.browse(cr, uid, ids):
+            condition = [('login', '=', wizard.email)]
+            if user_obj.search(cr, ROOT_UID, condition): return False
+        return True
+
+    def do_create(self, cr, uid, ids, context=None):
+        """ create a new user in the portal, and notify them by email """
+        # we copy the context to change the language for translating emails
+        context0 = context or {}
+        context = context0.copy()
+        
+        user = self.pool.get('res.users').browse(cr, ROOT_UID, uid, context0)
+        if not user.user_email:
+            raise osv.except_osv(_('Email required'),
+                _('You must have an email address in your User Preferences'
+                  ' to send emails.'))
+        
+        portal_obj = self.pool.get('res.portal')
+        for wizard in self.browse(cr, uid, ids, context):
+            # add a new user in wizard.portal_id
+            user_values = {
+                'name': wizard.name,
+                'login': wizard.email,
+                'password': random_password(),
+                'user_email': wizard.email,
+                'address_id': wizard.address_id.id,
+                'context_lang': wizard.lang,
+            }
+            values = {'users': [(0, 0, user_values)]}
+            portal_obj.write(cr, ROOT_UID, [wizard.portal_id.id], values, context0)
+            
+            # send email to new user (translated in language of new user)
+            context['lang'] = user_values['context_lang']
+            user_values['dbname'] = cr.dbname
+            user_values['url'] = "(missing url)"
+            
+            email_to = user_values['user_email']
+            subject = _("Your OpenERP account at %s") % user.company_id.name
+            body = _(
+                "Dear %(name)s,\n\n"
+                "You have been created an OpenERP account at %(url)s.\n\n"
+                "Your login account data is:\n"
+                "Database: %(dbname)s\n"
+                "User:     %(login)s\n"
+                "Password: %(password)s\n\n"
+                "--\n"
+                "OpenERP - Open Source Business Applications\n"
+                "http://www.openerp.com\n"
+                ) % user_values
+            res = email_send(user.user_email, [email_to], subject, body)
+            if not res:
+                logging.getLogger('res.portal.user_wizard').warning(
+                    'Failed to send email from %s to %s', user.user_email, email_to)
+
+        return {}
+
 user_wizard()
 
 
diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
index 996605d9816..f77d55f363f 100644
--- a/addons/portal/wizard_view.xml
+++ b/addons/portal/wizard_view.xml
@@ -27,7 +27,7 @@
                     </group>
                     <label colspan="2"/>
                     <button string="Cancel" special="cancel" icon="gtk-cancel"/>
-                    <button string="Create User" name="proceed" type="object" icon="gtk-ok"/>
+                    <button string="Create User" name="do_create" type="object" icon="gtk-ok"/>
                 </form>
             </field>
         </record>

From dc4e6b6f5ab2d3f8f303bb0cdef5ad3edab7ae79 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 27 Apr 2011 09:53:06 +0200
Subject: [PATCH 17/50] [IMP] add user wizard on res.partner

bzr revid: rco@openerp.com-20110427075306-ns4tpzooswvuz0ma
---
 addons/portal/wizard.py       | 25 ++++++++++++++++++-------
 addons/portal/wizard_view.xml | 14 +++++++++++---
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index 3c5a5983d2d..7d91cf52b45 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -77,20 +77,31 @@ class user_wizard(osv.osv_memory):
     ]
 
     def default_get(self, cr, uid, fields, context=None):
-        """ define the default name, login, email, address_id from the active
-            res.partner.address record """
+        """ determine default name, email, address_id and lang from the active
+            record """
         # get existing defaults
         defs = super(user_wizard, self).default_get(cr, uid, fields, context)
         
-        # override name, login, email, address_id, and lang
-        if context and ('active_id' in context):
+        # determine a res.partner.address depending on current context
+        address = None
+        if context.get('active_model') == 'res.partner.address':
             address_obj = self.pool.get('res.partner.address')
-            address = address_obj.browse(cr, uid, context['active_id'], context)
+            address = address_obj.browse(cr, uid, context.get('active_id'), context)
+        
+        elif context.get('active_model') == 'res.partner':
+            partner_obj = self.pool.get('res.partner')
+            partner = partner_obj.browse(cr, uid, context.get('active_id'), context)
+            if partner and partner.address:
+                # take default address if present, or any address otherwise
+                addresses = filter(lambda a: a.type == 'default', partner.address)
+                address = addresses[0] if addresses else partner.address[0]
+        
+        # override name, email, address_id, and lang
+        if address:
             defs['name'] = address.name
             defs['email'] = address.email
             defs['address_id'] = address.id
-            if address.partner_id and address.partner_id.lang:
-                defs['lang'] = address.partner_id.lang
+            defs['lang'] = address.partner_id and address.partner_id.lang
         
         return defs
 
diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
index f77d55f363f..cefd311ab5e 100644
--- a/addons/portal/wizard_view.xml
+++ b/addons/portal/wizard_view.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- User Wizard on res.partner.address -->
-        <act_window id="portal_user_wizard_action"
+        <!-- wizard action on res.partner -->
+        <act_window id="partner_user_wizard_action"
+            name="Create Portal User"
+            src_model="res.partner"
+            res_model="res.portal.user_wizard"
+            view_type="form" view_mode="form"
+            key2="client_action_multi" target="new"/>
+
+        <!-- wizard action on res.partner.address -->
+        <act_window id="address_user_wizard_action"
             name="Create Portal User"
             src_model="res.partner.address"
             res_model="res.portal.user_wizard"
@@ -10,7 +18,7 @@
             key2="client_action_multi" target="new"/>
 
         <!-- user_wizard view -->
-        <record id="portal_user_wizard_view" model="ir.ui.view">
+        <record id="user_wizard_view" model="ir.ui.view">
             <field name="name">Create Portal User</field>
             <field name="model">res.portal.user_wizard</field>
             <field name="type">form</field>

From 3e9d143d549db66049ad539fa33e16b36cb4ad69 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 27 Apr 2011 10:25:38 +0200
Subject: [PATCH 18/50] [FIX] remove useless translations

bzr revid: rco@openerp.com-20110427082538-lw1mcsejsk0lp94a
---
 addons/portal/portal.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index b111d79f4b5..948a0fa6316 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -20,7 +20,8 @@
 ##############################################################################
 
 from osv import osv, fields
-from tools.translate import _
+
+
 
 class portal(osv.osv):
     """
@@ -34,21 +35,21 @@ class portal(osv.osv):
     _columns = {
         'group_id': fields.many2one('res.groups', required=True, ondelete='cascade',
             string='Group',
-            help=_('The group extended by this portal')),
+            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")),
+            help="Those groups are assigned to the portal's users"),
         'menu_action_id': fields.many2one('ir.actions.act_window', readonly=True,
             # ISSUE: 'ondelete' constraints do not seem effective on this field...
             string='Menu Action',
-            help=_("If set, replaces the standard menu for the portal's users")),
+            help="If set, replaces the standard menu for the portal's users"),
         'parent_menu_id': fields.many2one('ir.ui.menu', ondelete='restrict',
             string='Parent Menu',
-            help=_('The menu action opens the submenus of this menu item')),
+            help='The menu action opens the submenus of this menu item'),
         'widget_ids': fields.one2many('res.portal.widget', 'portal_id',
             string='Widgets',
-            help=_('Widgets assigned to portal users')),
+            help='Widgets assigned to portal users'),
     }
     
     def copy(self, cr, uid, id, values, context=None):
@@ -192,7 +193,7 @@ class portal_override_menu(osv.osv):
         'override_menu': fields.function(
             _get_override_menu, fnct_inv=_set_override_menu,
             type='boolean', method=True, string='Override Users Menu Action',
-            help=_('Enable this option to create the Menu Action')),
+            help='Enable this option to create the Menu Action'),
     }
 
 portal_override_menu()

From fe091f2af1dddb204b1d1c760bda8c3c02a0c9ae Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 27 Apr 2011 12:26:55 +0200
Subject: [PATCH 19/50] [IMP] extend wizard to create several users

bzr revid: rco@openerp.com-20110427102655-lxve6401uljqik0k
---
 addons/portal/wizard.py       | 224 +++++++++++++++++++---------------
 addons/portal/wizard_view.xml |  59 ++++++---
 2 files changed, 170 insertions(+), 113 deletions(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index 7d91cf52b45..bed9204bcc9 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -45,65 +45,141 @@ def random_password():
 
 
 
-class user_wizard(osv.osv_memory):
+class wizard(osv.osv_memory):
     """
-        A wizard to create a portal user from a res.partner.address.  The use
-        case of the wizard is to provide access to a customer or supplier.
+        A wizard to create portal users from instances of either 'res.partner'
+        or 'res.partner.address'.  The purpose is to provide an OpenERP database
+        access to customers or suppliers.
     """
-    _name = 'res.portal.user_wizard'
-    _description = 'Portal User Wizard'
+    _name = 'res.portal.wizard'
+    _description = 'Portal Wizard'
     
     _columns = {
+        'portal_id': fields.many2one('res.portal', required=True,
+            string='Portal',
+            help="The portal where new users must be added"),
+        'user_ids': fields.one2many('res.portal.wizard.user', 'wizard_id',
+            string='Users'),
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        """ determine user configs from the active records """
+        # get existing defaults
+        defs = super(wizard, self).default_get(cr, uid, fields, context)
+        
+        # determine relevant res.partner.address(es) depending on context
+        addresses = []
+        if context.get('active_model') == 'res.partner.address':
+            address_obj = self.pool.get('res.partner.address')
+            address_ids = context.get('active_ids', [])
+            addresses = address_obj.browse(cr, uid, address_ids, context)
+        elif context.get('active_model') == 'res.partner':
+            partner_obj = self.pool.get('res.partner')
+            partner_ids = context.get('active_ids', [])
+            partners = partner_obj.browse(cr, uid, partner_ids, context)
+            for p in partners:
+                if p.address:
+                    # take default address if present, or any address otherwise
+                    good = filter(lambda a: a.type == 'default', p.address)
+                    addresses.append(good[0] if good else p.address[0])
+        
+        # create user configs based on these addresses
+        defs['user_ids'] = []
+        for address in addresses:
+            user_data = {
+                'name': address.name,
+                'email': address.email,
+                'lang': address.partner_id and address.partner_id.lang,
+                'address_id': address.id,
+            }
+            defs['user_ids'].append(user_data)
+        
+        return defs
+
+    def do_create(self, cr, uid, ids, context=None):
+        """ create new users in portal(s), and notify them by email """
+        # we copy the context to change the language for translating emails
+        context0 = context or {}
+        context = context0.copy()
+        
+        user = self.pool.get('res.users').browse(cr, ROOT_UID, uid, context0)
+        if not user.user_email:
+            raise osv.except_osv(_('Email required'),
+                _('You must have an email address in your User Preferences'
+                  ' to send emails.'))
+        email_from = user.user_email
+        company_name = user.company_id.name
+        
+        portal_obj = self.pool.get('res.portal')
+        for wiz in self.browse(cr, uid, ids, context):
+            # add new users in portal
+            users_data = [ {
+                    'name': u.name,
+                    'login': u.email,
+                    'password': random_password(),
+                    'user_email': u.email,
+                    'context_lang': u.lang,
+                    'address_id': u.address_id.id,
+                } for u in wiz.user_ids ]
+            portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
+                {'users': [(0, 0, data) for data in users_data]}, context0)
+            
+            # send email to new users (translated in their language)
+            for data in users_data:
+                context['lang'] = data['context_lang']
+                data['dbname'] = cr.dbname
+                data['url'] = "(missing url)"
+                
+                email_to = data['user_email']
+                subject = _("Your OpenERP account at %s") % company_name
+                body = _(
+                    "Dear %(name)s,\n\n"
+                    "You have been created an OpenERP account at %(url)s.\n\n"
+                    "Your login account data is:\n"
+                    "Database: %(dbname)s\n"
+                    "User:     %(login)s\n"
+                    "Password: %(password)s\n\n"
+                    "--\n"
+                    "OpenERP - Open Source Business Applications\n"
+                    "http://www.openerp.com\n"
+                    ) % data
+                res = email_send(email_from, [email_to], subject, body)
+                if not res:
+                    logging.getLogger('res.portal.wizard').warning(
+                        'Failed to send email from %s to %s', email_from, email_to)
+        
+        return {}
+
+wizard()
+
+
+
+class wizard_user(osv.osv_memory):
+    """
+        A model to configure users in the portal wizard.
+    """
+    _name = 'res.portal.wizard.user'
+    _description = 'Portal User Config'
+    
+    _columns = {
+        'wizard_id': fields.many2one('res.portal.wizard', required=True,
+            string='Wizard'),
         'name': fields.char(size=64, required=True,
             string='User Name',
-            help="The new user's real name"),
+            help="The user's real name"),
         'email': fields.char(size=64, required=True,
             string='E-mail',
-            help="A welcome e-mail will be sent to the new user, "
-                 "with the necessary information to connect to OpenERP"),
+            help="Will be used as user login.  "  
+                 "Also necessary to send the account information to new users"),
         'lang': fields.selection(_lang_get, required=True,
             string='Language',
             help="The language for the user's user interface"),
-        'address_id': fields.many2one('res.partner.address', readonly=True,
+        'address_id': fields.many2one('res.partner.address', required=True,
             string='Address'),
-        'portal_id': fields.many2one('res.portal', required=True,
-            string='Portal',
-            help="The Portal that the new user must belong to"),
+        'partner_id': fields.related('address_id', 'partner_id',
+            type='many2one', relation='res.partner', readonly=True,
+            string='Partner'),
     }
-    
-    _constraints = [
-        (lambda self,*args: self._check_email(*args), 'Invalid email address', ['email']),
-        (lambda self,*args: self._check_exist(*args), 'User login already exists', ['email']),
-    ]
-
-    def default_get(self, cr, uid, fields, context=None):
-        """ determine default name, email, address_id and lang from the active
-            record """
-        # get existing defaults
-        defs = super(user_wizard, self).default_get(cr, uid, fields, context)
-        
-        # determine a res.partner.address depending on current context
-        address = None
-        if context.get('active_model') == 'res.partner.address':
-            address_obj = self.pool.get('res.partner.address')
-            address = address_obj.browse(cr, uid, context.get('active_id'), context)
-        
-        elif context.get('active_model') == 'res.partner':
-            partner_obj = self.pool.get('res.partner')
-            partner = partner_obj.browse(cr, uid, context.get('active_id'), context)
-            if partner and partner.address:
-                # take default address if present, or any address otherwise
-                addresses = filter(lambda a: a.type == 'default', partner.address)
-                address = addresses[0] if addresses else partner.address[0]
-        
-        # override name, email, address_id, and lang
-        if address:
-            defs['name'] = address.name
-            defs['email'] = address.email
-            defs['address_id'] = address.id
-            defs['lang'] = address.partner_id and address.partner_id.lang
-        
-        return defs
 
     def _check_email(self, cr, uid, ids):
         """ check syntax of email address """
@@ -119,58 +195,12 @@ class user_wizard(osv.osv_memory):
             if user_obj.search(cr, ROOT_UID, condition): return False
         return True
 
-    def do_create(self, cr, uid, ids, context=None):
-        """ create a new user in the portal, and notify them by email """
-        # we copy the context to change the language for translating emails
-        context0 = context or {}
-        context = context0.copy()
-        
-        user = self.pool.get('res.users').browse(cr, ROOT_UID, uid, context0)
-        if not user.user_email:
-            raise osv.except_osv(_('Email required'),
-                _('You must have an email address in your User Preferences'
-                  ' to send emails.'))
-        
-        portal_obj = self.pool.get('res.portal')
-        for wizard in self.browse(cr, uid, ids, context):
-            # add a new user in wizard.portal_id
-            user_values = {
-                'name': wizard.name,
-                'login': wizard.email,
-                'password': random_password(),
-                'user_email': wizard.email,
-                'address_id': wizard.address_id.id,
-                'context_lang': wizard.lang,
-            }
-            values = {'users': [(0, 0, user_values)]}
-            portal_obj.write(cr, ROOT_UID, [wizard.portal_id.id], values, context0)
-            
-            # send email to new user (translated in language of new user)
-            context['lang'] = user_values['context_lang']
-            user_values['dbname'] = cr.dbname
-            user_values['url'] = "(missing url)"
-            
-            email_to = user_values['user_email']
-            subject = _("Your OpenERP account at %s") % user.company_id.name
-            body = _(
-                "Dear %(name)s,\n\n"
-                "You have been created an OpenERP account at %(url)s.\n\n"
-                "Your login account data is:\n"
-                "Database: %(dbname)s\n"
-                "User:     %(login)s\n"
-                "Password: %(password)s\n\n"
-                "--\n"
-                "OpenERP - Open Source Business Applications\n"
-                "http://www.openerp.com\n"
-                ) % user_values
-            res = email_send(user.user_email, [email_to], subject, body)
-            if not res:
-                logging.getLogger('res.portal.user_wizard').warning(
-                    'Failed to send email from %s to %s', user.user_email, email_to)
+    _constraints = [
+        (_check_email, 'Invalid email address', ['email']),
+        (_check_exist, 'User login already exists', ['email']),
+    ]
 
-        return {}
-
-user_wizard()
+wizard_user()
 
 
 
diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
index cefd311ab5e..dbc48a6979e 100644
--- a/addons/portal/wizard_view.xml
+++ b/addons/portal/wizard_view.xml
@@ -2,40 +2,67 @@
 <openerp>
     <data>
         <!-- wizard action on res.partner -->
-        <act_window id="partner_user_wizard_action"
-            name="Create Portal User"
+        <act_window id="partner_wizard_action"
+            name="Create Portal Users"
             src_model="res.partner"
-            res_model="res.portal.user_wizard"
+            res_model="res.portal.wizard"
             view_type="form" view_mode="form"
             key2="client_action_multi" target="new"/>
 
         <!-- wizard action on res.partner.address -->
-        <act_window id="address_user_wizard_action"
-            name="Create Portal User"
+        <act_window id="address_wizard_action"
+            name="Create Portal Users"
             src_model="res.partner.address"
-            res_model="res.portal.user_wizard"
+            res_model="res.portal.wizard"
             view_type="form" view_mode="form"
             key2="client_action_multi" target="new"/>
 
-        <!-- user_wizard view -->
-        <record id="user_wizard_view" model="ir.ui.view">
-            <field name="name">Create Portal User</field>
-            <field name="model">res.portal.user_wizard</field>
+        <!-- wizard view -->
+        <record id="wizard_view" model="ir.ui.view">
+            <field name="name">Create Portal Users</field>
+            <field name="model">res.portal.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create Portal User">
+                <form string="Create Portal Users">
+                    <field name="portal_id" colspan="4"/>
+                    <field name="user_ids" nolabel="1" colspan="4"/>
+                    <label colspan="2"/>
+                    <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                    <button string="Create Users" name="do_create" type="object" icon="gtk-ok"/>
+                </form>
+            </field>
+        </record>
+
+        <!-- wizard user list view -->
+        <record id="wizard_user_tree_view" model="ir.ui.view">
+            <field name="name">Portal Users</field>
+            <field name="model">res.portal.wizard.user</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Portal Users">
+                    <field name="name"/>
+                    <field name="email"/>
+                    <field name="partner_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- wizard user form view -->
+        <record id="wizard_user_form_view" model="ir.ui.view">
+            <field name="name">Portal User</field>
+            <field name="model">res.portal.wizard.user</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Portal User">
                     <group colspan="2" col="2">
                         <field name="name"/>
                         <field name="email"/>
                         <field name="lang"/>
-                        <field name="address_id"/>
                     </group>
                     <group colspan="2" col="2">
-                        <field name="portal_id"/>
+                        <field name="address_id"/>
+                        <field name="partner_id"/>
                     </group>
-                    <label colspan="2"/>
-                    <button string="Cancel" special="cancel" icon="gtk-cancel"/>
-                    <button string="Create User" name="do_create" type="object" icon="gtk-ok"/>
                 </form>
             </field>
         </record>

From 45d2baec5ce574a2a789324298113787039d1d22 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 27 Apr 2011 14:57:58 +0200
Subject: [PATCH 20/50] Small fix in field help

bzr revid: rco@openerp.com-20110427125758-otxnxs6qng682m4e
---
 addons/portal/wizard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index bed9204bcc9..794882730c1 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -57,7 +57,7 @@ class wizard(osv.osv_memory):
     _columns = {
         'portal_id': fields.many2one('res.portal', required=True,
             string='Portal',
-            help="The portal where new users must be added"),
+            help="The portal in which new users must be added"),
         'user_ids': fields.one2many('res.portal.wizard.user', 'wizard_id',
             string='Users'),
     }

From 72714ec312de69d62d5e0d34e44d9a009d00d68d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 27 Apr 2011 16:48:23 +0200
Subject: [PATCH 21/50] use _defaults instead of default_get for initializing
 wizard users

bzr revid: rco@openerp.com-20110427144823-5ehmjkq8e712zbqc
---
 addons/portal/wizard.py       | 30 +++++++++++++-----------------
 addons/portal/wizard_view.xml |  3 ++-
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index 794882730c1..3856821df4c 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -61,12 +61,12 @@ class wizard(osv.osv_memory):
         'user_ids': fields.one2many('res.portal.wizard.user', 'wizard_id',
             string='Users'),
     }
+    _defaults = {
+        'user_ids': (lambda self, *args: self._default_user_ids(*args))
+    }
 
-    def default_get(self, cr, uid, fields, context=None):
-        """ determine user configs from the active records """
-        # get existing defaults
-        defs = super(wizard, self).default_get(cr, uid, fields, context)
-        
+    def _default_user_ids(self, cr, uid, context):
+        """ determine default user_ids from the active records """
         # determine relevant res.partner.address(es) depending on context
         addresses = []
         if context.get('active_model') == 'res.partner.address':
@@ -84,19 +84,15 @@ class wizard(osv.osv_memory):
                     addresses.append(good[0] if good else p.address[0])
         
         # create user configs based on these addresses
-        defs['user_ids'] = []
-        for address in addresses:
-            user_data = {
-                'name': address.name,
-                'email': address.email,
-                'lang': address.partner_id and address.partner_id.lang,
-                'address_id': address.id,
-            }
-            defs['user_ids'].append(user_data)
-        
-        return defs
+        user_data = lambda address: {
+                        'name': address.name,
+                        'email': address.email,
+                        'lang': address.partner_id and address.partner_id.lang,
+                        'address_id': address.id,
+                    }
+        return map(user_data, addresses)
 
-    def do_create(self, cr, uid, ids, context=None):
+    def action_create(self, cr, uid, ids, context=None):
         """ create new users in portal(s), and notify them by email """
         # we copy the context to change the language for translating emails
         context0 = context or {}
diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
index dbc48a6979e..5c3b095aa1e 100644
--- a/addons/portal/wizard_view.xml
+++ b/addons/portal/wizard_view.xml
@@ -28,7 +28,8 @@
                     <field name="user_ids" nolabel="1" colspan="4"/>
                     <label colspan="2"/>
                     <button string="Cancel" special="cancel" icon="gtk-cancel"/>
-                    <button string="Create Users" name="do_create" type="object" icon="gtk-ok"/>
+                    <button string="Create Users"
+                        name="action_create" type="object" icon="gtk-ok"/>
                 </form>
             </field>
         </record>

From 1d2749a3d70ff1beab1eb9d221135fd25ead59b8 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 28 Apr 2011 09:02:02 +0200
Subject: [PATCH 22/50] improve a variable name

bzr revid: rco@openerp.com-20110428070202-0w5iwofu1noyi2wc
---
 addons/portal/wizard.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index 3856821df4c..fbd78e2a988 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -80,8 +80,8 @@ class wizard(osv.osv_memory):
             for p in partners:
                 if p.address:
                     # take default address if present, or any address otherwise
-                    good = filter(lambda a: a.type == 'default', p.address)
-                    addresses.append(good[0] if good else p.address[0])
+                    def_addrs = filter(lambda a: a.type == 'default', p.address)
+                    addresses.append(def_addrs[0] if def_addrs else p.address[0])
         
         # create user configs based on these addresses
         user_data = lambda address: {

From 93f6b18737826eec903b91f89fd320e5acc3d6a0 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 28 Apr 2011 11:33:07 +0200
Subject: [PATCH 23/50] [FIX] make the wizard work in the web client

bzr revid: rco@openerp.com-20110428093307-p1ihuh1s8td2pljt
---
 addons/portal/wizard.py       | 2 +-
 addons/portal/wizard_view.xml | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index fbd78e2a988..e961e890d64 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -144,7 +144,7 @@ class wizard(osv.osv_memory):
                     logging.getLogger('res.portal.wizard').warning(
                         'Failed to send email from %s to %s', email_from, email_to)
         
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 wizard()
 
diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
index 5c3b095aa1e..86a789e760c 100644
--- a/addons/portal/wizard_view.xml
+++ b/addons/portal/wizard_view.xml
@@ -40,9 +40,12 @@
             <field name="model">res.portal.wizard.user</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Portal Users">
+                <!-- the attribute 'editable' is set below to make the elements
+                     editable in the web client 6.0 -->
+                <tree string="Portal Users" editable="bottom">
                     <field name="name"/>
                     <field name="email"/>
+                    <field name="lang"/>
                     <field name="partner_id"/>
                 </tree>
             </field>

From 5de01d9e8cf82d8306c3334870de177d856a9422 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 28 Apr 2011 15:17:22 +0200
Subject: [PATCH 24/50] [IMP] move email template outside method code

bzr revid: rco@openerp.com-20110428131722-gjtmobkvuai3b7v2
---
 addons/portal/wizard.py | 44 +++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index e961e890d64..10e26ea4ae3 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -30,6 +30,22 @@ from base.res.res_user import _lang_get
 
 
 
+# welcome email sent to new portal users
+WELCOME_EMAIL_SUBJECT = u"Your OpenERP account at %(company)s"
+WELCOME_EMAIL_BODY = u"""Dear %(name)s,
+
+You have been created an OpenERP account at %(url)s.
+
+Your login account data is:
+Database: %(db)s
+User:     %(login)s
+Password: %(password)s
+
+--
+OpenERP - Open Source Business Applications
+http://www.openerp.com
+"""
+
 ROOT_UID = 1
 
 # character sets for passwords, excluding 0, O, o, 1, I, l
@@ -103,42 +119,32 @@ class wizard(osv.osv_memory):
             raise osv.except_osv(_('Email required'),
                 _('You must have an email address in your User Preferences'
                   ' to send emails.'))
-        email_from = user.user_email
-        company_name = user.company_id.name
         
         portal_obj = self.pool.get('res.portal')
         for wiz in self.browse(cr, uid, ids, context):
-            # add new users in portal
-            users_data = [ {
+            # create new users in portal
+            users_values = [ (0, 0, {
                     'name': u.name,
                     'login': u.email,
                     'password': random_password(),
                     'user_email': u.email,
                     'context_lang': u.lang,
                     'address_id': u.address_id.id,
-                } for u in wiz.user_ids ]
+                }) for u in wiz.user_ids ]
             portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
-                {'users': [(0, 0, data) for data in users_data]}, context0)
+                {'users': users_values}, context0)
             
             # send email to new users (translated in their language)
             for data in users_data:
                 context['lang'] = data['context_lang']
-                data['dbname'] = cr.dbname
+                data['company'] = user.company_id.name
+                data['db'] = cr.dbname
                 data['url'] = "(missing url)"
                 
+                email_from = user.user_email
                 email_to = data['user_email']
-                subject = _("Your OpenERP account at %s") % company_name
-                body = _(
-                    "Dear %(name)s,\n\n"
-                    "You have been created an OpenERP account at %(url)s.\n\n"
-                    "Your login account data is:\n"
-                    "Database: %(dbname)s\n"
-                    "User:     %(login)s\n"
-                    "Password: %(password)s\n\n"
-                    "--\n"
-                    "OpenERP - Open Source Business Applications\n"
-                    "http://www.openerp.com\n"
-                    ) % data
+                subject = _(WELCOME_EMAIL_SUBJECT) % data
+                body = _(WELCOME_EMAIL_BODY) % data
                 res = email_send(email_from, [email_to], subject, body)
                 if not res:
                     logging.getLogger('res.portal.wizard').warning(

From b8cb4dc8a575136718772e2274bb712113019f49 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 28 Apr 2011 15:52:27 +0200
Subject: [PATCH 25/50] [FIX] ensure that the mail template is exported for
 translation

bzr revid: rco@openerp.com-20110428135227-9sa52eeal63xqofz
---
 addons/portal/wizard.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index 10e26ea4ae3..7c5660097a7 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -30,9 +30,10 @@ from base.res.res_user import _lang_get
 
 
 
-# welcome email sent to new portal users
-WELCOME_EMAIL_SUBJECT = u"Your OpenERP account at %(company)s"
-WELCOME_EMAIL_BODY = u"""Dear %(name)s,
+# welcome email sent to new portal users (note that calling tools.translate._
+# has no effect except exporting those strings for translation)
+WELCOME_EMAIL_SUBJECT = _("Your OpenERP account at %(company)s")
+WELCOME_EMAIL_BODY = _("""Dear %(name)s,
 
 You have been created an OpenERP account at %(url)s.
 
@@ -44,7 +45,7 @@ Password: %(password)s
 --
 OpenERP - Open Source Business Applications
 http://www.openerp.com
-"""
+""")
 
 ROOT_UID = 1
 

From fd7a70ac93e5243e533fff226f8e0bb5866fc185 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Apr 2011 08:55:31 +0200
Subject: [PATCH 26/50] [FIX] fixed field name, and add exception for Admin
 user

bzr revid: rco@openerp.com-20110429065531-045aqfr66uy6omhp
---
 addons/portal/portal.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 948a0fa6316..cab2439cfb7 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -124,7 +124,7 @@ class portal(osv.osv):
             # 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]
+            user_ids = [u.id for u in p.users if u.id != 1]
             user_obj.write(cr, uid, user_ids, user_values, context)
 
     def _assign_widgets(self, cr, uid, ids, context=None):
@@ -133,7 +133,7 @@ class portal(osv.osv):
         for p in self.browse(cr, uid, ids, context):
             for w in p.widget_ids:
                 values = {'sequence': w.sequence, 'widget_id': w.widget_id.id}
-                for u in p.user_ids:
+                for u in p.users:
                     if u.id == 1: continue
                     values['user_id'] = u.id
                     widget_user_obj.create(cr, uid, values, context)

From 71c93bbe1378004e7f6bde475e4f02af7e7e01b4 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Apr 2011 09:11:47 +0200
Subject: [PATCH 27/50] [FIX] fixed local variable for subsequent usage

bzr revid: rco@openerp.com-20110429071147-b2043hv0jsf9jgtn
---
 addons/portal/wizard.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index 7c5660097a7..959158ded40 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -124,16 +124,16 @@ class wizard(osv.osv_memory):
         portal_obj = self.pool.get('res.portal')
         for wiz in self.browse(cr, uid, ids, context):
             # create new users in portal
-            users_values = [ (0, 0, {
+            users_data = [ {
                     'name': u.name,
                     'login': u.email,
                     'password': random_password(),
                     'user_email': u.email,
                     'context_lang': u.lang,
                     'address_id': u.address_id.id,
-                }) for u in wiz.user_ids ]
+                } for u in wiz.user_ids ]
             portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
-                {'users': users_values}, context0)
+                {'users': [(0, 0, data) for data in users_data]}, context0)
             
             # send email to new users (translated in their language)
             for data in users_data:

From 9a34f0341d0bbd8390f47c85e53da4c1540ab579 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Apr 2011 10:03:50 +0200
Subject: [PATCH 28/50] [ADD] groups Portal Manager / Officer, and their access
 controls

bzr revid: rco@openerp.com-20110429080350-idajhra8g2i5o2dn
---
 addons/portal/__openerp__.py               |  5 ++++-
 addons/portal/security/ir.model.access.csv |  7 +++++++
 addons/portal/security/portal_security.xml | 13 +++++++++++++
 addons/portal/wizard_view.xml              |  6 ++++--
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 addons/portal/security/ir.model.access.csv
 create mode 100644 addons/portal/security/portal_security.xml

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 012403a1a52..eb6d9405a92 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -38,7 +38,10 @@ module 'share'.
     """,
     'website': 'http://www.openerp.com',
     'demo_xml': [],
-    'data': ['portal_view.xml', 'wizard_view.xml'],
+    'data': [
+        'security/portal_security.xml', 'security/ir.model.access.csv',
+        'portal_view.xml', 'wizard_view.xml',
+    ],
     'installable': True,
     'certificate' : '',
 }
diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
new file mode 100644
index 00000000000..343b051c72d
--- /dev/null
+++ b/addons/portal/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_all","access.portal.all","model_res_portal",,1,0,0,0
+"access_widget_all","access.portal.widget.all","model_res_portal_widget",,1,0,0,0
+"access_manager","access.portal.manager","model_res_portal","group_portal_manager",1,1,1,1
+"access_widget_manager","access.portal.widget.manager","model_res_portal_widget","group_portal_manager",1,1,1,1
+"access_wizard_officer","access.portal.wizard.officer","model_res_portal_wizard","group_portal_officer",1,1,1,1
+"access_wizard_user_officer","access.portal.wizard.user.officer","model_res_portal_wizard_user","group_portal_officer",1,1,1,1
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
new file mode 100644
index 00000000000..015a390cdae
--- /dev/null
+++ b/addons/portal/security/portal_security.xml
@@ -0,0 +1,13 @@
+<?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>
+    </data>
+</openerp>
diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
index 86a789e760c..bd7a8b553a0 100644
--- a/addons/portal/wizard_view.xml
+++ b/addons/portal/wizard_view.xml
@@ -7,7 +7,8 @@
             src_model="res.partner"
             res_model="res.portal.wizard"
             view_type="form" view_mode="form"
-            key2="client_action_multi" target="new"/>
+            key2="client_action_multi" target="new"
+            groups="group_portal_officer"/>
 
         <!-- wizard action on res.partner.address -->
         <act_window id="address_wizard_action"
@@ -15,7 +16,8 @@
             src_model="res.partner.address"
             res_model="res.portal.wizard"
             view_type="form" view_mode="form"
-            key2="client_action_multi" target="new"/>
+            key2="client_action_multi" target="new"
+            groups="group_portal_officer"/>
 
         <!-- wizard view -->
         <record id="wizard_view" model="ir.ui.view">

From 11e1f4bca22c0a36663845ba9c67630516bc718a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Apr 2011 11:08:56 +0200
Subject: [PATCH 29/50] [FIX] hack in ir.ui.menu for web client 6.0

bzr revid: rco@openerp.com-20110429090856-wlng0lhq1x6vvn8u
---
 addons/portal/__init__.py   |  1 +
 addons/portal/ir_ui_menu.py | 54 +++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 addons/portal/ir_ui_menu.py

diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index 5aea1cf958f..4a16a77503c 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -21,4 +21,5 @@
 
 import portal
 import wizard
+import ir_ui_menu
 
diff --git a/addons/portal/ir_ui_menu.py b/addons/portal/ir_ui_menu.py
new file mode 100644
index 00000000000..210a305aef5
--- /dev/null
+++ b/addons/portal/ir_ui_menu.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 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 osv import osv, fields
+from tools.safe_eval import safe_eval
+
+class portal_menu(osv.osv):
+    """
+        Fix menu class to customize the login search for menus,
+        as web client 6.0 does not support the menu action properly yet
+    """
+    _name = 'ir.ui.menu'
+    _inherit = 'ir.ui.menu'
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
+        
+        # if the user belongs to a portal, we have to rewrite any search on the
+        # top menus to be under the portal's parent menu
+        if not context.get('ir.ui.menu.full_list') and uid != 1 and \
+                args == [('parent_id', '=', False)]:
+            portal_obj = self.pool.get('res.portal')
+            portal_ids = portal_obj.search(cr, uid, [('users', 'in', uid)])
+            if portal_ids:
+                assert len(portal_ids) == 1
+                p = portal_obj.browse(cr, uid, portal_ids[0])
+                # if the portal overrides the menu, use its domain
+                if p.menu_action_id:
+                    args = safe_eval(p.menu_action_id.domain)
+        
+        return super(portal_menu, self).search(cr, uid, args, offset=offset,
+                    limit=limit, order=order, context=context, count=count)
+
+portal_menu()
+

From 1838d7b451f47ec3584906580a5871d53fd4c13a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 2 May 2011 09:44:08 +0200
Subject: [PATCH 30/50] [IMP] log warning when user belonging to several
 portals

bzr revid: rco@openerp.com-20110502074408-hxb7i1eees8ezfp8
---
 addons/portal/ir_ui_menu.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/portal/ir_ui_menu.py b/addons/portal/ir_ui_menu.py
index 210a305aef5..a4fe364a4fd 100644
--- a/addons/portal/ir_ui_menu.py
+++ b/addons/portal/ir_ui_menu.py
@@ -19,6 +19,8 @@
 #
 ##############################################################################
 
+import logging
+
 from osv import osv, fields
 from tools.safe_eval import safe_eval
 
@@ -41,7 +43,9 @@ class portal_menu(osv.osv):
             portal_obj = self.pool.get('res.portal')
             portal_ids = portal_obj.search(cr, uid, [('users', 'in', uid)])
             if portal_ids:
-                assert len(portal_ids) == 1
+                if len(portal_ids) > 1:
+                    log = logging.getLogger('ir.ui.menu')
+                    log.warning('User %s belongs to several portals', str(uid))
                 p = portal_obj.browse(cr, uid, portal_ids[0])
                 # if the portal overrides the menu, use its domain
                 if p.menu_action_id:

From f4edff19fed9288f7576d8337539b2b5ee633dbc Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 6 May 2011 16:21:34 +0200
Subject: [PATCH 31/50] [FIX] manifest set to version 1.0

bzr revid: rco@openerp.com-20110506142134-s7ro0eqhspcxvchv
---
 addons/portal/__openerp__.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index eb6d9405a92..85cc4d08e6b 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -19,14 +19,13 @@
 #
 ##############################################################################
 
-
 {
-    "name" : "Portal",
-    "version" : "0.2",
-    "depends" : ["base"],
-    "author" : "OpenERP SA",
-    "category": 'Tools',
-    "description": """
+    'name' : "Portal",
+    'version' : "1.0",
+    'depends' : ["base"],
+    'author' : "OpenERP SA",
+    'category': 'Tools',
+    'description': """
 This module defines 'portals' to customize the access to your OpenERP database
 for external users.
 

From 097e07a31196de9bb0214ad1ae98a1b16c98c95d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 17 May 2011 10:23:31 +0200
Subject: [PATCH 32/50] [FIX] remove access rights on in-memory objects (used
 to trigger warning)

bzr revid: rco@openerp.com-20110517082331-wu56befh0plum4c2
---
 addons/portal/security/ir.model.access.csv | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
index 343b051c72d..db83f9ae77e 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -1,7 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_all","access.portal.all","model_res_portal",,1,0,0,0
-"access_widget_all","access.portal.widget.all","model_res_portal_widget",,1,0,0,0
-"access_manager","access.portal.manager","model_res_portal","group_portal_manager",1,1,1,1
-"access_widget_manager","access.portal.widget.manager","model_res_portal_widget","group_portal_manager",1,1,1,1
-"access_wizard_officer","access.portal.wizard.officer","model_res_portal_wizard","group_portal_officer",1,1,1,1
-"access_wizard_user_officer","access.portal.wizard.user.officer","model_res_portal_wizard_user","group_portal_officer",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_all,access.portal.all,model_res_portal,,1,0,0,0
+access_widget_all,access.portal.widget.all,model_res_portal_widget,,1,0,0,0
+access_manager,access.portal.manager,model_res_portal,group_portal_manager,1,1,1,1
+access_widget_manager,access.portal.widget.manager,model_res_portal_widget,group_portal_manager,1,1,1,1

From c0ccaaf816ec5901174650dde7cf15a1e994aa06 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 May 2011 09:03:02 +0200
Subject: [PATCH 33/50] set module version to 0.9, as changes on groups are
 expected

bzr revid: rco@openerp.com-20110518070302-nmtbptw3p5opg8qt
---
 addons/portal/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 85cc4d08e6b..48c40797164 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -21,7 +21,7 @@
 
 {
     'name' : "Portal",
-    'version' : "1.0",
+    'version' : "0.9",
     'depends' : ["base"],
     'author' : "OpenERP SA",
     'category': 'Tools',

From 9c75110fc59f620e5115ebea62d59b599831a318 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 23 May 2011 15:16:05 +0200
Subject: [PATCH 34/50] [IMP] fix copyright notice

bzr revid: rco@openerp.com-20110523131605-34dxgmw9ffrh85xa
---
 addons/portal/__init__.py    | 2 +-
 addons/portal/__openerp__.py | 2 +-
 addons/portal/portal.py      | 2 +-
 addons/portal/wizard.py      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index 4a16a77503c..f0dac9a6693 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2011 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
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 48c40797164..26c35954a70 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2011 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
diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index cab2439cfb7..92d946e02f5 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2011 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
diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index 959158ded40..85bd7cee37e 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2011 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

From d05232a26e1204e10873355e5d8b229d4febe128 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 26 May 2011 15:40:09 +0200
Subject: [PATCH 35/50] [IMP] add url to portal, and improve form view

bzr revid: rco@openerp.com-20110526134009-38ueubagxjj8122r
---
 addons/portal/portal.py       |  6 ++++--
 addons/portal/portal_view.xml | 25 +++++++++++++++++--------
 addons/portal/wizard.py       |  2 +-
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 92d946e02f5..1e8f59c3d42 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -40,6 +40,8 @@ class portal(osv.osv):
             '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,
             # ISSUE: 'ondelete' constraints do not seem effective on this field...
             string='Menu Action',
@@ -192,8 +194,8 @@ class portal_override_menu(osv.osv):
     _columns = {
         'override_menu': fields.function(
             _get_override_menu, fnct_inv=_set_override_menu,
-            type='boolean', method=True, string='Override Users Menu Action',
-            help='Enable this option to create the Menu Action'),
+            type='boolean', method=True, string='Override Menu Action of Users',
+            help='Enable this option to override the Menu Action of portal users'),
     }
 
 portal_override_menu()
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 5ce74633498..dcb7294d240 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -42,16 +42,25 @@ the portal's users.
             <field name="arch" type="xml">
                 <page string="Users" position="before">
                     <page string="Portal">
-                        <separator string="Portal Menu" colspan="4"/>
-                        <field name="menu_action_id"/>
-                        <field name="override_menu"/>
-                        <field name="parent_menu_id"
-                            context="{'ir.ui.menu.full_list': True}"/>
-                        <button name="do_create_menu" type="object"
-                            string="Create Parent Menu"/>
+                        <group colspan="2" col="2">
+                            <separator string="Website" colspan="2"/>
+                            <field name="url"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Portal Menu" colspan="2"/>
+                            <field name="override_menu"/>
+                            <field name="parent_menu_id"
+                                context="{'ir.ui.menu.full_list': True}"/>
+                            <label colspan="1"/>
+                            <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"/>
-                        <field name="other_group_ids" nolabel="1" 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"/>
diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index 85bd7cee37e..cb22a3a7e0b 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -140,7 +140,7 @@ class wizard(osv.osv_memory):
                 context['lang'] = data['context_lang']
                 data['company'] = user.company_id.name
                 data['db'] = cr.dbname
-                data['url'] = "(missing url)"
+                data['url'] = wiz.portal_id.url or "(missing url)"
                 
                 email_from = user.user_email
                 email_to = data['user_email']

From 486b9612ec9b9e3b8f0b6f24639e03bc3ff0e44c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 26 May 2011 15:45:30 +0200
Subject: [PATCH 36/50] [IMP] use url widget for portal url

bzr revid: rco@openerp.com-20110526134530-c2wkq8nvqkk2exhq
---
 addons/portal/portal_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index dcb7294d240..598f3f55315 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -44,7 +44,7 @@ the portal's users.
                     <page string="Portal">
                         <group colspan="2" col="2">
                             <separator string="Website" colspan="2"/>
-                            <field name="url"/>
+                            <field name="url" widget="url"/>
                         </group>
                         <group colspan="2" col="2">
                             <separator string="Portal Menu" colspan="2"/>

From 96d8f32e636574f9ad7bcb59b231b311a7796c7f Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 26 May 2011 16:46:12 +0200
Subject: [PATCH 37/50] [IMP] add message in wizard, and improve its form view

bzr revid: rco@openerp.com-20110526144612-na6ibojnafwnqglz
---
 addons/portal/wizard.py       | 20 ++++++++++++++++----
 addons/portal/wizard_view.xml |  4 +++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index cb22a3a7e0b..1af2ba17286 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -42,6 +42,8 @@ Database: %(db)s
 User:     %(login)s
 Password: %(password)s
 
+%(message)s
+
 --
 OpenERP - Open Source Business Applications
 http://www.openerp.com
@@ -60,6 +62,11 @@ def random_password():
     random.shuffle(chars)
     return ''.join(chars)
 
+def extract_email(user_email):
+    """ extract the email address from a user-friendly email address """
+    m = email_re.search(user_email)
+    return m and m.group(0) or ""
+
 
 
 class wizard(osv.osv_memory):
@@ -77,9 +84,8 @@ class wizard(osv.osv_memory):
             help="The portal in which new users must be added"),
         'user_ids': fields.one2many('res.portal.wizard.user', 'wizard_id',
             string='Users'),
-    }
-    _defaults = {
-        'user_ids': (lambda self, *args: self._default_user_ids(*args))
+        'message': fields.text(string='Invitation message',
+            help="This text is included in the welcome email sent to the users"),
     }
 
     def _default_user_ids(self, cr, uid, context):
@@ -103,12 +109,17 @@ class wizard(osv.osv_memory):
         # create user configs based on these addresses
         user_data = lambda address: {
                         'name': address.name,
-                        'email': address.email,
+                        'email': extract_email(address.email),
                         'lang': address.partner_id and address.partner_id.lang,
                         'address_id': address.id,
+                        'partner_id': address.partner_id and address.partner_id.id,
                     }
         return map(user_data, addresses)
 
+    _defaults = {
+        'user_ids': _default_user_ids
+    }
+
     def action_create(self, cr, uid, ids, context=None):
         """ create new users in portal(s), and notify them by email """
         # we copy the context to change the language for translating emails
@@ -141,6 +152,7 @@ class wizard(osv.osv_memory):
                 data['company'] = user.company_id.name
                 data['db'] = cr.dbname
                 data['url'] = wiz.portal_id.url or "(missing url)"
+                data['message'] = wiz.message or ""
                 
                 email_from = user.user_email
                 email_to = data['user_email']
diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
index bd7a8b553a0..85383d2f3f6 100644
--- a/addons/portal/wizard_view.xml
+++ b/addons/portal/wizard_view.xml
@@ -26,7 +26,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Portal Users">
-                    <field name="portal_id" colspan="4"/>
+                    <field name="portal_id" widget="selection" colspan="4"/>
+                    <field name="message" colspan="4"/>
+                    <separator string="Users to create" colspan="4"/>
                     <field name="user_ids" nolabel="1" colspan="4"/>
                     <label colspan="2"/>
                     <button string="Cancel" special="cancel" icon="gtk-cancel"/>

From 92a7a6b74d3890ec417d615b5c5dd7d8375421b2 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 26 May 2011 17:01:38 +0200
Subject: [PATCH 38/50] [IMP] wizard form view

bzr revid: rco@openerp.com-20110526150138-trnycap51uelqjom
---
 addons/portal/wizard_view.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
index 85383d2f3f6..f1661d0ef71 100644
--- a/addons/portal/wizard_view.xml
+++ b/addons/portal/wizard_view.xml
@@ -27,9 +27,15 @@
             <field name="arch" type="xml">
                 <form string="Create Portal Users">
                     <field name="portal_id" widget="selection" colspan="4"/>
-                    <field name="message" colspan="4"/>
-                    <separator string="Users to create" colspan="4"/>
-                    <field name="user_ids" nolabel="1" colspan="4"/>
+                    <notebook colspan="4">
+                        <page string="Users">
+                            <field name="user_ids" nolabel="1" colspan="4"/>
+                        </page>
+                        <page string="Invitation message">
+                            <label string="The following text will be included in the welcome email sent to users."/>
+                            <field name="message" nolabel="1" colspan="4"/>
+                        </page>
+                    </notebook>
                     <label colspan="2"/>
                     <button string="Cancel" special="cancel" icon="gtk-cancel"/>
                     <button string="Create Users"

From 5196b1517290ff3b4c736973cd5730fc4b3479cb Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 30 May 2011 14:03:15 +0200
Subject: [PATCH 39/50] [FIX] add ondelete on portal widget

bzr revid: rco@openerp.com-20110530120315-j6lg2gy9jiduokbf
---
 addons/portal/portal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 1e8f59c3d42..13f7ce8ca57 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -212,7 +212,7 @@ class portal_widget(osv.osv):
     _order = 'sequence'
     _columns = {
         'sequence': fields.integer('Sequence'),
-        'portal_id': fields.many2one('res.portal', select=1,
+        'portal_id': fields.many2one('res.portal', select=1, ondelete='cascade',
             string='Portal'),
         'widget_id': fields.many2one('res.widget', required=True, ondelete='cascade',
             string='Widget'),

From 6d97e3690f021172e3dd56616ed70fcb2cc34118 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 30 May 2011 14:22:53 +0200
Subject: [PATCH 40/50] add a partner_id field to res.users

bzr revid: rco@openerp.com-20110530122253-2yw6k04bm2bslihc
---
 addons/portal/res_user.py       | 32 ++++++++++++++++++++++++++++++++
 addons/portal/res_user_view.xml | 17 +++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 addons/portal/res_user.py
 create mode 100644 addons/portal/res_user_view.xml

diff --git a/addons/portal/res_user.py b/addons/portal/res_user.py
new file mode 100644
index 00000000000..9f86588b763
--- /dev/null
+++ b/addons/portal/res_user.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 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 osv import osv, fields
+
+
+
+class res_users(osv.osv):
+    _inherit = 'res.users'
+    _columns = {
+        'partner_id': fields.many2one('res.partner',
+            string='Related Partner'),
+    }
+
diff --git a/addons/portal/res_user_view.xml b/addons/portal/res_user_view.xml
new file mode 100644
index 00000000000..bf58e00068e
--- /dev/null
+++ b/addons/portal/res_user_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- add partner field in user form -->
+        <record id="openerp_portal_user" model="ir.ui.view">
+            <field name="name">Portal User Form Extension</field>
+            <field name="model">res.users</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <field name="address_id" position="before">
+                    <field name="partner_id"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

From b9337faa600f49730f8df7e315c632d0b736a7d7 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 30 May 2011 16:57:02 +0200
Subject: [PATCH 41/50] [IMP] create portal users for all addresses of
 partners, and resend invitation for existing users

bzr revid: rco@openerp.com-20110530145702-a762jj1vyeysmgu3
---
 addons/portal/wizard.py       | 108 ++++++++++++++++++----------------
 addons/portal/wizard_view.xml |  23 ++++----
 2 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index 1af2ba17286..9ffef534792 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -64,7 +64,7 @@ def random_password():
 
 def extract_email(user_email):
     """ extract the email address from a user-friendly email address """
-    m = email_re.search(user_email)
+    m = email_re.search(user_email or "")
     return m and m.group(0) or ""
 
 
@@ -90,31 +90,33 @@ class wizard(osv.osv_memory):
 
     def _default_user_ids(self, cr, uid, context):
         """ determine default user_ids from the active records """
-        # determine relevant res.partner.address(es) depending on context
-        addresses = []
+        def create_user_from_address(address):
+            return {    # a user config based on a contact (address)
+                'name': address.name,
+                'user_email': extract_email(address.email),
+                'lang': address.partner_id and address.partner_id.lang or 'en_US',
+                'partner_id': address.partner_id and address.partner_id.id,
+            }
+        
+        user_ids = []
         if context.get('active_model') == 'res.partner.address':
             address_obj = self.pool.get('res.partner.address')
             address_ids = context.get('active_ids', [])
             addresses = address_obj.browse(cr, uid, address_ids, context)
+            user_ids = map(create_user_from_address, addresses)
+        
         elif context.get('active_model') == 'res.partner':
             partner_obj = self.pool.get('res.partner')
             partner_ids = context.get('active_ids', [])
             partners = partner_obj.browse(cr, uid, partner_ids, context)
             for p in partners:
+                # add one user per contact, or one user if no contact
                 if p.address:
-                    # take default address if present, or any address otherwise
-                    def_addrs = filter(lambda a: a.type == 'default', p.address)
-                    addresses.append(def_addrs[0] if def_addrs else p.address[0])
+                    user_ids.extend(map(create_user_from_address, p.address))
+                else:
+                    user_ids.append({'lang': p.lang or 'en_US', 'partner_id': p.id})
         
-        # create user configs based on these addresses
-        user_data = lambda address: {
-                        'name': address.name,
-                        'email': extract_email(address.email),
-                        'lang': address.partner_id and address.partner_id.lang,
-                        'address_id': address.id,
-                        'partner_id': address.partner_id and address.partner_id.id,
-                    }
-        return map(user_data, addresses)
+        return user_ids
 
     _defaults = {
         'user_ids': _default_user_ids
@@ -126,7 +128,8 @@ class wizard(osv.osv_memory):
         context0 = context or {}
         context = context0.copy()
         
-        user = self.pool.get('res.users').browse(cr, ROOT_UID, uid, context0)
+        user_obj = self.pool.get('res.users')
+        user = user_obj.browse(cr, ROOT_UID, uid, context0)
         if not user.user_email:
             raise osv.except_osv(_('Email required'),
                 _('You must have an email address in your User Preferences'
@@ -134,28 +137,41 @@ class wizard(osv.osv_memory):
         
         portal_obj = self.pool.get('res.portal')
         for wiz in self.browse(cr, uid, ids, context):
-            # create new users in portal
-            users_data = [ {
-                    'name': u.name,
-                    'login': u.email,
-                    'password': random_password(),
-                    'user_email': u.email,
-                    'context_lang': u.lang,
-                    'address_id': u.address_id.id,
-                } for u in wiz.user_ids ]
-            portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
-                {'users': [(0, 0, data) for data in users_data]}, context0)
+            # determine existing users
+            login_cond = [('login', 'in', [u.user_email for u in wiz.user_ids])]
+            user_ids = user_obj.search(cr, ROOT_UID, login_cond)
+            users = user_obj.browse(cr, ROOT_UID, user_ids)
+            logins = [u.login for u in users]
             
-            # send email to new users (translated in their language)
-            for data in users_data:
-                context['lang'] = data['context_lang']
-                data['company'] = user.company_id.name
-                data['db'] = cr.dbname
-                data['url'] = wiz.portal_id.url or "(missing url)"
-                data['message'] = wiz.message or ""
+            # create new users in portal (skip existing logins)
+            new_users_data = [ {
+                    'name': u.name,
+                    'login': u.user_email,
+                    'password': random_password(),
+                    'user_email': u.user_email,
+                    'context_lang': u.lang,
+                    'partner_id': u.partner_id and u.partner_id.id,
+                } for u in wiz.user_ids if u.user_email not in logins ]
+            portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
+                {'users': [(0, 0, data) for data in new_users_data]}, context0)
+            
+            # send email to all users (translated in their language)
+            data = {
+                'company': user.company_id.name,
+                'message': wiz.message or "",
+                'url': wiz.portal_id.url or "(missing url)",
+                'db': cr.dbname,
+            }
+            user_ids = user_obj.search(cr, ROOT_UID, login_cond)
+            users = user_obj.browse(cr, ROOT_UID, user_ids)
+            for dest_user in users:
+                context['lang'] = dest_user.context_lang
+                data['login'] = dest_user.login
+                data['password'] = dest_user.password
+                data['name'] = dest_user.name
                 
                 email_from = user.user_email
-                email_to = data['user_email']
+                email_to = dest_user.user_email
                 subject = _(WELCOME_EMAIL_SUBJECT) % data
                 body = _(WELCOME_EMAIL_BODY) % data
                 res = email_send(email_from, [email_to], subject, body)
@@ -175,44 +191,32 @@ class wizard_user(osv.osv_memory):
     """
     _name = 'res.portal.wizard.user'
     _description = 'Portal User Config'
-    
+
     _columns = {
         'wizard_id': fields.many2one('res.portal.wizard', required=True,
             string='Wizard'),
         'name': fields.char(size=64, required=True,
             string='User Name',
             help="The user's real name"),
-        'email': fields.char(size=64, required=True,
+        'user_email': fields.char(size=64, required=True,
             string='E-mail',
             help="Will be used as user login.  "  
                  "Also necessary to send the account information to new users"),
         'lang': fields.selection(_lang_get, required=True,
             string='Language',
             help="The language for the user's user interface"),
-        'address_id': fields.many2one('res.partner.address', required=True,
-            string='Address'),
-        'partner_id': fields.related('address_id', 'partner_id',
-            type='many2one', relation='res.partner', readonly=True,
+        'partner_id': fields.many2one('res.partner',
             string='Partner'),
     }
 
     def _check_email(self, cr, uid, ids):
         """ check syntax of email address """
-        for wizard in self.browse(cr, uid, ids):
-            if not email_re.match(wizard.email): return False
-        return True
-
-    def _check_exist(self, cr, uid, ids):
-        """ check whether login (email) already in use """
-        user_obj = self.pool.get('res.users')
-        for wizard in self.browse(cr, uid, ids):
-            condition = [('login', '=', wizard.email)]
-            if user_obj.search(cr, ROOT_UID, condition): return False
+        for wuser in self.browse(cr, uid, ids):
+            if not email_re.match(wuser.user_email): return False
         return True
 
     _constraints = [
         (_check_email, 'Invalid email address', ['email']),
-        (_check_exist, 'User login already exists', ['email']),
     ]
 
 wizard_user()
diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
index f1661d0ef71..b877e84686d 100644
--- a/addons/portal/wizard_view.xml
+++ b/addons/portal/wizard_view.xml
@@ -3,7 +3,7 @@
     <data>
         <!-- wizard action on res.partner -->
         <act_window id="partner_wizard_action"
-            name="Create Portal Users"
+            name="Add Portal Access"
             src_model="res.partner"
             res_model="res.portal.wizard"
             view_type="form" view_mode="form"
@@ -12,7 +12,7 @@
 
         <!-- wizard action on res.partner.address -->
         <act_window id="address_wizard_action"
-            name="Create Portal Users"
+            name="Add Portal Access"
             src_model="res.partner.address"
             res_model="res.portal.wizard"
             view_type="form" view_mode="form"
@@ -21,12 +21,13 @@
 
         <!-- wizard view -->
         <record id="wizard_view" model="ir.ui.view">
-            <field name="name">Create Portal Users</field>
+            <field name="name">Add Portal Access</field>
             <field name="model">res.portal.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create Portal Users">
-                    <field name="portal_id" widget="selection" colspan="4"/>
+                <form string="Add Portal Access">
+                    <field name="portal_id" widget="selection"/>
+                    <newline/>
                     <notebook colspan="4">
                         <page string="Users">
                             <field name="user_ids" nolabel="1" colspan="4"/>
@@ -38,7 +39,7 @@
                     </notebook>
                     <label colspan="2"/>
                     <button string="Cancel" special="cancel" icon="gtk-cancel"/>
-                    <button string="Create Users"
+                    <button string="Send Invitations"
                         name="action_create" type="object" icon="gtk-ok"/>
                 </form>
             </field>
@@ -52,10 +53,9 @@
             <field name="arch" type="xml">
                 <!-- the attribute 'editable' is set below to make the elements
                      editable in the web client 6.0 -->
-                <tree string="Portal Users" editable="bottom">
+                <tree string="Portal Users" editable="bottom" colors="red:exists==True">
                     <field name="name"/>
-                    <field name="email"/>
-                    <field name="lang"/>
+                    <field name="user_email"/>
                     <field name="partner_id"/>
                 </tree>
             </field>
@@ -70,11 +70,8 @@
                 <form string="Portal User">
                     <group colspan="2" col="2">
                         <field name="name"/>
-                        <field name="email"/>
+                        <field name="user_email"/>
                         <field name="lang"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <field name="address_id"/>
                         <field name="partner_id"/>
                     </group>
                 </form>

From 71689f7f4337bf1f1961dd7dc2df01973b404b68 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 30 May 2011 16:58:21 +0200
Subject: [PATCH 42/50] [FIX] remove list coloring (mistake)

bzr revid: rco@openerp.com-20110530145821-xd7xhbzvnnvzfzf7
---
 addons/portal/wizard_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
index b877e84686d..537055e5fb2 100644
--- a/addons/portal/wizard_view.xml
+++ b/addons/portal/wizard_view.xml
@@ -53,7 +53,7 @@
             <field name="arch" type="xml">
                 <!-- the attribute 'editable' is set below to make the elements
                      editable in the web client 6.0 -->
-                <tree string="Portal Users" editable="bottom" colors="red:exists==True">
+                <tree string="Portal Users" editable="bottom">
                     <field name="name"/>
                     <field name="user_email"/>
                     <field name="partner_id"/>

From b456fcf6fd4891bff8f45d3335fb53fad06800c6 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 30 May 2011 17:01:21 +0200
Subject: [PATCH 43/50] small cleanup

bzr revid: rco@openerp.com-20110530150121-xljxkxv0efiddjv5
---
 addons/portal/wizard.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index 9ffef534792..e63e10fa443 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -162,9 +162,9 @@ class wizard(osv.osv_memory):
                 'url': wiz.portal_id.url or "(missing url)",
                 'db': cr.dbname,
             }
-            user_ids = user_obj.search(cr, ROOT_UID, login_cond)
-            users = user_obj.browse(cr, ROOT_UID, user_ids)
-            for dest_user in users:
+            dest_uids = user_obj.search(cr, ROOT_UID, login_cond)
+            dest_users = user_obj.browse(cr, ROOT_UID, user_ids)
+            for dest_user in dest_users:
                 context['lang'] = dest_user.context_lang
                 data['login'] = dest_user.login
                 data['password'] = dest_user.password

From 809435d3956222b4d95027912a302ab60f77830b Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 31 May 2011 08:55:36 +0200
Subject: [PATCH 44/50] fix users form view

bzr revid: rco@openerp.com-20110531065536-el7ocrvc33corok8
---
 addons/portal/res_user_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/portal/res_user_view.xml b/addons/portal/res_user_view.xml
index bf58e00068e..716493f2787 100644
--- a/addons/portal/res_user_view.xml
+++ b/addons/portal/res_user_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
         <!-- add partner field in user form -->
-        <record id="openerp_portal_user" model="ir.ui.view">
-            <field name="name">Portal User Form Extension</field>
+        <record id="view_users_form" model="ir.ui.view">
+            <field name="name">res.portal.users.form</field>
             <field name="model">res.users</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_users_form"/>

From 07b25fe662e09c2859b97d0ba9b7c053e48d7e9d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 31 May 2011 08:58:29 +0200
Subject: [PATCH 45/50] [FIX] import changes to res.users

bzr revid: rco@openerp.com-20110531065829-emsd2ylq22pb2zv1
---
 addons/portal/__init__.py    | 1 +
 addons/portal/__openerp__.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index f0dac9a6693..89397d2eab5 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -21,5 +21,6 @@
 
 import portal
 import wizard
+import res_user
 import ir_ui_menu
 
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 26c35954a70..87abc3a7229 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -39,7 +39,7 @@ module 'share'.
     'demo_xml': [],
     'data': [
         'security/portal_security.xml', 'security/ir.model.access.csv',
-        'portal_view.xml', 'wizard_view.xml',
+        'portal_view.xml', 'wizard_view.xml', 'res_user_view.xml',
     ],
     'installable': True,
     'certificate' : '',

From d4069fd4f9f5130e7500e6d8148f9f1887c3dcca Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 31 May 2011 09:01:10 +0200
Subject: [PATCH 46/50] [FIX] res.users extension

bzr revid: rco@openerp.com-20110531070110-bdpd4xwf6p0efdrj
---
 addons/portal/res_user.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/portal/res_user.py b/addons/portal/res_user.py
index 9f86588b763..2f32a65b761 100644
--- a/addons/portal/res_user.py
+++ b/addons/portal/res_user.py
@@ -30,3 +30,5 @@ class res_users(osv.osv):
             string='Related Partner'),
     }
 
+res_users()
+

From 54be2c8609b36685eb017d142eaf7a59b551a6d0 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 24 Jun 2011 10:50:18 +0200
Subject: [PATCH 47/50] [FIX] prevent automatic shortcut creation for portal
 users

bzr revid: rco@openerp.com-20110624085018-e8u6ykih3tdcg16q
---
 addons/crm/crm_meeting.py | 23 +++++++++++++----------
 addons/hr/hr.py           | 23 +++++++++++++----------
 addons/portal/wizard.py   |  1 +
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 57ce46b52cc..d752b111c02 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -138,16 +138,19 @@ class res_users(osv.osv):
 
     def create(self, cr, uid, data, context=None):
         user_id = super(res_users, self).create(cr, uid, data, context=context)
-        data_obj = self.pool.get('ir.model.data')
-        try:
-            data_id = data_obj._get_id(cr, uid, 'crm', 'ir_ui_view_sc_calendar0')
-            view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
-            self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
-                                        'user_id': user_id}, context=context)
-        except:
-            # Tolerate a missing shortcut. See product/product.py for similar code.
-            logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
-            
+        
+        # add shortcut unless 'noshortcut' is True in context
+        if not(context and context.get('noshortcut', False)):
+            data_obj = self.pool.get('ir.model.data')
+            try:
+                data_id = data_obj._get_id(cr, uid, 'crm', 'ir_ui_view_sc_calendar0')
+                view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
+                self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
+                                            'user_id': user_id}, context=context)
+            except:
+                # Tolerate a missing shortcut. See product/product.py for similar code.
+                logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
+        
         return user_id
 
 res_users()
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 59e4129fec7..32b46819721 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -241,16 +241,19 @@ class res_users(osv.osv):
 
     def create(self, cr, uid, data, context=None):
         user_id = super(res_users, self).create(cr, uid, data, context=context)
-        data_obj = self.pool.get('ir.model.data')
-        try:
-            data_id = data_obj._get_id(cr, uid, 'hr', 'ir_ui_view_sc_employee')
-            view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
-            self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
-                                        'user_id': user_id}, context=context)
-        except:
-            # Tolerate a missing shortcut. See product/product.py for similar code.
-            logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
-
+        
+        # add shortcut unless 'noshortcut' is True in context
+        if not(context and context.get('noshortcut', False)):
+            data_obj = self.pool.get('ir.model.data')
+            try:
+                data_id = data_obj._get_id(cr, uid, 'hr', 'ir_ui_view_sc_employee')
+                view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
+                self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
+                                            'user_id': user_id}, context=context)
+            except:
+                # Tolerate a missing shortcut. See product/product.py for similar code.
+                logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
+        
         return user_id
 
 res_users()
diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index e63e10fa443..01cee7a0435 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -126,6 +126,7 @@ class wizard(osv.osv_memory):
         """ create new users in portal(s), and notify them by email """
         # we copy the context to change the language for translating emails
         context0 = context or {}
+        context0['noshortcut'] = True           # prevent shortcut creation
         context = context0.copy()
         
         user_obj = self.pool.get('res.users')

From c106b1b0403010c872b0315f76cc5d4cd7e1296f Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 24 Jun 2011 11:51:11 +0200
Subject: [PATCH 48/50] put version number to 1.0

bzr revid: rco@openerp.com-20110624095111-modwb1ge3p2c69kn
---
 addons/portal/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 87abc3a7229..7aaa1682bb0 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -21,7 +21,7 @@
 
 {
     'name' : "Portal",
-    'version' : "0.9",
+    'version' : "1.0",
     'depends' : ["base"],
     'author' : "OpenERP SA",
     'category': 'Tools',

From 48b04d3d80d34c920bd18761efb4796298d2748a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 4 Jul 2011 16:05:46 +0200
Subject: [PATCH 49/50] [FIX] remove method=True in fields.function

bzr revid: rco@openerp.com-20110704140546-r7o4hj0bnxhkpggw
---
 addons/portal/portal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 13f7ce8ca57..a45a8c4410f 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -194,7 +194,7 @@ class portal_override_menu(osv.osv):
     _columns = {
         'override_menu': fields.function(
             _get_override_menu, fnct_inv=_set_override_menu,
-            type='boolean', method=True, string='Override Menu Action of Users',
+            type='boolean', string='Override Menu Action of Users',
             help='Enable this option to override the Menu Action of portal users'),
     }
 

From d3e87b4d5a4c24e31988bf55e92a43d9bdf799a5 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 4 Jul 2011 16:18:23 +0200
Subject: [PATCH 50/50] [IMP] introduce i18n

bzr revid: rco@openerp.com-20110704141823-fe4jzgtlcsnfpwt9
---
 addons/portal/i18n/en_US.po           | 393 ++++++++++++++++++++++++++
 addons/portal/i18n/portal.pot         | 393 ++++++++++++++++++++++++++
 addons/portal/portal.py               |   5 +-
 addons/portal/portal_view.xml         |   2 +-
 addons/portal/wizard/portal_wizard.py |   2 +-
 5 files changed, 791 insertions(+), 4 deletions(-)
 create mode 100644 addons/portal/i18n/en_US.po
 create mode 100644 addons/portal/i18n/portal.pot

diff --git a/addons/portal/i18n/en_US.po b/addons/portal/i18n/en_US.po
new file mode 100644
index 00000000000..ffc18da1f14
--- /dev/null
+++ b/addons/portal/i18n/en_US.po
@@ -0,0 +1,393 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* portal
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1-dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-07-04 14:16+0000\n"
+"PO-Revision-Date: 2011-07-04 14:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:55
+#, python-format
+msgid "Please select at least one user to share with"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:59
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,group_id:0
+msgid "Group"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,other_group_ids:0
+msgid "Those groups are assigned to the portal's users"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,group_ids:0
+msgid "Existing groups"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard.user:0
+msgid "Portal User"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,override_menu:0
+msgid "Enable this option to override the Menu Action of portal users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,user_email:0
+msgid "E-mail"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Other Groups assigned to Users"
+msgstr ""
+
+#. module: portal
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: field:res.portal,widget_ids:0
+msgid "Widgets"
+msgstr ""
+
+#. module: portal
+#: model:ir.module.module,description:portal.module_meta_information
+msgid "\n"
+"This module defines 'portals' to customize the access to your OpenERP database\n"
+"for external users.\n"
+"\n"
+"A portal defines customized user menu and access rights for a group of users\n"
+"(the ones associated to that portal).  It also associates user groups to the\n"
+"portal users (adding a group in the portal automatically adds it to the portal\n"
+"users, etc).  That feature is very handy when used in combination with the\n"
+"module 'share'.\n"
+"    "
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+msgid "Who do you want to share with?"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Send Invitations"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,url:0
+msgid "The url where portal users can connect to the server"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,widget_id:0
+msgid "Widget"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard,message:0
+msgid "This text is included in the welcome email sent to the users"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,menu_action_id:0
+msgid "If set, replaces the standard menu for the portal's users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,parent_menu_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Name"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard.user:0
+msgid "Portal Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,override_menu:0
+msgid "Override Menu Action of Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,menu_action_id:0
+msgid "Menu Action"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,name:0
+msgid "User Name"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_widget
+msgid "Portal Widgets"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal
+#: model:ir.module.module,shortdesc:portal.module_meta_information
+#: view:res.portal:0
+#: field:res.portal.widget,portal_id:0
+#: field:res.portal.wizard,portal_id:0
+msgid "Portal"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:35
+#, python-format
+msgid "Your OpenERP account at %(company)s"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/portal.py:110
+#: code:addons/portal/portal.py:184
+#, python-format
+msgid "%s Menu"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard,portal_id:0
+msgid "The portal in which new users must be added"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,widget_ids:0
+msgid "Widgets assigned to portal users"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:163
+#, python-format
+msgid "(missing url)"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,user_ids:0
+msgid "Existing users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,user_email:0
+msgid "Will be used as user login.  Also necessary to send the account information to new users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,url:0
+msgid "URL"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Widgets assigned to Users"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,lang:0
+msgid "The language for the user's user interface"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Website"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Create Parent Menu"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "The following text will be included in the welcome email sent to users."
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:135
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: portal
+#: constraint:res.portal.wizard.user:0
+msgid "Invalid email address"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:136
+#, python-format
+msgid "You must have an email address in your User Preferences to send emails."
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,group_id:0
+msgid "The group extended by this portal"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,other_group_ids:0
+msgid "Other User Groups"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.portal_list_action
+#: model:ir.ui.menu,name:portal.portal_list_menu
+#: model:ir.ui.menu,name:portal.portal_menu
+#: view:res.portal:0
+msgid "Portals"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,parent_menu_id:0
+msgid "The menu action opens the submenus of this menu item"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: portal
+#: field:res.users,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Menu"
+msgstr ""
+
+#. module: portal
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,message:0
+msgid "Invitation message"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:36
+#, python-format
+msgid "Dear %(name)s,\n"
+"\n"
+"You have been created an OpenERP account at %(url)s.\n"
+"\n"
+"Your login account data is:\n"
+"Database: %(db)s\n"
+"User:     %(login)s\n"
+"Password: %(password)s\n"
+"\n"
+"%(message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
+""
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_wizard
+msgid "Portal Wizard"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,name:0
+msgid "The user's real name"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.address_wizard_action
+#: model:ir.actions.act_window,name:portal.partner_wizard_action
+#: view:res.portal.wizard:0
+msgid "Add Portal Access"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,help:portal.portal_list_action
+msgid "\n"
+"A portal helps defining specific views and rules for a group of users (the\n"
+"portal group).  A portal menu, widgets and specific groups may be assigned to\n"
+"the portal's users.\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_share_wizard
+msgid "Share Wizard"
+msgstr ""
+
diff --git a/addons/portal/i18n/portal.pot b/addons/portal/i18n/portal.pot
new file mode 100644
index 00000000000..ffc18da1f14
--- /dev/null
+++ b/addons/portal/i18n/portal.pot
@@ -0,0 +1,393 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* portal
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1-dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-07-04 14:16+0000\n"
+"PO-Revision-Date: 2011-07-04 14:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:55
+#, python-format
+msgid "Please select at least one user to share with"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:59
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,group_id:0
+msgid "Group"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,other_group_ids:0
+msgid "Those groups are assigned to the portal's users"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,group_ids:0
+msgid "Existing groups"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard.user:0
+msgid "Portal User"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,override_menu:0
+msgid "Enable this option to override the Menu Action of portal users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,user_email:0
+msgid "E-mail"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Other Groups assigned to Users"
+msgstr ""
+
+#. module: portal
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: field:res.portal,widget_ids:0
+msgid "Widgets"
+msgstr ""
+
+#. module: portal
+#: model:ir.module.module,description:portal.module_meta_information
+msgid "\n"
+"This module defines 'portals' to customize the access to your OpenERP database\n"
+"for external users.\n"
+"\n"
+"A portal defines customized user menu and access rights for a group of users\n"
+"(the ones associated to that portal).  It also associates user groups to the\n"
+"portal users (adding a group in the portal automatically adds it to the portal\n"
+"users, etc).  That feature is very handy when used in combination with the\n"
+"module 'share'.\n"
+"    "
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+msgid "Who do you want to share with?"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Send Invitations"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,url:0
+msgid "The url where portal users can connect to the server"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,widget_id:0
+msgid "Widget"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard,message:0
+msgid "This text is included in the welcome email sent to the users"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,menu_action_id:0
+msgid "If set, replaces the standard menu for the portal's users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,parent_menu_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Name"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard.user:0
+msgid "Portal Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,override_menu:0
+msgid "Override Menu Action of Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,menu_action_id:0
+msgid "Menu Action"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,name:0
+msgid "User Name"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_widget
+msgid "Portal Widgets"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal
+#: model:ir.module.module,shortdesc:portal.module_meta_information
+#: view:res.portal:0
+#: field:res.portal.widget,portal_id:0
+#: field:res.portal.wizard,portal_id:0
+msgid "Portal"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:35
+#, python-format
+msgid "Your OpenERP account at %(company)s"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/portal.py:110
+#: code:addons/portal/portal.py:184
+#, python-format
+msgid "%s Menu"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard,portal_id:0
+msgid "The portal in which new users must be added"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,widget_ids:0
+msgid "Widgets assigned to portal users"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:163
+#, python-format
+msgid "(missing url)"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,user_ids:0
+msgid "Existing users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,user_email:0
+msgid "Will be used as user login.  Also necessary to send the account information to new users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,url:0
+msgid "URL"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Widgets assigned to Users"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,lang:0
+msgid "The language for the user's user interface"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Website"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Create Parent Menu"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "The following text will be included in the welcome email sent to users."
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:135
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: portal
+#: constraint:res.portal.wizard.user:0
+msgid "Invalid email address"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:136
+#, python-format
+msgid "You must have an email address in your User Preferences to send emails."
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,group_id:0
+msgid "The group extended by this portal"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,other_group_ids:0
+msgid "Other User Groups"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.portal_list_action
+#: model:ir.ui.menu,name:portal.portal_list_menu
+#: model:ir.ui.menu,name:portal.portal_menu
+#: view:res.portal:0
+msgid "Portals"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,parent_menu_id:0
+msgid "The menu action opens the submenus of this menu item"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: portal
+#: field:res.users,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Menu"
+msgstr ""
+
+#. module: portal
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,message:0
+msgid "Invitation message"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:36
+#, python-format
+msgid "Dear %(name)s,\n"
+"\n"
+"You have been created an OpenERP account at %(url)s.\n"
+"\n"
+"Your login account data is:\n"
+"Database: %(db)s\n"
+"User:     %(login)s\n"
+"Password: %(password)s\n"
+"\n"
+"%(message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
+""
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_wizard
+msgid "Portal Wizard"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,name:0
+msgid "The user's real name"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.address_wizard_action
+#: model:ir.actions.act_window,name:portal.partner_wizard_action
+#: view:res.portal.wizard:0
+msgid "Add Portal Access"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,help:portal.portal_list_action
+msgid "\n"
+"A portal helps defining specific views and rules for a group of users (the\n"
+"portal group).  A portal menu, widgets and specific groups may be assigned to\n"
+"the portal's users.\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_share_wizard
+msgid "Share Wizard"
+msgstr ""
+
diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index a45a8c4410f..78483d6a1f1 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import osv, fields
+from tools.translate import _
 
 
 
@@ -106,7 +107,7 @@ class portal(osv.osv):
         for p in self.browse(cr, uid, ids, context):
             # create a menuitem under 'portal.portal_menu'
             menu_values = {
-                'name': p.name + ' Menu',
+                'name': _('%s Menu') % p.name,
                 'parent_id': menu_root,
                 'groups_id': [(6, 0, [p.group_id.id])],
             }
@@ -180,7 +181,7 @@ class portal_override_menu(osv.osv):
             actions_obj = self.pool.get('ir.actions.act_window')
             parent_id = p.parent_menu_id.id if p.parent_menu_id else False
             action_values = {
-                'name': p.name + ' Menu',
+                'name': _('%s Menu') % p.name,
                 'type': 'ir.actions.act_window',
                 'usage': 'menu',
                 'res_model': 'ir.ui.menu',
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index c2f91941ff8..d43c6115ad6 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -3,7 +3,7 @@
     <data>
         <!-- menu Administration/Portals -->
         <menuitem name="Portals" id="portal_menu" parent="base.menu_administration"
-            group="group_portal_manager"/>
+            groups="group_portal_manager"/>
 
         <!-- menu Administration/Portals/Portals -->
         <record id="portal_list_action" model="ir.actions.act_window">
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 01cee7a0435..152a2bb7b38 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -160,7 +160,7 @@ class wizard(osv.osv_memory):
             data = {
                 'company': user.company_id.name,
                 'message': wiz.message or "",
-                'url': wiz.portal_id.url or "(missing url)",
+                'url': wiz.portal_id.url or _("(missing url)"),
                 'db': cr.dbname,
             }
             dest_uids = user_obj.search(cr, ROOT_UID, login_cond)