From 0e8b7de8a97918d8f737d627bdece1de63770720 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Mon, 4 Apr 2011 16:22:50 +0530
Subject: [PATCH 01/10] [IMP]product:ADD Create some products confg wiz

bzr revid: aag@tinyerp.co.in-20110404105250-bn3mw3w7hivp6v2x
---
 addons/product/__openerp__.py                 |  1 +
 addons/product/wizard/__init__.py             |  1 +
 .../product/wizard/res_product_installer.py   | 54 ++++++++++++++++
 .../product/wizard/res_product_installer.xml  | 61 +++++++++++++++++++
 4 files changed, 117 insertions(+)
 create mode 100644 addons/product/wizard/res_product_installer.py
 create mode 100644 addons/product/wizard/res_product_installer.xml

diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index a1ee0d144b5..5ce1730c8c5 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -55,6 +55,7 @@ Print product labels with barcode.
         'product_data.xml',
         'product_report.xml',
         'product_view.xml',
+        'wizard/res_product_installer.xml',
         'product_shortcut_data.xml',
         'pricelist_view.xml',
         'partner_view.xml',
diff --git a/addons/product/wizard/__init__.py b/addons/product/wizard/__init__.py
index 47f5f2641fc..b18565e932b 100644
--- a/addons/product/wizard/__init__.py
+++ b/addons/product/wizard/__init__.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 import product_price
+import res_product_installer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product/wizard/res_product_installer.py b/addons/product/wizard/res_product_installer.py
new file mode 100644
index 00000000000..9aa382ecda8
--- /dev/null
+++ b/addons/product/wizard/res_product_installer.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import pooler
+
+class res_product_installer(osv.osv_memory):
+    _name = 'res.product.installer'
+    _inherit = 'res.config'
+    _columns = {
+    }
+    _defaults = {
+    }
+    
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+             context = {}
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'product', 'product_normal_form_view')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        return {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'product.product',
+                'views': [(id2, 'form')],
+#                'view_id': False,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy':True,
+            }
+
+res_product_installer()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/product/wizard/res_product_installer.xml b/addons/product/wizard/res_product_installer.xml
new file mode 100644
index 00000000000..66cebf9c0a1
--- /dev/null
+++ b/addons/product/wizard/res_product_installer.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- configartion view -->
+<!---->
+<!--        <record id="view_res_product_installer" model="ir.ui.view">-->
+<!--            <field name="name">Configure Product</field>-->
+<!--            <field name="model">res.product.installer</field>-->
+<!--            <field name="type">form</field>-->
+<!--            <field name="inherit_id" ref="base.res_config_view_base"/>-->
+<!--            <field name="arch" type="xml">-->
+<!--              <data>-->
+<!--                <form position="attributes">-->
+<!--                  <attribute name="string">Product Application Configuration</attribute>-->
+<!--                </form>-->
+<!--                <separator string="title" position="attributes">-->
+<!--                <attribute name="string">Configure Product</attribute>-->
+<!--                  </separator>-->
+<!--                <xpath expr='//separator[@string="vsep"]' position='attributes'>-->
+<!--                      <attribute name='rowspan'>15</attribute>-->
+<!--                      <attribute name='string'></attribute>-->
+<!--                  </xpath>-->
+<!--                <xpath expr='//button[@name="action_skip"]' position='replace'/>-->
+<!--              </data>-->
+<!--            </field>-->
+<!--        </record>-->
+<!---->
+<!--        <record id="action_view_res_product_installer" model="ir.actions.act_window">-->
+<!--            <field name="name">Configure Product</field>-->
+<!--            <field name="type">ir.actions.act_window</field>-->
+<!--            <field name="res_model">res.product.installer</field>-->
+<!--            <field name="view_id" ref="view_res_product_installer"/>-->
+<!--            <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_res_product_installer" model="ir.actions.todo">-->
+<!--            <field name="action_id" ref="action_view_res_product_installer"/>-->
+<!--            <field name="restart">on_trigger</field>-->
+<!--        </record>-->
+<!--        -->
+
+         <record id="product_form_config_action" model="ir.actions.act_window">
+            <field name="name">Create some products</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="product.product_normal_form_view"/>
+        </record>
+        
+         <!--      register configuration wizard -->
+        <record id="config_wizard_res_product_installer" model="ir.actions.todo">
+            <field name="action_id" ref="product_form_config_action"/>
+            <field name="target">new</field>
+            <field name="restart">on_trigger</field>
+        </record>
+        
+    </data>
+</openerp>

From eec8920438bcda73cc9923010bca9cf6c176957e Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Mon, 4 Apr 2011 19:03:00 +0530
Subject: [PATCH 02/10] [IMP]product:Create some products confg wiz -modify

bzr revid: aag@tinyerp.co.in-20110404133300-gf3ge382gpg1iwpf
---
 addons/product/wizard/res_product_installer.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/product/wizard/res_product_installer.xml b/addons/product/wizard/res_product_installer.xml
