[MERGE]: Merged lp:openobject-addons

bzr revid: atp@tinyerp.com-20120615043300-2kia8hklbzlez0pw

29 files changed, 533 insertions, 481 deletions

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 892747c849f..accdf95d929 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1020,7 +1020,7 @@ class account_move_line(osv.osv):
         }
 
         document = etree.Element('tree', string=title, editable="top",
-                                 refresh="5", on_write="on_create_write",
+                                 on_write="on_create_write",
                                  colors="red:state=='draft';black:state=='valid'")
         fields_get = self.fields_get(cr, uid, flds, context)
         for field, _seq in fld:
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index cd1860b6d98..73bf64893ba 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -9,19 +9,16 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Accounting">
-                    <group name="properties">
-                        <separator string="Sales Properties" colspan="2"/>
-                        <separator string="Purchase Properties" colspan="2"/>
-                        <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                        <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
-                    </group>
-                    <newline/>
-                    <group colspan="2">
-                        <separator string="Sale Taxes" colspan="2"/>
-                        <separator string="Purchase Taxes" colspan="2"/>
-                        <field name="taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                        <field name="supplier_taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
-                    </group>
+                        <group name="properties">
+                            <group>
+                                <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                <field name="taxes_id" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}" widget="many2many_tags"/>
+                            </group>
+                            <group>
+                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
+                                <field name="supplier_taxes_id" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}" widget="many2many_tags"/>
+                            </group>
+                        </group>
                     </page>
                 </notebook>
             </field>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index b6803558b62..cd99299665b 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -29,7 +29,7 @@
             </field>
         </record>
 
-        <record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
+        <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
index 74dce06b85a..8a79d96d1c4 100644
--- a/addons/account_anglo_saxon/product_view.xml
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group/field[@name='property_account_expense']" position="after">
+                <xpath expr="//field[@name='property_account_expense']" position="after">
                     <label string="" colspan="2"/>
                     <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
                     <newline/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index dba40940166..b0a81461334 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -90,15 +90,32 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Sales Receipt" layout="auto">
-                    <group col="6">
-                        <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
-                        <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
-                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
-                        <field name="number"/>
-                        <field name="name" colspan="2"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <div class="oe_form_title">
+                        <label for="number" class="oe_form_readonly_hidden"/>
+                        <h1><field name="number" readonly="0" /></h1>
+                    </div>
+
+                    <group>
+                        <group>
+                            <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                            <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+                            <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
+                            <field name="name" colspan="2"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="currency_id"/>
+                            <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                            <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
+                            <field name="account_id"
+                                 attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                                  domain="[('type','=','liquidity')]"/>
+                            <field name="reference"
+                                 attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                            />
+                            <field name="paid" invisible="1"/>
+                        </group>
                         <field name="type" invisible="True"/>
-                        <field name="currency_id"/>
                     </group>
                     <notebook>
                         <page string="Sales Information">
@@ -111,26 +128,21 @@
                                 </tree>
                             </field>
                             <group col="3">
-                                <group string="Internal Notes" col="1">
-                                    <field name="narration"/>
-                                </group>
-                                <group col="2">
-                                    <separator string="Payment Options" colspan="2"/>
-                                    <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
-                                    <field name="account_id"
-                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                          domain="[('type','=','liquidity')]"/>
-                                         <!-- should select income accounts only. Or use the journal for this ? -->
-                                    <field name="reference"
-                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                    />
-                                    <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                                    <field name="paid" invisible="1"/>
+                                <group colspan="1">
+                                    <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
-                                <group col="4">
-                                    <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label string="" colspan="1"/><field name="amount" string="Total"/>
+                                <group>
+                                    <group class="oe_form_subtotal_footer" string="Total">
+                                        <field name="tax_id" 
+                                            on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
+                                            widget="selection"
+                                            domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
+                                        <field name="tax_amount" nolabel="1"/>
+                                        <field name="amount" class="oe_form_subtotal_footer_separator" />
+                                        <button type="object"
+                                            icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
+                                            attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </group>                                    
                                 </group>
                             </group>
                         </page>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index fa073938a37..5c83337044c 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -28,37 +28,40 @@
                             statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
                     </header>
                     <sheet>
-                        <group col="4">
-                            <field name="email" string="Invitation To"/>
-                            <field name="cutype" string="Invitation Type" />
-                            <field name="rsvp" />
-                            <field name="role" string="Role" />
-                            <field name="sent_by_uid" string="Invitation From" />
+
+                        <div class="oe_form_title">
+                            <label for="email" string="Invitation To" class="oe_form_readonly_hidden" /> 
+                            <h1>
+                                <field name="email" class="oe_form_inline" />
+                                (<field name="language" class="oe_form_inline" />)
+                            </h1>
+                            
+                            <h2>
+                                From <field name="event_date" class="oe_form_inline" />
+                                to <field name="event_end_date" class="oe_form_inline"/>
+                            </h2>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="sent_by_uid" string="Invitation From" />
+                                <field name="user_id" string="Invited User"/>
+                                <field name="partner_id" string="Contact" />
+                            </group>
+                            <group>
+                                <field name="cutype" string="Invitation Type" />
+                                <field name="role" string="Role" />
+                                <field name="rsvp" />
+                                <field name="ref" readonly="1"/>
+                            </group>
+                        </group>
+                        <group>
+                            <group string="Delegrated From">
+                                <field name="parent_ids" readonly="1" nolabel="1" />
+                            </group>
+                            <group string="Delegrated To" >
+                                <field name="child_ids" readonly="1" nolabel="1" />
+                            </group>
                         </group>
