From f4ad90bd9658737219822d524d7e251be25ab30b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 13 Dec 2009 18:54:14 +0100
Subject: [PATCH 01/39] [imp] base_setup: extract pooler.get_pool(cr.dbname) in
 a temp

bzr revid: xmo@tinyerp.com-20091213175414-aew11vnhn1lw78in
---
 addons/base_setup/wizard/wizard_base_setup.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index 9a6e61084ce..bc7a830783b 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -241,8 +241,9 @@ class wizard_base_setup(wizard.interface):
         return 'charts'
 
     def _config(self, cr, uid, data, context=None):
-        users_obj=pooler.get_pool(cr.dbname).get('res.users')
-        action_obj=pooler.get_pool(cr.dbname).get('ir.actions.act_window')
+        pool = pooler.get_pool(cr.dbname)
+        users_obj=pool.get('res.users')
+        action_obj=pool.get('ir.actions.act_window')
 
         ids=action_obj.search(cr, uid, [('name', '=', 'Menu')])
         menu=action_obj.browse(cr, uid, ids)[0]

From f9ffeae373c709188240e2e0ad58060c63c2592b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Sun, 13 Dec 2009 18:54:51 +0100
Subject: [PATCH 02/39] [fix] base_setup: migrate to res.config-based initial
 configuration

bzr revid: xmo@tinyerp.com-20091213175451-olhmbepsgrpa6lvr
---
 addons/base_setup/wizard/wizard_base_setup.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index bc7a830783b..355b72c41d4 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -252,14 +252,8 @@ class wizard_base_setup(wizard.interface):
         users_obj.write(cr, uid, ids, {'action_id': menu.id})
         ids=users_obj.search(cr, uid, [('menu_id', '=', 'Setup')])
         users_obj.write(cr, uid, ids, {'menu_id': menu.id})
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'context':{'menu':True},
-                'target':'new',
-         }
+
+        return pool.get('res.config').next(cr, uid, [], context=context)
 
     fields={
         'profile':{

From a391fca77184ff0e00f7eb9004221417b86ccb93 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 14 Dec 2009 15:49:30 +0100
Subject: [PATCH 03/39] [fix] crm: migrate to res.config-based initial
 configuration

bzr revid: xmo@tinyerp.com-20091214144930-zm1b51yj1xyikgfn
---
 addons/crm/crm.py              | 25 +++--------------
 addons/crm/crm_config.py       | 22 ++-------------
 addons/crm/crm_config_view.xml | 51 +++++++++++++++++++---------------
 addons/crm/crm_view.xml        | 29 ++++++++++---------
 4 files changed, 51 insertions(+), 76 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 44988520898..bd04a6c2ce0 100755
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -1109,12 +1109,14 @@ crm_email_add_cc_wizard()
 
 class crm_calendar_config_wizard(osv.osv_memory):
     _name = 'crm.calendar.config_wizard'
+    _inherit = 'res.config'
+
     _columns = {
         'name': fields.char('Name', size=64),
         'caldav': fields.boolean('Caldav Properties View', help="Manages the fields required for Caldav Properties.")
     }
-    
-    def action_create(self, cr, uid, ids, context=None):
+
+    def execute(self, cr, uid, ids, context=None):
         res = self.read(cr, uid, ids)[0]
         idref = {}
         if res['caldav']:
@@ -1126,26 +1128,7 @@ class crm_calendar_config_wizard(osv.osv_memory):
                 if fp:
                     tools.convert_xml_import(cr, 'crm', fp, idref, 'init', noupdate=True)
             cr.commit()
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-         }
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-         }
-
 crm_calendar_config_wizard()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/crm_config.py b/addons/crm/crm_config.py
index 04bd451102e..4a687c9ab31 100644
--- a/addons/crm/crm_config.py
+++ b/addons/crm/crm_config.py
@@ -118,6 +118,8 @@ crm_cases()
 
 class crm_menu_config_wizard(osv.osv_memory):
     _name = 'crm.menu.config_wizard'
+    _inherit = 'res.config'
+
     _columns = {
         'name': fields.char('Name', size=64),
         'meeting': fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
@@ -137,7 +139,7 @@ class crm_menu_config_wizard(osv.osv_memory):
         'phonecall': lambda *args: True,
     }
 
-    def action_create(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         module_proxy = self.pool.get('ir.module.module')
         modid = module_proxy.search(cr, uid, [('name', '=', 'crm')])
         moddemo = module_proxy.browse(cr, uid, modid[0]).demo
@@ -167,24 +169,6 @@ class crm_menu_config_wizard(osv.osv_memory):
             module_proxy.button_install(cr, uid, ids, context=context)
             cr.commit()
             db, pool = pooler.restart_pool(cr.dbname, update_module=True)
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-         }
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-         }
-
 crm_menu_config_wizard()
 
 
diff --git a/addons/crm/crm_config_view.xml b/addons/crm/crm_config_view.xml
index c65344fbcb8..62c01c2037b 100644
--- a/addons/crm/crm_config_view.xml
+++ b/addons/crm/crm_config_view.xml
@@ -8,28 +8,34 @@
             <field name="name">Configure Menu for Sections</field>
             <field name="model">crm.menu.config_wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Configure CRM Sections">
-                    <separator colspan="4" string="Install Pre-Configured Features"/>
-                    <label colspan="4" align="0.0" string="The CRM module of OpenERP is able to manage any kind of relationship. But, as to help you to start quickly on the system, we configured a few of them for you."/>
-                    <newline/>
-                    <field name="meeting"/>
-                    <field name="opportunity"/>
-                    <field name="phonecall"/>
-                    <field name="lead"/>
-                    <field name="claims"/>
-                    <field name="bugs"/>
-                    <field name="helpdesk"/>
-                    <field name="jobs"/>
-                    <field name="fund"/>
-                    <separator colspan="4" string="Calendar Sharing"/>
-                    <field name="document_ics"/>
-                    <newline/>
-                    <group col="4" colspan="4">
-                        <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-forward" name="action_create" string="Next" type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Configure CRM Sections
+                </attribute></form>
+
+                <group string="res_config_contents" position="replace">
+                  <separator colspan="4"
+                             string="Install Pre-Configured Features"/>
+                  <label colspan="4" align="0.0" string="
+                     The CRM module of OpenERP is able to manage any kind of
+                     relationship. But, as to help you to start quickly on the
+                     system, we configured a few of them for you."/>
+                  <newline/>
+                  <field name="meeting"/>
+                  <field name="opportunity"/>
+                  <field name="phonecall"/>
+                  <field name="lead"/>
+                  <field name="claims"/>
+                  <field name="bugs"/>
+                  <field name="helpdesk"/>
+                  <field name="jobs"/>
+                  <field name="fund"/>
+                  <separator colspan="4" string="Calendar Sharing"/>
+                  <field name="document_ics"/>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -37,6 +43,7 @@
             <field name="name">Configure Menu for CRM case Section</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">crm.menu.config_wizard</field>
+            <field name="view_id" ref="view_config_crm_menu"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -44,8 +51,6 @@
 
         <!-- register configuration wizard -->
         <record id="config_wizard_step_case_section_menu" model="ir.actions.todo">
-            <field name="name">Create Menu for CRM Case Section</field>
-            <field name="note">This Configuration step use to create Menu for Case Sections</field>
             <field name="action_id" ref="action_view_config_crm_menu"/>
         </record>
         
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 1d7c3a4fca5..cdd55fd6b83 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -750,18 +750,22 @@
             <field name="name">Configure Menu for Caldav Properites</field>
             <field name="model">crm.calendar.config_wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Configure view for Caldav Properites">
-                    <separator colspan="4" string=""/>
-                    <label colspan="4" align="0.0" string="This will provide a detailed view for caldav properties configuration"/>
-                    <newline/>
-                    <field name="caldav"/>
-                    <separator colspan="4" string=""/>
-                    <group col="4" colspan="4">
-                        <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-forward" name="action_create" string="Next" type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Configure view for Caldav Properties
+                </attribute></form>
+
+                <group string="res_config_contents" position="replace">
+                  <separator colspan="4" string=""/>
+                  <label colspan="4" align="0.0" string="
+                     Enable a detailed view of the caldav properties
+                     configuration."/>
+                  <newline/>
+                  <field name="caldav"/>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -769,6 +773,7 @@
             <field name="name">Configure Menu for Caldav Properites</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">crm.calendar.config_wizard</field>
+            <field name="view_id" ref="view_config_crm_caldav_menu"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -776,8 +781,6 @@
 
         <!-- register configuration wizard -->
         <record id="config_wizard_step_cam_caldav_menu" model="ir.actions.todo">
-            <field name="name">Configure Menu for Caldav Properites</field>
-            <field name="note">This Configuration step use to provide a detailed view for caldav properties configuration</field>
             <field name="action_id" ref="action_view_config_crm_caldav_menu"/>
         </record>
 

From 0ca489257aad765b4e456921318f899841c31b9d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 14 Dec 2009 16:01:41 +0100
Subject: [PATCH 04/39] [imp] group configuration wizard registration with
 associated action & view

bzr revid: xmo@tinyerp.com-20091214150141-mmds087h4ky04wur
---
 addons/account/account_view.xml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index dec57719c86..ce03dd1b044 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1476,6 +1476,12 @@
             <field name="target">new</field>
         </record>
 
+        <!-- register configuration wizard -->
+        <record id="config_fiscalyear" model="ir.actions.todo">
+            <field name="name">Account Configure Wizard</field>
+            <field name="note">Define Fiscal Years and Select Charts of Account</field>
+            <field name="action_id" ref="action_account_config_wizard_form"/>
+        </record>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Account Add wizard</field>
@@ -1500,16 +1506,6 @@
             src_model="account.account.template"
 	    view_type="form" view_mode="form"/>
 
-        <!-- register configuration wizard -->
-
-        <record id="config_fiscalyear" model="ir.actions.todo">
-            <field name="name">Account Configure Wizard</field>
-            <field name="note">Define Fiscal Years and Select Charts of Account</field>
-            <field name="action_id" ref="action_account_config_wizard_form"/>
-        </record>
-
-
-
         <!-- Account Templates -->
         <menuitem 
             id="account_template_folder"

From 0c4142b546140b3a723578314ecd735dd380d495 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 14 Dec 2009 16:41:08 +0100
Subject: [PATCH 05/39] [fix] account: migrate to res.config-based initial
 configuration

bzr revid: xmo@tinyerp.com-20091214154108-qy7ms9h83jxu2wnr
---
 addons/account/account.py       | 43 ++-----------------
 addons/account/account_view.xml | 74 ++++++++++++++++++---------------
 addons/account/company.py       | 21 +---------
 addons/account/company_view.xml | 21 ++++++----
 4 files changed, 58 insertions(+), 101 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 549f257b124..ad44b3e9ac5 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1708,6 +1708,7 @@ account_subscription_line()
 
 class account_config_wizard(osv.osv_memory):
     _name = 'account.config.wizard'
+    _inherit = 'res.config'
 
     def _get_charts(self, cr, uid, context):
         module_obj=self.pool.get('ir.module.module')
@@ -1732,15 +1733,6 @@ class account_config_wizard(osv.osv_memory):
         'date2': lambda *a: time.strftime('%Y-12-31'),
         'period':lambda *a:'month',
     }
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-
     def install_account_chart(self, cr, uid, ids, context=None):
         for res in self.read(cr,uid,ids):
             chart_id = res['charts']
@@ -1750,7 +1742,7 @@ class account_config_wizard(osv.osv_memory):
         cr.commit()
         db, pool = pooler.restart_pool(cr.dbname, update_module=True)
 