index 66cebf9c0a1..a9434640707 100644
--- a/addons/product/wizard/res_product_installer.xml
+++ b/addons/product/wizard/res_product_installer.xml
@@ -47,14 +47,15 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
+            <field name="view_mode">form</field>
             <field name="view_id" ref="product.product_normal_form_view"/>
         </record>
         
          <!--      register configuration wizard -->
         <record id="config_wizard_res_product_installer" model="ir.actions.todo">
             <field name="action_id" ref="product_form_config_action"/>
-            <field name="target">new</field>
-            <field name="restart">on_trigger</field>
+            <field name="target">current</field>
+            <field name="restart">never</field>
         </record>
         
     </data>

From 55968077fcc4b92f846c2a57655de61582e33036 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 5 Apr 2011 14:14:15 +0530
Subject: [PATCH 03/10] [IMP]product:skip Create some products confg wiz

bzr revid: aag@tinyerp.co.in-20110405084415-ua061g9jh8tp7azu
---
 addons/product/wizard/res_product_installer.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/product/wizard/res_product_installer.xml b/addons/product/wizard/res_product_installer.xml
index a9434640707..a92699bffb4 100644
--- a/addons/product/wizard/res_product_installer.xml
+++ b/addons/product/wizard/res_product_installer.xml
@@ -56,6 +56,7 @@
             <field name="action_id" ref="product_form_config_action"/>
             <field name="target">current</field>
             <field name="restart">never</field>
+            <field name="state">skip</field>
         </record>
         
     </data>

From 656c2f2b53a2882c22e3e56f52191529d1db9aab Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 6 Apr 2011 14:44:54 +0530
Subject: [PATCH 04/10] [IMP]sale:Improve sales wizard -Configure Picking
 Policy for Sales Order

bzr revid: aag@tinyerp.co.in-20110406091454-3jbbhyskp2icruh4
---
 addons/sale/sale.py       | 8 +-------
 addons/sale/sale_view.xml | 6 ++----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f80d610eb03..0758fac6c19 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1177,14 +1177,10 @@ class sale_config_picking_policy(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Name', size=64),
-        'picking_policy': fields.selection([
-            ('direct', 'Direct Delivery'),
-            ('one', 'All at Once')
-        ], 'Picking Default Policy', required=True, help="The Shipping Policy is used to configure per order if you want to deliver as soon as possible when one product is available or you wait that all products are available.."),
         'order_policy': fields.selection([
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),
-        ], 'Shipping Default Policy', required=True,
+        ], 'Invoice Method', required=True,
            help="You can generate invoices based on sales orders or based on shippings."),
         'step': fields.selection([
             ('one', 'Delivery Order Only'),
@@ -1196,7 +1192,6 @@ class sale_config_picking_policy(osv.osv_memory):
            "in one or two operations by the worker.")
     }
     _defaults = {
-        'picking_policy': 'direct',
         'order_policy': 'manual',
         'step': 'one'
     }
@@ -1204,7 +1199,6 @@ class sale_config_picking_policy(osv.osv_memory):
     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)
             ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], o.order_policy)
             if o.step == 'two':
                 md = self.pool.get('ir.model.data')
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9925354346b..61cb347655d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -545,18 +545,16 @@
                 <attribute name="string">Configure Sales Order Logistics</attribute>
                   </separator>
                   <xpath expr="//label[@string='description']" position="attributes">
-                    <attribute name="string">Setup your sales workflow and default values.</attribute>
+                    <attribute name="string">Define your invoice method. A services company usually invoices based on sale orders while a retailer usually invoices based on deliveries.</attribute>
                   </xpath>
                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
                       <attribute name='rowspan'>15</attribute>
                       <attribute name='string'></attribute>
                   </xpath>
                 <group string="res_config_contents" position="replace">
-                  <field name="picking_policy" groups="base.group_extended"/>
-                  <newline/>
                   <field name="order_policy"/>
                   <newline/>
-                  <field name="step"/>
+                  <field name="step" groups="base.group_extended"/>
                 </group>
                 <xpath expr='//button[@name="action_skip"]' position='replace'/>
               </data>

From ad211158355cf3b861511f8f81bfcde69955f618 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 7 Apr 2011 11:21:47 +0530
Subject: [PATCH 05/10] [IMP]Product:Optimize Code of Wiz

bzr revid: aag@tinyerp.co.in-20110407055147-knj8p33livb9dg23
---
 addons/product/__openerp__.py                 |  2 +-
 addons/product/wizard/__init__.py             |  1 -
 addons/product/wizard/product_installer.xml   | 23 +++++++
 .../product/wizard/res_product_installer.py   | 54 ----------------
 .../product/wizard/res_product_installer.xml  | 63 -------------------
 5 files changed, 24 insertions(+), 119 deletions(-)
 create mode 100644 addons/product/wizard/product_installer.xml
 delete mode 100644 addons/product/wizard/res_product_installer.py
 delete mode 100644 addons/product/wizard/res_product_installer.xml

diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 5ce1730c8c5..bcddcc93bdf 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -55,7 +55,7 @@ Print product labels with barcode.
         'product_data.xml',
         'product_report.xml',
         'product_view.xml',
