From 342ee38674689a996a3532811326795eaa6ec556 Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Mon, 29 Sep 2008 14:19:12 +0530
Subject: [PATCH] rename "ir.module.module.configuration.step" with
 "ir.actions.todo" and also rename "ir.module.module.configuration.wizard"
 with "ir.actions.configuration.wizard"

bzr revid: hmo@tinyerp.com-20080929084912-obuk8hsjkzuwyceu
---
 addons/account/account.py                     | 14 ++++++------
 addons/account/account_view.xml               |  2 +-
 addons/base_setup/wizard/wizard_base_setup.py |  2 +-
 addons/crm_configuration/crm_config.py        |  8 +++----
 addons/crm_configuration/crm_config_view.xml  |  4 ++--
 addons/l10n_be/l10n_be_wizard.xml             |  2 +-
 .../profile_accounting/profile_accounting.py  | 16 +++++++-------
 .../profile_accounting/profile_accounting.xml |  4 ++--
 .../profile_association.py                    | 14 ++++++------
 .../profile_association.xml                   |  2 +-
 .../profile_manufacturing.py                  |  6 ++---
 .../profile_manufacturing.xml                 |  8 +++----
 addons/profile_service/profile_service.py     | 12 +++++-----
 addons/profile_service/profile_service.xml    |  4 ++--
 addons/sale/sale.py                           | 14 ++++++------
 addons/sale/sale_view.xml                     | 22 +++++++++----------
 addons/sale_journal/sale_journal_view.xml     |  2 +-
 17 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 8374ba3e5e8..b34cafe00df 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -141,9 +141,9 @@ class account_account(osv.osv):
         if context is None:
             context = {}
         pos = 0
-       
+
         while pos<len(args):
-            
+
             if args[pos][0]=='code' and args[pos][1] in ('like','ilike') and args[pos][2]:
                 args[pos] = ('code', '=like', str(args[pos][2].replace('%',''))+'%')
             if args[pos][0]=='journal_id':
@@ -159,7 +159,7 @@ class account_account(osv.osv):
                 ids1 += map(lambda x: x.id, jour.account_control_ids)
                 args[pos] = ('id','in',ids1)
             pos+=1
-        
+
         return super(account_account,self).search(cr, uid, args, offset, limit,
                 order, context=context, count=count)
 
@@ -1544,7 +1544,7 @@ class account_config_wizard(osv.osv_memory):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                'res_model': 'ir.actions.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'target':'new',
         }
@@ -1593,7 +1593,7 @@ class account_config_wizard(osv.osv_memory):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                'res_model': 'ir.actions.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'target':'new',
         }
@@ -2065,7 +2065,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                'res_model': 'ir.actions.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'target':'new',
         }
@@ -2073,7 +2073,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                'res_model': 'ir.actions.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'target':'new',
         }
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 70709be18f5..104272dcaf4 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1368,7 +1368,7 @@
 
         <!-- register configuration wizard -->
 
-        <record id="config_fiscalyear" model="ir.module.module.configuration.step">
+        <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"/>
diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index 5e4b0356668..f8de1e6bfa8 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -264,7 +264,7 @@ class wizard_base_setup(wizard.interface):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                'res_model': 'ir.actions.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'context':{'menu':True},
                 'target':'new',
diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py
index c89d49af7ba..fe57488dd6f 100644
--- a/addons/crm_configuration/crm_config.py
+++ b/addons/crm_configuration/crm_config.py
@@ -106,11 +106,11 @@ class crm_menu_config_wizard(osv.osv_memory):
                         tools.convert_xml_import(cr, 'crm_configuration', tools.file_open(os.path.join('crm_configuration',file_name )),  {}, 'init', *args)
                     except Exception, e:
                         raise osv.except_osv('Error !', e)
-                        
+
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                'res_model': 'ir.actions.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'target':'new',
          }
@@ -118,11 +118,11 @@ class crm_menu_config_wizard(osv.osv_memory):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                'res_model': 'ir.actions.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'target':'new',
          }
-        
+
 crm_menu_config_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_configuration/crm_config_view.xml b/addons/crm_configuration/crm_config_view.xml
index 20dc8ed42c5..6185d763024 100644
--- a/addons/crm_configuration/crm_config_view.xml
+++ b/addons/crm_configuration/crm_config_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
         <!-- configartion view -->
 
         <record id="view_config_crm_menu" model="ir.ui.view">
@@ -38,7 +38,7 @@
         </record>
 
         <!-- register configuration wizard -->
-        <record id="config_wizard_step_case_section_menu" model="ir.module.module.configuration.step">
+        <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"/>
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index 296cdfefa65..5ae595ecc01 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -24,7 +24,7 @@
 			type="wizard"
 			id="account_wizard_vat_declaration"/>
 