-    def action_create(self, cr, uid,ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         for res in self.read(cr,uid,ids):
             if 'date1' in res and 'date2' in res:
                 res_obj = self.pool.get('account.fiscalyear')
@@ -1769,16 +1761,6 @@ class account_config_wizard(osv.osv_memory):
                 elif res['period']=='3months':
                     res_obj.create_period3(cr,uid,[new_id])
         self.install_account_chart(cr,uid,ids)
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-
-
-
 account_config_wizard()
 
 
@@ -2117,6 +2099,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         * generates all accounting properties and assigns them correctly
     """
     _name='wizard.multi.charts.accounts'
+    _inherit = 'res.config'
 
     _columns = {
         'company_id':fields.many2one('res.company','Company',required=True),
@@ -2137,7 +2120,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'code_digits': lambda *a:6,
     }
 
-    def action_create(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         obj_multi = self.browse(cr,uid,ids[0])
         obj_acc = self.pool.get('account.account')
         obj_acc_tax = self.pool.get('account.tax')
@@ -2400,24 +2383,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                                 'position_id' : new_fp,
                                 }
                     obj_ac_fp.create(cr, uid, vals_acc)
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-
-
 wizard_multi_charts_accounts()
 
 class account_bank_accounts_wizard(osv.osv_memory):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ce03dd1b044..044ad910c91 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1447,8 +1447,13 @@
             <field name="name">Account Configure wizard</field>
             <field name="model">account.config.wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Account Configure">
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Account Configure
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
                     <separator col="4" colspan="4" string="Create a Fiscal Year"/>
                     <field name="name"/>
                     <field name="code"/>
@@ -1457,13 +1462,8 @@
                     <field name="period" colspan="4"/>
                     <separator col="4" colspan="4" string="Select Chart of Accounts"/>
                     <field name="charts"/>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group col="2" colspan="2">
-                        <button icon="gtk-cancel" special="cancel" string="Skip" name="action_cancel" type="object"/>
-                        <button icon="gtk-ok" name="action_create" string="Continue" type="object"/>
-                    </group>
-                </form>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -1471,6 +1471,7 @@
             <field name="name">Account Configure Wizard </field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.config.wizard</field>
+            <field name="view_id" ref="view_account_config_wizard_form"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -1478,8 +1479,6 @@
 
         <!-- register configuration wizard -->
         <record id="config_fiscalyear" model="ir.actions.todo">
-            <field name="name">Account Configure Wizard</field>
-            <field name="note">Define Fiscal Years and Select Charts of Account</field>
             <field name="action_id" ref="action_account_config_wizard_form"/>
         </record>
 
@@ -1728,31 +1727,37 @@
             <field name="name">Generate Chart of Accounts from a Chart Template</field>
             <field name="model">wizard.multi.charts.accounts</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Generate Chart of Accounts from a Chart Template">
-                    <separator col="4" colspan="4" string="Generate Chart of Accounts from a Chart Template"/>
-                    <label align="0.0" string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" colspan="4"/>
-                    <field name="company_id"  widget="selection" groups="base.group_multi_company"/>
-                    <field name ="code_digits" />
-                    <field name="chart_template_id"/>
-                    <field name ="seq_journal" />
-                    <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
-                        <form string="Bank Information">
-                            <field name="acc_no"/>
-                            <field name="currency_id"/>
-                        </form>
-                        <tree editable="bottom" string="Bank Information">
-                            <field name="acc_no"/>
-                            <field name="currency_id"/>
-                        </tree>
-                    </field>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group col="2" colspan="2">
-                        <button icon="gtk-cancel" special="cancel" type="object" name="action_cancel" string="Cancel"/>
-                        <button icon="gtk-ok" name="action_create" string="Create" type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Generate Chart of Accounts from a Chart Template
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <separator col="4" colspan="4" string="
+                    Generate Chart of Accounts from a Chart Template"/>
+                  <label align="0.0" colspan="4" string="
+                    This will automatically configure your chart of accounts,
+                    bank accounts, taxes and journals according to the selected
+                    template"/>
+                  <field name="company_id"  widget="selection"
+                         groups="base.group_multi_company"/>
+                  <field name ="code_digits" />
+                  <field name="chart_template_id"/>
+                  <field name ="seq_journal" />
+                  <field colspan="4" mode="tree" name="bank_accounts_id"
+                         nolabel="1" widget="one2many_list">
+                    <form string="Bank Information">
+                      <field name="acc_no"/>
+                      <field name="currency_id"/>
+                    </form>
+                    <tree editable="bottom" string="Bank Information">
+                      <field name="acc_no"/>
+                      <field name="currency_id"/>
+                    </tree>
+                  </field>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -1760,6 +1765,7 @@
             <field name="name">Generate Chart of Accounts from a Chart Template</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">wizard.multi.charts.accounts</field>
+            <field name="view_id" ref="view_wizard_multi_chart"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
diff --git a/addons/account/company.py b/addons/account/company.py
index 7858339727e..04a2611fe7d 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -42,6 +42,7 @@ class company_setup(osv.osv_memory):
         * Insert a suitable message for Overdue Payment Report.
     """
     _name='wizard.company.setup'
+    _inherit = 'res.config'
 
     _columns = {
         'company_id':fields.many2one('res.company','Company',required=True),
@@ -72,27 +73,9 @@ class company_setup(osv.osv_memory):
         
         return {'value': res }
 
-    def action_create(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         content_wiz = self.pool.get('wizard.company.setup').read(cr,uid,ids,['company_id','overdue_msg'])
         if content_wiz:
             wiz_data = content_wiz[0]
             self.pool.get('res.company').write(cr, uid, [wiz_data['company_id']], {'overdue_msg':wiz_data['overdue_msg']})
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-
 company_setup()
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 1d4571e0d4f..ec4cec0c54a 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -22,17 +22,21 @@
             <field name="name">wizard.company.setup.form</field>
             <field name="model">wizard.company.setup</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Overdue Payment Report Message">
-                    <field name="company_id" select="1" on_change="onchange_company_id(company_id)"  groups="base.group_multi_company"/>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Overdue Payment Report Message
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                    <field name="company_id" select="1" 
+                           on_change="onchange_company_id(company_id)"
+                           groups="base.group_multi_company"/>
                     <field name="partner_id" select="1" readonly="1"/>
                     <separator string="Message" colspan="4"/>
                     <field name="overdue_msg" nolabel="1" colspan="4"/>
-                    <group col="2" colspan="4">
-                        <button icon="gtk-cancel" special="cancel" type="object" name="action_cancel" string="Cancel"/>
-                        <button icon="gtk-ok" name="action_create" string="Create" type="object"/>
-                    </group>
-                </form>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -40,6 +44,7 @@
             <field name="name">Overdue Payment Report Message</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">wizard.company.setup</field>
+            <field name="view_id" ref="wizard_company_setup_form"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -48,8 +53,6 @@
         <!-- register configuration wizard -->
 
         <record id="config_wizard_account_base_setup_form" model="ir.actions.todo">
-            <field name="name">Overdue Payment Report Message</field>
-            <field name="note">Specify The Message for the Overdue Payment Report.</field>
             <field name="action_id" ref="action_wizard_company_setup_form"/>
         </record>
     </data>

From e1335e2e344e9ac5bd545d9464e98c2a9dcef16e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 14 Dec 2009 16:48:14 +0100
Subject: [PATCH 06/39] [fix] document: incorrect _rec_name value

bzr revid: xmo@tinyerp.com-20091214154814-36sofdplinczd5vg
---
 addons/document/document.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 4acef4d3ab8..93594674aef 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -717,7 +717,8 @@ document_file()
 
 class document_configuration_wizard(osv.osv_memory):
     _name='document.configuration.wizard'
-    _rec_name = 'Auto Directory configuration'
+    _description = 'Auto Directory configuration'
+    _rec_name = 'host'
     _columns = {
         'host': fields.char('Server Address', size=64, help="Put here the server address or IP. " \
             "Keep localhost if you don't know what to write.", required=True),

From 059f6b6773eaec050b77df84a2d7dc013b956888 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 14 Dec 2009 17:08:43 +0100
Subject: [PATCH 07/39] [fix] document: migrate to res.config-based initial
 configuration

bzr revid: xmo@tinyerp.com-20091214160843-zgbw9mad9cddf785
---
 addons/document/document.py       | 21 ++-------------------
 addons/document/document_view.xml | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 93594674aef..2811c8bca40 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -718,6 +718,7 @@ document_file()
 class document_configuration_wizard(osv.osv_memory):
     _name='document.configuration.wizard'
     _description = 'Auto Directory configuration'
+    _inherit = 'res.config'
     _rec_name = 'host'
     _columns = {
         'host': fields.char('Server Address', size=64, help="Put here the server address or IP. " \
@@ -746,16 +747,7 @@ class document_configuration_wizard(osv.osv_memory):
         'port': get_ftp_server_port,
     }
 
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-
-    def action_config(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         conf = self.browse(cr, uid, ids[0], context)
         obj=self.pool.get('document.directory')
         objid=self.pool.get('ir.model.data')
@@ -828,15 +820,6 @@ class document_configuration_wizard(osv.osv_memory):
         config['ftp_server_address'] = conf.host
         config['ftp_server_port'] = conf.port
         config.save()
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-        }
-
 document_configuration_wizard()
 
 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 6e570bb406a..daabac4b60e 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -249,8 +249,13 @@
         <field name="name">Auto Configure Directory</field>
         <field name="model">document.configuration.wizard</field>
         <field name="type">form</field>
+        <field name="inherit_id" ref="base.res_config_view_base"/>
         <field name="arch" type="xml">
-            <form string="Auto Configure">
+          <data>
+            <form position="attributes"><attribute name="string">
+              Auto Configure
+            </attribute></form>
+            <group string="res_config_contents" position="replace">
                 <separator string="Document Management System." colspan="4"/>
                 <label string="This wizard will automatically configure the document management system according to modules installed on your system." align="0.0" colspan="4"/>
                 <separator string="" colspan="4"/>
@@ -258,13 +263,11 @@
                 <field name="host" colspan="4"/>
                 <field name="suggested_host" colspan="4"/>
                 <field name="port" colspan="4"/>
-                <separator string="" colspan="4"/>
-                <label string="" colspan="2"/>
-                <group col="4" colspan="2">
-                    <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                    <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
-                </group>
-            </form>
+            </group>
+            <xpath expr="//button[@name='action_next']" position="attributes">
+              <attribute name="string">Configure</attribute>
+            </xpath>
+          </data>
         </field>
     </record>
 
@@ -272,14 +275,13 @@
         <field name="name">Auto Configure Directory</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">document.configuration.wizard</field>
+        <field name="view_id" ref="view_auto_config_form"/>
         <field name="view_type">form</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
     </record>
 
     <record model="ir.actions.todo" id="config_auto_directory">
-        <field name="name">Auto Configure Directory</field>
-        <field name="note">This wizard will configure the URL of the server of the document management system. These ftp server address and port will be stored in the configuration file.</field>
         <field name="action_id" ref="action_config_auto_directory"/>
     </record>
 

From 844e999700f9b97629ed3f5597c11aa55ac6e253 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 14 Dec 2009 17:35:47 +0100
Subject: [PATCH 08/39] [fix] document_ics: migrate to res.config-based initial
 configuration

bzr revid: xmo@tinyerp.com-20091214163547-ctxo0veidlykomd5
---
 .../document_ics_config_wizard.py             | 21 ++------
 .../document_ics_config_wizard.xml            | 52 +++++++++----------
 2 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/addons/document_ics/document_ics_config_wizard.py b/addons/document_ics/document_ics_config_wizard.py
index ea6bef3d842..c669df33f3e 100644
--- a/addons/document_ics/document_ics_config_wizard.py
+++ b/addons/document_ics/document_ics_config_wizard.py
@@ -50,6 +50,8 @@ ICS_TAGS = {
 
 class document_ics_crm_wizard(osv.osv_memory):
     _name='document.ics.crm.wizard'
+    _inherit = 'res.config'
+
     _columns = {
         'name':fields.char('Name', size=64),
         'meeting' : fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
@@ -69,7 +71,7 @@ class document_ics_crm_wizard(osv.osv_memory):
         'phonecall': lambda *args: True,
     }
 
-    def action_create(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         data=self.read(cr, uid, ids, [])[0]
         dir_obj = self.pool.get('document.directory')
         dir_cont_obj = self.pool.get('document.directory.content')
@@ -110,23 +112,6 @@ class document_ics_crm_wizard(osv.osv_memory):
                                 'content_id': content_id ,
                                   }
                         ics_obj.create(cr, uid, vals_ics)
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-    def action_cancel(self, cr, uid, ids, conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-
 document_ics_crm_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index 9c2132bc89d..c77fa15c2a8 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
-	<record id="view_document_ics_config_directories" model="ir.ui.view">
+        <record id="view_document_ics_config_directories" model="ir.ui.view">
             <field name="name">Configure Calendars for Sections</field>
             <field name="model">document.ics.crm.wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Configure Calendars for CRM Sections">
-                    <separator colspan="4" string="Create Pre-Configured Calendars"/>
-                    <newline/>
-                    <field name="meeting"/>
-                    <field name="opportunity"/>
-                    <field name="phonecall"/>
-                    <field name="lead"/>
-                    <field name="claims"/>
-                    <field name="bugs"/>
-                    <field name="helpdesk"/>
-                    <field name="jobs"/>
-                    <field name="fund"/>
-                    <newline/>
-                    <group col="4" colspan="4">
-                        <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-forward" name="action_create" string="Next" type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Configure Calendars for CRM Sections
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <separator string="Create Pre-Configured Calendars"
+                             colspan="4"/>
+                  <newline/>
+                  <field name="meeting"/>
+                  <field name="opportunity"/>
+                  <field name="phonecall"/>
+                  <field name="lead"/>
+                  <field name="claims"/>
+                  <field name="bugs"/>
+                  <field name="helpdesk"/>
+                  <field name="jobs"/>
+                  <field name="fund"/>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -32,19 +33,16 @@
             <field name="name">Configure Calendars for Sections </field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">document.ics.crm.wizard</field>
+            <field name="view_id" ref="view_document_ics_config_directories"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
+
         <!-- register configuration wizard -->
         <record id="config_wizard_step_case_section_menu" model="ir.actions.todo">
-            <field name="name">Create Calendars for CRM Case Section</field>
-            <field name="note">This Configuration step use to create Calendars in document for all Case Sections</field>
             <field name="action_id" ref="action_view_document_ics_config_directories"/>
         </record>
-        
-        
-     </data>  
+     </data>
 </openerp>
-  
+

From 6eb9f6a5bd57c899327d04fd6df10c9f4519ca51 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 14 Dec 2009 18:00:11 +0100
Subject: [PATCH 09/39] [imp] l10n_ch: reformatting

bzr revid: xmo@tinyerp.com-20091214170011-ykicgd8hyqcg86d0
---
 addons/l10n_ch/account_journal_view.xml | 60 ++++++++++++-------------
 addons/l10n_ch/wizard/journal_config.py | 44 +++++-------------
 2 files changed, 40 insertions(+), 64 deletions(-)

diff --git a/addons/l10n_ch/account_journal_view.xml b/addons/l10n_ch/account_journal_view.xml
index cfe3db3573d..224020660f5 100755
--- a/addons/l10n_ch/account_journal_view.xml
+++ b/addons/l10n_ch/account_journal_view.xml
@@ -5,40 +5,40 @@
             <field name="model">account.journal.todo</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Journal">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                    </group>
-                    <separator colspan="4" string="The accounts linked to the account journals"/>
-                    <field name="default_credit_account_id"
-                        on_change="on_change_credit(name, default_credit_account_id)" select="1"/>
-                    <field name="default_debit_account_id"
-                        on_change="on_change_debit(name, default_debit_account_id)" select="1"/>
-                    <group col="4" colspan="4">
-						<button icon="gtk-cancel" name="action_cancel" string="Cancel" type="object"/>
-						<button icon="gtk-ok" name="action_new" string="Next" type="object"/>
-
-                    </group>
-                </form>
+              <form string="Account Journal">
+                <group colspan="4" col="6">
+                  <field name="name" select="1"/>
+                </group>
+                <separator colspan="4" string="
+                  The accounts linked to the account journals"/>
+                <field name="default_credit_account_id" select="1"
+                       on_change="on_change_credit(name, default_credit_account_id)"/>
+                <field name="default_debit_account_id" select="1"
+                       on_change="on_change_debit(name, default_debit_account_id)"/>
+                <group col="4" colspan="4">
+                  <button icon="gtk-cancel" name="action_cancel"
+                          string="Cancel" type="object"/>
+                  <button icon="gtk-ok" name="action_new"
+                          string="Next" type="object"/>
+                </group>
+              </form>
             </field>
         </record>
-		<record id="action_config_journal" model="ir.actions.act_window">
-            <field name="name">Configure Journal</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.journal.todo</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-			<field name="view_id" ref="view_account_journal_form_todo"/>
-            <field name="target">new</field>
+        <record id="action_config_journal" model="ir.actions.act_window">
+          <field name="name">Configure Journal</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">account.journal.todo</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="view_id" ref="view_account_journal_form_todo"/>
+          <field name="target">new</field>
         </record>
-
-
         <record id="action_config_journal_todo" model="ir.actions.todo">
-            <field name="name">Finalize your journal</field>
-            <field name="note">Set accounts on financial journals defined by
-			Camptocamp l10n_ch module</field>
-            <field name="action_id" ref="action_config_journal"/>
-            <field name="sequence">5</field>
+          <field name="name">Finalize your journal</field>
+          <field name="note">Set accounts on financial journals defined by
+            Camptocamp l10n_ch module</field>
+          <field name="action_id" ref="action_config_journal"/>
+          <field name="sequence">5</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_ch/wizard/journal_config.py b/addons/l10n_ch/wizard/journal_config.py
index 51368536f84..68c60fb9ca8 100755
--- a/addons/l10n_ch/wizard/journal_config.py
+++ b/addons/l10n_ch/wizard/journal_config.py
@@ -34,11 +34,8 @@ from osv import fields, osv
 
 class Journal(osv.osv):
     """Create account.journal.todo in order to add configuration wizzard"""
-
     _name ="account.journal.todo"
-    
-    
-    
+
     def _get_journal(self, cr, uid, ctx):
         if not self.__dict__.has_key('_inner_steps') :
             self._inner_steps = 0
@@ -47,36 +44,30 @@ class Journal(osv.osv):
             return False
         return ids[self._inner_steps]
         
-
     def _get_debit(self, cr, uid, ctx):
         if not self.__dict__.has_key('_inner_steps') :
             self._inner_steps = 0
         if self._inner_steps == 'done' :
             return False
         ids = self.pool.get('account.journal').search(cr,uid,[])
-        id = self.pool.get('account.journal').browse(
+        return self.pool.get('account.journal').browse(
             cr,
             uid,
             ids[self._inner_steps]
         ).default_debit_account_id.id
         
-        return id
-        
     def _get_credit(self, cr, uid, ctx):
         if not self.__dict__.has_key('_inner_steps') :
             self._inner_steps = 0
         if self._inner_steps == 'done' :
             return False
         ids = self.pool.get('account.journal').search(cr,uid,[])
-        id = self.pool.get('account.journal').browse(
+        return self.pool.get('account.journal').browse(
             cr,
             uid,
             ids[self._inner_steps]
         ).default_credit_account_id.id
         
-        return id
-    
-        
     _columns={
         'name': fields.many2one(
             'account.journal',
@@ -107,32 +98,19 @@ class Journal(osv.osv):
     def on_change_debit(self, cr, uid, id, journal, account) :
         if account :
             self.pool.get('account.journal').write(
-                                        cr,
-                                        uid, 
-                                        journal,
-                                        vals={
-                                            'default_debit_account_id': account,
-                                        }
-                                        )
-    
-        
-        
+                cr, uid, journal,
+                vals={'default_debit_account_id': account,}
+                )
         return {}
         
     def on_change_credit(self, cr, uid, id, journal, account) :
         if account : 
             self.pool.get('account.journal').write(
-                                        cr,
-                                        uid, 
-                                        journal,
-                                        vals={
-                                            'default_credit_account_id': account,
-                                        }
-                                )
+                cr, uid, journal,
+                vals={'default_credit_account_id': account,}
+                )
         return {}
 
-
-
     def action_cancel(self,cr,uid,ids,context=None):
         return {
                 'view_type': 'form',
@@ -140,7 +118,7 @@ class Journal(osv.osv):
                 'res_model': 'ir.actions.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'target':'new',
-        }   
+        }
     def action_new(self,cr,uid,ids,context={}):
         jids = self.pool.get('account.journal').search(cr, uid, [])
         if self._inner_steps < len(jids)-1 :
@@ -160,8 +138,6 @@ class Journal(osv.osv):
                 'type': 'ir.actions.act_window',
                 'target':'new',
                }
-        
-
 Journal()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From db490c154b0f0ccc043ff18656d2a5a3b075f5b3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 10:31:04 +0100
Subject: [PATCH 10/39] [fix] l10n_ch: migrate to res.config-based initial
 configuration

bzr revid: xmo@tinyerp.com-20091215093104-7telxcs49642u6v0
---
 addons/l10n_ch/account_journal_view.xml | 44 ++++++++++++++-----------
 addons/l10n_ch/wizard/journal_config.py | 33 +++++++------------
 2 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/addons/l10n_ch/account_journal_view.xml b/addons/l10n_ch/account_journal_view.xml
index 224020660f5..120bb1565ea 100755
--- a/addons/l10n_ch/account_journal_view.xml
+++ b/addons/l10n_ch/account_journal_view.xml
@@ -4,28 +4,35 @@
             <field name="name">account.journal.todo.form</field>
             <field name="model">account.journal.todo</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-              <form string="Account Journal">
-                <group colspan="4" col="6">
-                  <field name="name" select="1"/>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Account Journal
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    Set accounts on financial journals defined by CamptoCamp
+                    l10n_ch module"/>
+                  <separator colspan="4"/>
+                  <group colspan="4" col="6">
+                    <field name="name" select="1"/>
+                  </group>
+                  <separator colspan="4" string="
+                    The accounts linked to the account journals"/>
+                  <field name="default_credit_account_id" select="1"
+                         on_change="on_change_credit(name, default_credit_account_id)"/>
+                  <field name="default_debit_account_id" select="1"
+                         on_change="on_change_debit(name, default_debit_account_id)"/>
                 </group>
-                <separator colspan="4" string="
-                  The accounts linked to the account journals"/>
-                <field name="default_credit_account_id" select="1"
-                       on_change="on_change_credit(name, default_credit_account_id)"/>
-                <field name="default_debit_account_id" select="1"
-                       on_change="on_change_debit(name, default_debit_account_id)"/>
-                <group col="4" colspan="4">
-                  <button icon="gtk-cancel" name="action_cancel"
-                          string="Cancel" type="object"/>
-                  <button icon="gtk-ok" name="action_new"
-                          string="Next" type="object"/>
-                </group>
-              </form>
+                <xpath expr="//button[@name='action_next']" position="attributes">
+                  <attribute name="string">Next</attribute>
+                </xpath>
+              </data>
             </field>
         </record>
         <record id="action_config_journal" model="ir.actions.act_window">
-          <field name="name">Configure Journal</field>
+          <field name="name">Finalize your Journal</field>
           <field name="type">ir.actions.act_window</field>
           <field name="res_model">account.journal.todo</field>
           <field name="view_type">form</field>
@@ -34,9 +41,6 @@
           <field name="target">new</field>
         </record>
         <record id="action_config_journal_todo" model="ir.actions.todo">
-          <field name="name">Finalize your journal</field>
-          <field name="note">Set accounts on financial journals defined by
-            Camptocamp l10n_ch module</field>
           <field name="action_id" ref="action_config_journal"/>
           <field name="sequence">5</field>
         </record>
diff --git a/addons/l10n_ch/wizard/journal_config.py b/addons/l10n_ch/wizard/journal_config.py
index 68c60fb9ca8..096ddb8d79f 100755
--- a/addons/l10n_ch/wizard/journal_config.py
+++ b/addons/l10n_ch/wizard/journal_config.py
@@ -31,10 +31,10 @@
 ##############################################################################
 from osv import fields, osv
 
-
-class Journal(osv.osv):
+class Journal(osv.osv_memory):
     """Create account.journal.todo in order to add configuration wizzard"""
     _name ="account.journal.todo"
+    _inherit = 'res.config'
 
     def _get_journal(self, cr, uid, ctx):
         if not self.__dict__.has_key('_inner_steps') :
@@ -111,15 +111,7 @@ class Journal(osv.osv):
                 )
         return {}
 
-    def action_cancel(self,cr,uid,ids,context=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-    def action_new(self,cr,uid,ids,context={}):
+    def execute(self,cr,uid,ids,context={}):
         jids = self.pool.get('account.journal').search(cr, uid, [])
         if self._inner_steps < len(jids)-1 :
             self._inner_steps += 1
@@ -127,17 +119,14 @@ class Journal(osv.osv):
             print 'DONE'
             self._inner_steps = 'done'
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'account.journal.todo',
-                'view_id':self.pool.get('ir.ui.view').search(
-                        cr,
-                        uid,
-                        [('name','=','view_account_journal_form_todo')]
-                    ),
-                'type': 'ir.actions.act_window',
-                'target':'new',
-               }
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'account.journal.todo',
+            'view_id': self.pool.get('ir.ui.view')\
+                .search(cr, uid, [('name','=','account.journal.todo.form')]),
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            }
 Journal()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ef729db891a468aed8a2d31fe5818dbf1f0e3031 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 10:50:37 +0100
Subject: [PATCH 11/39] [fix] l10n_ch: slightly improve initial config
 cinematics

bzr revid: xmo@tinyerp.com-20091215095037-8km4f1o1z2y0dv6i
---
 addons/l10n_ch/wizard/journal_config.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/addons/l10n_ch/wizard/journal_config.py b/addons/l10n_ch/wizard/journal_config.py
index 096ddb8d79f..3241e255729 100755
--- a/addons/l10n_ch/wizard/journal_config.py
+++ b/addons/l10n_ch/wizard/journal_config.py
@@ -113,20 +113,17 @@ class Journal(osv.osv_memory):
 
     def execute(self,cr,uid,ids,context={}):
         jids = self.pool.get('account.journal').search(cr, uid, [])
-        if self._inner_steps < len(jids)-1 :
+        if self._inner_steps < len(jids)-1:
             self._inner_steps += 1
-        else :
-            print 'DONE'
-            self._inner_steps = 'done'
-        return {
-            'view_type': 'form',
-            "view_mode": 'form',
-            'res_model': 'account.journal.todo',
-            'view_id': self.pool.get('ir.ui.view')\
-                .search(cr, uid, [('name','=','account.journal.todo.form')]),
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-            }
+            return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'account.journal.todo',
+                'view_id': self.pool.get('ir.ui.view')\
+                    .search(cr, uid, [('name','=','account.journal.todo.form')]),
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                }
 Journal()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From a23c436282f4e525aada90fdb77450f2fc3e769d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 11:07:29 +0100
Subject: [PATCH 12/39] [imp] l10n_ch_chart_c2c_pcg: reformattings

bzr revid: xmo@tinyerp.com-20091215100729-1119z3a8j7cpjnnf
---
 addons/l10n_ch_chart_c2c_pcg/wizard/config.py | 126 +++++++-----------
 1 file changed, 47 insertions(+), 79 deletions(-)

diff --git a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
index 9503bb03ecd..416674bbe73 100755
--- a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
+++ b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.3
+#!/usr/bin/env python
 #
 #  config.py
 #
@@ -11,50 +11,38 @@ from osv import fields, osv
 class Tax_template(osv.osv):
     """Creat account.journal.todo class in order 
         to add configuration wizzard"""
-
     _name ="account.tax.template.todo"
     
-    
-    
-    def _get_tax(self, cr, uid, ctx):
-        if not self.__dict__.has_key('_inner_steps') :
+    def _ensure_step(self):
+        if getattr(self, '_inner_steps', None) is None:
             self._inner_steps = 0
-        ids = self.pool.get('account.tax.template').search(cr,uid,[])
+
+    def _get_tax(self, cr, uid, ctx):
+        self._ensure_step()
         if self._inner_steps == 'done' :
             return False
-        return ids[self._inner_steps]
-        
+        return self.pool.get('account.tax.template')\
+            .search(cr,uid,[])[self._inner_steps]
 
     def _get_collected(self, cr, uid, ctx):
-        if not self.__dict__.has_key('_inner_steps') :
-            self._inner_steps = 0
+        self._ensure_steps()
         if self._inner_steps == 'done' :
             return False
         ids = self.pool.get('account.tax.template').search(cr,uid,[])
-        id = self.pool.get('account.tax.template').browse(
-            cr,
-            uid,
-            ids[self._inner_steps]
+        return self.pool.get('account.tax.template').browse(
+            cr, uid, ids[self._inner_steps]
         ).account_collected_id.id
         
-        return id
-        
     def _get_paid(self, cr, uid, ctx):
-        if not self.__dict__.has_key('_inner_steps') :
-            self._inner_steps = 0
+        self._ensure_steps()
         if self._inner_steps == 'done' :
             return False
         ids = self.pool.get('account.tax.template').search(cr,uid,[])
-        id = self.pool.get('account.tax.template').browse(
-            cr,
-            uid,
-            ids[self._inner_steps]
+        return self.pool.get('account.tax.template').browse(
+            cr, uid, ids[self._inner_steps]
         ).account_paid_id.id
         
-        return id
-    
-        
-    _columns={
+    _columns = {
         'name': fields.many2one(
             'account.tax.template',
             'Tax to set',
@@ -62,63 +50,45 @@ class Tax_template(osv.osv):
              help="The tax template you are currently editing"
         ),
         'account_collected_id':fields.many2one(
-                                                'account.account.template', 
-                                                'Invoice Tax Account',
-                                                help="You can set \
-                                                here the invoice tax account"
-                                              ),
+            'account.account.template', 
+            'Invoice Tax Account',
+            help="You can set here the invoice tax account"
+            ),
         'account_paid_id':fields.many2one(
-                                            'account.account.template', 
-                                            'Refund Tax Account',
-                                            help="You can set \
-                                            here the refund tax account"
-                                          ),
-
-    }
+            'account.account.template', 
+            'Refund Tax Account',
+            help="You can set here the refund tax account"
+            ),
+        }
 
     _defaults = {
         'name': _get_tax,
-        'account_collected_id':_get_collected,
-        'account_paid_id':_get_paid,
+        'account_collected_id': _get_collected,
+        'account_paid_id': _get_paid,
         }
     
     def on_change_collected(self, cr, uid, id, tax, account) :
         if account :
             self.pool.get('account.tax.template').write(
-                                                    cr,
-                                                    uid, 
-                                                    tax,
-                                                    vals={
-                                                        'account_collected_id': account,
-                                                    }
-                                                    )
-        
-        
-        
+                cr, uid, tax, vals={'account_collected_id': account,}
+                )
         return {}
         
     def on_change_paid(self, cr, uid, id, tax, account) :
         if account :
             self.pool.get('account.tax.template').write(
-                                                    cr,
-                                                    uid, 
-                                                    tax,
-                                                    vals={
-                                                        'account_paid_id': account,
-                                                    }
-                                            )
+                cr, uid, tax, vals={'account_paid_id': account,}
+                )
         return {}
 
-
-
     def action_cancel(self,cr,uid,ids,context=None):
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'ir.actions.configuration.wizard',
+            'type': 'ir.actions.act_window',
+            'target':'new',
+            }
     
     def action_new(self,cr,uid,ids,context={}):
         jids = self.pool.get('account.tax.template').search(cr, uid, [])
@@ -127,19 +97,17 @@ class Tax_template(osv.osv):
         else :
             self._inner_steps = 'done'
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'account.tax.template.todo',
-                'view_id':self.pool.get('ir.ui.view').search(
-                        cr,
-                        uid,
-                        [('name','=','view_account_journal_form_todo')]
-                    ),
-                'type': 'ir.actions.act_window',
-                'target':'new',
-               }
-        
-
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'account.tax.template.todo',
+            'view_id':self.pool.get('ir.ui.view').search(
+                cr,
+                uid,
+                [('name','=','view_account_journal_form_todo')]
+                ),
+            'type': 'ir.actions.act_window',
+            'target':'new',
+            }
 Tax_template()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 737bc484dbb22f6d276bff9e7b6f99475b4b0325 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 11:19:09 +0100
