diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 5c107d984ce..72f50a78cf8 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -173,36 +173,34 @@
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer">
+                            <group class="oe_subtotal_footer" col="4">
                                 <field name="amount_untaxed"/>
+                                <newline/>
                                 <field name="amount_tax"/>
-                                <field name="amount_total" class="oe_subtotal_footer_separator"/>
-                                <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
+                                <newline/>
+                                <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute" colspan="2"/>
+                                <field name="amount_total" class="oe_subtotal_footer_separator" colspan="2"/>
                             </group>
                             <div class="oe_clear"/>
                             <label for="notes"/>
                             <field name="notes"/>
                         </page>
                         <page string="Delivery &amp; Invoicing">
-                            <group>
-                                <group string="Delivery">
-                                    <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
-                                    <field name="minimum_planned_date"/>
-                                    <field name="location_id" groups="stock.group_locations"/>
-                                    <field name="shipped"/>
-                                </group>
-                                <group string="Invoice Control">
-                                    <field name="invoice_method"/>
-                                    <field name="fiscal_position" widget="selection"/>
-                                    <field name="invoiced"/>
-                                </group>
-                                <group groups="base.group_no_one" string="Purchase Control">
-                                    <field name="validator"/>
-                                    <field name="date_approve"/>
-                                </group>
-                                <separator string="Invoices"/>
-                                <field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
+                            <group string="Delivery" col="4">
+                                <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/>
+                                <field name="minimum_planned_date"/>
+                                <field name="validator" groups="base.group_no_one"/>
+                                <field name="location_id" groups="stock.group_locations"/>
+                                <field name="date_approve"/>
+                                <field name="shipped" groups="base.group_no_one"/>
                             </group>
+                            <group string="Invoice Control" col="4">
+                                <field name="invoice_method"/>
+                                <field name="fiscal_position" widget="selection"/>
+                                <field name="invoiced"/>
+                            </group>
+                            <separator string="Invoices"/>
+                            <field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
                         </page>
                     </notebook>
                 </sheet>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 7d5c6ee4b79..11d6e361abc 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -9,7 +9,7 @@
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.purchase_order_form"/>
         <field name="arch" type="xml">
-            <field name="shipped" position="after">
+            <field name="dest_address_id" position="after">
                 <field name="requisition_id"/>
             </field>
         </field>