2008-09-10 17:56:00 +00:00
|
|
|
<openerp>
|
2008-06-29 08:26:07 +00:00
|
|
|
<data>
|
2008-07-01 11:15:14 +00:00
|
|
|
<!-- Delivery Carriers -->
|
2012-03-22 11:19:39 +00:00
|
|
|
<menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_configuration" groups="base.group_no_one" sequence="50"/>
|
2008-09-20 19:06:25 +00:00
|
|
|
|
2008-07-01 15:58:58 +00:00
|
|
|
<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="arch" type="xml">
|
|
|
|
<tree string="Carrier">
|
2011-10-01 22:18:03 +00:00
|
|
|
<field name="name"/>
|
2008-07-01 15:58:58 +00:00
|
|
|
<field name="partner_id"/>
|
2008-09-20 11:51:20 +00:00
|
|
|
<field name="price" invisible="'order_id' not in context"/>
|
2008-06-29 08:26:07 +00:00
|
|
|
</tree>
|
|
|
|
</field>
|
|
|
|
</record>
|
2012-07-23 14:20:57 +00:00
|
|
|
|
2008-07-01 15:58:58 +00:00
|
|
|
<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="arch" type="xml">
|
2012-06-09 14:39:04 +00:00
|
|
|
<form string="Carrier" version="7.0">
|
2012-07-17 15:19:01 +00:00
|
|
|
<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>
|
2012-07-16 04:54:52 +00:00
|
|
|
<field name="active"/>
|
2012-07-17 15:19:01 +00:00
|
|
|
</group>
|
|
|
|
</group>
|
|
|
|
<group col="4">
|
2012-07-16 04:54:52 +00:00
|
|
|
<group string="Pricing Information">
|
|
|
|
<field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
|
|
|
|
<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" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
|
|
|
|
<tree string="Delivery grids">
|
|
|
|
<field name="sequence"/>
|
|
|
|
<field name="name"/>
|
|
|
|
</tree>
|
|
|
|
<form string="Delivery grids" version="7.0">
|
|
|
|
<group>
|
2012-07-12 13:33:05 +00:00
|
|
|
<group>
|
2012-07-16 04:54:52 +00:00
|
|
|
<field name="name"/>
|
2012-06-29 11:41:39 +00:00
|
|
|
</group>
|
2012-07-16 04:54:52 +00:00
|
|
|
<group>
|
|
|
|
<field name="active"/>
|
|
|
|
<field name="sequence"/>
|
|
|
|
</group>
|
|
|
|
</group>
|
|
|
|
<notebook>
|
|
|
|
<page string="Grid definition">
|
|
|
|
<field name="line_ids"/>
|
|
|
|
</page>
|
|
|
|
<page string="Destination">
|
2012-06-29 11:41:39 +00:00
|
|
|
<group>
|
|
|
|
<group>
|
2012-07-16 04:54:52 +00:00
|
|
|
<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>
|
2012-06-29 11:41:39 +00:00
|
|
|
</group>
|
2012-07-16 04:54:52 +00:00
|
|
|
</group>
|
|
|
|
</page>
|
|
|
|
</notebook>
|
|
|
|
</form>
|
|
|
|
</field>
|
2008-06-29 08:26:07 +00:00
|
|
|
</form>
|
|
|
|
</field>
|
|
|
|
</record>
|
2012-07-23 14:20:57 +00:00
|
|
|
|
2008-07-01 15:58:58 +00:00
|
|
|
<record id="action_delivery_carrier_form" model="ir.actions.act_window">
|
2012-09-28 07:43:01 +00:00
|
|
|
<field name="name">Delivery Methods</field>
|
2008-07-01 15:58:58 +00:00
|
|
|
<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>
|
2012-08-04 14:35:56 +00:00
|
|
|
<field name="help" type="html">
|
2012-08-04 13:56:31 +00:00
|
|
|
<p class="oe_view_nocontent_create">
|
2012-08-04 13:21:36 +00:00
|
|
|
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
|
2012-12-21 16:48:08 +00:00
|
|
|
according to your settings; on the sales order (based on the
|
2012-08-04 13:21:36 +00:00
|
|
|
quotation) or the invoice (based on the delivery orders).
|
|
|
|
</p>
|
|
|
|
</field>
|
2008-06-29 08:26:07 +00:00
|
|
|
</record>
|
2011-05-13 07:50:46 +00:00
|
|
|
|
2012-03-22 11:19:39 +00:00
|
|
|
<menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="stock.menu_stock_configuration" sequence="15"/>
|
2008-09-20 19:06:25 +00:00
|
|
|
|
2008-07-01 11:15:14 +00:00
|
|
|
<!-- Delivery Grids -->
|
2008-07-01 15:58:58 +00:00
|
|
|
<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="arch" type="xml">
|
|
|
|
<tree string="Delivery grids">
|
|
|
|
<field name="sequence"/>
|
|
|
|
<field name="carrier_id"/>
|
|
|
|
<field name="name"/>
|
2008-06-29 08:26:07 +00:00
|
|
|
</tree>
|
|
|
|
</field>
|
|
|
|
</record>
|
2008-09-20 19:06:25 +00:00
|
|
|
|
2008-07-01 15:58:58 +00:00
|
|
|
<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="arch" type="xml">
|
2012-06-09 14:39:04 +00:00
|
|
|
<form string="Delivery grids" version="7.0">
|
2012-06-07 13:37:52 +00:00
|
|
|
<group col="4">
|
|
|
|
<field name="name"/>
|
|
|
|
<field name="active"/>
|
|
|
|
<field name="carrier_id"/>
|
|
|
|
<field name="sequence"/>
|
|
|
|
</group>
|
|
|
|
<notebook>
|
2008-07-01 15:58:58 +00:00
|
|
|
<page string="Grid definition">
|
2012-06-07 13:37:52 +00:00
|
|
|
<field name="line_ids"/>
|
2008-06-29 08:26:07 +00:00
|
|
|
</page>
|
2008-07-01 15:58:58 +00:00
|
|
|
<page string="Destination">
|
2012-07-12 13:33:05 +00:00
|
|
|
<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"/>
|
2012-06-07 13:37:52 +00:00
|
|
|
</group>
|
2008-06-29 08:26:07 +00:00
|
|
|
</page>
|
|
|
|
</notebook>
|
|
|
|
</form>
|
|
|
|
</field>
|
|
|
|
</record>
|
2008-07-01 15:58:58 +00:00
|
|
|
<record id="action_delivery_grid_form" model="ir.actions.act_window">
|
|
|
|
<field name="name">Delivery Pricelist</field>
|
|
|
|
<field name="type">ir.actions.act_window</field>
|
|
|
|
<field name="res_model">delivery.grid</field>
|
|
|
|
<field name="view_type">form</field>
|
|
|
|
<field name="view_mode">tree,form</field>
|
2012-08-04 14:35:56 +00:00
|
|
|
<field name="help" type="html">
|
2012-08-04 13:56:31 +00:00
|
|
|
<p class="oe_view_nocontent_create">
|
2012-08-04 13:21:36 +00:00
|
|
|
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>
|
2008-06-29 08:26:07 +00:00
|
|
|
</record>
|
2012-03-22 11:19:39 +00:00
|
|
|
<menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery"/>
|
2008-09-20 19:06:25 +00:00
|
|
|
|
2008-07-01 15:58:58 +00:00
|
|
|
<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="arch" type="xml">
|
2012-06-09 14:39:04 +00:00
|
|
|
<form string="Grid Lines" version="7.0">
|
2012-07-17 15:19:01 +00:00
|
|
|
<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>
|
2012-07-12 13:33:05 +00:00
|
|
|
</group>
|
2008-06-29 08:26:07 +00:00
|
|
|
</form>
|
|
|
|
</field>
|
2012-07-16 07:08:11 +00:00
|
|
|
</record>
|
2008-07-01 15:58:58 +00:00
|
|
|
<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="arch" type="xml">
|
|
|
|
<tree string="Grid Lines">
|
|
|
|
<field name="name"/>
|
|
|
|
<field name="type"/>
|
|
|
|
<field name="operator"/>
|
2011-05-17 08:36:18 +00:00
|
|
|
<field name="max_value" nolabel="1"/>
|
2008-07-01 15:58:58 +00:00
|
|
|
<field name="list_price"/>
|
2012-04-25 13:56:29 +00:00
|
|
|
<field name="standard_price"/>
|
2008-06-29 08:26:07 +00:00
|
|
|
</tree>
|
|
|
|
</field>
|
|
|
|
</record>
|
2008-09-20 19:06:25 +00:00
|
|
|
|
2008-07-01 15:58:58 +00:00
|
|
|
<record id="view_picking_withcarrier_out_form" model="ir.ui.view">
|
2013-07-30 10:44:41 +00:00
|
|
|
<field name="name">delivery.stock.picking_withcarrier.form.view</field>
|
|
|
|
<field name="model">stock.picking</field>
|
2012-05-08 21:22:45 +00:00
|
|
|
<field name="inherit_id" ref="stock.view_picking_form"/>
|
2008-07-01 15:58:58 +00:00
|
|
|
<field name="arch" type="xml">
|
2013-08-02 17:37:00 +00:00
|
|
|
<xpath expr="/form/header//button[@name='action_cancel']" position="after">
|
2013-07-30 10:44:41 +00:00
|
|
|
<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>
|
2013-09-23 15:37:56 +00:00
|
|
|
<xpath expr="//page[@string='Additional Info']/group[last()]" position="after">
|
|
|
|
<separator string="Carrier Informations"/>
|
|
|
|
<group>
|
|
|
|
<group>
|
|
|
|
<field name="carrier_id"/>
|
|
|
|
<field name="carrier_tracking_ref"/>
|
|
|
|
<field name="number_of_packages"/>
|
|
|
|
</group>
|
|
|
|
<group>
|
|
|
|
<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"/>
|
|
|
|
</group>
|
|
|
|
</group>
|
|
|
|
</xpath>
|
2010-03-11 12:03:01 +00:00
|
|
|
</field>
|
2010-04-16 09:16:25 +00:00
|
|
|
</record>
|
2008-09-20 19:06:25 +00:00
|
|
|
|
2013-07-23 16:47:55 +00:00
|
|
|
<record id="action_picking_tree" model="ir.actions.act_window">
|
2009-11-23 13:47:57 +00:00
|
|
|
<field name="name">Picking to be invoiced</field>
|
2013-07-30 10:44:41 +00:00
|
|
|
<field name="res_model">stock.picking</field>
|
2008-07-01 15:58:58 +00:00
|
|
|
<field name="type">ir.actions.act_window</field>
|
|
|
|
<field name="view_type">form</field>
|
2008-10-27 15:29:13 +00:00
|
|
|
<field name="view_mode">tree,form</field>
|
2008-07-01 15:58:58 +00:00
|
|
|
<field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','out')]</field>
|
2009-09-24 10:46:21 +00:00
|
|
|
<field name="filter" eval="True"/>
|
2011-11-24 12:14:33 +00:00
|
|
|
<field name="context">{'default_invoice_state': '2binvoiced', 'default_type': 'out', 'contact_display': 'partner'}</field>
|
2013-08-02 17:26:43 +00:00
|
|
|
<field name="search_view_id" eval="False"/>
|
2008-06-29 08:26:07 +00:00
|
|
|
</record>
|
2010-04-16 09:16:25 +00:00
|
|
|
|
2010-03-11 12:03:01 +00:00
|
|
|
<record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
|
|
|
|
<field name="name">stock.picking_withweight.internal.move.form.view</field>
|
2012-08-29 10:18:31 +00:00
|
|
|
<field name="model">stock.move</field>
|
2012-11-20 06:20:14 +00:00
|
|
|
<field name="inherit_id" ref="stock.view_move_picking_form"/>
|
2010-03-11 12:03:01 +00:00
|
|
|
<field name="arch" type="xml">
|
2012-11-20 06:20:14 +00:00
|
|
|
<xpath expr="//field[@name='date_expected']" position="after">
|
2010-03-11 12:03:01 +00:00
|
|
|
<field name="weight"/>
|
2012-07-26 13:36:41 +00:00
|
|
|
<field name="weight_net" groups="base.group_no_one"/>
|
2010-03-11 12:03:01 +00:00
|
|
|
</xpath>
|
|
|
|
</field>
|
|
|
|
</record>
|
2010-04-16 09:16:25 +00:00
|
|
|
|
2010-03-11 12:03:01 +00:00
|
|
|
<record id="view_move_withweight_form" model="ir.ui.view">
|
|
|
|
<field name="name">stock.move.form.weight</field>
|
|
|
|
<field name="model">stock.move</field>
|
|
|
|
<field name="inherit_id" ref="stock.view_move_form"/>
|
|
|
|
<field name="arch" type="xml">
|
2012-07-17 15:19:01 +00:00
|
|
|
<xpath expr="//group[@name='main_grp']" position="inside">
|
2012-12-04 10:58:29 +00:00
|
|
|
<label for="weight" string="Weight"/>
|
|
|
|
<div>
|
|
|
|
<field name="weight" class="oe_inline"/>
|
|
|
|
<field name="weight_uom_id" nolabel="1" class="oe_inline"/>
|
|
|
|
</div>
|
2012-12-06 10:14:45 +00:00
|
|
|
<field name="weight_net" groups="base.group_no_one" class="oe_inline"/>
|
2012-07-17 15:19:01 +00:00
|
|
|
</xpath>
|
2010-03-11 12:03:01 +00:00
|
|
|
</field>
|
|
|
|
</record>
|
2010-04-16 09:16:25 +00:00
|
|
|
|
2012-05-25 10:26:43 +00:00
|
|
|
<record id="view_order_withcarrier_form" model="ir.ui.view">
|
|
|
|
<field name="name">delivery.sale.order_withcarrier.form.view</field>
|
2010-04-23 11:50:16 +00:00
|
|
|
<field name="model">sale.order</field>
|
|
|
|
<field name="inherit_id" ref="sale.view_order_form"/>
|
|
|
|
<field name="arch" type="xml">
|
2012-06-10 08:35:15 +00:00
|
|
|
<xpath expr="//group[@name='sale_total']" position="after">
|
2012-07-14 12:54:56 +00:00
|
|
|
<group style="width: 65%%">
|
2012-06-10 08:35:15 +00:00
|
|
|
<label for="carrier_id"/>
|
|
|
|
<div>
|
2012-06-19 08:56:18 +00:00
|
|
|
<field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
|
2012-07-14 12:54:56 +00:00
|
|
|
<button name="delivery_set" string="Add in Quote" type="object"
|
|
|
|
class="oe_edit_only"
|
|
|
|
attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
|
2012-07-17 15:19:01 +00:00
|
|
|
<br/>
|
2012-07-14 20:36:23 +00:00
|
|
|
<label string="If you don't 'Add in Quote', the exact price will be computed when invoicing based on delivery order(s)."
|
2012-07-14 12:54:56 +00:00
|
|
|
class="oe_edit_only"
|
|
|
|
attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
|
2012-06-10 08:35:15 +00:00
|
|
|
</div>
|
2012-06-10 10:32:54 +00:00
|
|
|
</group>
|
2012-05-25 10:26:43 +00:00
|
|
|
</xpath>
|
2010-04-23 11:50:16 +00:00
|
|
|
</field>
|
|
|
|
</record>
|
|
|
|
|
2008-06-29 08:26:07 +00:00
|
|
|
</data>
|
2011-07-29 14:03:24 +00:00
|
|
|
</openerp>
|