-                        <notebook>
-                            <page string="Invitation">
-                                <group>
-                                    <group string="Invitation Detail">
-                                        <field name="user_id" string="Invited User"/>
-                                        <field name="partner_id" string="Contact" />
-                                    </group>
-                                    <group string="Event Detail">
-                                        <field name="event_date" />
-                                        <field name="event_end_date" />
-                                        <field name="language"/>
-                                        <field name="ref" readonly="1"/>
-                                    </group>
-                                </group>
-                            </page>
-                            <page string="Delegation Info">
-                                <separator string="Delegated From" colspan="4" />
-                                <field name="parent_ids"
-                                    readonly="1" />
-                                <separator string="Delegated To" colspan="4" />
-                                <field name="child_ids"
-                                    readonly="1" />
-                            </page>
-                        </notebook>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 02fc3369041..fd3a398845d 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -40,27 +40,6 @@
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
 
-    <act_window
-            id="act_crm_opportunity_crm_phonecall_new"
-            name="Phone calls"
-            groups="base.group_sale_salesman"
-            res_model="crm.phonecall"
-            src_model="crm.lead"
-            view_mode="tree,calendar,form"
-            context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
-            domain="[('opportunity_id', '=', active_id)]"
-            view_type="form"/>
-
-    <act_window
-            id="act_crm_opportunity_crm_meeting_new"
-            name="Meetings"
-            res_model="crm.meeting"
-            src_model="crm.lead"
-            view_mode="tree,form,calendar"
-            context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
-            domain="[('opportunity_id', '=', active_id)]"
-            view_type="form"/>
-
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
           <field name="name">Opportunities</field>
           <field name="res_model">crm.lead</field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 86a891aae45..d75df3384e3 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -53,6 +53,25 @@
         <!--
             LEADS
             -->
+        <act_window
+                id="act_crm_opportunity_crm_phonecall_new"
+                name="Phone calls"
+                groups="base.group_sale_salesman"
+                res_model="crm.phonecall"
+                view_mode="tree,calendar,form"
+                context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
+                domain="[('opportunity_id', '=', active_id)]"
+                view_type="form"/>
+
+        <act_window
+                id="act_crm_opportunity_crm_meeting_new"
+                name="Meetings"
+                res_model="crm.meeting"
+                view_mode="tree,form,calendar"
+                context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
+                domain="[('opportunity_id', '=', active_id)]"
+                view_type="form"/>
+
 
         <!-- CRM Lead Form View  -->
         <record model="ir.ui.view" id="crm_case_form_view_leads">
@@ -74,6 +93,16 @@
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
+                    <div class="oe_right oe_form_button_box" name="buttons">
+                        <button type="action"
+                            name="%(act_crm_opportunity_crm_meeting_new)d"
+                            string="Meetings" />
+
+                        <button type="action"
+                            name="%(act_crm_opportunity_crm_phonecall_new)d"
+                            string="Phone Calls" />
+                    </div>
+
                     <label for="name" class="oe_form_readonly_hidden" string="Lead Description"/>
                     <h1><field name="name" placeholder="Describe the lead..."/></h1>
                     <group>
@@ -220,10 +249,9 @@
                             <ul class="oe_kanban_menu">
                                 <li><a type="edit" >Edit...</a></li>
                                 <li><a type="delete">Delete</a></li>
-                                <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send New Email</a></li>
+                                <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
                                 <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
                                 <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
-                                <li><a name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" type="action">Add Internal Note</a></li>
                                 <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                             </ul>
                             <div class="oe_kanban_content">
@@ -363,6 +391,10 @@
         <field name="arch" type="xml">
             <form string="Opportunities" version="7.0">
                 <header>
+                    <button name="stage_previous" string="Previous" type="object"
+                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
+                    <button name="stage_next" string="Next" type="object"  
+                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <button name="case_mark_won" string="Mark Won" type="object"
                             states="draft,open,pending"/>
                     <button name="case_open" string="Open" type="object"
@@ -375,10 +407,6 @@
                             states="done,cancel"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft"/>
-                    <button name="stage_previous" string="Previous" type="object"
-                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
-                    <button name="stage_next" string="Next" type="object"  
-                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 7c0b2f6cfa4..5f94e3d738f 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-
     <act_window
         id="crm_case_categ_meet_create_partner"
         name="Schedule a Meeting"
         res_model="crm.meeting"
-        src_model="res.partner"
         view_mode="calendar,tree,form,gantt"
         context="{'search_default_partner_id': active_id, 'default_duration': 4.0}"
         domain="[('partner_id', '=', active_id)]"
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e98ce2ce8f6..9123cf7c305 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -38,52 +38,62 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
                 <sheet>