-        'wizard/res_product_installer.xml',
+        'wizard/product_installer.xml',
         'product_shortcut_data.xml',
         'pricelist_view.xml',
         'partner_view.xml',
diff --git a/addons/product/wizard/__init__.py b/addons/product/wizard/__init__.py
index b18565e932b..47f5f2641fc 100644
--- a/addons/product/wizard/__init__.py
+++ b/addons/product/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 import product_price
-import res_product_installer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product/wizard/product_installer.xml b/addons/product/wizard/product_installer.xml
new file mode 100644
index 00000000000..93113818bb6
--- /dev/null
+++ b/addons/product/wizard/product_installer.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+         <record id="product_form_config_action" model="ir.actions.act_window">
+            <field name="name">Create some products</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="product.product_normal_form_view"/>
+        </record>
+        
+         <!--      register configuration wizard -->
+        <record id="config_wizard_res_product_installer" model="ir.actions.todo">
+            <field name="action_id" ref="product_form_config_action"/>
+            <field name="target">current</field>
+            <field name="restart">never</field>
+            <field name="state">skip</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/product/wizard/res_product_installer.py b/addons/product/wizard/res_product_installer.py
deleted file mode 100644
index 9aa382ecda8..00000000000
--- a/addons/product/wizard/res_product_installer.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-import pooler
-
-class res_product_installer(osv.osv_memory):
-    _name = 'res.product.installer'
-    _inherit = 'res.config'
-    _columns = {
-    }
-    _defaults = {
-    }
-    
-    def execute(self, cr, uid, ids, context=None):
-        if context is None:
-             context = {}
-        data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'product', 'product_normal_form_view')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        return {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'product.product',
-                'views': [(id2, 'form')],
-#                'view_id': False,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'nodestroy':True,
-            }
-
-res_product_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/product/wizard/res_product_installer.xml b/addons/product/wizard/res_product_installer.xml
deleted file mode 100644
index a92699bffb4..00000000000
--- a/addons/product/wizard/res_product_installer.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- configartion view -->
-<!---->
-<!--        <record id="view_res_product_installer" model="ir.ui.view">-->
-<!--            <field name="name">Configure Product</field>-->
-<!--            <field name="model">res.product.installer</field>-->
-<!--            <field name="type">form</field>-->
-<!--            <field name="inherit_id" ref="base.res_config_view_base"/>-->
-<!--            <field name="arch" type="xml">-->
-<!--              <data>-->
-<!--                <form position="attributes">-->
-<!--                  <attribute name="string">Product Application Configuration</attribute>-->
-<!--                </form>-->
-<!--                <separator string="title" position="attributes">-->
-<!--                <attribute name="string">Configure Product</attribute>-->
-<!--                  </separator>-->
-<!--                <xpath expr='//separator[@string="vsep"]' position='attributes'>-->
-<!--                      <attribute name='rowspan'>15</attribute>-->
-<!--                      <attribute name='string'></attribute>-->
-<!--                  </xpath>-->
-<!--                <xpath expr='//button[@name="action_skip"]' position='replace'/>-->
-<!--              </data>-->
-<!--            </field>-->
-<!--        </record>-->
-<!---->
-<!--        <record id="action_view_res_product_installer" model="ir.actions.act_window">-->
-<!--            <field name="name">Configure Product</field>-->
-<!--            <field name="type">ir.actions.act_window</field>-->
-<!--            <field name="res_model">res.product.installer</field>-->
-<!--            <field name="view_id" ref="view_res_product_installer"/>-->
-<!--            <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_res_product_installer" model="ir.actions.todo">-->
-<!--            <field name="action_id" ref="action_view_res_product_installer"/>-->
-<!--            <field name="restart">on_trigger</field>-->
-<!--        </record>-->
-<!--        -->
-
-         <record id="product_form_config_action" model="ir.actions.act_window">
-            <field name="name">Create some products</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">product.product</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="product.product_normal_form_view"/>
-        </record>
-        
-         <!--      register configuration wizard -->
-        <record id="config_wizard_res_product_installer" model="ir.actions.todo">
-            <field name="action_id" ref="product_form_config_action"/>
-            <field name="target">current</field>
-            <field name="restart">never</field>
-            <field name="state">skip</field>
-        </record>
-        
-    </data>
-</openerp>

From 3a1bc3d153fc564c4c534c2aab90c4f9ccaa1091 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 7 Apr 2011 12:49:56 +0530
Subject: [PATCH 06/10] [IMP]sale,POS:Rename Shortcut Sales order line and add
 separator string Point of Sale in procurement & locations Tab

bzr revid: aag@tinyerp.co.in-20110407071956-cjre75kkx8abown0
---
 addons/point_of_sale/point_of_sale_view.xml | 3 ++-
 addons/sale/sale_view.xml                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index acc0a72ff3b..18bbfb2a7f8 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -654,7 +654,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                  <field name="active" position="after">
