imp

bzr revid: fp@tinyerp.com-20120610173821-560aihfbvlwm6v3e

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 30be3d0..402aad2 100644 (file)
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -146,7 +146,7 @@
             <field name="type">form</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="invoice_open" states="draft,proforma2" string="Validate"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
@@ -156,10 +156,6 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Supplier Invoice">
-                    <h1>
-                        <field name="state" class="oe_form_inline"/>
-                        <field name="number"/>
-                    </h1>
                     <group>
                         <group>
                             <field string="Supplier" name="partner_id"
@@ -173,6 +169,7 @@
                             <field name="fiscal_position" widget="selection"/>
                         </group>
                         <group>
+                            <field name="number"/>
                             <field name="date_invoice"/>
                             <field name="period_id" domain="[('state', '=', 'draft')]"
                                 groups="account.group_account_user" widget="selection"/>
@@ -279,7 +276,7 @@
             <field name="model">account.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
                     <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a0442eb..b5c75aa 100644 (file)
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -94,25 +94,18 @@
                     <field name="section_id" colspan="1" widget="selection" />
                 </group>
 
-                <group col="3" colspan="2">
-                    <separator colspan="3" string="Contacts" />
-                    <field name="partner_id"
-                        on_change="onchange_partner_id(partner_id)" />
-                    <button string="Create a Partner"
-                        icon="terp-partner"
-                        name="%(action_crm_phonecall2partner)d"
-                        type="action"
-                        attrs="{'invisible':[('partner_id','!=',False)]}"
-                        groups="base.group_partner_manager"/>
-                    <newline/>
-                    <field name="partner_mobile" />
-                </group>
-                <group col="2" colspan="2">
-                    <separator colspan="2" string="Categorization" />
-                    <field name="categ_id" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                    <field name="priority"/>
-                    <field name="opportunity_id"/>
+                <group>
+                    <group string="Contacts">
+                        <field name="partner_id"
+                            on_change="onchange_partner_id(partner_id)" />
+                        <field name="partner_mobile"/>
+                    </group>
+                    <group string="Categorization">
+                        <field name="categ_id" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="priority"/>
+                        <field name="opportunity_id"/>
+                    </group>
                 </group>
                 <separator string="Description"/>
                 <field name="description"/>