-                <group col="6" colspan="4">
-                    <field name="name" string="Title"
-                           required="1" />
-                    <field name="categ_id" widget="selection"
-                        string="Meeting Type"
-                        domain="[('object_id.model', '=', 'crm.meeting')]" />
-                    <field name="allday" on_change="onchange_dates(date,False,False,allday)" />
-                    <newline/>
-                    <field name="date" string="Start Date" required="1"
-                        on_change="onchange_dates(date,duration,False,allday)" />
-                    <field name="duration" widget="float_time"
-                        on_change="onchange_dates(date,duration,False,allday)" />
-                    <field name="date_deadline" string="End Date" required="1"
-                        on_change="onchange_dates(date,False,date_deadline)" />
-                    <field name="location" />
-                    <field name="alarm_id" string="Reminder"
-                        widget="selection" />
-                    <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
-                           <field name="recurrency" string="Recurrence"/>
+                    <div class="oe_form_title">
+                        <div class="oe_form_readonly_hidden">
+                            <label for="name" string="Title"/> 
+                            (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_form_inline"/>
+                            <label for="allday" string="All Day?"/>)
+                        </div>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                        <h2>
+                            At <field name="location" class="oe_form_inline" />
+                        </h2>
+                    </div>
+                    <h2>
+                        <label for="duration" string="Duration" />
+                        <field name="duration" widget="float_time"
+                            on_change="onchange_dates(date,duration,False,allday)"
+                            class="oe_form_inline"/> from
+                        <field name="date"
+                            string="Start Date" 
+                            required="1"
+                            class="oe_form_readonly_hidden oe_form_inline"/> to
+                        <field name="date_deadline" 
+                            string="End Date" required="1"
+                            on_change="onchange_dates(date,False,date_deadline)"                            
+                            class="oe_form_inline"/> 
+                    </h2>
+                <group colspan="4" col="4">
+                    <group colspan="2">
+                        <field name="user_id" />
+                        <field name="organizer"/>
+                        <field name="section_id" widget="selection"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="alarm_id" string="Reminder" widget="selection" />
+                        <field name="class" string="Privacy"/>
+                        <field name="show_as" string="Show Time as"/>
+                        <field name="recurrency" string="Recurrence" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="partner_id" string="Partner"
+                            on_change="onchange_partner_id(partner_id)" />
+                        <field name="email_from"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="categ_id" widget="selection"
+                            string="Meeting Type"
+                            domain="[('object_id.model', '=', 'crm.meeting')]" />
+                        <field name="rrule" invisible="1" readonly="1"/>
+                        <field name="recurrent_id" invisible="1"/>
+                        <field name="recurrent_uid" invisible="1"/>
                     </group>
                 </group>
+                <separator string="Description" colspan="4" />
+                <field name="description" nolabel="1" colspan="4" />
                 <notebook>
-                <page string="Meeting">
-                    <group col="6" colspan="4">
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="Assignment"/>
-                            <field name="user_id" />
-                            <field name="organizer"/>
-                            <field name="section_id" widget="selection"/>
-                        </group><group col="2" colspan="2">
-                            <separator colspan="2" string="Contacts"/>
-                            <field name="partner_id" string="Partner"
-                                on_change="onchange_partner_id(partner_id)" />
-                            <field name="email_from"/>
-                        </group><group col="2" colspan="2">
-                            <separator colspan="2" string="Visibility"/>
-                            <field name="class" string="Privacy"/>
-                            <field name="show_as" string="Show Time as"/>
-                            <field name="rrule" invisible="1" readonly="1"/>
-                            <field name="recurrent_id" invisible="1"/>
-                            <field name="recurrent_uid" invisible="1"/>
-                        </group>
-                    </group>
-                    <separator string="Description" colspan="4" />
-                    <field name="description" nolabel="1" colspan="4" />
-                    </page>
                     <page string="Invitation Detail">
                         <button string="Invite People"
                             name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
@@ -157,12 +167,11 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Recurrence Options" attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
+                    <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string=" Recurrence Pattern" />
                                 <field name="interval" />
-                                <separator string="End of Recurrence" colspan="4"/>
                                 <field name="end_type" />
                                 <label string=" " colspan="2" />
                                 <newline />
@@ -209,9 +218,9 @@
                     </page>
                 </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
             </form>
         </field>
     </record>
@@ -296,7 +305,7 @@
                 <field name="type">form</field>
                 <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
                 <field name="arch" type="xml">
-                    <field name="language" position="after">
+                    <field name="ref" position="after">
                         <field name="categ_id" string="Event Type"/>
                     </field>
                 </field>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index c6fc9b404a4..b4e65d9aa0a 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -6,7 +6,6 @@
         id="crm_case_categ_phone_create_partner"
         name="Schedule a Call"
         res_model="crm.phonecall"
-        src_model="res.partner"
         view_mode="calendar,tree,form"
         context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}"
         groups="base.group_sale_salesman"
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index b5c75aa6ccf..04ab8645215 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -65,50 +65,48 @@
             <form version="7.0">
             <header>
                 <button name="case_open" string="Confirm" type="object"
-                        states="draft,pending" icon="gtk-go-forward"/>
+                        states="draft,pending"/>
                 <button name="case_close" string="Held" type="object"
-                        states="open,pending" icon="gtk-jump-to"/>
+                        states="open,pending"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
-                        states="cancel" icon="gtk-convert"/>
+                        states="cancel"/>
                 <button name="case_cancel" string="Cancel" type="object"
-                        states="draft,open,pending" icon="gtk-cancel"/>
+                        states="draft,open,pending"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
-                    icon="gtk-index" type="action"
+                    type="action"
                     attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Schedule Other Call"
-                    icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
-                <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
+                <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
             </header>
             <sheet string="Phone Call">
+                  <div class="oe_form_title">
+                      <div class="oe_form_readonly_hidden">
+                          <label for="name" string="Title"/> 
+                      </div>
+                      <h1><field name="name" required="1"/></h1>
+                      <div class="oe_form_readonly_hidden">
+                        <label for="partner_phone" string="Phone" />
+                      </div>
+                      <h2><field name="partner_phone"/></h2>
+                  </div>
                  <group col="4">
-                    <field name="name" required="1"/>
-                    <field name="partner_phone"/>
-                    <field name="duration" widget="float_time"/>
-
-                    <field name="date"/>
-                    <field name="user_id"/>
+                    <field name="date" />
+                    <field name="user_id" />
+                    <field name="duration" widget="float_time" />
                     <field name="section_id" colspan="1" widget="selection" />