+                  <field name="company_id" position="after">
+                  <separator string="Point of Sale" colspan="2"/>
                       <field name="income_pdt"/>
                       <field name="expense_pdt"/>
                       <field name="am_out"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 61cb347655d..07bf44d8372 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -521,7 +521,7 @@
         <act_window
         context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
         id="action_order_line_product_tree"
-        name="Product sales"
+        name="Sales order line"
         res_model="sale.order.line"
         src_model="product.product"
         groups="base.group_sale_salesman"/>

From 7eff17aef5c0f9b2f84ac54251a4e29b892c2ce1 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 7 Apr 2011 14:24:15 +0530
Subject: [PATCH 07/10] [IMP]thunderbird,outlook:Rename Conf wiz name With
 Prefix Load like Thunderbird Plug-In to --> Load Thunderbird Plug-In

bzr revid: aag@tinyerp.co.in-20110407085415-jgob7tvcacn14dnj
---
 addons/outlook/outlook_installer.xml         | 10 +++++-----
 addons/thunderbird/thunderbird_installer.xml | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index e9fd756ff3d..a73ec7ac6c4 100644
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -9,10 +9,10 @@
             <field name="arch" type="xml">
                 <data>
                     <form position="attributes">
-                        <attribute name="string">Outlook Plug-In Configuration</attribute>
+                        <attribute name="string">Load Outlook Plug-In Configuration</attribute>
                     </form>
                     <separator string="title" position="attributes">
-                        <attribute name="string">Outlook Plug-In</attribute>
+                        <attribute name="string">Load Outlook Plug-In</attribute>
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
                         <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
@@ -49,7 +49,7 @@
         </record>
 
         <record id="action_outlook_installer" model="ir.actions.act_window">
-            <field name="name">Outlook Plug-In Configuration</field>
+            <field name="name">Load Outlook Plug-In Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">outlook.installer</field>
             <field name="view_id" ref="view_outlook_installer"/>
@@ -64,7 +64,7 @@
         </record>
 
         <record id="action_outlook_wizard" model="ir.actions.act_window">
-            <field name="name">Outlook Plug-In Configuration</field>
+            <field name="name">Load Outlook Plug-In Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">outlook.installer</field>
             <field name="view_id" ref="view_outlook_installer"/>
@@ -81,7 +81,7 @@
 
         <menuitem id="menu_base_config_plugins_outlook"
                   action="action_outlook_wizard"
-                  name="Outlook Plug-In"
+                  name="Load Outlook Plug-In"
                   parent="base.menu_base_config_plugins"
                   sequence="10" />
     </data>
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 0059cdfd8ab..260e9eec150 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -9,10 +9,10 @@
       <field name="arch" type="xml">
           <data>
               <form position="attributes">
-                  <attribute name="string">Thunderbird Plug-In Configuration</attribute>
+                  <attribute name="string">Load Thunderbird Plug-In Configuration</attribute>
               </form>
               <separator string="title" position="attributes">
-                   <attribute name="string">Thunderbird Plug-In</attribute>
+                   <attribute name="string">Load Thunderbird Plug-In</attribute>
               </separator>
               <xpath expr="//label[@string='description']" position="attributes">
                   <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
@@ -50,7 +50,7 @@
     </record>
 
     <record id="action_thunderbird_installer" model="ir.actions.act_window">
-      <field name="name">Thunderbird Plug-In Configuration</field>
+      <field name="name">Load Thunderbird Plug-In Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
       <field name="view_id" ref="view_thunderbird_installer"/>
@@ -67,7 +67,7 @@
 
 
     <record id="action_thunderbird_wizard" model="ir.actions.act_window">
-      <field name="name">Thunderbird Plug-In Configuration</field>
+      <field name="name">Load Thunderbird Plug-In Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
       <field name="view_id" ref="view_thunderbird_installer"/>
@@ -78,7 +78,7 @@
     </record>
 
 	<menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10" />
-	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10" />
+	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Load Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10" />
 
   </data>
 </openerp>

From 4941e9e4317e0d6a0b14234501cca208e4d53aa3 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 7 Apr 2011 16:15:27 +0530
Subject: [PATCH 08/10] [IMP]Base Setup:Create New Conf wiz- Migrate data from
 another application

bzr revid: aag@tinyerp.co.in-20110407104527-hf08x01bfwhlph8c
---
 addons/base_setup/base_setup_installer.xml | 50 ++++++++++++++++++++++
 addons/base_setup/installer.py             | 25 +++++++++++
 2 files changed, 75 insertions(+)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 13906abe6ba..a36d4213650 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -63,5 +63,55 @@
         <field name="sequence">2</field>
         <field name="restart">always</field>
     </record>
