From 4e354e55c167946ab114201d73bbce24f262b959 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 28 Jun 2012 17:33:16 +0200
Subject: [PATCH] [IMP] clean up views

bzr revid: rco@openerp.com-20120628153316-3bwp71lz22v6tmc4
---
 .../wizard/crm_lead_to_opportunity_view.xml   | 96 +++++++++----------
 .../wizard/crm_merge_opportunities_view.xml   |  4 +-
 .../wizard/crm_phonecall_to_partner_view.xml  |  7 +-
 addons/event/wizard/event_confirm_view.xml    |  4 +-
 4 files changed, 52 insertions(+), 59 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 52628035279..5d0719f786d 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -1,11 +1,11 @@
 <openerp>
-      <data>
+    <data>
         <record id="view_crm_lead2opportunity_partner" model="ir.ui.view">
-          <field name="name">crm.lead2opportunity.partner.form</field>
-          <field name="model">crm.lead2opportunity.partner</field>
-          <field name="type">form</field>
-          <field name="arch" type="xml">
-               <form string="Convert to Opportunity" version="7.0">
+            <field name="name">crm.lead2opportunity.partner.form</field>
+            <field name="model">crm.lead2opportunity.partner</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Convert to Opportunity" version="7.0">
                     <header>
                         <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight_on_dirty"/>
                         or
@@ -15,49 +15,47 @@
                     <group attrs="{'invisible':[('action','!=','exist')]}">
                         <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
                     </group>
-                    <separator string="Convert to Opportunity" colspan="4"/>
-                    <field name="name" colspan="4"/>
-                    <group col="4" colspan="4" attrs="{'invisible': [('name', '=', 'convert')]}" >
-                        <separator string="Select Opportunities" colspan="4" />
-                    </group>
-                        <field name="opportunity_ids" colspan="4" nolabel="1" attrs="{'invisible': [('name', '=', 'convert')]}">
-                            <tree>
-                                <field name="name" />
-                                <field name="partner_id" />
-                                <field name="user_id" />
-                                <field name="section_id" />
-                            </tree>
-                    </field>
-              </form>
-          </field>
-       </record> 
-
-		<record id="view_crm_lead2opportunity_partner_mass" model="ir.ui.view">
-	          <field name="name">crm.lead2opportunity.partner.mass.form</field>
-	          <field name="model">crm.lead2opportunity.partner.mass</field>
-	          <field name="type">form</field>
-	          <field name="arch" type="xml">
-	               <form string="Convert to Opportunity" version="7.0">
-	                    <header>
-	                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight_on_dirty"/>
-	                        or
-                            <button string="Cancel" class="oe_link" special="cancel" />
-	                    </header>
-                        <field name="action"/>
+                    <group string="Convert to Opportunity">
                         <field name="name" colspan="4"/>
-                        <separator string="Assigned Opportunities to" colspan="4" />
-						<field name="section_id" />
-						<group col="4" colspan="4">
-							<separator string="Select Salesman" colspan="4" />
-						</group>
-						<field name="user_ids" nolabel="1" colspan="4">
-							<tree>
-								<field name="name" />
-							</tree>
-						</field>
-	              </form>
-	          </field>
-	       </record>
+                    </group>
+                    <separator string="Select Opportunities" attrs="{'invisible': [('name', '=', 'convert')]}"/>
+                    <field name="opportunity_ids" attrs="{'invisible': [('name', '=', 'convert')]}">
+                        <tree>
+                            <field name="name" />
+                            <field name="partner_id" />
+                            <field name="user_id" />
+                            <field name="section_id" />
+                        </tree>
+                    </field>
+                </form>
+            </field>
+        </record> 
+
+        <record id="view_crm_lead2opportunity_partner_mass" model="ir.ui.view">
+            <field name="name">crm.lead2opportunity.partner.mass.form</field>
+            <field name="model">crm.lead2opportunity.partner.mass</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Convert to Opportunity" version="7.0">
+                    <header>
+                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </header>
+                    <field name="action"/>
+                    <field name="name" colspan="4"/>
+                    <group string="Assigned Opportunities to">
+                        <field name="section_id" />
+                    </group>
+                    <separator string="Select Salesman"/>
+                    <field name="user_ids">
+                        <tree>
+                            <field name="name" />
+                        </tree>
+                    </field>
+                </form>
+            </field>
+        </record>
 
         <record id="action_crm_lead2opportunity_partner" model="ir.actions.act_window">
             <field name="name">Create a Partner</field>
@@ -75,5 +73,5 @@
             view_mode="form" target="new" view_type="form"
             context="{'mass_convert' : True}"
             view_id="view_crm_lead2opportunity_partner_mass"/> 
-     </data>
+    </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index ae87683ee67..896b6f391ef 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -15,9 +15,7 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-                    <group>
-                        <separator string="Select Opportunities"/>
-                    </group>
+                    <separator string="Select Opportunities"/>
                     <field name="opportunity_ids">
                         <tree>
                             <field name="name" />
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index 5f3881caa12..1d4313dceb8 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -14,10 +14,9 @@
                     or
                     <button string="Cancel" class="oe_link" special="cancel" />
                 </header>
-                <group>
-                    <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
-                    <label string="You may have to verify that this partner does not exist already."/>
-                </group>
+                <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
+                <newline/>
+                <label string="You may have to verify that this partner does not exist already."/>
             </form>
         </field>
        </record>
diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml
index e6d6388004f..7713d1896c2 100644
--- a/addons/event/wizard/event_confirm_view.xml
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -13,9 +13,7 @@
                       or
                       <button string="Cancel" class="oe_link" special="cancel" />
                   </header>
-                  <group>
-                    <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
-                  </group>
+                  <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
             </form>
             </field>
         </record>