+                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" />
+                    <field name="categ_id" widget="selection"
+                        domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                    <field name="partner_mobile" />
+                    <field name="priority"/>
+                    <field name="opportunity_id"/>
                 </group>
 
-                <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"/>
+                <field name="description" placeholder="Description..." />
             </sheet>
             <footer>
                 <field name="message_ids" widget="ThreadView"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b9da39c4721..257d1cd93f7 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -158,13 +158,13 @@
                 <form string="Stage" version="7.0">
                     <group col="4">
                         <field name="name"/>
+                        <field name="state" string="Related State" />
                         <field name="probability"/>
+                        <field name="type"/>
                         <field name="on_change"/>
-                        <field name="case_default"/>
                         <field name="sequence"/>
-                        <field name="state"/>
+                        <field name="case_default"/>
                         <field name="fold"/>
-                        <field name="type"/>
                     </group>
                     <separator string="Requirements"/>
                     <field name="requirements" nolabel="1"/>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 78a956f65ac..8ca4e4755ee 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -82,6 +82,27 @@
             </field>
         </record>
 
+
+        <record model="ir.ui.view" id="res_partner_view_buttons">
+            <field name="name">res.partner.view.buttons</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button type="action"
+                        string="Schedule a Meeting"
+                        name="%(crm.crm_case_categ_meet_create_partner)d"
+                        context="{'search_default_partner_id': [active_id], 'default_duration': 4.0}"/>
+                    <button type="action" string="Schedule a Call" 
+                        name="%(crm.crm_case_categ_phone_create_partner)d" 
+                        context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
+                    <button type="action" string="Create an Opportunity"
+                        name="%(crm.action_view_crm_partner2opportunity)d" />
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
 
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index b91b31d7721..ad1a763fa46 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -10,29 +10,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" layout="manual" version="7.0">
-                <header>
-                    <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                    <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
-                    <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                </header>
-                <group>
+                    <header>
+                        <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                    </header>
                     <group>
-                        <field name="action"/>
-                        <field name="name"/>
-                        <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
+                        <group>
+                            <field name="action"/>
+                            <field name="name"/>
+                            <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
+                        </group>
+                        <group>
+                            <field name="partner_id" readonly="True"/>
+                            <field name="categ_id" string="Type"
+                                widget="selection"
+                            domain="[('object_id.model', '=', 'crm.phonecall')]"
+                            groups="base.group_no_one"/>
+                            <field name="phone"/>
+                            <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
+                            <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
+                        </group>
                     </group>
-                    <group>
-                        <field name="partner_id" readonly="True"/>
-                        <field name="categ_id" string="Type"
-                            widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"
-                        groups="base.group_no_one"/>
-                        <field name="phone"/>
-                        <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
-                        <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
-                    </group>
-                </group>
-                <field name="note"/>
+                    <field name="note" placeholder="Call Description" />
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index a65aa4ae5e0..c7641d8f64d 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -42,5 +42,4 @@
             view_mode="form" target="new" view_type="form"
             groups="base.group_sale_salesman"/>
      </data>
-
 </openerp>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 099754aef06..fb1587b543c 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -230,12 +230,10 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                <group name="picking" position="after">
-                    <group string="Weights">
-                        <field name="weight"/>
-                        <field name="weight_net"/>
-                    </group>
-                </group>
+                <field name="picking_id" position="after">
+                    <field name="weight"/>
+                    <field name="weight_net"/>
+                </field>
             </field>
         </record>
 
@@ -245,12 +243,10 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
             <field name="arch" type="xml">
-                <group name="picking" position="after">
-                    <group string="Weights">
-                        <field name="weight"/>
-                        <field name="weight_net"/>
-                    </group>
-                </group>
+                <field name="picking_id">
+                    <field name="weight"/>
+                    <field name="weight_net"/>
+                </field>
             </field>
         </record>
 
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index af276f48440..0a9860dc979 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -9,8 +9,10 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
-                    <field name="message_ids" widget="ThreadView" nolabel="1"
+                    <footer>
+                    <field name="message_ids" widget="ThreadView" 
                             options='{"thread_level": 1}'/>
+                    </footer>
                 </xpath>
             </field>
         </record>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index d94ac882cda..c9a6d55c9d4 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -207,33 +207,34 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reordering Rules" version="7.0">
-                    <group col="2" colspan="2">
-                        <separator string="General Information" colspan="2" />
-                        <field name="name" />
-                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                        <field name="product_uom"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Locations" colspan="2" />
-                        <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Quantity Rules" colspan="2" />
-                        <field name="product_min_qty"/>
-                        <field name="product_max_qty"/>
-                        <field name="qty_multiple"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Misc" colspan="2" />
-                        <field name="procurement_id" readonly="1"/>
-                        <field name="active" />
-                    </group>
-                    <group col="4" colspan="4">
-                        <separator string="Procurement Orders to Process" colspan="4" />
-                        <field name="procurement_draft_ids" colspan="4" nolabel="1"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name" />
+                                <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                            </group>
+                            <group>
+                                <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
+                                <field name="product_uom"/>
+                                <field name="location_id" groups="stock.group_locations"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            </group>
+                        </group>
+                        <group>
+                            <group string="Rules">
+                                <field name="product_min_qty" />
+                                <field name="product_max_qty" />
+                                <field name="qty_multiple" string="Quantity Multiple"/>
+                            </group>
+                            <group string="Misc">
+                                <field name="procurement_id" readonly="1"/>
+                                <field name="active" />
+                            </group>
+                        </group>
+                        <group string="Procurement Orders to Process">
+                            <field name="procurement_draft_ids" nolabel="1"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8bfd600578e..a479e9a72e1 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -69,118 +69,124 @@
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Product" layout="auto" version="7.0">
-                   <sheet>
-                     <field name="product_image" widget='image' class="oe_form_avatar oe_right"/>
-                     <label for="name" class="oe_form_readonly_hidden"/>
-                     <h1><field name="name"/></h1>
-                     <label for="categ_id" class="oe_form_readonly_hidden"/>
-                     <h2><field name="categ_id"/></h2>
-                    <notebook>
-                        <page string="Information">
-                            <group>
-                                <group>
-                                    <field name="default_code"/>
-                                    <field name="ean13" placeholder="5901234123457" />
-                                    <field groups="product.group_product_variant" name="variants" />
-                                </group>
+                    <sheet>
+                        <field name="product_image" widget="image" class="oe_form_avatar oe_right" />
+
+                        <div class="oe_form_title">
+                            <div class="oe_form_readonly_hidden">
+                                <label for="name" string="Product Name" /> 
+                            </div>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                            <label for="categ_id" class="oe_form_readonly_hidden" />
+                            <h2><field name="categ_id" /></h2>
+                        </div>
+                        <notebook>
+                            <page string="Information">
                                 <group>