+    
+<!--     Migrate data from another application Conf Wiz-->
+
+    <record id="view_migrade_application_installer_modules" model="ir.ui.view">
+        <field name="name">migrade.application.installer.modules.form</field>
+        <field name="model">migrade.application.installer.modules</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="base.res_config_installer"/>
+        <field name="arch" type="xml">
+            <data>
+                <form position="attributes">
+                    <attribute name="string">Migrate data from another application</attribute>
+                </form>
+                <separator string="title" position="attributes">
+                     <attribute name="string">Migrate data from another application</attribute>
+                </separator>
+                <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">Import data from other applications. Following the selected application, you can import more or less type of data matching to OpenERP objects. Choose the application and then the data you want to import in OpenERP</attribute>
+                </xpath>
+                <xpath expr="//button[@string='Install Modules']" position="attributes">
+                    <attribute name="string">Configure</attribute>
+                </xpath>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                    <attribute name='string'></attribute>
+                </xpath>
+                <group colspan="8">
+                    <field name="import_saleforce"/>
+                    <field name="import_sugarcrm"/>
+                    <field name="sync_google_contact"/>
+                    <field name="quickbooks_ippids"/>
+                </group>
+            </data>
+        </field>
+    </record>
+    
+    <record id="action_migrade_application_installer_modules" model="ir.actions.act_window">
+	     <field name="name">Migrate data from another application</field>
+	     <field name="type">ir.actions.act_window</field>
+	     <field name="res_model">migrade.application.installer.modules</field>
+	     <field name="view_id" ref="view_migrade_application_installer_modules"/>
+	     <field name="view_type">form</field>
+	     <field name="view_mode">form</field>
+	     <field name="target">new</field>
+   </record>
+ 
+   <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_migrade_application_installer_modules"/>
+      <field name="restart">always</field>
+  </record>
+       
   </data>
 </openerp>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 34c68fcf9f9..562301531df 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -148,4 +148,29 @@ class base_setup_installer(osv.osv_memory):
                         cr.execute("update ir_actions_todo set restart='on_trigger' , state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model =  'ir.actions.todo' and data.module  like '%"+instl+"%'")
         
         return 
+    
 base_setup_installer()
+
+#Migrate data from another application Conf wiz
+
+class migrade_application_installer_modules(osv.osv_memory):
+    _name = 'migrade.application.installer.modules'
+    _inherit = 'res.config.installer'
+    _columns = {
+        'import_saleforce': fields.boolean('Import Saleforce',
+            help="For Import Saleforce"),
+        'import_sugarcrm': fields.boolean('Import Sugarcrm',
+            help="For Import Sugarcrm"),
+        'sync_google_contact': fields.boolean('Sync Google Contact',
+            help="For Sync Google Contact"),
+        'quickbooks_ippids': fields.boolean('Quickbooks Ippids',
+            help="For Quickbooks Ippids"),
+    }
+    
+    _defaults = {
+        'import_saleforce': True,
+    }
+
+migrade_application_installer_modules()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 228ac9aaf60190fef317a6ee8fb73c0e28738081 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 7 Apr 2011 18:59:30 +0530
Subject: [PATCH 09/10] [IMP]Base Setup:Create New Conf wiz- Import or create
 customers

bzr revid: aag@tinyerp.co.in-20110407132930-4r2kywrleb41aclb
---
 addons/base_setup/base_setup_installer.xml | 51 ++++++++++++++++++++++
 addons/base_setup/installer.py             | 34 +++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index a36d4213650..9255efdac07 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -1,5 +1,6 @@
 <openerp>
   <data>
+  
     <record id="view_base_setup_installer" model="ir.ui.view">
       <field name="name">base.setup.installer.view</field>
       <field name="model">base.setup.installer</field>
@@ -112,6 +113,56 @@
       <field name="action_id" ref="action_migrade_application_installer_modules"/>
       <field name="restart">always</field>
   </record>
+  
+          <!-- Import or create customers configartion view  -->
+
+	 <record id="view_import_create_installer" model="ir.ui.view">
+	     <field name="name">Import or create customers </field>
+	     <field name="model">product.installer</field>
+	     <field name="type">form</field>
+	     <field name="inherit_id" ref="base.res_config_view_base"/>
+	     <field name="arch" type="xml">
+	       <data>
+	         <form position="attributes">
+	           <attribute name="string">Import or create customers </attribute>
+	         </form>
+	         <separator string="title" position="attributes">
+	         <attribute name="string">Import or create customers </attribute>
+	           </separator>
+	         <xpath expr="//label[@string='description']"
+                 position="attributes">
+                <attribute name="string">Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link</attribute>
+              </xpath>
+	         <xpath expr='//separator[@string="vsep"]' position='attributes'>
+	               <attribute name='rowspan'>15</attribute>
+	               <attribute name='string'></attribute>
+	          </xpath>
+	           
+	           <group string="res_config_contents" position="replace">
+	               <group colspan="4">
+	                   <field colspan="4" name="customers" width="200"/>
+	             </group>
+	         </group>
+	       </data>
+	     </field>
+	 </record>
+	
+	 <record id="action_import_create_installer" model="ir.actions.act_window">
+	     <field name="name">Import or create customers </field>
+	     <field name="type">ir.actions.act_window</field>
+	     <field name="res_model">product.installer</field>
+	     <field name="view_id" ref="view_import_create_installer"/>
+	     <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_res_product_installer" model="ir.actions.todo">
+	    <field name="action_id" ref="action_import_create_installer"/>
+	    <field name="restart">never</field>
+	    <field name="state">skip</field>
+	</record>
        
   </data>
 </openerp>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 562301531df..fe63bb9c1e3 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -173,4 +173,38 @@ class migrade_application_installer_modules(osv.osv_memory):
 
 migrade_application_installer_modules()
 