-	<record id="config_call_account_template" model="ir.module.module.configuration.step">
+	<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 Managament/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
diff --git a/addons/profile_accounting/profile_accounting.py b/addons/profile_accounting/profile_accounting.py
index 744a66dd796..20a27f04baa 100644
--- a/addons/profile_accounting/profile_accounting.py
+++ b/addons/profile_accounting/profile_accounting.py
@@ -44,31 +44,31 @@ class profile_accounting_config_install_modules_wizard(osv.osv_memory):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                '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)        
+        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]:
                     ids += mod_obj.search(cr, uid, [('name', '=', r)])
-                    mod_obj.action_install(cr, uid, ids, context=context)           
+                    mod_obj.action_install(cr, uid, ids, context=context)
         cr.commit()
         db, pool = pooler.restart_pool(cr.dbname,force_demo=True, update_module=True)
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                'res_model': 'ir.actions.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'target':'new',
             }
-    
-    
+
+
 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 d98b6d1f0d1..85737dcecf1 100644
--- a/addons/profile_accounting/profile_accounting.xml
+++ b/addons/profile_accounting/profile_accounting.xml
@@ -10,7 +10,7 @@
 					<separator string="Accounting Management" colspan="4"/>
                     <field name="account_analytic_analysis"/>
                     <field name="account_analytic_plans"/>
-                    <field name="account_payment"/>                               
+                    <field name="account_payment"/>
                     <separator string="Resources Management" colspan="4"/>
 					<field name="account_budget_crossover"/>
                     <field name="account_asset"/>
@@ -35,7 +35,7 @@
             <field name="target">new</field>
         </record>
 
-      <record model="ir.module.module.configuration.step"
+      <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>
diff --git a/addons/profile_association/profile_association.py b/addons/profile_association/profile_association.py
index 3ca64f5adbb..c68ac0dc77d 100644
--- a/addons/profile_association/profile_association.py
+++ b/addons/profile_association/profile_association.py
@@ -43,14 +43,14 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                '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)        
+        result=self.read(cr,uid,ids)
         mod_obj = self.pool.get('ir.module.module')
         for res in result:
             for r in res:
@@ -62,12 +62,12 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                '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 a1a8467fe51..1f70efe17b6 100644
--- a/addons/profile_association/profile_association.xml
+++ b/addons/profile_association/profile_association.xml
@@ -34,7 +34,7 @@
             <field name="target">new</field>
         </record>
 
-      <record model="ir.module.module.configuration.step"
+      <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>
diff --git a/addons/profile_manufacturing/profile_manufacturing.py b/addons/profile_manufacturing/profile_manufacturing.py
index 5ab575acde6..3ea2adbb230 100644
--- a/addons/profile_manufacturing/profile_manufacturing.py
+++ b/addons/profile_manufacturing/profile_manufacturing.py
@@ -75,12 +75,12 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                '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)        
+        result=self.read(cr,uid,ids)
         mod_obj = self.pool.get('ir.module.module')
         for res in result:
             for r in res:
@@ -92,7 +92,7 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                'res_model': 'ir.actions.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'target':'new',
             }
diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml
index 2d41b6d577a..f4f917afe97 100644
--- a/addons/profile_manufacturing/profile_manufacturing.xml
+++ b/addons/profile_manufacturing/profile_manufacturing.xml
@@ -11,13 +11,13 @@
                     <field name="stock_location"/>
                     <field name="mrp_jit"/>
                     <field name="mrp_operation"/>
-                    <separator string="Sales Management" colspan="4"/> 
+                    <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"/> 
+                    <separator string="Relationship Management" colspan="4"/>
                     <field name="crm_configuration"/>
-					<separator string="Portal Management" colspan="4"/> 
+					<separator string="Portal Management" colspan="4"/>
                     <field name="portal"/>
                     <separator string="" colspan="4"/>
                     <label string="" colspan="2"/>
@@ -38,7 +38,7 @@
             <field name="target">new</field>
         </record>
 
-      <record model="ir.module.module.configuration.step"
+      <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>
diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py
index 4dd4d83c24a..88755b28238 100644
--- a/addons/profile_service/profile_service.py
+++ b/addons/profile_service/profile_service.py
@@ -50,24 +50,24 @@ class profile_service_config_install_modules_wizard(osv.osv_memory):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                '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)        
+        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]:                
-                    ids = mod_obj.search(cr, uid, [('name', '=', r)])   
-                    mod_obj.action_install(cr,uid,ids,context=context)                       
+                if r<>'id' and res[r]:
+                    ids = mod_obj.search(cr, uid, [('name', '=', r)])
+                    mod_obj.action_install(cr,uid,ids,context=context)
         cr.commit()
         db, pool = pooler.restart_pool(cr.dbname,force_demo=True, update_module=True)
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                'res_model': 'ir.actions.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'target':'new',
             }
diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml
index 50e90f4c1d1..d2080232f71 100644
--- a/addons/profile_service/profile_service.xml
+++ b/addons/profile_service/profile_service.xml
@@ -21,7 +21,7 @@
                     <separator string="Relationship Management" colspan="4"/>
                     <field name="crm_configuration"/>
                     <field name="base_contact"/>
-					<separator string="Portal Management" colspan="4"/> 
+					<separator string="Portal Management" colspan="4"/>
                     <field name="portal"/>
                     <separator string="" colspan="4"/>
                     <label string="" colspan="2"/>
@@ -42,7 +42,7 @@
             <field name="target">new</field>
         </record>
 
-      <record model="ir.module.module.configuration.step"
+      <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>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 1fd812db08b..3bbc650816b 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -812,7 +812,7 @@ class sale_order_line(osv.osv):
                     'message': warn_msg
                     }
             result['product_uom_qty'] = qty
-            
+
         if uom:
             uom2 = product_uom_obj.browse(cr, uid, uom)
             if product_obj.uom_id.category_id.id <> uom2.category_id.id:
@@ -839,7 +839,7 @@ class sale_order_line(osv.osv):
 				taxep_id = self.pool.get('res.partner').property_get(cr, uid,
 						partner_id,property_pref=['property_account_tax']).get('property_account_tax',False)
 				if taxep_id:
-					taxep=self.pool.get('account.tax').browse(cr, uid,taxep_id)                
+					taxep=self.pool.get('account.tax').browse(cr, uid,taxep_id)
             if not taxep or not taxep.id:
                 result['tax_id'] = [x.id for x in product_obj.taxes_id]
             else:
@@ -884,7 +884,7 @@ class sale_order_line(osv.osv):
         # Round the quantity up
 
         # get unit price
-        
+
         if not pricelist:
             warning={
                 'title':'No Pricelist !',
@@ -904,9 +904,9 @@ class sale_order_line(osv.osv):
                     'message':
                         "Couldn't find a pricelist line matching this product and quantity.\n"
                         "You have to change either the product, the quantity or the pricelist."
-                    }                
+                    }
             else:
-                result.update({'price_unit': price})		
+                result.update({'price_unit': price})
         return {'value': result, 'domain': domain,'warning':warning}
 
     def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
@@ -962,7 +962,7 @@ class sale_config_picking_policy(osv.osv_memory):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                'res_model': 'ir.actions.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'target':'new',
          }
@@ -970,7 +970,7 @@ class sale_config_picking_policy(osv.osv_memory):
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
-                'res_model': 'ir.module.module.configuration.wizard',
+                'res_model': 'ir.actions.configuration.wizard',
                 'type': 'ir.actions.act_window',
                 'target':'new',
          }
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3dfeb6d9872..0e672a62112 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -44,7 +44,7 @@
         </record>
         <menuitem id="menu_shop_configuration" name="Configuration" parent="sale.menu_sale_root" sequence="1"/>
         <menuitem action="action_shop_form" id="menu_action_shop_form" parent="sale.menu_shop_configuration"/>
-        
+
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
             <field name="model">sale.order</field>
@@ -116,20 +116,20 @@
                                             <separator colspan="4" string="Automatic Declaration"/>
                                             <field colspan="4"
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-                                                name="product_id" 
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging)" 
+                                                name="product_id"
+                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging)"
                                                 select="1"/>
                                             <field
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" 
-                                                name="product_uom_qty" 
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging)" 
+                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
+                                                name="product_uom_qty"
+                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging)"
                                                 select="1"/>
-                                            <field name="product_uom" 
+                                            <field name="product_uom"
                                                 on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
                                             <field
-                                                name="product_packaging" 
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" 
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging)" 
+                                                name="product_packaging"
+                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
+                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging)"
                                                 domain="[('product_id','=',product_id)]"
                                                 groups="base.group_extended"/>
                                             <separator colspan="4" string="Manual Description"/>
@@ -479,7 +479,7 @@
         </record>
 
         <!-- register configuration wizard -->
-        <record id="config_wizard_step_sale_picking_policy" model="ir.module.module.configuration.step">
+        <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"/>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 7647a7b2bfb..17975fe9755 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -285,7 +285,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
-            <field name="property_product_pricelist" position="after"/>
+            <field name="property_product_pricelist" position="after">
                 <field name="property_invoice_type"/>
             </field>
         </field>