-                                    <field name="sale_ok"/>
-                                    <field name="purchase_ok"/>
-                                </group>
-                                <group string="Procurement">
-                                    <field name="type"/>
-                                    <field name="procure_method"/>
-                                    <field name="supply_method"/>
-                                </group>
-                                <group string="Base Prices">
-                                    <field name="list_price"/>
-                                    <field name="cost_method"/>
-                                    <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
-                                    <field name="price_margin" groups="product.group_product_variant"/>
-                                    <field name="price_extra" groups="product.group_product_variant"/>
-                                </group>
+                                    <group>
+                                        <field name="default_code"/>
+                                        <field name="ean13" placeholder="5901234123457" />
+                                        <field groups="product.group_product_variant" name="variants" />
+                                    </group>
+                                    <group>
+                                        <field name="sale_ok"/>
+                                        <field name="purchase_ok"/>
+                                    </group>
+                                    <group string="Procurement">
+                                        <field name="type"/>
+                                        <field name="procure_method"/>
+                                        <field name="supply_method"/>
+                                    </group>
+                                    <group string="Prices">
+                                        <field name="list_price"/>
+                                        <field name="cost_method"/>
+                                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                                        <field name="price_margin" groups="product.group_product_variant"/>
+                                        <field name="price_extra" groups="product.group_product_variant"/>
+                                    </group>
 
-                                <group groups="product.group_stock_packaging" string="Weights">
-                                    <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
-                                    <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
-                                    <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
-                                </group>
+                                    <group groups="product.group_stock_packaging" string="Weights">
+                                        <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
+                                    </group>
 
-                                <group name="status" string="Status">
-                                    <field name="state"/>
-                                    <field name="product_manager"/>
-                                </group>
+                                    <group name="uom" groups="product.group_uom" string="Unit of Measure">
+                                        <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                        <field name="uom_po_id"/>
+                                        <field name="uos_id"/>
+                                        <field name="uos_coeff"/>
+                                        <field name="mes_type"/>
+                                    </group>
 
-                                <group name="uom" groups="product.group_uom" string="Unit of Measure">
-                                    <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
-                                    <field name="uom_po_id"/>
-                                </group>
+                                    <group name="status" string="Status">
+                                        <field name="state"/>
+                                        <field name="product_manager"/>
+                                    </group>
 
-                                <group name="uos" groups="product.group_uos" string="Second Unit of Measure">
-                                    <field name="uos_id"/>
-                                    <field name="uos_coeff"/>
-                                    <field name="mes_type"/>
-                                </group>
-                            </group>
-                        </page>
-                        <page string="Procurement &amp; Locations">
-                            <group>
-                                <group name="delay" string="Delays">
-                                    <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                    <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                                    <field name="warranty"/>
-                                </group>
-                                <group name="store" string="Storage Localisation">
-                                    <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
-                                    <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                                    <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
                                 </group>
-                                <group name="misc" string="Miscellaneous">
-                                    <field name="active"/>
-                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                </group>
-                            </group>
-                        </page>
-                        <page string="Suppliers">
-                            <field name="seller_ids" context="{'uom_id': uom_id}"/>
-                        </page>
-                        <page string="Descriptions">
-                            <separator string="Description"/>
-                            <field name="description"/>
-                            <separator string="Sale Description"/>
-                            <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
-                            <separator string="Purchase Description"/>
-                            <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
-                        </page>
-                        <page groups="product.group_stock_packaging" string="Packaging">
-                            <field name="packaging">
-                                <form string="Packaging" version="7.0">
-                                    <group col="4">
-                                        <field name="ean"/>
-                                        <field name="sequence" invisible="1"/>
-                                        <newline/>
-                                        <field name="qty"/>
-                                        <field name="ul"/>
-                                        <field name="weight_ul"/>
-                                        <separator colspan="4" string="Palletization"/>
-                                        <field name="ul_qty"/>
-                                        <field name="rows"/>
-                                        <field name="weight"/>
-                                        <separator colspan="4" string="Pallet Dimension"/>
-                                        <field name="height"/>
-                                        <field name="width"/>
-                                        <field name="length"/>
+                            </page>
+                            <page string="Procurement &amp; Locations">
+                                <group>
+                                    <group name="delay" string="Delays">
+                                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                                        <field name="warranty"/>
                                     </group>