+class product_installer(osv.osv_memory):
+    _name = 'product.installer'
+    _inherit = 'res.config'
+    _columns = {
+                'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
+
+    }
+    _defaults = {
+                 'customers': 'create',
+    }
+    
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+             context = {}
+        data_obj = self.pool.get('ir.model.data')
+        val = self.browse(cr, uid, ids, context=context)[0]
+        if val.customers == 'create':
+            id2 = data_obj._get_id(cr, uid, 'base', 'view_partner_form')
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            return {
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'res.partner',
+                    'views': [(id2, 'form')],
+                    'type': 'ir.actions.act_window',
+                    'target': 'current',
+                    'nodestroy':False,
+                }
+        if val.customers == 'import':
+            return {'type': 'ir.actions.act_window'}
+
+product_installer()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 767f6571dc13fc3253d6bcddef233586493d26f2 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 8 Apr 2011 17:58:11 +0530
Subject: [PATCH 10/10] [IMP]ADDONS:Change Field Restart To Type

bzr revid: aag@tinyerp.co.in-20110408122811-dm029nwtkmjzcgdj
---
 addons/account/account_installer.xml                        | 4 ++--
 addons/account/configurable_account_chart.xml               | 2 +-
 addons/account_sequence/account_sequence_installer_view.xml | 2 +-
 addons/association/profile_association.xml                  | 2 +-
 .../base_report_designer/base_report_designer_installer.xml | 2 +-
 addons/base_setup/base_setup_installer.xml                  | 6 +++---
 addons/base_setup/base_setup_todo.xml                       | 2 +-
 addons/base_setup/installer.py                              | 2 +-
 addons/crm/crm_installer_view.xml                           | 2 +-
 addons/document/wizard/document_configuration_view.xml      | 2 +-
 addons/document_ics/document_ics_config_wizard.xml          | 2 +-
 addons/hr/hr_installer.xml                                  | 2 +-
 addons/knowledge/knowledge_installer.xml                    | 2 +-
 addons/l10n_be/l10n_be_wizard.xml                           | 2 +-
 addons/l10n_br/data/l10n_br_account_chart_template.xml      | 2 +-
 addons/l10n_cr/l10n_wizard.xml                              | 2 +-
 addons/l10n_es/l10n_es_wizard.xml                           | 2 +-
 addons/l10n_fr/l10n_fr_wizard.xml                           | 2 +-
 addons/l10n_lu/l10n_lu_wizard.xml                           | 2 +-
 addons/l10n_ma/l10n_ma_wizard.xml                           | 2 +-
 addons/l10n_uk/l10n_uk_wizard.xml                           | 2 +-
 addons/marketing/marketing_view.xml                         | 2 +-
 addons/mrp/mrp_installer.xml                                | 2 +-
 addons/product/wizard/product_installer.xml                 | 2 +-
 addons/profile_tools/misc_tools_installer.xml               | 2 +-
 addons/project/project_installer.xml                        | 2 +-
 .../purchase_double_validation_installer.xml                | 2 +-
 addons/report_designer/report_designer_installer.xml        | 2 +-
 addons/sale/sale_installer.xml                              | 2 +-
 addons/sale/sale_view.xml                                   | 2 +-
 addons/thunderbird/thunderbird_installer.xml                | 2 +-
 31 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index f64fa6bb839..766a9b888bc 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -101,13 +101,13 @@
         <record id="account_configuration_installer_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_account_configuration_installer"/>
             <field name="sequence">3</field>
-            <field name="restart">on_trigger</field>
+            <field name="type">special</field>
         </record>
 
         <record id="account_installer_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_account_installer"/>
             <field name="sequence">5</field>
-            <field name="restart">on_trigger</field>
+            <field name="type">special</field>
             <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
         </record>
 
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index c4b3899b772..6ec78163d92 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -617,7 +617,7 @@
 			<field name="name">Generate Chart of Accounts from a Chart Template</field>
 			<field name="action_id" ref="account.action_wizard_multi_chart"/>
 			<field name="state">open</field>
-			<field name="restart">on_trigger</field>
+			<field name="type">special</field>
 		</record>
 
 
diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml
index 3a812a187c4..a1fce67e4b1 100644
--- a/addons/account_sequence/account_sequence_installer_view.xml
+++ b/addons/account_sequence/account_sequence_installer_view.xml
@@ -50,7 +50,7 @@
     <record id="account_seq_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_account_seq_installer"/>
       <field name="sequence">3</field>
-      <field name="restart">on_trigger</field>
+      <field name="type">special</field>
     </record>
 
   </data>
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 95e46457cca..3181ac32a78 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -50,7 +50,7 @@
             id="config_install_module">
             <field name="action_id" ref="action_config_install_module"/>
             <field name="sequence">3</field>
