From 102705dcd261e53e33119394ea83d3865192047e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 20 Jan 2010 15:15:17 +0100
Subject: [PATCH 02/29] [imp] Move interface complexity selection to front of
 the sequence (id 1)

bzr revid: xmo@tinyerp.com-20100120141517-j4bryr49u2189hj5
---
 bin/addons/base/base_update.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 93c33fd9a9d..d69f4c88dba 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -314,7 +314,7 @@
 
         <record id="config_wizard_simple_view" model="ir.actions.todo">
             <field name="action_id" ref="action_config_simple_view_form"/>
-            <field name="sequence">5</field>
+            <field name="sequence">1</field>
         </record>
 
     </data>

From 37c7d2c0afddb0bb9cbe4ab6edac75e425c29c41 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 21 Jan 2010 14:21:18 +0100
Subject: [PATCH 03/29] [imp] add docstring to explain how default_get
 works/what it does

bzr revid: xmo@tinyerp.com-20100121132118-zvvpi168d8vdzbgb
---
 bin/osv/orm.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 223c2875f03..f1306be7fc2 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -932,6 +932,17 @@ class orm_template(object):
             self._invalids.clear()
 
     def default_get(self, cr, uid, fields_list, context=None):
+        """ Set default values for the object's fields.
+
+        Returns a dict of {field_name:default_value}
+
+        Arguments:
+        `fields_list`: the fields for which the object doesn't have
+                       any value yet, and default values need to be
+                       provided. If fields outside this list are
+                       returned, the user-provided values will be
+                       overwritten.
+        """
         return {}
 
     def perm_read(self, cr, user, ids, context=None, details=True):

From 2f3040d63eca2a57c486725a90e2d0cccf86933e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 21 Jan 2010 21:47:00 +0100
Subject: [PATCH 04/29] [fix] line breaks in labels & stuff break the gtk
 client, remove the nice line breaks

bzr revid: xmo@tinyerp.com-20100121204700-8t4uufgay05452fj
---
 bin/addons/base/base_update.xml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index d69f4c88dba..ec980f6da15 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -226,9 +226,7 @@
                   <field name="context_tz"/>
 
                   <separator string="Group" colspan="4"/>
-                  <label  align="0.0" colspan="4" string="
-                    Groups are used to define access rights on objects and
-                    the visibility of screens and menus"/>
+                  <label  align="0.0" colspan="4" string="Groups are used to define access rights on objects and the visibility of screens and menus"/>
                   <field colspan="4" nolabel="1" name="groups_id"/>
                 </group>
 
@@ -268,18 +266,11 @@
                 </form>
 
                 <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0" string='
-                    Choose between the simplified interface and the extended
-                    one.'/>
+                  <label colspan="4" align="0.0" string="Choose between the simplified interface and the extended one."/>
                   <newline/>
-                  <label colspan="4" align="0.0" string='
-                    If you are testing OpenERP or using it for the first time,
-                    we suggest you use the simplified interface. It has less
-                    options and fields but is easier to understand.'/>
+                  <label colspan="4" align="0.0" string="If you are testing OpenERP or using it for the first time, we suggest you use the simplified interface. It has less options and fields but is easier to understand."/>
                   <newline/>
-                  <label colspan="4" align="0.0" string='
-                    You will be able to switch to the extended interface later.
-                    '/>
+                  <label colspan="4" align="0.0" string="You will be able to switch to the extended interface later."/>
                   <separator string="Choose Your Interface" colspan="4"/>
                   <field colspan="2" name="view" nolabel="1"/>
                 </group>

From 1840d3a60910bf1c6efcf2e074484929d5c0fd35 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 22 Jan 2010 16:43:59 +0100
Subject: [PATCH 05/29] [imp] use creation screen, re-label Next button to Done
 to not get confused between Next (user? screen?) and Done (with that
 configuration)

bzr revid: xmo@tinyerp.com-20100122154359-h3g3flvbe5ryz32w
---
 bin/addons/base/base_update.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index ec980f6da15..180bd134a6e 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -232,7 +232,7 @@
 
                 <xpath expr='//button[@name="action_skip"]'
                        position='attributes'>
-                  <attribute name='string'>Next</attribute>
+                  <attribute name='string'>Done</attribute>
                   <attribute name='icon'>gtk-go-forward</attribute>
                 </xpath>
                 <xpath expr='//button[@name="action_next"]'

From 2bfaec5adf82ee69f8ff7c332b6534181547d25b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sat, 23 Jan 2010 13:43:35 +0100
Subject: [PATCH 06/29] [imp] res.config.installer: preselect installable
 modules which are, in fact, already installed

bzr revid: xmo@tinyerp.com-20100123124335-311r6an7kpgir3rn
---
 bin/addons/base/res/res_config.py | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 204be08c9d0..8af36291fa6 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,10 +15,12 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
+from operator import attrgetter
+
 from osv import osv, fields
 import netsvc
 import pooler
@@ -140,6 +142,26 @@ class res_config_installer(osv.osv_memory):
 
         return base | hooks_results | additionals
 
