From 0f566832f9d4d503cf2e698995a1b2903d4a720c Mon Sep 17 00:00:00 2001
From: Olivier Ligot <olivier.ligot@groupes.be>
Date: Mon, 14 Feb 2011 16:19:36 +0100
Subject: [FIX] Add priority on view_base_synchro as there are 2 form views on
 object base.synchro

Without the priority, the wrong form view (view_base_synchro_finish) is displayed

bzr revid: olivier.ligot@groupes.be-20110214151936-xs6w6jxu41es1715
---
 addons/base_synchro/wizard/base_synchro_view.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/base_synchro/wizard/base_synchro_view.xml')

diff --git a/addons/base_synchro/wizard/base_synchro_view.xml b/addons/base_synchro/wizard/base_synchro_view.xml
index c0c140f3791..e37a82914b4 100644
--- a/addons/base_synchro/wizard/base_synchro_view.xml
+++ b/addons/base_synchro/wizard/base_synchro_view.xml
@@ -7,6 +7,7 @@
             <field name="name">Base Synchronization</field>
             <field name="model">base.synchro</field>
             <field name="type">form</field>
+            <field name="priority">1</field>
             <field name="arch" type="xml">
             <form string="Transfer Data To Server">
                 <field name="server_url" colspan="4"/>
-- 
cgit v1.2.3


From 7675254982427108fd3e70bd2306b36c58660f11 Mon Sep 17 00:00:00 2001
From: Quentin THEURET <quentin@tempo-quentin>
Date: Fri, 25 Feb 2011 16:04:03 +0100
Subject: [FIX] Duplicated menus entries -- Call the good view on 'Synchronized
 object' wizard

lp bug: https://launchpad.net/bugs/725033 fixed

bzr revid: quentin@tempo-quentin-20110225150403-tsxsukf1wvmhkoam
---
 addons/base_synchro/wizard/base_synchro_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/base_synchro/wizard/base_synchro_view.xml')

diff --git a/addons/base_synchro/wizard/base_synchro_view.xml b/addons/base_synchro/wizard/base_synchro_view.xml
index c0c140f3791..e4ffc8e323c 100644
--- a/addons/base_synchro/wizard/base_synchro_view.xml
+++ b/addons/base_synchro/wizard/base_synchro_view.xml
@@ -25,22 +25,22 @@
             <field name="res_model">base.synchro</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
+            <field name="view_id" ref="view_base_synchro" />
             <field name="target">new</field>
         </record>
 
-        <menuitem id="next_id_62" name="Synchronization" parent="base.menu_administration"/>
         <record id="view_base_synchro_finish" model="ir.ui.view">
             <field name="name">Base Synchronization</field>
             <field name="model">base.synchro</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Synchronization Complited!">
+            <form string="Synchronization Completed!">
             <label string="The synchronisation has been started.You will receive a request when it's done." colspan="4"/>
                  <separator string="" colspan="4"/>
                     <button special="cancel" string="OK" icon="gtk-ok"/>
             </form>
             </field>
-       </record>
+        </record>
 
         <menuitem id="next_id_62" name="Synchronization" parent="base.menu_administration"/>
 
-- 
cgit v1.2.3