-            <field name="restart">always</field>
+            <field name="type">normal_recurring</field>
       </record>
 
         <menuitem
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 2c0cf191e4e..3299e49a6c1 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -57,7 +57,7 @@
     <record id="report_designer_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_report_designer_installer"/>
         <field name="sequence">3</field>
-        <field name="restart">always</field>
+        <field name="type">normal_recurring</field>
     </record>
 
     <record id="action_report_designer_wizard" model="ir.actions.act_window">
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 9255efdac07..e37a9eabee0 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -62,7 +62,7 @@
     <record id="base_setup_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_installer"/>
         <field name="sequence">2</field>
-        <field name="restart">always</field>
+        <field name="type">normal_recurring</field>
     </record>
     
 <!--     Migrate data from another application Conf Wiz-->
@@ -111,7 +111,7 @@
  
    <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_migrade_application_installer_modules"/>
-      <field name="restart">always</field>
+      <field name="type">normal_recurring</field>
   </record>
   
           <!-- Import or create customers configartion view  -->
@@ -160,7 +160,7 @@
     <!--          register configuration wizard -->
 	<record id="config_wizard_res_product_installer" model="ir.actions.todo">
 	    <field name="action_id" ref="action_import_create_installer"/>
-	    <field name="restart">never</field>
+	    <field name="type">normal</field>
 	    <field name="state">skip</field>
 	</record>
        
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 234571b458e..7467cad4d4b 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -67,7 +67,7 @@
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="sequence">1</field>
-        <field name="restart">never</field>
+        <field name="type">normal</field>
         <field name="state">skip</field>
     </record>
   </data>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index fe63bb9c1e3..ea9ad555b37 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -145,7 +145,7 @@ class base_setup_installer(osv.osv_memory):
             elif i.state == 'installed':
                 if modules_selected:
                     for instl in modules_selected:
-                        cr.execute("update ir_actions_todo set restart='on_trigger' , state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model =  'ir.actions.todo' and data.module  like '%"+instl+"%'")
+                        cr.execute("update ir_actions_todo set state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model =  'ir.actions.todo' and data.module  like '%"+instl+"%'")
         
         return 
     
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 778ebd5646a..7e95d1979b3 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -61,7 +61,7 @@
     <record id="crm_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_crm_installer"/>
         <field name="sequence">3</field>
-        <field name="restart">on_trigger</field>
+        <field name="type">special</field>
         <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
     </record>
   </data>
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index 8aa874782b9..bdbaf410499 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -46,7 +46,7 @@
         <field name="action_id" ref="action_config_auto_directory"/>
         <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
         <field name="state" eval="'skip'" />
-        <field name="restart" eval="'on_trigger'" />
+        <field name="type" eval="'special'" />
     </record>
   </data>
 </openerp>
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index e338765e97d..5767e4ee74d 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -55,7 +55,7 @@
          
         <record id="config_wizard_step_case_section_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_view_document_ics_config_directories"/>
-            <field name="restart">always</field>
+            <field name="type">special</field>
         </record>
      </data>
 </openerp>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 3d04abf00e3..64973a54e9b 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -52,7 +52,7 @@
     <record id="hr_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_hr_installer"/>
       <field name="sequence">3</field>
-            <field name="restart">on_trigger</field>
+            <field name="type">special</field>
     </record>
 
   </data>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 79f6cfb178e..a8c458a1fe1 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -53,7 +53,7 @@
       <field name="action_id" ref="action_knowledge_installer"/>
       <field name="sequence">3</field>
       <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
-            <field name="restart">on_trigger</field>
+            <field name="type">special</field>
     </record>
 
   </data>
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index 5b3c42b22fa..a78951ca466 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -4,7 +4,7 @@
 
     <record id="config_call_account_template" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">on_trigger</field>
+        <field name="type">special</field>
     </record>
 
     </data>
diff --git a/addons/l10n_br/data/l10n_br_account_chart_template.xml b/addons/l10n_br/data/l10n_br_account_chart_template.xml
index 4b548f65c8c..8872baae2d9 100644
--- a/addons/l10n_br/data/l10n_br_account_chart_template.xml
+++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml
@@ -19,7 +19,7 @@
     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"/>
             <field name="state">open</field>
-            <field name="restart">on_trigger</field>
+            <field name="type">special</field>
         </record>
 	
 	</data>
diff --git a/addons/l10n_cr/l10n_wizard.xml b/addons/l10n_cr/l10n_wizard.xml
index 5b3c42b22fa..a78951ca466 100644
--- a/addons/l10n_cr/l10n_wizard.xml
+++ b/addons/l10n_cr/l10n_wizard.xml
@@ -4,7 +4,7 @@
 
     <record id="config_call_account_template" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">on_trigger</field>
+        <field name="type">special</field>
     </record>
 
     </data>
diff --git a/addons/l10n_es/l10n_es_wizard.xml b/addons/l10n_es/l10n_es_wizard.xml
index 3bbda51e00c..2d7a955fd6d 100644
--- a/addons/l10n_es/l10n_es_wizard.xml
+++ b/addons/l10n_es/l10n_es_wizard.xml
@@ -4,7 +4,7 @@
 
         <record id="config_call_account_template" model="ir.actions.todo">
             <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="restart">on_trigger</field>