-                                    <separator colspan="4" string="Description"/>
-                                    <field name="name"/>
-                                </form>
-                            </field>
-                        </page>
-                      </notebook>
+                                    <group name="store" string="Storage Localisation">
+                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
+                                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
+                                    </group>
+                                    <group name="misc" string="Miscellaneous">
+                                        <field name="active"/>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    </group>
+                                </group>
+
+                            </page>
+                            <page string="Suppliers">
+                                <field name="seller_ids" context="{'uom_id': uom_id}"/>
+                            </page>
+                            <page string="Descriptions">
+                                <separator string="Description"/>
+                                <field name="description"/>
+                                <separator string="Sale Description"/>
+                                <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
+                                <separator string="Purchase Description"/>
+                                <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
+                            </page>
+                            <page groups="product.group_stock_packaging" string="Packaging">
+                                <field name="packaging">
+                                    <form string="Packaging" version="7.0">
+                                        <group col="4">
+                                            <field name="ean"/>
+                                            <field name="sequence" invisible="1"/>
+                                            <newline/>
+                                            <field name="qty"/>
+                                            <field name="ul"/>
+                                            <field name="weight_ul"/>
+                                            <separator colspan="4" string="Palletization"/>
+                                            <field name="ul_qty"/>
+                                            <field name="rows"/>
+                                            <field name="weight"/>
+                                            <separator colspan="4" string="Pallet Dimension"/>
+                                            <field name="height"/>
+                                            <field name="width"/>
+                                            <field name="length"/>
+                                        </group>
+                                        <separator colspan="4" string="Description"/>
+                                        <field name="name"/>
+                                    </form>
+                                </field>
+                            </page>
+                        </notebook>
                     </sheet>
-                <footer>
-                    <field name="message_ids" widget="ThreadView"/>
-                </footer>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index fb875b9dc60..66b50a20433 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -356,18 +356,18 @@
                     </h2>
                     <group>
                         <group>
+                            <field name="effective_hours"
+                                widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
                             <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="partner_id" />
-                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
+                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
                                 groups="project.group_time_work_estimation_tasks"
                                 on_change="onchange_planned(planned_hours, effective_hours)"/>
 
-                            <field name="effective_hours"
-                                widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
                             <label for="remaining_hours" string="+ Remaining"/>
                             <div>
                                 <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
@@ -380,8 +380,9 @@
                         </group>
                     </group>
                     <notebook>
-                        <page string="Information">
-                            <field name="description" attrs="{'readonly':[('state','=','done')]}"/>
+                        <page string="Description">
+                            <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..." />
+                            <separator string="Task Works" />
                             <field name="work_ids" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />
@@ -414,8 +415,6 @@
                                 <field name="sequence"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
-                            <separator string="Notes"/>
-                            <field name="notes"/>
                         </page>
                     </notebook>
                     </sheet>
@@ -697,16 +696,15 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="state"/>
+                            <field name="case_default"/>
                         </group>
                         <group>
-                            <field name="case_default"/>
+                            <field name="state" string="Related State"/>
                             <field name="sequence"/>
                             <field name="fold"/>
                         </group>
                     </group>
-                    <separator string="Description"/>
-                    <field name="description"/>
+                    <field name="description" placeholder="Add a description..."/>
                 </form>
             </field>
         </record>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index b7089cac129..30e6bfa91dd 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -84,13 +84,8 @@
                             <field name="user_id"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
-                            <label for="task_id"/>
-                            <div>
-                                <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_form_inline"/>
-                                <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
-                                    attrs="{'invisible':[('task_id','!=',False)]}" />
-                            </div>
                         </group><group>
+                            <field name="task_id" on_change="onchange_task_id(task_id)" />
                             <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
                             <field name="version_id" widget="selection"/>
                             <field name="priority"/>
@@ -98,7 +93,7 @@
                             <field name="state" groups="base.group_no_one"/>
                         </group>
                     </group>
-                    <field name="description"/>
+                    <field name="description" placeholder="Add a description..." />
 
                     <notebook groups="base.group_no_one">
                         <page string="Extra Info">
@@ -258,7 +253,6 @@
                                         <a string="Edit" icon="gtk-edit" type="edit"/>
                                         <a string="Change Color" icon="color-picker" type="color" name="color"/>
                                         <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
-                                        <a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/>
                                         <a string="Escalate" name="case_escalate"  icon="gtk-go-up" type="object"/>
                                         <a string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"/>
                                     </div>
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index 32d2113727b..93417cf2ac8 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -29,9 +29,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-            <xpath expr="//notebook/page[@string='Extra Info']/separator[@string='Notes']" position="before">
-                <field name="sale_line_id"/>
-            </xpath>
+                <field name="state" position="after">
+                    <field name="sale_line_id" string="Order Line"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ea7f6eb230e..dbdfcbc4fbd 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -212,7 +212,7 @@ class sale_order(osv.osv):
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
-            ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
+            ], 'Status', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
         'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
         'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b439c7ff4f0..9688fb69802 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -90,7 +90,6 @@
                     <field name="user_id"/>
                     <field name="picked_rate" widget="progressbar"/>
                     <field name="invoiced_rate" widget="progressbar"/>
-                    <field name="amount_untaxed" sum="Total Tax Excluded"/>
                     <field name="amount_total" sum="Total Tax Included"/>
                     <field name="state"/>
                 </tree>
@@ -149,11 +148,16 @@
                         <page string="Order Lines">
                             <field name="order_line">
                                 <form string="Sales Order Lines" version="7.0">
-                                    <field name="product_id"
-                                        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, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
-                                    <field name="name" placeholder="Porduct/Service characteristics"/>
-                                    <group>
+                                    <header>
+                                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
+                                    </header>
+                                    <group col="4" colspan="4">
+                                        <group>
+                                            <field name="product_id"
+                                                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, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                                            <field name="name" placeholder="Product/Service characteristics"/>
+                                        </group>
                                         <group>
                                             <label for="product_uom_qty"/>
                                             <div>
