<record id="view_delivery_carrier_tree" model="ir.ui.view">
<field name="name">delivery.carrier.tree</field>
<field name="model">delivery.carrier</field>
- <field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Carrier">
<field name="name"/>
</tree>
</field>
</record>
+
<record id="view_delivery_carrier_form" model="ir.ui.view">
<field name="name">delivery.carrier.form</field>
<field name="model">delivery.carrier</field>
- <field name="type">form</field>
<field name="arch" type="xml">
- <form string="Carrier">
- <group colspan="4" col="4" name="general">
- <field name="name" select="1"/>
- <field name="partner_id" select="1"/>
- <field name="product_id" select="1"/>
- <field name="active" select="1"/>
- <separator string="Pricing Information" colspan="4"/>
- <group colspan="4" col="4">
+ <form string="Carrier" version="7.0">
+ <div class="oe_title">
+ <label for="name" class="oe_edit_only"/>
+ <h1>
+ <field name="name"/>
+ </h1>
+ </div>
+ <group>
+ <group name="general">
+ <field name="partner_id"/>
+ <field name="product_id"/>
+ </group>
+ <group>
+ <field name="active"/>
+ </group>
+ </group>
+ <group col="4">
+ <group string="Pricing Information">
<field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
- <newline/>
- <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
- <field name="amount" attrs="{'required':[('free_if_more_than','<>',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
+ <label for="free_if_more_than"/>
+ <div>
+ <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+ <field name="amount" attrs="{'required':[('free_if_more_than','<>',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
+ </div>
</group>
<newline/>
<field name="use_detailed_pricelist"/>
</group>
- <field name="pricelist_ids" nolabel="1" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
- <tree string="Delivery grids">
+ <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
+ <tree string="Delivery grids">
<field name="sequence"/>
<field name="name"/>
- </tree>
- <form string="Delivery grids">
- <field name="name" select="1"/>
- <field name="active" select="1"/>
- <field name="sequence" select="1"/>
- <notebook colspan="4">
- <page string="Grid definition">
- <field colspan="4" name="line_ids" nolabel="1" select="1"/>
- </page>
- <page string="Destination">
- <separator colspan="4" string="Countries"/>
- <field colspan="4" name="country_ids" nolabel="1"/>
- <separator colspan="4" string="States"/>
- <field colspan="4" name="state_ids" nolabel="1"/>
- <field name="zip_from"/>
- <field name="zip_to"/>
- </page>
- </notebook>
- </form>
+ </tree>
+ <form string="Delivery grids" version="7.0">
+ <group>
+ <group>
+ <field name="name"/>
+ </group>
+ <group>
+ <field name="active"/>
+ <field name="sequence"/>
+ </group>
+ </group>
+ <notebook>
+ <page string="Grid definition">
+ <field name="line_ids"/>
+ </page>
+ <page string="Destination">
+ <group>
+ <group>
+ <field name="country_ids" widget="many2many_tags"/>
+ <field name="state_ids" widget="many2many_tags"/>
+ </group>
+ <group>
+ <label for="zip_from" string="Zip"/>
+ <div>
+ <field name="zip_from" class="oe_inline"/>
+ -
+ <field name="zip_to" class="oe_inline"/>
+ </div>
+ </group>
+ </group>
+ </page>
+ </notebook>
+ </form>
</field>
</form>
</field>
</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>
<field name="view_mode">tree,form</field>
- <field name="help">Define the delivery methods you are using and their pricing in order to reinvoice the delivery costs when you are doing invoicing based on delivery orders</field>
+ <field name="help" type="html">
+ <p class="oe_view_nocontent_create">
+ Click to define a new deliver method.
+ </p><p>
+ Each carrier (e.g. UPS) can have several delivery methods (e.g.
+ UPS Express, UPS Standard) with a set of pricing rules attached
+ to each method.
+ </p><p>
+ These methods allows to automaticaly compute the delivery price
+ according to your settings; on the sales order (based on the
+ quotation) or the invoice (based on the delivery orders).
+ </p>
+ </field>
</record>
<menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="stock.menu_stock_configuration" sequence="15"/>
<record id="view_delivery_grid_tree" model="ir.ui.view">
<field name="name">delivery.grid.tree</field>
<field name="model">delivery.grid</field>
- <field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Delivery grids">
<field name="sequence"/>
<record id="view_delivery_grid_form" model="ir.ui.view">
<field name="name">delivery.grid.form</field>
<field name="model">delivery.grid</field>
- <field name="type">form</field>
<field name="arch" type="xml">
- <form string="Delivery grids">
- <field name="name" select="1"/>
- <field name="active" select="1"/>
- <field name="carrier_id" select="1"/>
- <field name="sequence" select="1"/>
- <notebook colspan="4">
+ <form string="Delivery grids" version="7.0">
+ <group col="4">
+ <field name="name"/>
+ <field name="active"/>
+ <field name="carrier_id"/>
+ <field name="sequence"/>
+ </group>
+ <notebook>
<page string="Grid definition">
- <field colspan="4" name="line_ids" nolabel="1" select="1"/>
+ <field name="line_ids"/>
</page>
<page string="Destination">
- <separator colspan="4" string="Countries"/>
- <field colspan="4" name="country_ids" nolabel="1"/>
- <separator colspan="4" string="States"/>
- <field colspan="4" name="state_ids" nolabel="1"/>
- <field name="zip_from"/>
- <field name="zip_to"/>
+ <group string="Countries">
+ <field name="country_ids"/>
+ </group>
+ <group string="States">
+ <field colspan="2" name="state_ids" nolabel="1"/>
+ <field name="zip_from"/>
+ <field name="zip_to"/>
+ </group>
</page>
</notebook>
</form>
<field name="res_model">delivery.grid</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
- <field name="help">The delivery price list allows you to compute the cost and sales price of the delivery according to the weight of the products and other criteria. You can define several price lists for one delivery method, per country or a zone in a specific country defined by a postal code range.</field>
+ <field name="help" type="html">
+ <p class="oe_view_nocontent_create">
+ Click to create a delivery price list for a specific region.
+ </p><p>
+ The delivery price list allows you to compute the cost and
+ sales price of the delivery according to the weight of the
+ products and other criteria. You can define several price lists
+ for each delivery method: per country or a zone in a specific
+ country defined by a postal code range.
+ </p>
+ </field>
</record>
<menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery"/>
<record id="view_delivery_grid_line_form" model="ir.ui.view">
<field name="name">delivery.grid.line.form</field>
<field name="model">delivery.grid.line</field>
- <field name="type">form</field>
<field name="arch" type="xml">
- <form string="Grid Lines">
- <group colspan="5" col="5">
- <field colspan="4" name="name" select="1"/>
- <newline/>
- <field name="type" string="Condition"/>
- <field name="operator" nolabel="1"/>
- <field name="max_value" nolabel="1"/>
+ <form string="Grid Lines" version="7.0">
+ <group>
+ <field name="name"/>
+ </group>
+ <group>
+ <group>
+ <label for="type" string="Condition"/>
+ <div>
+ <field name="type" class="oe_inline"/>
+ <field name="operator" class="oe_inline"/>
+ <field name="max_value" class="oe_inline"/>
+ </div>
+ <label for="price_type"/>
+ <div>
+ <field name="price_type" class="oe_inline"/>
+ <label string=" in Function of " class="oe_inline" attrs="{'invisible':[('price_type','=','fixed')]}"/>
+ <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}" class="oe_inline"/>
+ </div>
+ </group>
+ <group>
+ <field name="list_price"/>
+ <field name="standard_price"/>
+ </group>
</group>
- <newline/>
- <field name="list_price"/>
- <field name="standard_price"/>
- <field name="price_type"/>
- <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
</form>
</field>
</record>
<record id="view_delivery_grid_line_tree" model="ir.ui.view">
<field name="name">delivery.grid.line.tree</field>
<field name="model">delivery.grid.line</field>
- <field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Grid Lines">
<field name="name"/>
</field>
</record>
- <record id="view_order_withcarrier_form" model="ir.ui.view">
- <field name="name">delivery.sale.order_withcarrier.form.view</field>
- <field name="type">form</field>
- <field name="model">sale.order</field>
- <field name="inherit_id" ref="sale.view_order_form"/>
- <field name="arch" type="xml">
- <group name="logistics" position="inside">
- <field name="id" invisible="True"/>
- <field name="carrier_id" context="{'order_id':active_id or False}"/>
- </group>
- </field>
- </record>
-
<record id="view_picking_withcarrier_out_form" model="ir.ui.view">
<field name="name">delivery.stock.picking_withcarrier.out.form.view</field>
- <field name="type">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">
- <field name="partner_id" position="after">
+ <field name="min_date" position="after">
<field name="carrier_id"/>
<field name="carrier_tracking_ref"/>
<field name="number_of_packages"/>
- <field name="weight"/>
- <field name="weight_net"/>
</field>
- </field>
- </record>
-
- <record id="view_picking_withweight_in_form" model="ir.ui.view">
- <field name="name">stock.picking_withweight.in.form.view</field>
- <field name="type">form</field>
- <field name="model">stock.picking</field>
- <field name="inherit_id" ref="stock.view_picking_in_form"/>
- <field name="arch" type="xml">
- <field name="type" position="after">
+ <field name="company_id" position="before">
<field name="weight"/>
- <field name="weight_net"/>
- </field>
+ <field name="weight_net" groups="base.group_no_one"/>
+ </field>
</field>
</record>
<record id="view_picking_withweight_internal_form" model="ir.ui.view">
<field name="name">stock.picking_withweight.internal.form.view</field>
- <field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
- <field name="type" position="after">
- <field name="weight"/>
- <field name="weight_net"/>
+ <field name="company_id" position="before">
+ <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>
</field>
</record>
<record id="action_picking_tree4" model="ir.actions.act_window">
<field name="name">Picking to be invoiced</field>
- <field name="res_model">stock.picking</field>
+ <field name="res_model">stock.picking.out</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="stock.view_picking_out_search"/>
</record>
- <record id="view_picking_withcarrier_out_move_form" model="ir.ui.view">
- <field name="name">delivery.stock.picking_withcarrier.out.move.form.view</field>
- <field name="type">form</field>
- <field name="model">stock.picking</field>
- <field name="inherit_id" ref="stock.view_picking_out_form"/>
- <field name="arch" type="xml">
- <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
- <field name="weight"/>
- <field name="weight_net"/>
- </xpath>
- </field>
- </record>
-
- <record id="view_picking_withweight_in_move_form" model="ir.ui.view">
- <field name="name">stock.picking_withweight.in.move.form.view</field>
- <field name="type">form</field>
- <field name="model">stock.picking</field>
- <field name="inherit_id" ref="stock.view_picking_in_form"/>
- <field name="arch" type="xml">
- <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
- <field name="weight"/>
- <field name="weight_net"/>
- </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="type">form</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"/>
+ <field name="weight_net" groups="base.group_no_one"/>
</xpath>
</field>
</record>
<record id="view_move_withweight_form" model="ir.ui.view">
<field name="name">stock.move.form.weight</field>
- <field name="type">form</field>
<field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml">
- <group colspan="2" col="2" position="after">
- <group colspan="2" col="2">
- <separator string="Weights" colspan="2"/>
- <field name="weight"/>
- <field name="weight_net"/>
- </group>
- </group>
- </field>
- </record>
-
- <record id="view_move_reception_picking_withweight_form" model="ir.ui.view">
- <field name="name">stock.move.reception.packing.form.weight</field>
- <field name="type">form</field>
- <field name="model">stock.move</field>
- <field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
- <field name="arch" type="xml">
- <group colspan="2" col="2" position="after">
- <group colspan="2" col="2">
- <separator string="Weights" colspan="2"/>
- <field name="weight"/>
- <field name="weight_net"/>
- </group>
- </group>
+ <xpath expr="//group[@name='main_grp']" position="inside">
+ <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 model="ir.ui.view" id="edit_project_multicompany">
- <field name="name">sale.order.multicompany</field>
+ <record id="view_order_withcarrier_form" model="ir.ui.view">
+ <field name="name">delivery.sale.order_withcarrier.form.view</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
- <xpath expr="//button[@name='order_confirm']" position="after">
- <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>
- </xpath>
+ <xpath expr="//group[@name='sale_total']" position="after">
+ <group style="width: 65%%">
+ <label for="carrier_id"/>
+ <div>
+ <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
+ <button name="delivery_set" string="Add in Quote" type="object"
+ class="oe_edit_only"
+ attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
+ <br/>
+ <label string="If you don't 'Add in Quote', the exact price will be computed when invoicing based on delivery order(s)."
+ class="oe_edit_only"
+ attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
+ </div>
+ </group>
+ </xpath>
</field>
</record>
<record id="view_delivery_order_inherit_stock" model="ir.ui.view">
<field name="name">stock.picking.out.form</field>
- <field name="type">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/sheet/notebook/page[@string='Products']/group/button[@string='Create Invoice']" 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="model">stock.picking.in</field>
+ <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"/>
+ </field>
+ </field>
+ </record>
</data>
</openerp>
projects / odoo / odoo.git / blobdiff