[IMP] delivery, stock: reorganize stock.picking form view

This commit will avoid having the company_id and/or website_id field(s) alone
on the top right of the 'extra' tab if the `picking_type_code` is in `incoming`

task-1894793

addons/delivery/views/delivery_view.xml

@@ -203,27 +203,22 @@
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
               <data>
-                <xpath expr="//page[@name='extra']" position="inside">
-                <separator string="Delivery Information"/>
-                <group>
-                    <group name='carrier_data'>
+                <xpath expr="//group[@name='other_infos']" position="before">
+                    <group name='carrier_data' string="Delivery Information">
                         <field name="carrier_id" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}" options="{'no_create': True, 'no_open': True}"/>
                         <field name="delivery_type" attrs="{'invisible':True}"/>
                         <label for="carrier_tracking_ref"/>
                         <div name="tracking">
                             <field name="carrier_tracking_ref" class="oe_inline" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"/>
                             <button type='object' class="fa fa-arrow-right oe_link" name="cancel_shipment" string="Cancel" attrs="{'invisible':['|','|','|',('carrier_tracking_ref','=',False),('delivery_type','in', ['fixed', 'base_on_rule']),('delivery_type','=',False),('state','not in',('done'))]}"/>
                         </div>
-                    </group>
-                    <group>
                         <label for="weight" string="Weight"/>
                         <div>
                             <field name="weight" class="oe_inline"/>
                             <field name="weight_uom_id" nolabel="1" class="oe_inline" style="margin-left:5px"/>
                         </div>
                         <field name="shipping_weight"/>
                     </group>
-                </group>
                 </xpath>
                 <div name="button_box" position="inside">
                     <button type="object" name="open_website_url" class="oe_stat_button" icon='fa-truck' string="Tracking"

addons/stock/views/stock_picking_views.xml

@@ -323,14 +323,12 @@
                         </page>
                         <page string="Additional Info" name="extra">
                             <group>
-                                <group>
+                                <group string="Other Information" name="other_infos">
                                     <field name="picking_type_code" invisible="1"/>
                                     <field name="move_type" attrs="{'invisible': [('picking_type_code', '=', 'incoming')]}"/>
-                                </group>
-                                <group>
-                                    <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
+                                    <field name="priority"/>
                                     <field name="group_id" groups="base.group_no_one"/>
-                                    <field name="priority" attrs="{'invisible': [('picking_type_code', '=', 'incoming')]}"/>
+                                    <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
                                 </group>
                             </group>
                         </page>