@@ -172,14 +176,16 @@
                                             </div>
                                             <field name="price_unit"/>
                                             <field name="discount" groups="sale.group_discount_per_so_line"/>
-                                        </group><group>
+                                        </group>
+                                    </group>
+                                    <group>
+                                        <group>
                                             <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_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
                                                 domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"
                                                 colspan="3"/>
                                             <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                             <field name="invoiced"/>
-                                            <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                                             <button name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
                                         </group>
                                         <group col="4">
@@ -189,7 +195,7 @@
                                             <field name="address_allotment_id"/>
                                         </group>
                                         <separator string="Properties" colspan="2"/>
-                                        <field name="property_ids"/>
+                                        <field name="property_ids" colspan="4" nolabel="1" />
                                         <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
                                         <field name="notes" groups="base.group_sale_notes_subtotal"/>
                                         <div groups="base.group_no_one">
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 49e7686542c..60ef80db245 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,9 +9,9 @@
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
                 <data>
-                    <field name="state" position="before">
+                    <xpath expr="/form/header/button[@name='stage_previous']" position="before">
                         <button string="Convert to Quote" name="%(action_crm_make_sale)d" type="action"/>
-                    </field>
+                    </xpath>
                 </data>
             </field>
         </record>
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 3923336eb5b..9484b87652e 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -120,6 +120,7 @@ class crm_make_sale(osv.osv_memory):
                     'res_model': 'sale.order',
                     'view_id': False,
                     'type': 'ir.actions.act_window',
+                    'name' : _('Quotation'),
                     'res_id': new_ids and new_ids[0]
                 }
             else:
@@ -130,6 +131,7 @@ class crm_make_sale(osv.osv_memory):
                     'res_model': 'sale.order',
                     'view_id': False,
                     'type': 'ir.actions.act_window',
+                    'name' : _('Quotation'),
                     'res_id': new_ids
                 }
             return value
@@ -145,9 +147,9 @@ class crm_make_sale(osv.osv_memory):
         'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'),
     }
     _defaults = {
-         'shop_id': _get_shop_id,
-         'close': False,
-         'partner_id': _selectPartner,
+        'shop_id': _get_shop_id,
+        'close': False,
+        'partner_id': _selectPartner,
     }
 
 crm_make_sale()
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 49e0e9c1880..135c2c79fa4 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -60,13 +60,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <field name="standard_price" position="replace">
+                <field name="standard_price" position="replace" version="7.0">
                     <label string="Cost Price" for="standard_price" align="1.0"/>
-                    <group col="2" colspan="1">
+                    <div>
                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
                         <button name="%(action_view_change_standard_price)d" string="Update"
                             type="action" icon="gtk-execute" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"/>
-                    </group>
+                    </div>
                 </field>
             </field>
         </record>
@@ -78,7 +78,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="priority">26</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group[@name='properties']" position="before">
+                <xpath expr="//group[@name='properties']" position="before">
                     <group groups="stock.group_inventory_valuation">
                         <separator string="Inventory Valuation" colspan="4"/>
                         <group colspan="2" col="2">
@@ -102,22 +102,20 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <group name="status" position="after">
-                    <group colspan="2" col="3">
-                        <separator string="Stocks" colspan="4"/>
+                <group name="status" position="before" version="7.0">
+                    <group string="Stock and Expected Variations">
                         <field name="qty_available"/>
-                        <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
-                            type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user"/>
-                        <newline/>
-                        <field name="virtual_available"/>
-                    </group>
-                    <group colspan="2" col="2" name="stock_variations">
-                        <separator string="Expected Stock Variations" colspan="2"/>
                         <field name="incoming_qty"/>
+                        <label for="virtual_available" />
+                        <div>
+                            <field name="virtual_available" class="oe_form_inline" />
+
+                            <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
+                                type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user" class="oe_form_inline" />
+                        </div>
                         <field name="outgoing_qty"/>
                     </group>
-                    <group colspan="2" col="2" name="lot" groups="stock.group_tracking_lot,stock.group_production_lot">
-                        <separator string="Lots" colspan="4"/>
+                    <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
                         <field name="track_production" groups="stock.group_production_lot"/>
                         <field name="track_incoming" groups="stock.group_tracking_lot"/>
                         <field name="track_outgoing" groups="stock.group_tracking_lot"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0154af26d95..8f18b89ed1f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -119,15 +119,20 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                    <div class="oe_form_title">
+                        <div class="oe_form_readonly_hidden">
+                            <label for="name"  /> 
+                        </div>
+                        <h1>
+                            <field name="name" placeholder="Annual inventory"/>
+                        </h1>
+                    </div>
                 <group>
-                    <label for="name" clas="oe_form_readonly_hidden"/>
-                    <h1>
-                        <field name="name" placeholder="Annual invetory 2013"/>
-                    </h1>
-                    <group col="4">
+                    <group>
                         <field name="date"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
+                </group>
                     <notebook>
                     <page string="General Informations">
                         <field name="inventory_line_id">
@@ -182,7 +187,6 @@
                          </field>
                     </page>
                     </notebook>
-                    </group>
                     </sheet>
                 </form>
             </field>
@@ -783,62 +787,62 @@
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <field name="state" widget="statusbar"/>
+                                        <field name="state" widget="statusbar" status_visible="draft,assigned,done" />
                                     </header>
                                     <group>