Subject: [PATCH 13/39] [imp] l10n_ch_chart_c2c_pcg: refactorings of a pair of
 methods

bzr revid: xmo@tinyerp.com-20091215101909-l702myh3u6vvjxg0
---
 addons/l10n_ch_chart_c2c_pcg/wizard/config.py | 55 +++++++++----------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
index 416674bbe73..0dfa98efe46 100755
--- a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
+++ b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
@@ -7,16 +7,21 @@
 #
 from osv import fields, osv
 
-
 class Tax_template(osv.osv):
-    """Creat account.journal.todo class in order 
+    """Creat account.journal.todo class in order
         to add configuration wizzard"""
     _name ="account.tax.template.todo"
-    
+
     def _ensure_step(self):
         if getattr(self, '_inner_steps', None) is None:
             self._inner_steps = 0
 
+    def _current_tax_template(self, cr, uid):
+        ids = self.pool.get('account.tax.template').search(cr,uid,[])
+        return self.pool.get('account.tax.template').browse(
+            cr, uid, ids[self._inner_steps]
+            )
+
     def _get_tax(self, cr, uid, ctx):
         self._ensure_step()
         if self._inner_steps == 'done' :
@@ -28,20 +33,14 @@ class Tax_template(osv.osv):
         self._ensure_steps()
         if self._inner_steps == 'done' :
             return False
-        ids = self.pool.get('account.tax.template').search(cr,uid,[])
-        return self.pool.get('account.tax.template').browse(
-            cr, uid, ids[self._inner_steps]
-        ).account_collected_id.id
-        
+        return self._current_tax_template(cr, uid).account_collected_id.id
+
     def _get_paid(self, cr, uid, ctx):
         self._ensure_steps()
         if self._inner_steps == 'done' :
             return False
-        ids = self.pool.get('account.tax.template').search(cr,uid,[])
-        return self.pool.get('account.tax.template').browse(
-            cr, uid, ids[self._inner_steps]
-        ).account_paid_id.id
-        
+        return self._current_tax_template(cr, uid).account_paid_id.id
+
     _columns = {
         'name': fields.many2one(
             'account.tax.template',
@@ -50,12 +49,12 @@ class Tax_template(osv.osv):
              help="The tax template you are currently editing"
         ),
         'account_collected_id':fields.many2one(
-            'account.account.template', 
+            'account.account.template',
             'Invoice Tax Account',
             help="You can set here the invoice tax account"
             ),
         'account_paid_id':fields.many2one(
-            'account.account.template', 
+            'account.account.template',
             'Refund Tax Account',
             help="You can set here the refund tax account"
             ),
@@ -66,21 +65,21 @@ class Tax_template(osv.osv):
         'account_collected_id': _get_collected,
         'account_paid_id': _get_paid,
         }
-    
-    def on_change_collected(self, cr, uid, id, tax, account) :
-        if account :
+
+    def _on_change(self, cr, uid, id, tax, vals):
+        if account:
             self.pool.get('account.tax.template').write(
-                cr, uid, tax, vals={'account_collected_id': account,}
-                )
-        return {}
-        
-    def on_change_paid(self, cr, uid, id, tax, account) :
-        if account :
-            self.pool.get('account.tax.template').write(
-                cr, uid, tax, vals={'account_paid_id': account,}
-                )
+                cr, uid, tax, vals=vals)
         return {}
 
+    def on_change_collected(self, cr, uid, id, tax, account):
+        return self._on_change(
+            cr, uid, ids, tax, vals={'account_collected_id': account})
+
+    def on_change_paid(self, cr, uid, id, tax, account):
+        return self._on_change(
+            cr, uid, ids, tax, vals={'account_paid_id': account})
+
     def action_cancel(self,cr,uid,ids,context=None):
         return {
             'view_type': 'form',
@@ -89,7 +88,7 @@ class Tax_template(osv.osv):
             'type': 'ir.actions.act_window',
             'target':'new',
             }
-    
+
     def action_new(self,cr,uid,ids,context={}):
         jids = self.pool.get('account.tax.template').search(cr, uid, [])
         if self._inner_steps < len(jids)-1 :

From 0002fb427e9acd7e3bcf6772f1064a704993abb2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 11:45:42 +0100
Subject: [PATCH 14/39] [fix] l10n_ch_chart_c2c_pcg: fix breaking typo from
 xmo@tinyerp.com-20091215100729-1119z3a8j7cpjnnf

bzr revid: xmo@tinyerp.com-20091215104542-4xx1lmh2gwsyaeig
---
 addons/l10n_ch_chart_c2c_pcg/wizard/config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
index 0dfa98efe46..66237fa96db 100755
--- a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
+++ b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
@@ -30,13 +30,13 @@ class Tax_template(osv.osv):
             .search(cr,uid,[])[self._inner_steps]
 
     def _get_collected(self, cr, uid, ctx):
-        self._ensure_steps()
+        self._ensure_step()
         if self._inner_steps == 'done' :
             return False
         return self._current_tax_template(cr, uid).account_collected_id.id
 
     def _get_paid(self, cr, uid, ctx):
-        self._ensure_steps()
+        self._ensure_step()
         if self._inner_steps == 'done' :
             return False
         return self._current_tax_template(cr, uid).account_paid_id.id

From 109999463ee3ea0c4d957fb4fb7fee09a1ed81ab Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 12:19:12 +0100
Subject: [PATCH 15/39] [fix] l10n_ch_chart_c2c_pcg: migrate to
 res.config-based initial configuration

bzr revid: xmo@tinyerp.com-20091215111912-zoejxzwq1cnp7m39
---
 addons/l10n_ch/wizard/journal_config.py       |  2 +-
 .../tax_template_view.xml                     | 44 +++++++++----------
 addons/l10n_ch_chart_c2c_pcg/wizard/config.py | 19 ++------
 3 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/addons/l10n_ch/wizard/journal_config.py b/addons/l10n_ch/wizard/journal_config.py
index 3241e255729..b350d918e2e 100755
--- a/addons/l10n_ch/wizard/journal_config.py
+++ b/addons/l10n_ch/wizard/journal_config.py
@@ -111,7 +111,7 @@ class Journal(osv.osv_memory):
                 )
         return {}
 
-    def execute(self,cr,uid,ids,context={}):
+    def execute(self,cr,uid,ids,context=None):
         jids = self.pool.get('account.journal').search(cr, uid, [])
         if self._inner_steps < len(jids)-1:
             self._inner_steps += 1
diff --git a/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml b/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
index fbfd5165a31..4ebda575962 100755
--- a/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
+++ b/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
@@ -11,38 +11,38 @@
             <field name="name">account.tax.template.todo</field>
             <field name="model">account.tax.template.todo</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Account tax template">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                    </group>
-                    <separator colspan="4" string="The accounts linked to the tax template"/>
-                    <field name="account_collected_id"
-                        on_change="on_change_collected(name, account_collected_id)" select="1"/>
-                    <field name="account_paid_id"
-                        on_change="on_change_paid(name, account_paid_id)" select="1"/>
-                    <group col="4" colspan="4">
-						<button icon="gtk-cancel" name="action_cancel" string="Cancel" type="object"/>
-                        <button icon="gtk-ok" name="action_new" string="Next" type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Account tax template
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    Set account on financial taxes defined by 
+                    Camptocamp l10n_ch_c2c_pcg module"/>
+                  <group colspan="4" col="6">
+                    <field name="name" select="1"/>
+                  </group>
+                  <separator colspan="4" string="The accounts linked to the tax template"/>
+                  <field name="account_collected_id"
+                         on_change="on_change_collected(name, account_collected_id)" select="1"/>
+                  <field name="account_paid_id"
+                         on_change="on_change_paid(name, account_paid_id)" select="1"/>
+                </group>
+              </data>
             </field>
         </record>
-		<record id="action_config_tax" model="ir.actions.act_window">
-            <field name="name">Configure Journal</field>
+        <record id="action_config_tax" model="ir.actions.act_window">
+            <field name="name">Finalize your tax configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.tax.template.todo</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-			<field name="view_id" ref="view_tax_template_form_todo"/>
+            <field name="view_id" ref="view_tax_template_form_todo"/>
             <field name="target">new</field>
         </record>
-
-
         <record id="action_config_tax_todo" model="ir.actions.todo">
-            <field name="name">Finalize your tax configuration</field>
-            <field name="note">Set account on financial taxes defined by 
-			Camptocamp l10n_ch_c2c_pcg module</field>
             <field name="action_id" ref="action_config_tax"/>
             <field name="sequence">5</field>
         </record>
diff --git a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
index 66237fa96db..29af7bef1bc 100755
--- a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
+++ b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
@@ -7,10 +7,11 @@
 #
 from osv import fields, osv
 
-class Tax_template(osv.osv):
+class Tax_template(osv.osv_memory):
     """Creat account.journal.todo class in order
         to add configuration wizzard"""
     _name ="account.tax.template.todo"
+    _inherit = 'res.config'
 
     def _ensure_step(self):
         if getattr(self, '_inner_steps', None) is None:
@@ -80,16 +81,7 @@ class Tax_template(osv.osv):
         return self._on_change(
             cr, uid, ids, tax, vals={'account_paid_id': account})
 
-    def action_cancel(self,cr,uid,ids,context=None):
-        return {
-            'view_type': 'form',
-            "view_mode": 'form',
-            'res_model': 'ir.actions.configuration.wizard',
-            'type': 'ir.actions.act_window',
-            'target':'new',
-            }
-
-    def action_new(self,cr,uid,ids,context={}):
+    def execute(self,cr,uid,ids,context={}):
         jids = self.pool.get('account.tax.template').search(cr, uid, [])
         if self._inner_steps < len(jids)-1 :
             self._inner_steps += 1
@@ -100,10 +92,7 @@ class Tax_template(osv.osv):
             "view_mode": 'form',
             'res_model': 'account.tax.template.todo',
             'view_id':self.pool.get('ir.ui.view').search(
-                cr,
-                uid,
-                [('name','=','view_account_journal_form_todo')]
-                ),
+                cr, uid, [('name','=','account.tax.template.todo')]),
             'type': 'ir.actions.act_window',
             'target':'new',
             }

From 33b09dd923a08e040363c42909e6f6a9d8863e34 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 14:23:07 +0100
Subject: [PATCH 16/39] [imp] l10n_ch_chart_c2c_pcg: improve initial
 configuration cinematics

bzr revid: xmo@tinyerp.com-20091215132307-tputkr4qjvoc8no4
---
 addons/l10n_ch_chart_c2c_pcg/wizard/config.py | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
index 29af7bef1bc..07ee7a6efe0 100755
--- a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
+++ b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
@@ -25,21 +25,15 @@ class Tax_template(osv.osv_memory):
 
     def _get_tax(self, cr, uid, ctx):
         self._ensure_step()
-        if self._inner_steps == 'done' :
-            return False
         return self.pool.get('account.tax.template')\
             .search(cr,uid,[])[self._inner_steps]
 
     def _get_collected(self, cr, uid, ctx):
         self._ensure_step()
-        if self._inner_steps == 'done' :
-            return False
         return self._current_tax_template(cr, uid).account_collected_id.id
 
     def _get_paid(self, cr, uid, ctx):
         self._ensure_step()
-        if self._inner_steps == 'done' :
-            return False
         return self._current_tax_template(cr, uid).account_paid_id.id
 
     _columns = {
@@ -85,17 +79,15 @@ class Tax_template(osv.osv_memory):
         jids = self.pool.get('account.tax.template').search(cr, uid, [])
         if self._inner_steps < len(jids)-1 :
             self._inner_steps += 1
-        else :
-            self._inner_steps = 'done'
-        return {
-            'view_type': 'form',
-            "view_mode": 'form',
-            'res_model': 'account.tax.template.todo',
-            'view_id':self.pool.get('ir.ui.view').search(
-                cr, uid, [('name','=','account.tax.template.todo')]),
-            'type': 'ir.actions.act_window',
-            'target':'new',
-            }
+            return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'account.tax.template.todo',
+                'view_id':self.pool.get('ir.ui.view').search(
+                    cr, uid, [('name','=','account.tax.template.todo')]),
+                'type': 'ir.actions.act_window',
+                'target':'new',
+                }
 Tax_template()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From f51111f283a33bcd73e699b9bff82f951fd231b1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 15:08:41 +0100
Subject: [PATCH 17/39] [fix] profile_accounting: migrate to res.config-based
 initial configuration

bzr revid: xmo@tinyerp.com-20091215140841-c93etyiidd6v04pk
---
 .../profile_accounting/profile_accounting.py  | 30 +++---------
 .../profile_accounting/profile_accounting.xml | 49 ++++++++++---------
 2 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/addons/profile_accounting/profile_accounting.py b/addons/profile_accounting/profile_accounting.py
index 6d2eafc66b9..3b877c0c690 100644
--- a/addons/profile_accounting/profile_accounting.py
+++ b/addons/profile_accounting/profile_accounting.py
@@ -24,6 +24,8 @@ import pooler
 
 class profile_accounting_config_install_modules_wizard(osv.osv_memory):
     _name='profile.accounting.config.install_modules_wizard'
+    _inherit = 'res.config'
+
     _columns = {
         'name':fields.char('Name', size=64),
         'account_analytic_analysis':fields.boolean('Analytic Accounting'),
@@ -33,38 +35,18 @@ class profile_accounting_config_install_modules_wizard(osv.osv_memory):
         'hr_timesheet_invoice':fields.boolean('Invoice on Analytic Entries'),
         'account_budget':fields.boolean('Budgets', help="Helps you to manage financial and analytic budgets."),
         'board_document':fields.boolean('Document Management',help= "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."),
-
-
     }
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
 
-
-    def action_install(self, cr, uid, ids, context=None):
-        result=self.read(cr,uid,ids)
+    def execute(self, cr, uid, ids, context=None):
+        result = self.read(cr, uid, ids)
         mod_obj = self.pool.get('ir.module.module')
         for res in result:
             for r in res:
-                if r<>'id' and res[r]:
+                if r != 'id' and res[r]:
                     ids += mod_obj.search(cr, uid, [('name', '=', r)])
                     mod_obj.button_install(cr, uid, ids, context=context)
         cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname,update_module=True)
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-            }
-
-
+        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
 profile_accounting_config_install_modules_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_accounting/profile_accounting.xml b/addons/profile_accounting/profile_accounting.xml
index ab82f8a69c6..e3d3c973405 100644
--- a/addons/profile_accounting/profile_accounting.xml
+++ b/addons/profile_accounting/profile_accounting.xml
@@ -5,25 +5,29 @@
             <field name="name">Accounting Profile : Install extra modules</field>
             <field name="model">profile.accounting.config.install_modules_wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Install Extra Module">
-					<separator string="Accounting Management" colspan="4"/>
-                    <field name="account_analytic_analysis"/>
-                    <field name="account_analytic_plans"/>
-                    <field name="account_payment"/>
-                    <separator string="Resources Management" colspan="4"/>
-					<field name="account_budget"/>
-                    <field name="account_asset"/>
-                    <separator string="Services Management" colspan="4"/>
-                    <field name="hr_timesheet_invoice"/>
-                    <field name="board_document"/>
-					<separator string="" colspan="4"/>
-					<label string="" colspan="2"/>
-                    <group col="4" colspan="2">
-                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                        <button name="action_install" string="Install" icon='gtk-ok' type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Install Extra Modules
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    Install more modules. A few modules are proposed according
+                    to the Account Profile you selected. You will be able to
+                    install them based on our requirements."/>
+                  <separator string="Accounting Management" colspan="4"/>
+                  <field name="account_analytic_analysis"/>
+                  <field name="account_analytic_plans"/>
+                  <field name="account_payment"/>
+                  <separator string="Resources Management" colspan="4"/>
+                  <field name="account_budget"/>
+                  <field name="account_asset"/>
+                  <separator string="Services Management" colspan="4"/>
+                  <field name="hr_timesheet_invoice"/>
+                  <field name="board_document"/>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -31,16 +35,15 @@
             <field name="name">Accounting Profile : Install Extra Modules</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">profile.accounting.config.install_modules_wizard</field>
+            <field name="view_id" ref="view_confirm_install_module_form"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
 
-      <record model="ir.actions.todo"
-            id="profile_accounting.config_install_wizard">
-            <field name="name">Accounting Profile : Install Extra modules</field>
-            <field name="note">Install more modules. A few modules are proposed according to the Account Profile you selected. You will be able to install them based on our requirements.</field>
-            <field name="action_id" ref="action_config_install_module"/>
+        <record model="ir.actions.todo"
+                id="profile_accounting.config_install_wizard">
+          <field name="action_id" ref="action_config_install_module"/>
         </record>
     </data>
 </openerp>

From 8bcc50815563c589f792f52ebb9d81896ca0c8ed Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 15:38:03 +0100
Subject: [PATCH 18/39] [fix] profile_association: migrate to res.config-based
 initial configuration

bzr revid: xmo@tinyerp.com-20091215143803-mj95o09ovvavhgoe
---
 .../profile_association.py                    | 23 +++--------
 .../profile_association.xml                   | 40 ++++++++++---------
 2 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/addons/profile_association/profile_association.py b/addons/profile_association/profile_association.py
index 1b0af4705d9..bbf0d62c5d2 100644
--- a/addons/profile_association/profile_association.py
+++ b/addons/profile_association/profile_association.py
@@ -25,6 +25,8 @@ import pooler
 
 class profile_association_config_install_modules_wizard(osv.osv_memory):
     _name='profile.association.config.install_modules_wizard'
+    _inherit = 'res.config'
+
     _columns = {
         'hr_expense':fields.boolean('Expenses Tracking', help="Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."),
         'project':fields.boolean('Project Management'),
@@ -36,30 +38,15 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
         'wiki': fields.boolean('Wiki', 
             help="An integrated wiki content management system. This is really usefull to manage FAQ, quality manuals, etc.")
     }
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-    def action_install(self, cr, uid, ids, context=None):
-        result=self.read(cr,uid,ids)
+    def execute(self, cr, uid, ids, context=None):
+        result = self.read(cr,uid,ids)
         mod_obj = self.pool.get('ir.module.module')
         for res in result:
             for r in res:
-                if r<>'id' and res[r]:
+                if r != 'id' and res[r]:
                     ids = mod_obj.search(cr, uid, [('name', '=', r)])
                     mod_obj.button_install(cr, uid, ids, context=context)
         cr.commit()
         db, pool = pooler.restart_pool(cr.dbname, update_module=True)
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-            }
 profile_association_config_install_modules_wizard()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_association/profile_association.xml b/addons/profile_association/profile_association.xml
index 6640f2a9f14..e23af3fdbe5 100644
--- a/addons/profile_association/profile_association.xml
+++ b/addons/profile_association/profile_association.xml
@@ -5,24 +5,27 @@
             <field name="name">Association Profile : Install extra modules</field>
             <field name="model">profile.association.config.install_modules_wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Install Extra Module">
-                    <separator string="Project Management" colspan="4"/>
-                    <field name="project"/>
-                    <field name="project_gtd"/>
-                    <field name="wiki"/>
-                    <separator string="Resources Management" colspan="4"/>
-                    <field name="hr_expense"/>
-                    <separator string="Relationship Management" colspan="4"/>
-                    <field name="crm_configuration"/>
-                    <separator string="" colspan="4"/>
-                    <field name="board_document"/>
-                    <label string="" colspan="2"/>
-                    <group col="4" colspan="2">
-                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                        <button name="action_install" string="Install" icon='gtk-ok' type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Install Extra Modules
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    Install more modules. A few modules are proposed according
+                    to the Account Profile you selected. You will be able to
+                    install them based on our requirements."/>
+                  <separator string="Project Management" colspan="4"/>
+                  <field name="project"/>
+                  <field name="project_gtd"/>
+                  <field name="wiki"/>
+                  <separator string="Resources Management" colspan="4"/>
+                  <field name="hr_expense"/>
+                  <separator string="Relationship Management" colspan="4"/>
+                  <field name="crm_configuration"/>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -30,6 +33,7 @@
             <field name="name">Association Profile : Install Extra Modules</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">profile.association.config.install_modules_wizard</field>
+            <field name="view_id" ref="view_confirm_install_module_form"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -37,8 +41,6 @@
 
       <record model="ir.actions.todo"
             id="config_install_module">
-            <field name="name">Association Profile : Install Extra modules</field>
-            <field name="note">Install more modules. A few modules are proposed according to the association profile you selected. You will be able to install them based on our requirements.</field>
             <field name="action_id" ref="action_config_install_module"/>
         </record>
     </data>

From 75b145e6c9883d4be332a32c7a7d9083ddf3f39e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 15:58:47 +0100
Subject: [PATCH 19/39] [fix] profile_manufacturing: migrate to
 res.config-based initial configuration

bzr revid: xmo@tinyerp.com-20091215145847-j0x1ermf1lqeozfq
---
 .../profile_manufacturing.py                  | 25 ++-------
 .../profile_manufacturing.xml                 | 55 ++++++++++---------
 2 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/addons/profile_manufacturing/profile_manufacturing.py b/addons/profile_manufacturing/profile_manufacturing.py
index 991e405bafb..a58878fe88f 100644
--- a/addons/profile_manufacturing/profile_manufacturing.py
+++ b/addons/profile_manufacturing/profile_manufacturing.py
@@ -25,6 +25,8 @@ import pooler
 
 class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
     _name='profile.manufacturing.config.install_modules_wizard'
+    _inherit = 'res.config'
+
     _columns = {
         'mrp_jit':fields.boolean('Just in Time Scheduling',
             help="The JIT module allows you to not run the scheduler "\
@@ -76,31 +78,16 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
             help="Allow to manage product repairs. Handle the guarantee limit date and the invoicing of products and services."),
 
     }
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-    def action_install(self, cr, uid, ids, context=None):
-        result=self.read(cr,uid,ids)
+    def execute(self, cr, uid, ids, context=None):
+        result = self.read(cr,uid,ids)
         mod_obj = self.pool.get('ir.module.module')
         for res in result:
             for r in res:
-                if r<>'id' and res[r]:
+                if r != 'id' and res[r]:
                     ids = mod_obj.search(cr, uid, [('name', '=', r)])
                     mod_obj.button_install(cr, uid, ids, context=context)
         cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname,update_module=True)
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-            }
+        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
 profile_manufacturing_config_install_modules_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml
index b20d9fdfe96..13f4aa9ddbe 100644
--- a/addons/profile_manufacturing/profile_manufacturing.xml
+++ b/addons/profile_manufacturing/profile_manufacturing.xml
@@ -5,46 +5,47 @@
             <field name="name">Manufacturing Profile: Install Extra Modules</field>
             <field name="model">profile.manufacturing.config.install_modules_wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Manufacturing Profile: Install Extra Modules">
-                    <separator string="Stock &amp; Manufacturing" colspan="4"/>
-                    <field name="stock_location"/>
-                    <field name="mrp_jit"/>
-                    <field name="mrp_operation"/>
-					<field name="mrp_subproduct"/>
-					<field name="mrp_repair"/>
-                    <separator string="Sales Management" colspan="4"/>
-                    <field name="point_of_sale"/>
-                    <field name="sale_journal"/>
-                    <field name="sale_margin"/>
-                    <separator string="Relationship Management" colspan="4"/>
-                    <field name="sale_crm"/>
-                    <field name="board_document"/>
-                    <field name="warning"/>
-                    <field name="portal"/>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group col="4" colspan="2">
-                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                        <button name="action_install" string="Install" icon='gtk-ok' type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Manufacturing Profile: Install Extra Modules
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    Install more modules. A few modules are proposed according
+                    to the Account Profile you selected. You will be able to
+                    install them based on our requirements."/>
+                  <separator string="Stock &amp; Manufacturing" colspan="4"/>
+                  <field name="stock_location"/>
+                  <field name="mrp_jit"/>
+                  <field name="mrp_operation"/>
+                  <field name="mrp_subproduct"/>
+                  <field name="mrp_repair"/>
+                  <separator string="Sales Management" colspan="4"/>
+                  <field name="point_of_sale"/>
+                  <field name="sale_journal"/>
+                  <field name="sale_margin"/>
+                  <separator string="Relationship Management" colspan="4"/>
+                  <field name="sale_crm"/>
+                  <field name="board_document"/>
+                  <field name="warning"/>
+                  <field name="portal"/>
+                </group>
+              </data>
             </field>
         </record>
-
         <record id="action_config_install_module" model="ir.actions.act_window">
             <field name="name">Manufacturing Profile: Install Extra Modules</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">profile.manufacturing.config.install_modules_wizard</field>
+            <field name="view_id" ref="view_confirm_install_module_form"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-
       <record model="ir.actions.todo"
             id="config_install_module">
-            <field name="name">Manufacturing Profile: Install Extra modules</field>
-            <field name="note">Install more modules. A few modules are proposed according to the manufacturing profile you selected. You will be able to install them based on our requirements.</field>
             <field name="action_id" ref="action_config_install_module"/>
         </record>
     </data>

From 0bf0ceebee6cb5a8a7f758c317457ddda733f3ed Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 16:23:11 +0100
Subject: [PATCH 20/39] [fix] profile_service: migrate to res.config-based
 initial configuration

bzr revid: xmo@tinyerp.com-20091215152311-sb4cxygms426bftf
---
 addons/profile_service/profile_service.py  | 24 ++-------
 addons/profile_service/profile_service.xml | 58 ++++++++++++----------
 2 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py
index 48236901d90..1b5195b9099 100644
--- a/addons/profile_service/profile_service.py
+++ b/addons/profile_service/profile_service.py
@@ -24,6 +24,7 @@ import pooler
 
 class profile_service_config_install_modules_wizard(osv.osv_memory):
     _name='profile.service.config.install_modules_wizard'
+    _inherit = 'res.config'
     _rec_name = 'crm_configuration'
     _columns = {
         'crm_configuration':fields.boolean('CRM & Calendars', help="This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."),
@@ -46,31 +47,16 @@ class profile_service_config_install_modules_wizard(osv.osv_memory):
             help="An integrated wiki content management system. This is really "\
                 "usefull to manage FAQ, quality manuals, etc.")
     }
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-    def action_install(self, cr, uid, ids, context=None):
-        result=self.read(cr,uid,ids)
+    def execute(self, cr, uid, ids, context=None):
+        result = self.read(cr, uid, ids)
         mod_obj = self.pool.get('ir.module.module')
         for res in result:
             for r in res:
-                if r<>'id' and res[r]:
+                if r != 'id' and res[r]:
                     ids = mod_obj.search(cr, uid, [('name', '=', r)])
-                    mod_obj.button_install(cr,uid,ids,context=context)
+                    mod_obj.button_install(cr, uid, ids, context=context)
         cr.commit()
         db, pool = pooler.restart_pool(cr.dbname, update_module=True)
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-            }
 profile_service_config_install_modules_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml
index e1533ead011..94a967d1840 100644
--- a/addons/profile_service/profile_service.xml
+++ b/addons/profile_service/profile_service.xml
@@ -5,32 +5,37 @@
             <field name="name">Service Profile : Install extra modules</field>
             <field name="model">profile.service.config.install_modules_wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Install Extra Module">
-                    <separator string="Services Management" colspan="4"/>
-                    <field name="project_timesheet"/>
-                    <field name="hr_timesheet_invoice"/>
-                    <field name="project_gtd"/>
-                    <field name="scrum"/>
-                    <field name="project_mrp"/>
-                    <separator string="Resources Management" colspan="4"/>
-                    <field name="hr_holidays"/>
-                    <field name="hr_expense"/>
-                    <field name="account_budget_crossover"/>
-                    <separator string="Relationship Management" colspan="4"/>
-                    <field name="crm_configuration"/>
-                    <field name="base_contact"/>
-                    <field name="board_document"/>
-                    <separator string="Portal Management" colspan="4"/>
-                    <field name="portal"/>
-                    <field name="wiki"/>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group col="4" colspan="2">
-                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                        <button name="action_install" string="Install" icon='gtk-ok' type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Install Extra Modules
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    A few modules are proposed according to the
+                    'service profile' you selected. You will be able to
+                    install them or more modules later through the
+                    Administration menu."/>
+                  <separator string="Services Management" colspan="4"/>
+                  <field name="project_timesheet"/>
+                  <field name="hr_timesheet_invoice"/>
+                  <field name="project_gtd"/>
+                  <field name="scrum"/>
+                  <field name="project_mrp"/>
+                  <separator string="Resources Management" colspan="4"/>
+                  <field name="hr_holidays"/>
+                  <field name="hr_expense"/>
+                  <field name="account_budget_crossover"/>
+                  <separator string="Relationship Management" colspan="4"/>
+                  <field name="crm_configuration"/>
+                  <field name="base_contact"/>
+                  <field name="board_document"/>
+                  <separator string="Portal Management" colspan="4"/>
+                  <field name="portal"/>
+                  <field name="wiki"/>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -38,6 +43,7 @@
             <field name="name">Service Profile : Install Extra Modules</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">profile.service.config.install_modules_wizard</field>
+            <field name="view_id" ref="view_confirm_install_module_form"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -45,8 +51,6 @@
 
       <record model="ir.actions.todo"
             id="config_install_module">
-            <field name="name">Service Profile : Install Extra modules</field>
-            <field name="note">A few modules are proposed according to the 'service profile' you selected. You will be able to install them or more modules later through the Administration menu.</field>
             <field name="action_id" ref="action_config_install_module"/>
         </record>
 

From 3bbf579f49d680dd3b5268787117bcde946d3e3f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 16:55:52 +0100
Subject: [PATCH 21/39] [fix] sale: migrate to res.config-based initial
 configuration

bzr revid: xmo@tinyerp.com-20091215155552-3jst1v1qsuqqfrzn
---
 addons/sale/sale.py       | 22 +++-------------------
 addons/sale/sale_view.xml | 36 ++++++++++++++++++++----------------
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 1be4b4a2477..407e9ea473a 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1057,6 +1057,8 @@ sale_order_line()
 
 class sale_config_picking_policy(osv.osv_memory):
     _name = 'sale.config.picking_policy'
+    _inherit = 'res.config'
+
     _columns = {
         'name': fields.char('Name', size=64),
         'picking_policy': fields.selection([
@@ -1082,7 +1084,7 @@ class sale_config_picking_policy(osv.osv_memory):
         'step': lambda *a: 'one'
     }
 
-    def set_default(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         for o in self.browse(cr, uid, ids, context=context):
             ir_values_obj = self.pool.get('ir.values')
             ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], o.picking_policy)
@@ -1099,23 +1101,5 @@ class sale_config_picking_policy(osv.osv_memory):
                 location_id = md._get_id(cr, uid, 'stock', 'stock_location_output')
                 location_id = md.browse(cr, uid, location_id, context).res_id
                 self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-         }
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-         }
-
 sale_config_picking_policy()
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a7535336982..e750a669156 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -508,21 +508,26 @@
             <field name="name">Configure Picking Policy for Sale Order </field>
             <field name="model">sale.config.picking_policy</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Sales Configuration">
-                    <separator colspan="4" string="Configure Sale Order Logistic"/>
-                    <newline/>
-                    <field name="picking_policy"/>
-                    <newline/>
-                    <field name="order_policy"/>
-                    <newline/>
-                    <field name="step"/>
-                    <separator string="" colspan="4"/>
-                    <group col="4" colspan="4">
-                        <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" name="set_default" string="Set Default" type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Sales Configuration
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    This Configuration step use to set default picking policy
+                    when make sale order"/>
+                  <separator colspan="4"
+                             string="Configure Sale Order Logistic"/>
+                  <newline/>
+                  <field name="picking_policy"/>
+                  <newline/>
+                  <field name="order_policy"/>
+                  <newline/>
+                  <field name="step"/>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -530,6 +535,7 @@
             <field name="name">Configure Picking Policy for Sale Order</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.config.picking_policy</field>
+            <field name="view_id" ref="view_config_picking_policy"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -537,8 +543,6 @@
 
         <!-- register configuration wizard -->
         <record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo">
-            <field name="name">Select the default picking policy for Sale Order</field>
-            <field name="note">This Configuration step use to set default picking policy when make sale order</field>
             <field name="action_id" ref="action_config_picking_policy"/>
         </record>
 

From 76ecd6159989e162aa4f1ce819bd04f0a9874839 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 16 Dec 2009 11:33:24 +0100
Subject: [PATCH 22/39] [fix] removed name and not fields on ir.actions.todo

bzr revid: xmo@tinyerp.com-20091216103324-vhpnp956jqo6ptwe
---
 addons/l10n_be/l10n_be_wizard.xml | 3 ---
 addons/l10n_lu/l10n_lu_wizard.xml | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index b170bc93f4d..c20f1c62420 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -49,9 +49,6 @@
         id="partner_intra_vat_menu"/>
 
     <record id="config_call_account_template" model="ir.actions.todo">
-        <field name="name">Generate Chart of Accounts from a Chart Template</field>
-        <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
     </record>
 
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
index 6987cf931f5..cbbf76975c4 100644
--- a/addons/l10n_lu/l10n_lu_wizard.xml
+++ b/addons/l10n_lu/l10n_lu_wizard.xml
@@ -3,9 +3,6 @@
     <data>
 
     <record id="config_call_account_template" model="ir.actions.todo">
-        <field name="name">Generate Chart of Accounts from a Chart Template</field>
-        <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to select the company, the chart template, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
     </record>
 

From 1b02d06d6590b2b57a07a82654e4366aa9161e1a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 18 Dec 2009 11:32:07 +0100
Subject: [PATCH 23/39] [imp] simplify interface of config screen for DMS ftp
 server

* remove suggested_host
* remove skip button
* put host and port on the same line

bzr revid: xmo@tinyerp.com-20091218103207-20km3mtu99qhqchd
---
 addons/document/document.py       | 22 ++++++----------------
 addons/document/document_view.xml | 22 +++++++++-------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 2811c8bca40..3e5b65cdf00 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -721,11 +721,10 @@ class document_configuration_wizard(osv.osv_memory):
     _inherit = 'res.config'
     _rec_name = 'host'
     _columns = {
-        'host': fields.char('Server Address', size=64, help="Put here the server address or IP. " \
-            "Keep localhost if you don't know what to write.", required=True),
-        'suggested_host': fields.char('Suggested Server Address', size=64, readonly=True, help="This is the guessed server address"),
-        'port': fields.char('Server Port', size=5, help="Put here the server port. " \
-            "Keep 8021 if you don't know what to write.", required=True)
+        'host': fields.char('Address', size=64,
+                            help="Server address or IP.", required=True),
+        'port': fields.char('Port', size=5, help="Server port. " \
+            "Leave 8021 if you don't know what to write.", required=True)
     }
 
     def get_ftp_server_address(self, cr, uid, context=None):
@@ -738,12 +737,8 @@ class document_configuration_wizard(osv.osv_memory):
     def get_ftp_server_port(self, cr, uid, context=None):
         return config.get('ftp_server_port', 8021)
 
-    def get_suggested_ftp_server_address(self, cr, uid, context=None):
-        return tools.misc.detect_ip_addr()
-
     _defaults = {
         'host': get_ftp_server_address,
-        'suggested_host': get_suggested_ftp_server_address,
         'port': get_ftp_server_port,
     }
 
@@ -827,10 +822,9 @@ class document_configuration_ftpserver_wizard(osv.osv_memory):
     _name='document.configuration.ftp_server.wizard'
     _rec_name = 'Configure FTP server address'
     _columns = {
-        'host': fields.char('Server Address', size=64, help="Put here the server address or IP. " \
+        'host': fields.char('Address', size=64, help="Put here the server address or IP. " \
             "Keep localhost if you don't know what to write.", required=True),
-        'suggested_host': fields.char('Suggested Server Address', size=64, readonly=True, help="This is the guessed server address"),
-        'port': fields.char('Server Port', size=5, help="Put here the server port. " \
+        'port': fields.char('Port', size=5, help="Put here the server port. " \
             "Keep 8021 if you don't know what to write.", required=True)
     }
 
@@ -841,12 +835,8 @@ class document_configuration_ftpserver_wizard(osv.osv_memory):
     def get_ftp_server_port(self, cr, uid, context=None):
         return config.get('ftp_server_port', '8021')
 
-    def get_suggested_ftp_server_address(self, cr, uid, context=None):
-        return tools.misc.detect_ip_addr()
-
     _defaults = {
         'host': get_ftp_server_address,
-        'suggested_host': get_suggested_ftp_server_address,
         'port': get_ftp_server_port,
     }
 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index daabac4b60e..ec222d4cac3 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -256,17 +256,14 @@
               Auto Configure
             </attribute></form>
             <group string="res_config_contents" position="replace">
-                <separator string="Document Management System." colspan="4"/>
-                <label string="This wizard will automatically configure the document management system according to modules installed on your system." align="0.0" colspan="4"/>
-                <separator string="" colspan="4"/>
-                <label string="Choose the ftp server address and port. These values will be stored in the configuration file." align="0.0" colspan="4"/>
-                <field name="host" colspan="4"/>
-                <field name="suggested_host" colspan="4"/>
-                <field name="port" colspan="4"/>
+                <separator string="FTP Server Configuration." colspan="4"/>
+                <label align="0.0" colspan="4"
+                       string="Choose the address and port for the Document
+                               Management System's FTP server."/>
+                <field name="host"/>
+                <field name="port"/>
             </group>
-            <xpath expr="//button[@name='action_next']" position="attributes">
-              <attribute name="string">Configure</attribute>
-            </xpath>
+            <xpath expr='//button[@name="action_skip"]' position="replace"/>
           </data>
         </field>
     </record>
@@ -296,9 +293,8 @@
                 <separator string="Document Management System." colspan="4"/>
                 <label string="This wizard will configure the ftp server address and port." align="0.0" colspan="4"/>
                 <label string="These values will be stored in the configuration file." align="0.0" colspan="4"/>
-                <field name="host" colspan="4"/>
-                <field name="suggested_host" colspan="4"/>
-                <field name="port" colspan="4"/>
+                <field name="host"/>
+                <field name="port"/>
                 <separator string="" colspan="4"/>
                 <label string="" colspan="2"/>
                 <group col="4" colspan="2">

From 01bc147cc02e25ec3292785016f6004b455ec7a2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 18 Dec 2009 13:05:19 +0100
Subject: [PATCH 24/39] [imp] crm: simplify caldav config wizard

bzr revid: xmo@tinyerp.com-20091218120519-ko0pa4lyts2yga1z
---
 addons/crm/crm.py       | 2 +-
 addons/crm/crm_view.xml | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index bd04a6c2ce0..5b412ca4c42 100755
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -1113,7 +1113,7 @@ class crm_calendar_config_wizard(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Name', size=64),
-        'caldav': fields.boolean('Caldav Properties View', help="Manages the fields required for Caldav Properties.")
+        'caldav': fields.boolean('Advanced View')
     }
 
     def execute(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 9f813791aa4..41b378bb413 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -736,7 +736,7 @@
         <!-- Caldav configartion view -->
 
         <record id="view_config_crm_caldav_menu" model="ir.ui.view">
-            <field name="name">Configure Menu for Caldav Properites</field>
+            <field name="name">Configure Caldav Properties</field>
             <field name="model">crm.calendar.config_wizard</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_view_base"/>
@@ -749,17 +749,18 @@
                 <group string="res_config_contents" position="replace">
                   <separator colspan="4" string=""/>
                   <label colspan="4" align="0.0" string="
-                     Enable a detailed view of the caldav properties
-                     configuration."/>
+                     Enable a detailed view of the caldav configuration
+                     screens."/>
                   <newline/>
                   <field name="caldav"/>
                 </group>
+                <xpath expr='//button[@name="action_skip"]' position='replace'/>
               </data>
             </field>
         </record>
 
         <record id="action_view_config_crm_caldav_menu" model="ir.actions.act_window">
-            <field name="name">Configure Menu for Caldav Properites</field>
+            <field name="name">Configure Caldav Properties</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">crm.calendar.config_wizard</field>
             <field name="view_id" ref="view_config_crm_caldav_menu"/>

From 2ef1b7f520a65958e21a17ac8fd9d32ccf66bf10 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 18 Dec 2009 14:17:46 +0100
Subject: [PATCH 25/39] [imp] document_ics: remove skip button, add explanatory
 label

bzr revid: xmo@tinyerp.com-20091218131746-2f79tytbgocmp82i
---
 .../document_ics_config_wizard.py             | 20 ++++++++-----------
 .../document_ics_config_wizard.xml            |  5 +++++
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/document_ics/document_ics_config_wizard.py b/addons/document_ics/document_ics_config_wizard.py
index c669df33f3e..a34957d55e9 100644
--- a/addons/document_ics/document_ics_config_wizard.py
+++ b/addons/document_ics/document_ics_config_wizard.py
@@ -81,16 +81,12 @@ class document_ics_crm_wizard(osv.osv_memory):
         else:
             dir_id = dir_obj.create(cr, uid, {'name': 'Calendars' ,'user_id' : uid, 'type': 'directory'})
         for section in ['meeting', 'lead', 'opportunity', 'jobs', 'bugs', 'fund', 'helpdesk', 'claims', 'phonecall']:
-            if (not data[section]):
-                continue
-            else:
+            if data[section]:
                 section_id=self.pool.get('crm.case.section').search(cr, uid, [('name', '=', SECTION_NAME[section])])
-                if not section_id:
-                    continue
-                else:
+                if section_id:
                     object_id=self.pool.get('ir.model').search(cr, uid, [('name', '=', 'Case')])[0]
 
-                    vals_cont={
+                    vals_cont = {
                           'name': SECTION_NAME[section],
                           'sequence': 1,
                           'directory_id': dir_id,
@@ -106,11 +102,11 @@ class document_ics_crm_wizard(osv.osv_memory):
                     ics_obj=self.pool.get('document.directory.ics.fields')
                     for tag in ['description', 'url', 'summary', 'dtstart', 'dtend', 'uid']:
                         field_id =  self.pool.get('ir.model.fields').search(cr, uid, [('model_id.name', '=', 'Case'), ('field_description', '=', ICS_TAGS[tag])])[0]
-                        vals_ics={
-                                'field_id':  field_id ,
-                                'name':  tag ,
-                                'content_id': content_id ,
-                                  }
+                        vals_ics = {
+                            'field_id':  field_id ,
+                            'name':  tag ,
+                            'content_id': content_id ,
+                            }
                         ics_obj.create(cr, uid, vals_ics)
 document_ics_crm_wizard()
 
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index c77fa15c2a8..2f25ccce5db 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -12,6 +12,9 @@
                   Configure Calendars for CRM Sections
                 </attribute></form>
                 <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    OpenERP can create and pre-configure a series of integrated
+                    calendar for you."/>
                   <separator string="Create Pre-Configured Calendars"
                              colspan="4"/>
                   <newline/>
@@ -25,6 +28,8 @@
                   <field name="jobs"/>
                   <field name="fund"/>
                 </group>
+                <xpath expr='//button[@name="action_skip"]'
+                       position='replace'/>
               </data>
             </field>
         </record>

From 7734b7e5d294936666fb0d3949d8378164757181 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 18 Dec 2009 14:54:40 +0100
Subject: [PATCH 26/39] [imp] crm: improve wording of CRM pre-config screen

bzr revid: xmo@tinyerp.com-20091218135440-6vghjzuyzb21qqd0
---
 addons/crm/crm_config.py       | 33 +++++++++++++++++++++++----------
 addons/crm/crm_config_view.xml | 10 ++++------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/addons/crm/crm_config.py b/addons/crm/crm_config.py
index 91a6d439418..6865b1465ad 100644
--- a/addons/crm/crm_config.py
+++ b/addons/crm/crm_config.py
@@ -122,16 +122,29 @@ class crm_menu_config_wizard(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Name', size=64),
-        'meeting': fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
-        'lead': fields.boolean('Leads', help="Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."),
-        'opportunity': fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."),
-        'jobs': fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."),
-        'document_ics': fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."),
-        'bugs': fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on software"),
-        'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
-        'fund': fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."),
-        'claims': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."),
-        'phonecall': fields.boolean('Phone Calls', help="Help you to encode the result of a phone call or to plan a list of phone calls to process."),
+        'meeting': fields.boolean('Meetings Calendar',
+            help="Manages each user's meetings calendar"),
+        'lead': fields.boolean('Leads', help="Tracks and manages leads"),
+        'opportunity': fields.boolean('Business Opportunities',
+            help="Tracks identified business opportunities"),
+        'jobs': fields.boolean('Jobs Hiring Process',
+            help="Helps you organise your hiring process (evaluation, "\
+                                   "meetings, email integration...)"),
+        'document_ics': fields.boolean('Shared Calendar',
+            help="Lets you use your OpenERP calendars in third-party systems "\
+                 "(smartphones, Microsoft Outlook, iCal, Google Calendar..."),
+        'bugs': fields.boolean('Bug Tracking',
+            help="Track bugs and support requests on software"),
+        'helpdesk': fields.boolean('Helpdesk',
+            help="Manages an Helpdesk service."),
+        'fund': fields.boolean('Fund Raising Operations',
+            help="Provides processing and tracking for fund raisings"),
+        'claims': fields.boolean('Claims',
+            help="Manages supplier and customers claims, including "\
+                 "corrective or preventive actions"),
+        'phonecall': fields.boolean('Phone Calls',
+            help="Lets users encode phone call outcomes or phone calls to "\
+                                        "perform"),
     }
     _defaults = {
         'meeting': lambda *args: True,
diff --git a/addons/crm/crm_config_view.xml b/addons/crm/crm_config_view.xml
index 62c01c2037b..e5b6384156e 100644
--- a/addons/crm/crm_config_view.xml
+++ b/addons/crm/crm_config_view.xml
@@ -16,13 +16,11 @@
                 </attribute></form>
 
                 <group string="res_config_contents" position="replace">
-                  <separator colspan="4"
-                             string="Install Pre-Configured Features"/>
                   <label colspan="4" align="0.0" string="
-                     The CRM module of OpenERP is able to manage any kind of
-                     relationship. But, as to help you to start quickly on the
-                     system, we configured a few of them for you."/>
-                  <newline/>
+                     The CRM module is able to pre-configure its section
+                     to get you started. Select the sections you want to
+                     pre-configure."/>
+                  <separator colspan="4" string="Install Pre-Configured Features"/>
                   <field name="meeting"/>
                   <field name="opportunity"/>
                   <field name="phonecall"/>

From 48e9e4879ea3bdc988c43105321903183fe344f3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 21 Dec 2009 08:46:52 +0100
Subject: [PATCH 27/39] [imp] crm: style fixes

bzr revid: xmo@tinyerp.com-20091221074652-hbp33f3n10nsj0lo
---
 addons/crm/crm_config.py | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/crm/crm_config.py b/addons/crm/crm_config.py
index 6865b1465ad..dcf73e022c4 100644
--- a/addons/crm/crm_config.py
+++ b/addons/crm/crm_config.py
@@ -144,7 +144,7 @@ class crm_menu_config_wizard(osv.osv_memory):
                  "corrective or preventive actions"),
         'phonecall': fields.boolean('Phone Calls',
             help="Lets users encode phone call outcomes or phone calls to "\
-                                        "perform"),
+                 "perform"),
     }
     _defaults = {
         'meeting': lambda *args: True,
@@ -153,28 +153,27 @@ class crm_menu_config_wizard(osv.osv_memory):
     }
 
     def execute(self, cr, uid, ids, context=None):
-        module_proxy = self.pool.get('ir.module.module')
-        modid = module_proxy.search(cr, uid, [('name', '=', 'crm')])
-        moddemo = module_proxy.browse(cr, uid, modid[0]).demo
+        modobj = self.pool.get('ir.module.module')
+        modids = modobj.search(cr, uid, [('name', '=', 'crm')])
+        moddemo = modobj.browse(cr, uid, modids[0]).demo
         lst = ('data', 'menu')
         if moddemo:
             lst = ('data', 'menu', 'demo')
         res = self.read(cr, uid, ids)[0]
-        idref = {}
         for section in ['meeting', 'lead', 'opportunity', 'jobs', 'bugs', 'fund', 'helpdesk', 'claims', 'phonecall']:
             if (not res[section]):
                 continue
             for fname in lst:
-                file_name = 'crm_' + section + '_' + fname + '.xml'
+                file_name = 'crm_%s_%s.xml'%(section, fname)
                 try:
-                    fp = tools.file_open(os.path.join('crm', file_name))
-                except IOError, e:
-                    fp = None
-                if fp:
-                    tools.convert_xml_import(cr, 'crm', fp, idref, 'init', noupdate=True)
+                    tools.convert_xml_import(
+                        cr, 'crm',
+                        tools.file_open(os.path.join('crm', file_name)),
+                        {}, 'init', noupdate=True)
+                except IOError:
+                    pass
+
         cr.commit()
-        modobj = self.pool.get('ir.module.module')
-        modids = modobj.search(cr, uid, [('name', '=', 'crm')])
         modobj.update_translations(cr, 1, modids, None)
 
         if res['document_ics']:

From 3d9109d0365a3d650bcb5b0c7286c8d99cb8f29c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 21 Dec 2009 14:52:46 +0100
Subject: [PATCH 28/39] [imp] account: reformatting 80c

bzr revid: xmo@tinyerp.com-20091221135246-ntywx4uyus3ic7us
---
 addons/account/account.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index ad44b3e9ac5..1871275c2d9 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1712,18 +1712,24 @@ class account_config_wizard(osv.osv_memory):
 
     def _get_charts(self, cr, uid, context):
         module_obj=self.pool.get('ir.module.module')
-        ids=module_obj.search(cr, uid, [('category_id', '=', 'Account Charts'), ('state', '<>', 'installed')])
+        ids=module_obj.search(cr, uid, [('category_id', '=', 'Account Charts'),
+                                        ('state', '<>', 'installed')])
         res=[(m.id, m.shortdesc) for m in module_obj.browse(cr, uid, ids)]
         res.append((-1, 'None'))
         res.sort(key=lambda x: x[1])
         return res
 
     _columns = {
-        'name':fields.char('Name', required=True, size=64, help="Name of the fiscal year as displayed on screens."),
-        'code':fields.char('Code', required=True, size=64, help="Name of the fiscal year as displayed in reports."),
+        'name':fields.char(
+            'Name', required=True, size=64,
+            help="Name of the fiscal year as displayed on screens."),
+        'code':fields.char(
+            'Code', required=True, size=64,
+            help="Name of the fiscal year as displayed in reports."),
         'date1': fields.date('Start Date', required=True),
         'date2': fields.date('End Date', required=True),
-        'period':fields.selection([('month','Month'),('3months','3 Months')], 'Periods', required=True),
+        'period':fields.selection([('month','Month'), ('3months','3 Months')],
+                                  'Periods', required=True),
         'charts' : fields.selection(_get_charts, 'Charts of Account',required=True)
     }
     _defaults = {

From 007c0970dba601c8d49d71367fc8ff29b8860b05 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 21 Dec 2009 14:58:35 +0100
Subject: [PATCH 29/39] [imp] account: remove skip button

bzr revid: xmo@tinyerp.com-20091221135835-x8gsvqew2ksxula4
---
 addons/account/account_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 044ad910c91..ca44d4b900e 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1463,6 +1463,7 @@
                     <separator col="4" colspan="4" string="Select Chart of Accounts"/>
                     <field name="charts"/>
                 </group>
+                <xpath expr='//button[@name="action_skip"]' position="replace"/>
               </data>
             </field>
         </record>

From ff4e6888f8ad99a97e96b3a40b8a66de87b63cd6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 21 Dec 2009 15:55:34 +0100
Subject: [PATCH 30/39] [imp] account: code reorganization

bzr revid: xmo@tinyerp.com-20091221145534-ncjgkd2dywg3lcbp
---
 addons/account/company.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/addons/account/company.py b/addons/account/company.py
index 04a2611fe7d..2e210626495 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -63,19 +63,25 @@ class company_setup(osv.osv_memory):
     }
 
     def onchange_company_id(self, cr, uid, ids, company, context=None):
-        res = {}
         if not company:
             return {}
         comp_obj = self.pool.get('res.company').browse(cr,uid,company)
-        res['partner_id'] = comp_obj.partner_id.id
-        phone = comp_obj.partner_id.address and (comp_obj.partner_id.address[0].phone and ' at ' + str(comp_obj.partner_id.address[0].phone) + '.' or '.') or '.'
-        res['overdue_msg'] = comp_obj.overdue_msg + str(phone)
-        
-        return {'value': res }
+        partner_address = comp_obj.partner_id.address
+        if partner_address and partner_address[0].phone:
+            msg_tail = ' at %s.'%(partner_address[0].phone)
+        else:
+            msg_tail = '.'
+
+        return {'value': {'overdue_msg': comp_obj.overdue_msg + msg_tail,
+                          'partner_id': comp_obj.partner_id.id } }
 
     def execute(self, cr, uid, ids, context=None):
-        content_wiz = self.pool.get('wizard.company.setup').read(cr,uid,ids,['company_id','overdue_msg'])
+        content_wiz = self.pool.get('wizard.company.setup')\
+            .read(cr,uid,ids,['company_id','overdue_msg'])
         if content_wiz:
             wiz_data = content_wiz[0]
-            self.pool.get('res.company').write(cr, uid, [wiz_data['company_id']], {'overdue_msg':wiz_data['overdue_msg']})
+            self.pool.get('res.company').write(
+                cr, uid,
+                [wiz_data['company_id']],
+                {'overdue_msg':wiz_data['overdue_msg']})
 company_setup()

From b08138b7d75dac39012a5aea4fedec7cc244562f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 21 Dec 2009 15:58:57 +0100
Subject: [PATCH 31/39] [rem] account: remove partner_id from
 wizard.company.setup

bzr revid: xmo@tinyerp.com-20091221145857-l27b2qh7cw2xpsvd
---
 addons/account/company.py       | 5 +----
 addons/account/company_view.xml | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/account/company.py b/addons/account/company.py
index 2e210626495..eb1a1918386 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -46,7 +46,6 @@ class company_setup(osv.osv_memory):
 
     _columns = {
         'company_id':fields.many2one('res.company','Company',required=True),
-        'partner_id':fields.many2one('res.partner','Partner'),
         'overdue_msg': fields.text('Overdue Payment Message'),
     }
     def get_message(self,cr,uid,context={}):
@@ -58,7 +57,6 @@ class company_setup(osv.osv_memory):
 
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr,uid,[uid],c)[0].company_id.id,
-        'partner_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr,uid,[uid],c)[0].company_id.partner_id.id,
         'overdue_msg': get_message,
     }
 
@@ -72,8 +70,7 @@ class company_setup(osv.osv_memory):
         else:
             msg_tail = '.'
 
-        return {'value': {'overdue_msg': comp_obj.overdue_msg + msg_tail,
-                          'partner_id': comp_obj.partner_id.id } }
+        return {'value': {'overdue_msg': comp_obj.overdue_msg + msg_tail } }
 
     def execute(self, cr, uid, ids, context=None):
         content_wiz = self.pool.get('wizard.company.setup')\
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index ec4cec0c54a..8a84a76ecec 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -32,7 +32,6 @@
                     <field name="company_id" select="1" 
                            on_change="onchange_company_id(company_id)"
                            groups="base.group_multi_company"/>
-                    <field name="partner_id" select="1" readonly="1"/>
                     <separator string="Message" colspan="4"/>
                     <field name="overdue_msg" nolabel="1" colspan="4"/>
                 </group>

From ca157700ca4d54513e15de537146af1169e597e7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 21 Dec 2009 16:02:35 +0100
Subject: [PATCH 32/39] [rem] account: remove Skip button from Overdue Payment
 Report Message screen

bzr revid: xmo@tinyerp.com-20091221150235-fwio4nx1pr5q0owr
---
 addons/account/company_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 8a84a76ecec..31f8e03a6b3 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -35,6 +35,7 @@
                     <separator string="Message" colspan="4"/>
                     <field name="overdue_msg" nolabel="1" colspan="4"/>
                 </group>
+                <xpath expr='//button[@name="action_skip"]' position='replace'/>
               </data>
             </field>
         </record>

From 4afec788364d7c3338191206f038707ffb5c39d5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 21 Dec 2009 16:12:14 +0100
Subject: [PATCH 33/39] [imp] sale: slightly improve grammar of configuration's
 main label

bzr revid: xmo@tinyerp.com-20091221151214-73xa5d4pqzqyhmo5
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 908d8953a2e..e35d5ae6ae6 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -456,8 +456,8 @@
                 </attribute></form>
                 <group string="res_config_contents" position="replace">
                   <label colspan="4" align="0.0" string="
-                    This Configuration step use to set default picking policy
-                    when make sale order"/>
+                    Set the policies selected by default when creating a new
+                    sale order."/>
                   <separator colspan="4"
                              string="Configure Sale Order Logistic"/>
                   <newline/>

From 5fa1f9620beaded6df3ecda31c7db3dc3027b75b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 21 Dec 2009 16:29:25 +0100
Subject: [PATCH 34/39] [imp] sale: remove skip button in picking policy
 configuration

bzr revid: xmo@tinyerp.com-20091221152925-ya0y7n0u406nho2g
---
 addons/sale/sale_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e35d5ae6ae6..e45cae972e0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -467,6 +467,7 @@
                   <newline/>
                   <field name="step"/>
                 </group>
+                <xpath expr='//button[@name="action_skip"]' position='replace'/>
               </data>
             </field>
         </record>

From 1f9fe4e3be7d40d356a067f484e706b1c6297018 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 21 Dec 2009 16:35:48 +0100
Subject: [PATCH 35/39] [imp] account: remove skip button on 'generate chart of
 accounts' configuration screen

bzr revid: xmo@tinyerp.com-20091221153548-400n95cdd8ilw5c7
---
 addons/account/account_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ca44d4b900e..a811e01b7d3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1757,6 +1757,7 @@
                       <field name="currency_id"/>
                     </tree>
                   </field>
+                  <xpath expr='//button[@name="action_skip"]' position='replace'/>
                 </group>
               </data>
             </field>

From 9b58be2afdc92d7536640d07da7fda58742c5220 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 21 Dec 2009 16:45:01 +0100
Subject: [PATCH 36/39] [fix] account: incorrect insertion in previous revision

bzr revid: xmo@tinyerp.com-20091221154501-in0jk0z5wwwggswe
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a811e01b7d3..8fe8f30a5f9 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1757,8 +1757,8 @@
                       <field name="currency_id"/>
                     </tree>
                   </field>
-                  <xpath expr='//button[@name="action_skip"]' position='replace'/>
                 </group>
+                <xpath expr='//button[@name="action_skip"]' position='replace'/>
               </data>
             </field>
         </record>

From 097bc209df3dce16460bab8e92d579d550640527 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 21 Dec 2009 16:49:29 +0100
Subject: [PATCH 37/39] [imp] profile_manufacturing: removed skip button from
 extra modules selection dialog

bzr revid: xmo@tinyerp.com-20091221154929-8zt5egfgsr987yhk
---
 addons/profile_manufacturing/profile_manufacturing.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml
index 13f4aa9ddbe..cb99feeffd7 100644
--- a/addons/profile_manufacturing/profile_manufacturing.xml
+++ b/addons/profile_manufacturing/profile_manufacturing.xml
@@ -32,6 +32,7 @@
                   <field name="warning"/>
                   <field name="portal"/>
                 </group>
+                <xpath expr='//button[@name="action_skip"]' position='replace'/>
               </data>
             </field>
         </record>

From 90dbc298ce5c95ba8e498c0c8e2aec13d65847f7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 21 Dec 2009 16:52:47 +0100
Subject: [PATCH 38/39] [imp] profile_manufacturing: make top label a bit more
 helpful in extra modules selection dialog

bzr revid: xmo@tinyerp.com-20091221155247-e98fjyop71ytfwcd
---
 addons/profile_manufacturing/profile_manufacturing.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml
index cb99feeffd7..b69203f83e3 100644
--- a/addons/profile_manufacturing/profile_manufacturing.xml
+++ b/addons/profile_manufacturing/profile_manufacturing.xml
@@ -13,9 +13,11 @@
                 </attribute></form>
                 <group string="res_config_contents" position="replace">
                   <label colspan="4" align="0.0" string="
-                    Install more modules. A few modules are proposed according
-                    to the Account Profile you selected. You will be able to
-                    install them based on our requirements."/>
+                    Here are a few modules which might be useful along with
+                    the rest of the Manufacturing profile. You can also install
+                    them the normal way later on, but if you think you'll need
+                    them to fit your requirements, you can select them now and
+                    they'll be installed immediately."/>
                   <separator string="Stock &amp; Manufacturing" colspan="4"/>
                   <field name="stock_location"/>
                   <field name="mrp_jit"/>