+    def default_get(self, cr, uid, fields_list, context=None):
+        modules = self.pool.get('ir.module.module')
+        defaults = super(res_config_installer, self).default_get(
+            cr, uid, fields_list, context=context)
+
+        selectable = [field for field in self._columns
+                      if type(self._columns[field]) is fields.boolean]
+        already_installed = modules.browse(
+            cr, uid,
+            modules.search(cr, uid,
+                           [('name','in',selectable),
+                            ('state','not in',['uninstallable', 'uninstalled'])],
+                           context=context),
+            context=context)
+
+        return dict(defaults,
+                    **dict.fromkeys(
+                        map(attrgetter('name'), already_installed),
+                        True))
+
     def execute(self, cr, uid, ids, context=None):
         modules = self.pool.get('ir.module.module')
         to_install = list(self._modules_to_install(

From c6eddc33353cef99553f45718fedb959e04e8fdf Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sat, 23 Jan 2010 15:37:05 +0100
Subject: [PATCH 07/29] imp] res.config.installer: set already installed
 modules to readonly, as res.config.installer can't uninstall them.

Also, remove already installed modules from the set of modules to
install, and add a few docstrings to clarify the purpose of
overloading default_get and fields_get, and how _modules_to_install
works

bzr revid: xmo@tinyerp.com-20100123143705-9qyjhfnrlx372nso
---
 bin/addons/base/res/res_config.py | 72 +++++++++++++++++++++++++------
 1 file changed, 59 insertions(+), 13 deletions(-)

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 8af36291fa6..1394f60f3bd 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -22,6 +22,7 @@
 from operator import attrgetter
 
 from osv import osv, fields
+from tools.translate import _
 import netsvc
 import pooler
 
@@ -121,13 +122,49 @@ class res_config_installer(osv.osv_memory):
 
     _install_if = {}
 
+    def _already_installed(self, cr, uid, context=None):
+        """ For each module (boolean fields in a res.config.installer),
+        check if it's already installed (neither uninstallable nor uninstalled)
+        and if it is, check it by default
+        """
+        modules = self.pool.get('ir.module.module')
+
+        selectable = [field for field in self._columns
+                      if type(self._columns[field]) is fields.boolean]
+        return modules.browse(
+            cr, uid,
+            modules.search(cr, uid,
+                           [('name','in',selectable),
+                            ('state','not in',['uninstallable', 'uninstalled'])],
+                           context=context),
+            context=context)
+
+
     def _modules_to_install(self, cr, uid, ids, context=None):
+        """ selects all modules to install:
+
+        * checked boolean fields
+        * return values of hook methods. Hook methods are of the form
+          ``_if_%(addon_name)s``, and are called if the corresponding
+          addon is marked for installation. They take the arguments
+          cr, uid, ids and context, and return an iterable of addon
+          names
+        * additionals, additionals are setup through the ``_install_if``
+          class variable. ``_install_if`` is a dict of {iterable:iterable}
+          where key and value are iterables of addon names.
+
+          If all the addons in the key are selected for installation
+          (warning: addons added through hooks don't count), then the
+          addons in the value are added to the set of modules to install
+        * not already installed
+        """
         base = set(module_name
                    for installer in self.read(cr, uid, ids, context=context)
                    for module_name, to_install in installer.iteritems()
                    if module_name != 'id'
                    if type(self._columns[module_name]) is fields.boolean
                    if to_install)
+
         hooks_results = set()
         for module in base:
             hook = getattr(self, '_if_%s'%(module), None)
@@ -140,28 +177,37 @@ class res_config_installer(osv.osv_memory):
                    if base.issuperset(requirements)
                    for module in consequences)
 
-        return base | hooks_results | additionals
+        return (base | hooks_results | additionals) - set(
+            map(attrgetter('name'), self._already_installed(cr, uid, context)))
 
     def default_get(self, cr, uid, fields_list, context=None):
-        modules = self.pool.get('ir.module.module')
+        ''' If an addon is already installed, check it by default
+        '''
         defaults = super(res_config_installer, self).default_get(
             cr, uid, fields_list, context=context)
 
-        selectable = [field for field in self._columns
-                      if type(self._columns[field]) is fields.boolean]
-        already_installed = modules.browse(
-            cr, uid,
-            modules.search(cr, uid,
-                           [('name','in',selectable),
-                            ('state','not in',['uninstallable', 'uninstalled'])],
-                           context=context),
-            context=context)
-
         return dict(defaults,
                     **dict.fromkeys(
-                        map(attrgetter('name'), already_installed),
+                        map(attrgetter('name'),
+                            self._already_installed(cr, uid, context=context)),
                         True))
 
+    def fields_get(self, cr, uid, fields=None, context=None, read_access=True):
+        """ If an addon is already installed, set it to readonly as
+        res.config.installer doesn't handle uninstallations of already
+        installed addons
+        """
+        fields = super(res_config_installer, self).fields_get(
+            cr, uid, fields, context, read_access)
+
+        for module in self._already_installed(cr, uid, context=context):
+            fields[module.name].update(
+                readonly=True,
+                help=fields[module.name].get('help', '') +
+                     '\n\nThis module is already installed on your system')
+
+        return fields
+
     def execute(self, cr, uid, ids, context=None):
         modules = self.pool.get('ir.module.module')
         to_install = list(self._modules_to_install(

From 1aadecf71f7e78e4fca6b4feadd7f5d8178d1f57 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sat, 23 Jan 2010 15:49:18 +0100
Subject: [PATCH 08/29] [fix] Talk of installing addons, not modules

bzr revid: xmo@tinyerp.com-20100123144918-57khr8yeccgashhr
---
 bin/addons/base/res/res_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 1394f60f3bd..555baf8a0d1 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -204,7 +204,7 @@ class res_config_installer(osv.osv_memory):
             fields[module.name].update(
                 readonly=True,
                 help=fields[module.name].get('help', '') +
-                     '\n\nThis module is already installed on your system')
+                     '\n\nThis addon is already installed on your system')
 
         return fields
 

From 942ab051edb3eb4147f889e3da943d7bfd086f85 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sat, 23 Jan 2010 15:50:17 +0100
Subject: [PATCH 09/29] [imp] make help addendum that an addon is already
 installed translatable

bzr revid: xmo@tinyerp.com-20100123145017-osfrv7x2oxeamywb
---
 bin/addons/base/res/res_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 555baf8a0d1..6f87e8a83b9 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -204,7 +204,7 @@ class res_config_installer(osv.osv_memory):
             fields[module.name].update(
                 readonly=True,
                 help=fields[module.name].get('help', '') +
-                     '\n\nThis addon is already installed on your system')
+                     _('\n\nThis addon is already installed on your system'))
 
         return fields
 

From e987cdab6c7da1a8ce251ca78c2cfe1968197074 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sat, 23 Jan 2010 23:32:05 +0100
Subject: [PATCH 10/29] [add] purpose-built inheritable view for
 res.config.installer instances

bzr revid: xmo@tinyerp.com-20100123223205-vqs0t44aqih67ngl
---
 bin/addons/base/res/res_config.xml | 36 ++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 2b1d3b45d42..a85fb61cff4 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -47,5 +47,41 @@
       </field>
     </record>
 
+    <record id="res_config_installer" model="ir.ui.view">
+      <field name="name">Inheritable view for installer objects</field>
+      <field name="model">res.config.installer</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+
+        <form>
+          <group>
+            <separator string="title" colspan="4"/>
+            <group colspan="4" col="10">
+              <group colspan="2">
+                <image name="gtk-dialog-info"/>
+                <newline/>
+                <label align="0.0" string="description"/>
+              </group>
+              <group colspan="8"/>
+            </group>
+          </group>
+          <separator string="" colspan="4"/>
+          <group colspan="4" col="8">
+            <field name="progress" widget="progressbar"/>
+            <label string="" colspan="3"/>
+            <group colspan="1" col="2">
+              <button name="action_skip" icon="gtk-goto-last" special="cancel"
+                      type="object" string="Skip"/>
+            </group>
+            <group colspan="1" col="2">
+              <button name="action_next" icon="gtk-go-forward"
+                      type="object" string="Install Modules"/>
+            </group>
+          </group>
+        </form>
+
+      </field>
+    </record>
+
   </data>
 </openerp>

From 958d7492201f9b0b93518f138d2097e9d08b0688 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 24 Jan 2010 16:57:12 +0100
Subject: [PATCH 11/29] [imp] add a few tooltips to the user object