-                                    <group string="Move Information">
-                                        <field name="name" invisible="1"/>
-                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
-                                        <label for="product_qty"/>
-                                        <div>
-                                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
-                                            <button name="%(stock.move_scrap)d"
-                                                    string="Scrap" type="action"
-                                                    icon="gtk-convert" context="{'scrap': True}"
-                                                    states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        </div>
-                                        <label for="product_uos_qty" groups="product.group_uos"/>
-                                        <div>
-                                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/>
-                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                                        </div>
-                                        <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                    </group>
-
-                                    <group string="Locations" groups="stock.group_locations">
-                                        <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                        <field name="location_dest_id" domain="[('usage','=','internal')]"/>
-                                    </group>
-
-                                    <group string="Dates">
-                                        <field name="create_date" invisible="1"/>
-                                        <field name="date"/>
-                                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                    </group>
-
-                                    <group groups="stock.group_tracking_lot" string="Traceability">
-                                        <label for="tracking_id"/>
-                                        <div>
-                                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
-                                            <button name="%(split_into)d" string="New Pack" type="action"
-                                                  groups="product.group_stock_packaging"
-                                                  icon="terp-stock_effects-object-colorize"
-                                                  states="draft,assigned,confirmed"/>
-                                        </div>
-
-                                        <label for="prodlot_id"/>
-                                        <div>
-                                            <field name="prodlot_id" groups="stock.group_production_lot"
-                                                context="{'location_id':location_id, 'product_id':product_id}"
-                                                domain="[('product_id','=?',product_id)]"
-                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
-                                            <button name="%(track_line)d"
-                                                groups="stock.group_tracking_lot"
-                                                states="draft,waiting,confirmed,assigned"
-                                                string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
-                                        </div>
-                                    </group>
+                                        <group string="Move Information">
+                                            <field name="name" invisible="1"/>
+                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                                            <label for="product_qty"/>
+                                            <div>
+                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
+                                                <button name="%(stock.move_scrap)d"
+                                                        string="Scrap" type="action"
+                                                        icon="gtk-convert" context="{'scrap': True}"
+                                                        states="draft,waiting,confirmed,assigned" colspan="1"/>
+                                            </div>
+                                            <label for="product_uos_qty" groups="product.group_uos"/>
+                                            <div>
+                                                <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/>
+                                                <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                            </div>
+                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                                        </group>
+
+                                        <group string="Dates">
+                                            <field name="create_date" invisible="1"/>
+                                            <field name="date"/>
+                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                                        </group>
+
+                                        <group string="Locations" groups="stock.group_locations">
+                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+                                        </group>
+
+                                        <group groups="stock.group_tracking_lot" string="Traceability">
+                                            <label for="tracking_id"/>
+                                            <div>
+                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                                                <button name="%(split_into)d" string="New Pack" type="action"
+                                                      groups="product.group_stock_packaging"
+                                                      icon="terp-stock_effects-object-colorize"
+                                                      states="draft,assigned,confirmed"/>
+                                            </div>
+
+                                            <label for="prodlot_id"/>
+                                            <div>
+                                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                                    context="{'location_id':location_id, 'product_id':product_id}"
+                                                    domain="[('product_id','=?',product_id)]"
+                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
+                                                <button name="%(track_line)d"
+                                                    groups="stock.group_tracking_lot"
+                                                    states="draft,waiting,confirmed,assigned"
+                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            </div>
+                                        </group>
                                     </group>
                                 </form>
                             </field>
@@ -1219,32 +1223,37 @@
                             <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                             <label for="product_qty"/>
                             <div>
-                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                <field name="product_qty"
+                                    on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"
+                                    class="oe_form_inline"/>
                                 <field name="product_uom" groups="product.group_uom" class="oe_form_inline"/>
                                 <button name="%(stock.move_scrap)d"
                                         string="Scrap" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" colspan="1"/>
                             </div>
-                            <field name="location_id" groups="stock.group_locations"/>
-                            <field name="location_dest_id" groups="stock.group_locations"/>
-                            <field name="partner_id" context="{'contact_display':'partner'}"/>
-                        </group>
-                        <group string="Move Information">
+                            <label for="product_uso_qty" />
+                            <div>
+                                <field name="product_uos_qty" 
+                                    groups="product.group_uos" 
+                                    on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" 
+                                    class="oe_form_inline"/>
+                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_form_inline"/>
+                            </div>
                             <field name="name" string="Reason"/>
-                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                            <field name="product_uos" groups="product.group_uos" colspan="4"/>
                         </group>
-                        <group string="Picking" name="picking">
+                        <group>
                             <field name="picking_id"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        </group>
-                        <group string="Dates">
+                            <field name="location_id" groups="stock.group_locations"/>
+                            <field name="location_dest_id" groups="stock.group_locations"/>
+                            <field name="partner_id" context="{'contact_display':'partner'}"/>
                             <field name="create_date" groups="base.group_no_one" />
                             <field name="date" groups="base.group_no_one" />
                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+
                         </group>
-                        <group string="Traceability">
+                        <group>
                             <label for="tracking_id"/>
                             <div>
                                 <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
@@ -1418,16 +1427,13 @@
                             <field name="product_uos" groups="product.group_uos"/>
                         </div>
                         <field name="name" string="Reason"/>
-                    </group><group>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="location_dest_id" groups="stock.group_locations"/>
-                        <field name="partner_id"/>
                     </group>
-                    <group name="picking">
+                    <group>
                         <field name="picking_id"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <group>
+                        <field name="location_id" groups="stock.group_locations"/>
+                        <field name="location_dest_id" groups="stock.group_locations"/>
+                        <field name="partner_id"/>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" />
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>