</record>
<record id="action_delivery_carrier_form" model="ir.actions.act_window">
- <field name="name">Delivery Method</field>
+ <field name="name">Delivery Methods</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">delivery.carrier</field>
<field name="view_type">form</field>
to each method.
</p><p>
These methods allows to automaticaly compute the delivery price
- according to your settings; on the sale order (based on the
+ according to your settings; on the sales order (based on the
quotation) or the invoice (based on the delivery orders).
</p>
</field>
<field name="weight"/>
<field name="weight_net" groups="base.group_no_one"/>
</field>
- <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
- <field name="weight"/>
- <field name="weight_net" groups="base.group_no_one"/>
- </xpath>
</field>
</record>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<field name="company_id" position="before">
- <field name="weight"/>
- <field name="weight_net" groups="base.group_no_one"/>
+ <label for="weight" string="Weight"/>
+ <div>
+ <field name="weight" class="oe_inline"/>
+ <field name="weight_uom_id" nolabel="1" class="oe_inline"/>
+ </div>
+ <field name="weight_net" groups="base.group_no_one" class="oe_inline"/>
</field>
- <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
- <field name="weight"/>
- <field name="weight_net" groups="base.group_no_one"/>
- </xpath>
</field>
</record>
<record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
<field name="name">stock.picking_withweight.internal.move.form.view</field>
- <field name="model">stock.picking</field>
- <field name="inherit_id" ref="stock.view_picking_form"/>
+ <field name="model">stock.move</field>
+ <field name="inherit_id" ref="stock.view_move_picking_form"/>
<field name="arch" type="xml">
- <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
+ <xpath expr="//field[@name='date_expected']" position="after">
<field name="weight"/>
<field name="weight_net" groups="base.group_no_one"/>
</xpath>
<field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='main_grp']" position="inside">
- <field name="weight"/>
- <field name="weight_net" groups="base.group_no_one"/>
+ <label for="weight" string="Weight"/>
+ <div>
+ <field name="weight" class="oe_inline"/>
+ <field name="weight_uom_id" nolabel="1" class="oe_inline"/>
+ </div>
+ <field name="weight_net" groups="base.group_no_one" class="oe_inline"/>
</xpath>
</field>
</record>
<record id="view_delivery_order_inherit_stock" model="ir.ui.view">
<field name="name">stock.picking.out.form</field>
- <field name="model">stock.picking</field>
- <field name="inherit_id" ref="stock.view_picking_out_form"/>
+ <field name="model">stock.picking.out</field>
+ <field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
- <xpath expr="/form/header//button[@string='Create Invoice/Refund']" position="after">
- <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
+ <xpath expr="/form/header//button[@name='action_process']" position="after">
+ <button name="%(report_shipping)d" string="Print Delivery Order" states="confirmed,assigned" type="action"/>
+ <button name="%(report_shipping)d" string="Print Delivery Order" states="done" type="action" class="oe_highlight"/>
</xpath>
</field>
</record>
<record id="view_picking_withcarrier_in_form" model="ir.ui.view">
<field name="name">delivery.stock.picking_withcarrier.in.form.view</field>
- <field name="type">form</field>
<field name="model">stock.picking.in</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<field name="weight"/>
<field name="weight_net" groups="base.group_no_one"/>
</field>
- <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
- <field name="weight"/>
- <field name="weight_net" groups="base.group_no_one"/>
- </xpath>
</field>
</record>
</data>