bzr revid: xmo@tinyerp.com-20100124155712-t15hjl2vkv5uit88
---
 bin/addons/base/res/res_user.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index c85f2544e3c..6d1517b7358 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -131,11 +131,14 @@ class users(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Name', size=64, required=True, select=True),
-        'login': fields.char('Login', size=64, required=True),
+        'name': fields.char('Name', size=64, required=True, select=True,
+                            help="The new user's real name, used for searching"
+                                 " and most listings"),
+        'login': fields.char('Login', size=64, required=True,
+                             help="Used to log into the system"),
         'password': fields.char('Password', size=64, invisible=True, help="Keep empty if you don't want the user to be able to connect on the system."),
-        'email': fields.char('E-mail', size=64, help='If an email is provided'\
-                             ', the user will be sent a message welcoming him'),
+        'email': fields.char('E-mail', size=64, help='If an email is provided,'
+                             ' the user will be sent a message welcoming him'),
         'signature': fields.text('Signature', size=64),
         'address_id': fields.many2one('res.partner.address', 'Address'),
         'active': fields.boolean('Active'),
@@ -144,10 +147,15 @@ class users(osv.osv):
         'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
         'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
         'rules_id': fields.many2many('ir.rule.group', 'user_rule_group_rel', 'user_id', 'rule_group_id', 'Rules'),
-        'company_id': fields.many2one('res.company', 'Company', help="The company this user is currently working on.", required=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True,
+            help="The company this user is currently working for."),
         'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Accepted Companies'),
-        'context_lang': fields.selection(_lang_get, 'Language', required=True),
-        'context_tz': fields.selection(_tz_get,  'Timezone', size=64),
+        'context_lang': fields.selection(_lang_get, 'Language', required=True,
+            help="Sets the language for the user's user interface, when UI "
+                 "translations are available"),
+        'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
+            help="The user's timezone, used to perform timezone conversions "
+                 "between the server and the client."),
         'company': fields.selection(_companies_get,  'Company', size=64),
     }
     def read(self,cr, uid, ids, fields=None, context=None, load='_classic_read'):