+            <field name="type">special</field>
         </record>
 
     </data>
diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml
index 48147ac172d..972551b7389 100644
--- a/addons/l10n_fr/l10n_fr_wizard.xml
+++ b/addons/l10n_fr/l10n_fr_wizard.xml
@@ -4,7 +4,7 @@
 
     <record id="config_call_account_template_fr" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">on_trigger</field>
+        <field name="type">special</field>
     </record>
 
     </data>
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
index 5942e7800d0..0d2a1da607b 100644
--- a/addons/l10n_lu/l10n_lu_wizard.xml
+++ b/addons/l10n_lu/l10n_lu_wizard.xml
@@ -4,7 +4,7 @@
 
     <record id="config_call_account_template_lu" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">on_trigger</field>
+        <field name="type">special</field>
     </record>
 
     </data>
diff --git a/addons/l10n_ma/l10n_ma_wizard.xml b/addons/l10n_ma/l10n_ma_wizard.xml
index 4768ed60dee..caf81480ef8 100644
--- a/addons/l10n_ma/l10n_ma_wizard.xml
+++ b/addons/l10n_ma/l10n_ma_wizard.xml
@@ -4,7 +4,7 @@
 
     <record id="config_call_account_template_ma" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">on_trigger</field>
+        <field name="type">special</field>
     </record>
 
     </data>
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index 62fe38a1642..0ce7559b0e6 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -8,7 +8,7 @@
     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"/>
             <field name="state">open</field>
-            <field name="restart">on_trigger</field>
+            <field name="type">special</field>
         </record>
 
     </data>
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index c6c8c6e6946..4b6b282527e 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -58,7 +58,7 @@
         <record id="marketing_installer_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_marketing_installer"/>
             <field name="sequence">3</field>
-            <field name="restart">always</field>
+            <field name="type">normal_recurring</field>
         </record>
 
     </data>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 4008385ff32..47c7aadfe89 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -48,7 +48,7 @@
     <record id="mrp_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_mrp_installer"/>
       <field name="sequence">3</field>
-        <field name="restart">on_trigger</field>
+        <field name="type">special</field>
       <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>
 
diff --git a/addons/product/wizard/product_installer.xml b/addons/product/wizard/product_installer.xml
index 93113818bb6..95c6d00fa16 100644
--- a/addons/product/wizard/product_installer.xml
+++ b/addons/product/wizard/product_installer.xml
@@ -15,7 +15,7 @@
         <record id="config_wizard_res_product_installer" model="ir.actions.todo">
             <field name="action_id" ref="product_form_config_action"/>
             <field name="target">current</field>
-            <field name="restart">never</field>
+            <field name="type">normal</field>
             <field name="state">skip</field>
         </record>
         
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index c21f703b291..d1bfcd259c4 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -48,7 +48,7 @@
 
     <record id="misc_tools_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_misc_tools_installer"/>
-        <field name="restart">on_trigger</field>
+        <field name="type">special</field>
       <field name="sequence">3</field>
     </record>
   </data>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 7200986beb2..c704a980000 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -50,7 +50,7 @@
 
     <record id="project_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_project_installer"/>
-        <field name="restart">on_trigger</field>
+        <field name="type">special</field>
         <field name="sequence">3</field>
     </record>
 
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index 2cafbd7cd9a..b3eb4f84574 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -44,7 +44,7 @@
         <!-- register configuration wizard -->
         <record id="config_wizard_step_purchase_limit_amount" model="ir.actions.todo">
             <field name="action_id" ref="action_config_purchase_limit_amount"/>
-            <field name="restart">on_trigger</field>
+            <field name="type">special</field>
         </record>
         
     </data>
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 31f6d16ae22..d3416162ab8 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -45,7 +45,7 @@
 
     <record id="report_designer_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_report_designer_installer"/>
-      <field name="restart">on_trigger</field>
+      <field name="type">special</field>
       <field name="sequence">3</field>
     </record>
   </data>
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
index ad707a1abec..6d67b105578 100644
--- a/addons/sale/sale_installer.xml
+++ b/addons/sale/sale_installer.xml
@@ -47,7 +47,7 @@
 
     <record id="sale_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_sale_installer"/>
-      <field name="restart">on_trigger</field>
+      <field name="type">special</field>
       <field name="sequence">3</field>
       <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 07bf44d8372..f311b13c95b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -574,7 +574,7 @@
         <!-- register configuration wizard -->
         <record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo">
             <field name="action_id" ref="action_config_picking_policy"/>
-            <field name="restart">always</field>
+            <field name="type">normal_recurring</field>
             <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
         </record>
 
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 260e9eec150..8de59218278 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -61,7 +61,7 @@
 
     <record id="thunderbird_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_thunderbird_installer"/>
-        <field name="restart">always</field>
+        <field name="type">normal_recurring</field>
         <field name="sequence">3</field>
     </record>