[IMP]: crm: Merge 2 screens for Create partner confirmation in lead to partner wizard

bzr revid: rpa@tinyerp.com-20100709051952-fnrnik6e3r54jhqm

diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index 2f7f854..8b9c0d1 100644 (file)
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -1,25 +1,6 @@
 <openerp>
       <data>
 
-        <!-- Lead to partner confirmation form -->
-
-          <record id="view_crm_lead2partner_create" model="ir.ui.view">
-          <field name="name">crm.lead2partner.view.create</field>
-          <field name="model">crm.lead2partner</field>
-          <field name="type">form</field>
-          <field name="arch" type="xml">
-              <form string="Create a Partner?">
-                  <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-                <label string="You may have to verify that this partner does not exist already." colspan="4"/>
-                <separator string="" colspan="4" />
-                  <group col="4" colspan="4">
-                      <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                      <button name="open_create_partner" string="Create _Partner" type="object" icon="gtk-ok"/>
-                  </group>
-              </form>
-          </field>
-       </record>
-
        <!-- Lead to Partner form view -->
 
        <record id="view_crm_lead2partner" model="ir.ui.view">
@@ -28,6 +9,9 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
               <form string="Create a Partner">
+                  <separator string="Create a Partner" colspan="4" />
+                  <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+                  <label string="You may have to verify that this partner does not exist already." colspan="4"/>
                   <field name="action"/>
                   <group attrs="{'invisible':[('action','!=','exist')]}">
                     <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
@@ -48,7 +32,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">crm.lead2partner</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="view_crm_lead2partner_create"/>
+            <field name="view_id" ref="view_crm_lead2partner"/>
             <field name="target">new</field>
         </record>