From d30b92f2ee08827d544b3308d3972eab6049e0da Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 26 Jan 2010 13:19:01 +0100
Subject: [PATCH 12/29] [imp] add a bit of API documentation to
 res.config.installer, and make modules_to_install part of the installer API
 (in case the previous hooks aren't enough)

bzr revid: xmo@tinyerp.com-20100126121901-bl68akae0mrig0a5
---
 bin/addons/base/res/res_config.py | 96 +++++++++++++++++++++++++++++--
 1 file changed, 92 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 6f87e8a83b9..e3b3d2df167 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -114,9 +114,97 @@ class res_config_configurable(osv.osv_memory):
 res_config_configurable()
 
 class res_config_installer(osv.osv_memory):
-    ''' New-style configuration base specialized for modules selection
+    """ New-style configuration base specialized for addons selection
     and installation.
-    '''
+
+    Basic usage
+    -----------
+
+    Subclasses can simply define a number of _columns as
+    fields.boolean objects. The keys (column names) should be the
+    names of the addons to install (when selected). Upon action
+    execution, selected boolean fields (and those only) will be
+    interpreted as addons to install, and batch-installed.
+
+    Additional addons
+    -----------------
+
+    It is also possible to require the installation of an additional
+    addon set when a specific preset of addons has been marked for
+    installation (in the basic usage only, additionals can't depend on
+    one another).
+
+    These additionals are defined through the ``_install_if``
+    property. This property is a mapping of a collection of addons (by
+    name) to a collection of addons (by name) [#]_, and if all the *key*
+    addons are selected for installation, then the *value* ones will
+    be selected as well. For example::
+
+        _install_if = {
+            ('sale','crm'): ['sale_crm'],
+        }
+
+    This will install the ``sale_crm`` addon if and only if both the
+    ``sale`` and ``crm`` addons are selected for installation.
+
+    You can define as many additionals as you wish, and additionals
+    can overlap in key and value. For instance::
+
+        _install_if = {
+            ('sale','crm'): ['sale_crm'],
+            ('sale','project'): ['project_mrp'],
+        }
+
+    will install both ``sale_crm`` and ``project_mrp`` if all of
+    ``sale``, ``crm`` and ``project`` are selected for installation.
+
+    Hook methods
+    ------------
+
+    Subclasses might also need to express dependencies more complex
+    than that provided by additionals. In this case, it's possible to
+    define methods of the form ``_if_%(name)s`` where ``name`` is the
+    name of a boolean field. If the field is selected, then the
+    corresponding module will be marked for installation *and* the
+    hook method will be executed.
+
+    Hook methods take the usual set of parameters (cr, uid, ids,
+    context) and can return a collection of additional addons to
+    install (if they return anything, otherwise they should not return
+    anything, though returning any "falsy" value such as None or an
+    empty collection will have the same effect).
+
+    Complete control
+    ----------------
+
+    The last hook is to simply overload the ``modules_to_install``
+    method, which implements all the mechanisms above. This method
+    takes the usual set of parameters (cr, uid, ids, context) and
+    returns a ``set`` of addons to install (addons selected by the
+    above methods minus addons from the *basic* set which are already
+    installed) [#]_ so an overloader can simply manipulate the ``set``
+    returned by ``res_config_installer.modules_to_install`` to add or
+    remove addons.
+
+    Skipping the installer
+    ----------------------
+
+    Unless it is removed from the view, installers have a *skip*
+    button which invokes ``action_skip`` (and the ``cancel`` hook from
+    ``res.config``). Hooks and additionals *are not run* when skipping
+    installation, even for already installed addons.
+
+    Again, setup your hooks accordinly.
+
+    .. [#] note that since a mapping key needs to be hashable, it's
+           possible to use a tuple or a frozenset, but not a list or a
+           regular set
+
+    .. [#] because the already-installed modules are only pruned at
+           the very end of ``modules_to_install``, additionals and
+           hooks depending on them *are guaranteed to execute*. Setup
+           your hooks accordingly.
+    """
     _name = 'res.config.installer'
     _inherit = 'res.config'
 
@@ -140,7 +228,7 @@ class res_config_installer(osv.osv_memory):
             context=context)
 
 
-    def _modules_to_install(self, cr, uid, ids, context=None):
+    def modules_to_install(self, cr, uid, ids, context=None):
         """ selects all modules to install:
 
         * checked boolean fields
@@ -210,7 +298,7 @@ class res_config_installer(osv.osv_memory):
 
     def execute(self, cr, uid, ids, context=None):
         modules = self.pool.get('ir.module.module')
-        to_install = list(self._modules_to_install(
+        to_install = list(self.modules_to_install(
             cr, uid, ids, context=context))
         self.logger.notifyChannel(
             'installer', netsvc.LOG_INFO,

From 693b74d6f2184f2b861f45e8dcfab489a3d54f26 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 26 Jan 2010 15:26:18 +0100
Subject: [PATCH 13/29] [imp] remove pointless boolean check (there's a default
 priority in the method kwargs)

bzr revid: xmo@tinyerp.com-20100126142618-22cjfny6b8go7apo
---
 bin/tools/misc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 2984fb09186..21cc122aa00 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -455,8 +455,8 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
     msg['X-Generated-By'] = 'OpenERP (http://www.openerp.com)'
     msg['X-OpenERP-Server-Host'] = socket.gethostname()
     msg['X-OpenERP-Server-Version'] = release.version
-    if priority:
-        msg['X-Priority'] = priorities.get(priority, '3 (Normal)')
+
+    msg['X-Priority'] = priorities.get(priority, '3 (Normal)')
 
     # Add dynamic X Header
     for key, value in x_headers.items():

From 24a53305647c0a88622f8a9e10e9287408c827be Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 26 Jan 2010 15:30:03 +0100
Subject: [PATCH 14/29] [imp] use more specific error type (and message) in
 email send

bzr revid: xmo@tinyerp.com-20100126143003-y8huixulml70qa3y
---
 bin/tools/misc.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 21cc122aa00..73fc0e7f87f 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -395,7 +395,7 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
     for i, url in enumerate(url_index):
         if i == 0:
             html += '\n\n'
-        html += '[%s] %s\n' % (i+1, url)       
+        html += '[%s] %s\n' % (i+1, url)
     return html
 
 def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False,
@@ -410,7 +410,7 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
     from email.Utils import formatdate, COMMASPACE
     from email.Utils import formatdate, COMMASPACE
     from email import Encoders
-    import netsvc    
+    import netsvc
 
     if x_headers is None:
         x_headers = {}
@@ -418,8 +418,9 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
     if not ssl:
         ssl = config.get('smtp_ssl', False)
 
-    if not email_from and not config['email_from']:
-        raise Exception("No Email sender by default, see config file")
+    if not (email_from or config['email_from']):
+        raise ValueError("Sending an email requires either providing a sender "
+                         "address or having configured one")
 
     if not email_from:
         email_from = config.get('email_from', False)
@@ -459,7 +460,7 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
     msg['X-Priority'] = priorities.get(priority, '3 (Normal)')
 
     # Add dynamic X Header
-    for key, value in x_headers.items():
+    for key, value in x_headers.iteritems():
         msg['X-OpenERP-%s' % key] = str(value)
 
     if openobject_id:

From e4de42a1b7237314ee19e4eb6cee989545cf3aac Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 26 Jan 2010 15:35:07 +0100
Subject: [PATCH 15/29] [imp] invert attachment condition, preset body value,
 use more precise exception catching

bzr revid: xmo@tinyerp.com-20100126143507-pnfw1yoor58pknaw
---
 bin/tools/misc.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 73fc0e7f87f..d4ed777e5d2 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -430,13 +430,14 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
     if not email_bcc:
         email_bcc = []
 
-    if not attach:
-        try:
-            msg = MIMEText(body.encode('utf8') or '',_subtype=subtype,_charset='utf-8')
-        except:
-            msg = MIMEText(body or '',_subtype=subtype,_charset='utf-8')
-    else:
+    if attach:
         msg = MIMEMultipart()
+    else:
+        if not body: body = u''
+        try:
+            msg = MIMEText(body.encode('utf8'),_subtype=subtype,_charset='utf-8')
+        except UnicodeEncodeError:
+            msg = MIMEText(body,_subtype=subtype,_charset='utf-8')
 
     msg['Subject'] = Header(ustr(subject), 'utf-8')
     msg['From'] = email_from

From f98f5e2192670a06872d51d9e68fce32dd4764c4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 26 Jan 2010 15:41:54 +0100
Subject: [PATCH 16/29] [imp] remove redundancies between sending mails with
 and without attachments

bzr revid: xmo@tinyerp.com-20100126144154-xgk8ep9skczc1vf5
---
 bin/tools/misc.py | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index d4ed777e5d2..c8ebe3a9885 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -415,29 +415,27 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
     if x_headers is None:
         x_headers = {}
 
-    if not ssl:
-        ssl = config.get('smtp_ssl', False)
+    if not ssl: ssl = config.get('smtp_ssl', False)
 
     if not (email_from or config['email_from']):
         raise ValueError("Sending an email requires either providing a sender "
                          "address or having configured one")
 
-    if not email_from:
-        email_from = config.get('email_from', False)
+    if not email_from: email_from = config.get('email_from', False)
 
-    if not email_cc:
-        email_cc = []
-    if not email_bcc:
-        email_bcc = []
+    if not email_cc: email_cc = []
+    if not email_bcc: email_bcc = []
+    if not body: body = u''
+    try:
+        email_text = MIMEText(body.encode('utf-8'),_subtype=subtype,
+                              _charset='utf-8')
+    except (UnicodeEncodeError, UnicodeDecodeError):
+        email_text = MIMEText(body,_subtype=subtype,_charset='utf-8')
 
     if attach:
         msg = MIMEMultipart()
     else:
-        if not body: body = u''
-        try:
-            msg = MIMEText(body.encode('utf8'),_subtype=subtype,_charset='utf-8')
-        except UnicodeEncodeError:
-            msg = MIMEText(body,_subtype=subtype,_charset='utf-8')
+        msg = email_text
 
     msg['Subject'] = Header(ustr(subject), 'utf-8')
     msg['From'] = email_from
@@ -468,10 +466,7 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
         msg['Message-Id'] = "<%s-openobject-%s@%s>" % (time.time(), openobject_id, socket.gethostname())
 
     if attach:
-        try:
-            msg.attach(MIMEText(body.encode('utf8') or '',_subtype=subtype,_charset='utf-8'))
-        except:
-            msg.attach(MIMEText(body or '', _charset='utf-8', _subtype=subtype) )
+        msg.attach(email_text)
         for (fname,fcontent) in attach:
             part = MIMEBase('application', "octet-stream")
             part.set_payload( fcontent )

From fa7a5baca6e977770864fc1e3eac732ea2af0749 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 26 Jan 2010 15:46:47 +0100
Subject: [PATCH 17/29] [imp] don't include MIMEText call in encoding-related
 branches

bzr revid: xmo@tinyerp.com-20100126144647-gxd1eqmu3duh8ys9
---
 bin/tools/misc.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index c8ebe3a9885..7b9777a694f 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -426,16 +426,14 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
     if not email_cc: email_cc = []
     if not email_bcc: email_bcc = []
     if not body: body = u''
-    try:
-        email_text = MIMEText(body.encode('utf-8'),_subtype=subtype,
-                              _charset='utf-8')
+    try: email_body = body.encode('utf-8')
     except (UnicodeEncodeError, UnicodeDecodeError):
-        email_text = MIMEText(body,_subtype=subtype,_charset='utf-8')
+        email_body = body
 
-    if attach:
-        msg = MIMEMultipart()
-    else:
-        msg = email_text
+    email_text = MIMEText(mail_body, _subtype=subtype, _charset='utf-8')
+
+    if attach: msg = MIMEMultipart()
+    else: msg = email_text
 
     msg['Subject'] = Header(ustr(subject), 'utf-8')
     msg['From'] = email_from

From ed446050d725feabe570edad5997fec025101074 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 26 Jan 2010 16:30:45 +0100
Subject: [PATCH 18/29] [add] base for sending data when a new user is created
 through the res.config.users wizard.

Currently untested, and needs improvement and some QCing on the mail body.

bzr revid: xmo@tinyerp.com-20100126153045-tvj8gr8343pybetp
---
 bin/addons/base/res/res_user.py | 39 ++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 6d1517b7358..8a887ca2dd5 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -330,16 +330,42 @@ class config_users(osv.osv_memory):
     _name = 'res.config.users'
     _inherit = ['res.users', 'res.config']
 
+    WELCOME_MAIL_SUBJECT = _(u"Welcome to OpenERP")
+    WELCOME_MAIL_BODY = _(u"An OpenERP account has been created for \
+        \"%(name)s\" on the server ???.\n\nYour login is %(login)s, \
+        you should ask your supervisor or system administrator if you \
+        haven't been given your password yet.\n\n\
+        If you aren't %(name)s, this email reached you by errorneously, \
+        please delete it.")
+
     def _generate_signature(self, cr, name, email, context=None):
         return _('--\n%(name)s %(email)s\n') % {
             'name': name or '',
             'email': email and ' <'+email+'>' or '',
             }
 
+    def get_welcome_mail_subject(self, cr, uid, context=None):
+        """ Returns the subject of the mail new users receive (when
+        created via the res.config.users wizard), default implementation
+        is to return config_users.WELCOME_MAIL_SUBJECT
+        """
+        return self.WELCOME_MAIL_SUBJECT
+    def get_welcome_mail_body(self, cr, uid, context=None):
+        """ Returns the subject of the mail new users receive (when
+        created via the res.config.users wizard), default implementation
+        is to return config_users.WELCOME_MAIL_BODY
+        """
+        return self.WELCOME_MAIL_BODY
+
     def create_user(self, cr, uid, new_id, context=None):
-        ''' create a new res.user instance from the data stored
-        in the current res.config.users
-        '''
+        """ create a new res.user instance from the data stored
+        in the current res.config.users.
+
+        If an email address was filled in for the user, sends a mail
+        composed of the return values of ``get_welcome_mail_subject``
+        and ``get_welcome_mail_body`` (which should be unicode values),
+        with the user's data %-formatted into the mail body
+        """
         base_data = self.read(cr, uid, new_id, context=context)
         partner_id = self.pool.get('res.partner').main_partner(cr, uid)
         address = self.pool.get('res.partner.address').create(
@@ -355,6 +381,13 @@ class config_users(osv.osv_memory):
             )
         self.pool.get('res.users').create(
             cr, uid, user_data, context)
+        if user_data['email']:
+            tools.email_send(email_from=None, email_to=user_data['email'],
+                             subject=self.get_welcome_mail_subject(
+                                 cr, uid, context=context),
+                             body=self.get_welcome_mail_body(
+                                 cr, uid, context=context) % user_data,
+                             reply_to="no@reply.to")
 
     def execute(self, cr, uid, ids, context=None):
         self.create_user(cr, uid, ids[0], context=context)

From 16c8091429f3aee5e1d5769e4e9121c65499f07d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 26 Jan 2010 16:35:58 +0100
Subject: [PATCH 19/29] [imp] use compiler-joining to break strings across
 multiple lines (instead of backslash-escaping newlines) otherwise can't
 indent following lines

bzr revid: xmo@tinyerp.com-20100126153558-hlqpo24ddr04lg50
---
 bin/addons/base/res/res_user.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 8a887ca2dd5..eff550deba0 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -331,12 +331,12 @@ class config_users(osv.osv_memory):
     _inherit = ['res.users', 'res.config']
 
     WELCOME_MAIL_SUBJECT = _(u"Welcome to OpenERP")
-    WELCOME_MAIL_BODY = _(u"An OpenERP account has been created for \
-        \"%(name)s\" on the server ???.\n\nYour login is %(login)s, \
-        you should ask your supervisor or system administrator if you \
-        haven't been given your password yet.\n\n\
-        If you aren't %(name)s, this email reached you by errorneously, \
-        please delete it.")
+    WELCOME_MAIL_BODY = _(u"An OpenERP account has been created for "
+        "\"%(name)s\" on the server ???.\n\nYour login is %(login)s, "
+        "you should ask your supervisor or system administrator if you "
+        "haven't been given your password yet.\n\n"
+        "If you aren't %(name)s, this email reached you errorneously, "
+        "please delete it.")
 
     def _generate_signature(self, cr, name, email, context=None):
         return _('--\n%(name)s %(email)s\n') % {

From 392631cc3283d75b8e072249214dc5ffbbfa85e0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 26 Jan 2010 17:42:37 +0100
Subject: [PATCH 20/29] [fix] res.config so the state of a todo is changed
 after being done with it, not when it's displayed.

Add the setting of states to ``skip`` (action_skip) and ``cancel``
(action_cancel) on top of ``done`` (action_next) plus a bit of
documentation to the API.

Also, fix res.config.users to use the right buttons/actions for its
stuff, or clicking "Done" registers as having skipped the screen:
create ``action_add`` event for "Add User" button, and hook "Done" to
``action_next`` with a NOOP ``execute``.

bzr revid: xmo@tinyerp.com-20100126164237-0zvk4jc1dv9gqdc7
---
 bin/addons/base/base_update.xml   | 25 ++++++++--
 bin/addons/base/res/res_config.py | 76 +++++++++++++++++++++++++++++--
 bin/addons/base/res/res_user.py   |  5 +-
 3 files changed, 96 insertions(+), 10 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 180bd134a6e..3b969817d47 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -230,16 +230,31 @@
                   <field colspan="4" nolabel="1" name="groups_id"/>
                 </group>
 
-                <xpath expr='//button[@name="action_skip"]'
-                       position='attributes'>
-                  <attribute name='string'>Done</attribute>
-                  <attribute name='icon'>gtk-go-forward</attribute>
-                </xpath>
                 <xpath expr='//button[@name="action_next"]'
                        position='attributes'>
+                  <attribute name="name">action_add</attribute>
                   <attribute name='string'>Add User</attribute>
                   <attribute name='icon'>gtk-add</attribute>
                 </xpath>
+
+                <xpath expr='//button[@name="action_skip"]'
+                       position='attributes'>
+                  <!-- if this one is performed first, it transforms
+                       the action_skip into action_next, and the
+                       transformation of action_next to action_add,
+                       since it uses first-match, transforms the same
+                       button. And we end up with [add] [next] instead
+                       of [next] [add]
+
+                       Would probably be simpler to just replace both
+                       by nothing and create a pair of brand new
+                       buttons... but we'd have to handle the groups
+                       around the buttons... oh well...
+                  -->
+                  <attribute name="name">action_next</attribute>
+                  <attribute name='string'>Done</attribute>
+                  <attribute name='icon'>gtk-go-forward</attribute>
+                </xpath>
               </data>
             </field>
         </record>
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index e3b3d2df167..85a363c58a2 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -60,11 +60,30 @@ class res_config_configurable(osv.osv_memory):
                                   'getting next %s' % todos)
         active_todos = todos.search(cr, uid, [('state','=','open'),
                                               ('active','=',True)],
-                                    limit=1, context=None)
+                                    limit=1)
         if active_todos:
             return todos.browse(cr, uid, active_todos[0], context=None)
         return None
 
+    def _set_previous_todo(self, cr, uid, state):
+        """ lookup the previous (which is still the next at this point)
+        ir.actions.todo, set it to whatever state was provided.
+
+        Raises
+        `LookupError`: if we couldn't find *any* previous todo
+        `ValueError`: if no state is provided
+        anything ir_actions_todo.write can throw
+        """
+        # this is ultra brittle, but apart from storing the todo id
+        # into the res.config view, I'm not sure how to do it
+        previous_todo = self._next_action(cr, uid)
+        if not previous_todo:
+            raise LookupError(_("Couldn't find previous ir.actions.todo"))
+        if not state:
+            raise ValueError(_("Can't set an ir.actions.todo's state to "
+                               "nothingness"))
+        previous_todo.write({'state':state})
+
     def _next(self, cr, uid):
         self.logger.notifyChannel('actions', netsvc.LOG_INFO,
                                   'getting next operation')
@@ -72,9 +91,6 @@ class res_config_configurable(osv.osv_memory):
         self.logger.notifyChannel('actions', netsvc.LOG_INFO,
                                   'next action is %s' % next)
         if next:
-            self.pool.get('ir.actions.todo').write(cr, uid, next.id, {
-                    'state':'done',
-                    }, context=None)
             action = next.action_id
             return {
                 'view_mode': action.view_mode,
@@ -93,21 +109,73 @@ class res_config_configurable(osv.osv_memory):
         # return the action associated with the menu
         return self.pool.get(current_user_menu.type)\
             .read(cr, uid, current_user_menu.id)
+
     def next(self, cr, uid, ids, context=None):
+        """ Returns the next action to execute execute (using the default
+        sort order)
+        """
         return self._next(cr, uid)
 
     def execute(self, cr, uid, ids, context=None):
+        """ Method called when the user clicks on the ``Next`` button.
+
+        Execute *must* be overloaded unless ``action_next`` is overloaded
+        (which is something you generally don't need to do).
+
+        If ``execute`` returns an action dictionary, that action is executed
+        rather than just going to the next configuration item.
+        """
         raise NotImplementedError(
             'Configuration items need to implement execute')
     def cancel(self, cr, uid, ids, context=None):
+        """ Method called when the user click on the ``Skip`` button.
+
+        ``cancel`` should be overloaded instead of ``action_skip``. As with
+        ``execute``, if it returns an action dictionary that action is
+        executed in stead of the default (going to the next configuration item)
+
+        The default implementation is a NOOP.
+        """
         pass
 
     def action_next(self, cr, uid, ids, context=None):
+        """ Action handler for the ``next`` event.
+
+        Sets the status of the todo the event was sent from to
+        ``done``, calls ``execute`` and -- unless ``execute`` returned
+        an action dictionary -- executes the action provided by calling
+        ``next``.
+        """
+        self._set_previous_todo(cr, uid, state='done')
         next = self.execute(cr, uid, ids, context=None)
         if next: return next
         return self.next(cr, uid, ids, context=context)
 
     def action_skip(self, cr, uid, ids, context=None):
+        """ Action handler for the ``skip`` event.
+
+        Sets the status of the todo the event was sent from to
+        ``skip``, calls ``cancel`` and -- unless ``cancel`` returned
+        an action dictionary -- executes the action provided by calling
+        ``next``.
+        """
+        self._set_previous_todo(cr, uid, state='skip')
+        next = self.cancel(cr, uid, ids, context=None)
+        if next: return next
+        return self.next(cr, uid, ids, context=context)
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """ Action handler for the ``cancel`` event. That event isn't
+        generated by the res.config.view.base inheritable view, the
+        inherited view has to overload one of the buttons (or add one
+        more).
+
+        Sets the status of the todo the event was sent from to
+        ``cancel``, calls ``cancel`` and -- unless ``cancel`` returned
+        an action dictionary -- executes the action provided by calling
+        ``next``.
+        """
+        self._set_previous_todo(cr, uid, state='cancel')
         next = self.cancel(cr, uid, ids, context=None)
         if next: return next
         return self.next(cr, uid, ids, context=context)
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index eff550deba0..43f91e69917 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -388,8 +388,11 @@ class config_users(osv.osv_memory):
                              body=self.get_welcome_mail_body(
                                  cr, uid, context=context) % user_data,
                              reply_to="no@reply.to")
-
     def execute(self, cr, uid, ids, context=None):
+        'Do nothing on execution, just launch the next action/todo'
+        pass
+    def action_add(self, cr, uid, ids, context=None):
+        'Create a user, and re-display the view'
         self.create_user(cr, uid, ids[0], context=context)
         return {
             'view_type': 'form',

From 50f599947e37d9be6565cf4ff2c959f5369a957b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 26 Jan 2010 19:45:11 +0100
Subject: [PATCH 21/29] [fix] erratas to res.config's documentation

bzr revid: xmo@tinyerp.com-20100126184511-4e0iu2ziqgn4wlhy
---
 bin/addons/base/res/res_config.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 85a363c58a2..2885a4059cf 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -75,7 +75,8 @@ class res_config_configurable(osv.osv_memory):
         anything ir_actions_todo.write can throw
         """
         # this is ultra brittle, but apart from storing the todo id
-        # into the res.config view, I'm not sure how to do it
+        # into the res.config view, I'm not sure how to get the
+        # "previous" todo
         previous_todo = self._next_action(cr, uid)
         if not previous_todo:
             raise LookupError(_("Couldn't find previous ir.actions.todo"))
@@ -111,7 +112,7 @@ class res_config_configurable(osv.osv_memory):
             .read(cr, uid, current_user_menu.id)
 
     def next(self, cr, uid, ids, context=None):
-        """ Returns the next action to execute execute (using the default
+        """ Returns the next todo action to execute (using the default
         sort order)
         """
         return self._next(cr, uid)
@@ -135,6 +136,9 @@ class res_config_configurable(osv.osv_memory):
         executed in stead of the default (going to the next configuration item)
 
         The default implementation is a NOOP.
+
+        ``cancel`` is also called by the default implementation of
+        ``action_cancel``.
         """
         pass
 

From 154a301fa31c3084821445d82ad751306bd95a00 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 26 Jan 2010 19:45:34 +0100
Subject: [PATCH 22/29] [imp] don't display ir.actions.todo's active field in
 tree view

bzr revid: xmo@tinyerp.com-20100126184534-gjqobv95b2yl5axw
---
 bin/addons/base/ir/ir.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 59ccd5dde7c..ad9b0f4d4e1 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1343,7 +1343,7 @@
                     <field name="sequence"/>
                     <field name="action_id" select="1"/>
                     <field name="state"/>
-                    <field name="active" select="2"/>
+                    <field name="active" select="2" invisible="True"/>
                 </tree>
             </field>
         </record>

From 5e5fedc78df1287c302add4ebf021c1e8dc889be Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 27 Jan 2010 10:12:44 +0100
Subject: [PATCH 23/29] [fix] Add a width to installer description field

bzr revid: xmo@tinyerp.com-20100127091244-z9xuyjxpmk6rrvz9
---
 bin/addons/base/res/res_config.xml | 2 +-
 bin/addons/base/rng/view.rng       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index a85fb61cff4..fc4ebba2b1b 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -60,7 +60,7 @@
               <group colspan="2">
                 <image name="gtk-dialog-info"/>
                 <newline/>
-                <label align="0.0" string="description"/>
+                <label align="0.0" string="description" width="200"/>
               </group>
               <group colspan="8"/>
             </group>
diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index 3a9c8f92369..a46e8e312ca 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -97,6 +97,7 @@
             <rng:optional><rng:attribute name="position"/></rng:optional>
             <rng:optional><rng:attribute name="fill"/></rng:optional>
             <rng:optional><rng:attribute name="help"/></rng:optional>
+            <rng:optional><rng:attribute name="width"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="notebook"/>

From fee5e0734ccbfd1a2f5a6aeccba79db1ef16f818 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 27 Jan 2010 12:28:49 +0100
Subject: [PATCH 24/29] [imp] move email sending into res.users, be a bit more
 defensive

bzr revid: xmo@tinyerp.com-20100127112849-3bouvwmym99d6xl9
---
 bin/addons/base/res/res_user.py | 82 ++++++++++++++++++++-------------
 1 file changed, 50 insertions(+), 32 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 43f91e69917..db89b92537a 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -83,7 +83,6 @@ class groups(osv.osv):
 
 groups()
 
-
 class roles(osv.osv):
     _name = "res.roles"
     _columns = {
@@ -124,12 +123,55 @@ class users(osv.osv):
     _uid_cache = {}
     _name = "res.users"
 
+    WELCOME_MAIL_SUBJECT = u"Welcome to OpenERP"
+    WELCOME_MAIL_BODY = u"An OpenERP account has been created for "\
+        "\"%(name)s\" on the server ???.\n\nYour login is %(login)s, "\
+        "you should ask your supervisor or system administrator if you "\
+        "haven't been given your password yet.\n\n"\
+        "If you aren't %(name)s, this email reached you errorneously, "\
+        "please delete it."
+
+    def get_welcome_mail_subject(self, cr, uid, context=None):
+        """ Returns the subject of the mail new users receive (when
+        created via the res.config.users wizard), default implementation
+        is to return config_users.WELCOME_MAIL_SUBJECT
+        """
+        return self.WELCOME_MAIL_SUBJECT
+    def get_welcome_mail_body(self, cr, uid, context=None):
+        """ Returns the subject of the mail new users receive (when
+        created via the res.config.users wizard), default implementation
+        is to return config_users.WELCOME_MAIL_BODY
+        """
+        return self.WELCOME_MAIL_BODY
+
     def get_current_company(self, cr, uid):
         res=[]
         cr.execute('select company_id, res_company.name from res_users left join res_company on res_company.id = company_id where res_users.id=%s' %uid)
         res = cr.fetchall()
         return res
 
+    def send_welcome_email(self, cr, uid, id, context=None):
+        logger= netsvc.Logger()
+        user = self.pool.get('res.users').read(cr, uid, id, context=context)
+        if not tools.config.get('smtp_server'):
+            logger.notifyChannel('mails', netsvc.LOG_WARNING,
+                _('"smtp_server" needs to be set to send mails to users'))
+            return False
+        if not tools.config.get('email_from'):
+            logger.notifyChannel("mails", netsvc.LOG_WARNING,
+                _('"email_from" needs to be set to send welcome mails '
+                  'to users'))
+            return False
+        if not user.get('email'):
+            return False
+
+        return tools.email_send(email_from=None, email_to=user['email'],
+                                subject=self.get_welcome_mail_subject(
+                                    cr, uid, context=context),
+                                body=self.get_welcome_mail_body(
+                                    cr, uid, context=context) % user,
+                                reply_to="no@reply.to")
+
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=True,
                             help="The new user's real name, used for searching"
@@ -137,8 +179,11 @@ class users(osv.osv):
         'login': fields.char('Login', size=64, required=True,
                              help="Used to log into the system"),
         'password': fields.char('Password', size=64, invisible=True, help="Keep empty if you don't want the user to be able to connect on the system."),
-        'email': fields.char('E-mail', size=64, help='If an email is provided,'
-                             ' the user will be sent a message welcoming him'),
+        'email': fields.char('E-mail', size=64,
+            help='If an email is provided, the user will be sent a message '
+                 'welcoming him.\n\nWarning: if "email_from" and "smtp_server"'
+                 " aren't configured, it won't be possible to email new "
+                 "users."),
         'signature': fields.text('Signature', size=64),
         'address_id': fields.many2one('res.partner.address', 'Address'),
         'active': fields.boolean('Active'),
@@ -330,33 +375,12 @@ class config_users(osv.osv_memory):
     _name = 'res.config.users'
     _inherit = ['res.users', 'res.config']
 
-    WELCOME_MAIL_SUBJECT = _(u"Welcome to OpenERP")
-    WELCOME_MAIL_BODY = _(u"An OpenERP account has been created for "
-        "\"%(name)s\" on the server ???.\n\nYour login is %(login)s, "
-        "you should ask your supervisor or system administrator if you "
-        "haven't been given your password yet.\n\n"
-        "If you aren't %(name)s, this email reached you errorneously, "
-        "please delete it.")
-
     def _generate_signature(self, cr, name, email, context=None):
         return _('--\n%(name)s %(email)s\n') % {
             'name': name or '',
             'email': email and ' <'+email+'>' or '',
             }
 
-    def get_welcome_mail_subject(self, cr, uid, context=None):
-        """ Returns the subject of the mail new users receive (when
-        created via the res.config.users wizard), default implementation
-        is to return config_users.WELCOME_MAIL_SUBJECT
-        """
-        return self.WELCOME_MAIL_SUBJECT
-    def get_welcome_mail_body(self, cr, uid, context=None):
-        """ Returns the subject of the mail new users receive (when
-        created via the res.config.users wizard), default implementation
-        is to return config_users.WELCOME_MAIL_BODY
-        """
-        return self.WELCOME_MAIL_BODY
-
     def create_user(self, cr, uid, new_id, context=None):
         """ create a new res.user instance from the data stored
         in the current res.config.users.
@@ -379,15 +403,9 @@ class config_users(osv.osv_memory):
                 cr, base_data['name'], base_data['email'], context=context),
             address_id=address,
             )
-        self.pool.get('res.users').create(
+        new_user = self.pool.get('res.users').create(
             cr, uid, user_data, context)
-        if user_data['email']:
-            tools.email_send(email_from=None, email_to=user_data['email'],
-                             subject=self.get_welcome_mail_subject(
-                                 cr, uid, context=context),
-                             body=self.get_welcome_mail_body(
-                                 cr, uid, context=context) % user_data,
-                             reply_to="no@reply.to")
+        self.send_welcome_email(cr, uid, new_user, context=context)
     def execute(self, cr, uid, ids, context=None):
         'Do nothing on execution, just launch the next action/todo'
         pass

From 2dd21b183e956dcfb1b5755986500c1cadc30409 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 27 Jan 2010 12:37:16 +0100
Subject: [PATCH 25/29] [fix] typo in send_mail

bzr revid: xmo@tinyerp.com-20100127113716-ev7vi7s1axvj7na4
---
 bin/tools/misc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 7b9777a694f..f73c407b2ae 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -430,7 +430,7 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
     except (UnicodeEncodeError, UnicodeDecodeError):
         email_body = body
 
-    email_text = MIMEText(mail_body, _subtype=subtype, _charset='utf-8')
+    email_text = MIMEText(email_body, _subtype=subtype, _charset='utf-8')
 
     if attach: msg = MIMEMultipart()
     else: msg = email_text

From f277ec836b204363c4c5d7c94cf4a0b7cb6dd777 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 27 Jan 2010 13:14:12 +0100
Subject: [PATCH 26/29] [fix] email_to is a sequence of email addresses, not
 just one

bzr revid: xmo@tinyerp.com-20100127121412-5mhk4y34d9g0239u
---
 bin/addons/base/res/res_user.py |  6 +++---
 bin/tools/misc.py               | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index db89b92537a..25ef17bc387 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -124,8 +124,8 @@ class users(osv.osv):
     _name = "res.users"
 
     WELCOME_MAIL_SUBJECT = u"Welcome to OpenERP"
-    WELCOME_MAIL_BODY = u"An OpenERP account has been created for "\
-        "\"%(name)s\" on the server ???.\n\nYour login is %(login)s, "\
+    WELCOME_MAIL_BODY = u"An OpenERP account has been created for you, "\
+        "\"%(name)s\".\n\nYour login is %(login)s, "\
         "you should ask your supervisor or system administrator if you "\
         "haven't been given your password yet.\n\n"\
         "If you aren't %(name)s, this email reached you errorneously, "\
@@ -165,7 +165,7 @@ class users(osv.osv):
         if not user.get('email'):
             return False
 
-        return tools.email_send(email_from=None, email_to=user['email'],
+        return tools.email_send(email_from=None, email_to=[user['email']],
                                 subject=self.get_welcome_mail_subject(
                                     cr, uid, context=context),
                                 body=self.get_welcome_mail_body(
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index f73c407b2ae..f68dda46b7a 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -401,7 +401,16 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
 def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False,
                attach=None, openobject_id=False, ssl=False, debug=False, subtype='plain', x_headers=None, priority='3'):
 
-    """Send an email."""
+    """Send an email.
+
+    Arguments:
+
+    `email_from`: A string used to fill the `From` header, if falsy,
+                  config['email_from'] is used instead.  Also used for
+                  the `Reply-To` header if `reply_to` is not provided
+
+    `email_to`: a sequence of addresses to send the mail to.
+    """
     import smtplib
     from email.MIMEText import MIMEText
     from email.MIMEBase import MIMEBase

From c8468aa37c0948d7ad40bd81041780f700f82e62 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 27 Jan 2010 13:15:07 +0100
Subject: [PATCH 27/29] [imp] remove explicit reply-to setting in welcome email

bzr revid: xmo@tinyerp.com-20100127121507-j2ano3hioykmw5s5
---
 bin/addons/base/res/res_user.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 25ef17bc387..b5f8851c3d2 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -169,8 +169,7 @@ class users(osv.osv):
                                 subject=self.get_welcome_mail_subject(
                                     cr, uid, context=context),
                                 body=self.get_welcome_mail_body(
-                                    cr, uid, context=context) % user,
-                                reply_to="no@reply.to")
+                                    cr, uid, context=context) % user))
 
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=True,

From ce5acb2c5e93dec5a517c03cb735f96704598274 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 31 Jan 2010 18:48:44 +0100
Subject: [PATCH 28/29] [fix] syntax error introduced in
 xmo@tinyerp.com-20100127121507-cw98bdzkq1z8vgj4

bzr revid: xmo@tinyerp.com-20100131174844-ni2pkc2nj89m7qki
---
 bin/addons/base/res/res_user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index b5f8851c3d2..1ff262fe234 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -169,7 +169,7 @@ class users(osv.osv):
                                 subject=self.get_welcome_mail_subject(
                                     cr, uid, context=context),
                                 body=self.get_welcome_mail_body(
-                                    cr, uid, context=context) % user))
+                                    cr, uid, context=context) % user)
 
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=True,

From 3d6e738cb66479d7b67b0c94301a25e27d3eeacc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 31 Jan 2010 18:54:21 +0100
Subject: [PATCH 29/29] [fix] installer layout in gecko browsers

bzr revid: xmo@tinyerp.com-20100131175421-ob1vyyzsdvmcipgm
---
 bin/addons/base/res/res_config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index fc4ebba2b1b..11d753018c2 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -54,7 +54,7 @@
       <field name="arch" type="xml">
 
         <form>
-          <group>
+          <group colspan="4">
             <separator string="title" colspan="4"/>
             <group colspan="4" col="10">
               <group colspan="2">