Improvements in stock management
bzr revid: fp@tinyerp.com-17c9301cd4d32b58d7fc676e491b01849e3603c5
This commit is contained in:
Fabien Pinckaers
parent
f355f0ce73
commit
e9e9792e1a
|
|
@ -137,18 +137,43 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
<record model="ir.ui.view" id="view_picking_withcarrier_form">
|
||||
<field name="name">delivery.stock.picking_withcarrier.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="inherit_id" ref="stock.view_picking_delivery_form" />
|
||||
<field name="arch" type="xml">
|
||||
<field name="address_id" position="after">
|
||||
<field name="volume" />
|
||||
<field name="weight" />
|
||||
<field name="carrier_id" />
|
||||
<field name="volume"/>
|
||||
<field name="weight"/>
|
||||
<field name="carrier_id"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_picking_withcarrier_out_form">
|
||||
<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="arch" type="xml">
|
||||
<field name="address_id" position="after">
|
||||
<field name="volume"/>
|
||||
<field name="weight"/>
|
||||
<field name="carrier_id"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_picking_withcarrier_delivery_form">
|
||||
<field name="name">delivery.stock.picking_withcarrier.delivery.form.view</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="inherit_id" ref="stock.view_picking_delivery_form" />
|
||||
<field name="arch" type="xml">
|
||||
<field name="address_id" position="after">
|
||||
<field name="volume"/>
|
||||
<field name="weight"/>
|
||||
<field name="carrier_id"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -85,13 +85,14 @@ class stock_location(osv.osv):
|
|||
|
||||
'chained_location_id': fields.many2one('stock.location', 'Chained Location If Fixed'),
|
||||
'chained_location_type': fields.selection([('','None'),('customer', 'Customer'),('fixed','Fixed Location')], 'Chained Location Type'),
|
||||
'chained_auto_packing': fields.boolean('Chained Auto-Packing'),
|
||||
|
||||
'address_id': fields.many2one('res.partner.address', 'Location Address'),
|
||||
|
||||
'comment': fields.text('Additional Information'),
|
||||
'posx': fields.integer('Corridor (X)', required=True),
|
||||
'posy': fields.integer('Shelves (Y)', required=True),
|
||||
'posz': fields.integer('Height (Z)', required=True)
|
||||
'posz': fields.integer('Height (Z)', required=True),
|
||||
}
|
||||
_defaults = {
|
||||
'active': lambda *a: 1,
|
||||
|
|
@ -114,9 +115,9 @@ class stock_location(osv.osv):
|
|||
|
||||
def picking_type_get(self, cr, uid, from_location, to_location, context={}):
|
||||
result = 'internal'
|
||||
if (to_location and to_location.usage=='customer'):
|
||||
if (from_location.usage=='internal') and (to_location and to_location.usage in ('customer','supplier')):
|
||||
result = 'delivery'
|
||||
elif from_location.usage=='supplier':
|
||||
elif (from_location.usage in ('supplier','customer')) and (to_location.usage=='internal'):
|
||||
result = 'in'
|
||||
return result
|
||||
|
||||
|
|
@ -445,7 +446,9 @@ class stock_picking(osv.osv):
|
|||
'type': ptype,
|
||||
'note': picking.note,
|
||||
'move_type': picking.move_type,
|
||||
'address_id': picking.address_id.id
|
||||
'auto_picking': todo[0].location_dest_id.chained_auto_packing,
|
||||
'address_id': picking.address_id.id,
|
||||
'invoice_state': 'none'
|
||||
})
|
||||
for move in todo:
|
||||
loc = self.pool.get('stock.location').chained_location_get(cr, uid, move.location_dest_id, picking.address_id.partner_id, move.product_id).id
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
<?xml version="1.0"?>
|
||||
<terp>
|
||||
<data>
|
||||
<menuitem name="Inventory Control" id="menu_stock_root" icon="terp-stock"/>
|
||||
<menuitem name="Inventory Control/Configuration" groups="base.group_admin"
|
||||
sequence="1"/>
|
||||
<menuitem name="Stock Management" id="menu_stock_root" icon="terp-stock"/>
|
||||
<menuitem name="Configuration" groups="base.group_admin"
|
||||
sequence="1" id="menu_stock_configuration"
|
||||
parent="menu_stock_root"/>
|
||||
|
||||
=============================
|
||||
Inventory Line
|
||||
|
|
@ -75,21 +76,25 @@
|
|||
</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window" id="action_inventory_form">
|
||||
<field name="name">Physical Inventory</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">stock.inventory</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_inventory_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Physical Inventory" id="menu_action_inventory_form" action="action_inventory_form"/>
|
||||
<menuitem parent="menu_stock_root" id="menu_action_inventory_form" action="action_inventory_form"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_inventory_line_form">
|
||||
<field name="name">Inventory Lines</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">stock.inventory.line</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="stock_inventory_line_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Physical Inventory/Lot Inventory Line" id="menu_action_inventory_line_form" action="action_inventory_line_form"/>
|
||||
<menuitem parent="menu_action_inventory_form"
|
||||
id="menu_action_inventory_line_form"
|
||||
action="action_inventory_line_form"/>
|
||||
|
||||
|
||||
=============================
|
||||
|
|
@ -123,13 +128,16 @@
|
|||
</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window" id="action_tracking_form">
|
||||
<field name="name">Tracking Lots</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">stock.tracking</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_tracking_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Traceability" sequence="2"/>
|
||||
<menuitem name="Inventory Control/Traceability/Tracking Lots " id="menu_action_tracking_form" action="action_tracking_form"/>
|
||||
<menuitem name="Traceability" sequence="2" parent="menu_stock_root" id="menu_traceability"/>
|
||||
<menuitem parent="menu_traceability"
|
||||
id="menu_action_tracking_form"
|
||||
action="action_tracking_form"/>
|
||||
|
||||
<record model="ir.ui.view" id="lot_line_tree">
|
||||
<field name="name">stock.tracking.tree</field>
|
||||
|
|
@ -145,42 +153,6 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
<record model="ir.ui.view" id="view_lot_tree">
|
||||
<field name="name">stock.lot.tree</field>
|
||||
<field name="model">stock.lot</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Stock Lot">
|
||||
<field name="name"/>
|
||||
<field name="tracking"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_lot_form">
|
||||
<field name="name">stock.lot.form</field>
|
||||
<field name="model">stock.lot</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Stock Lot">
|
||||
<field name="name" colspan="4" select="1"/>
|
||||
<field name="active" select="1"/>
|
||||
<field name="tracking" select="1"/>
|
||||
<newline/>
|
||||
<field name="move_ids" colspan="4" nolabel="1" widget="one2many_list"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window" id="action_lot_form">
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">stock.lot</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_lot_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Traceability/Consumer Lots" id="menu_action_lot_form" action="action_lot_form"/>
|
||||
-->
|
||||
|
||||
<record model="ir.ui.view" id="view_production_lot_revision_form">
|
||||
<field name="name">stock.production.lot.revision.form</field>
|
||||
<field name="model">stock.production.lot.revision</field>
|
||||
|
|
@ -238,12 +210,15 @@
|
|||
</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window" id="action_production_lot_form">
|
||||
<field name="name">Production Lots</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">stock.production.lot</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_production_lot_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Traceability/Production Lots" id="menu_action_production_lot_form" action="action_production_lot_form"/>
|
||||
<menuitem parent="menu_traceability"
|
||||
id="menu_action_production_lot_form"
|
||||
action="action_production_lot_form"/>
|
||||
|
||||
|
||||
#
|
||||
|
|
@ -353,6 +328,7 @@
|
|||
<field name="address_id"/>
|
||||
<field name="chained_location_type"/>
|
||||
<field name="chained_location_id"/>
|
||||
<field name="chained_auto_packing"/>
|
||||
<newline/>
|
||||
<field name="comment" colspan="4"/>
|
||||
</page>
|
||||
|
|
@ -380,12 +356,16 @@
|
|||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_location_form">
|
||||
<field name="name">Locations</field>
|
||||
<field name="res_model">stock.location</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_location_tree2"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Configuration/Locations" id="menu_action_location_form" action="action_location_form"/>
|
||||
<menuitem
|
||||
parent="menu_stock_configuration"
|
||||
id="menu_action_location_form"
|
||||
action="action_location_form"/>
|
||||
|
||||
<record model="ir.ui.view" id="view_location_tree">
|
||||
<field name="name">stock.location.tree</field>
|
||||
|
|
@ -400,13 +380,17 @@
|
|||
</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window" id="action_location_tree">
|
||||
<field name="name">Locations Structure</field>
|
||||
<field name="res_model">stock.location</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="domain">[('location_id','=',False)]</field>
|
||||
<field name="view_type">tree</field>
|
||||
<field name="view_id" ref="view_location_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Locations Structure" id="menu_action_location_tree" action="action_location_tree"/>
|
||||
<menuitem
|
||||
parent="menu_stock_root"
|
||||
id="menu_action_location_tree"
|
||||
action="action_location_tree"/>
|
||||
|
||||
=============================
|
||||
Warehouse
|
||||
|
|
@ -441,12 +425,16 @@
|
|||
</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window" id="action_warehouse_form">
|
||||
<field name="name">Warehouses</field>
|
||||
<field name="res_model">stock.warehouse</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_warehouse_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Configuration/Warehouses" id="menu_action_warehouse_form" action="action_warehouse_form"/>
|
||||
<menuitem
|
||||
parent="menu_stock_configuration"
|
||||
id="menu_action_warehouse_form"
|
||||
action="action_warehouse_form"/>
|
||||
|
||||
=============================
|
||||
Packing
|
||||
|
|
@ -540,6 +528,88 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
#
|
||||
# Delivery Orders
|
||||
#
|
||||
|
||||
<record model="ir.ui.view" id="view_picking_delivery_tree">
|
||||
<field name="name">stock.picking.delivery.tree</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Packing list" color="red:state=='cancel'">
|
||||
<field name="name" select="1" colspan="4"/>
|
||||
<field name="date" select="1"/>
|
||||
<field name="address_id" select="1"/>
|
||||
<field name="origin" select="1"/>
|
||||
<field name="state" readonly="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_picking_delivery_form">
|
||||
<field name="name">stock.picking.delivery.form</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Packing list">
|
||||
<notebook>
|
||||
<page string="General Information">
|
||||
<field name="name" select="1"/>
|
||||
<field name="date" select="1"/>
|
||||
<newline/>
|
||||
<field name="address_id" select="2"/>
|
||||
<field name="move_lines" widget="one2many_list" colspan="4" nolabel="1">
|
||||
<form string="Stock Moves">
|
||||
<separator string="Move Information" colspan="4"/>
|
||||
<field name="product_id" colspan="4" select="1" on_change="onchange_product_id(product_id, parent.location_id, parent.location_dest_id)" context="location=parent.location_id"/>
|
||||
<field name="product_uom" select="1"/>
|
||||
<field name="product_qty" select="1"/>
|
||||
<field name="product_uos" groups="product.group_uos"/>
|
||||
<field name="product_uos_qty" groups="product.group_uos"/>
|
||||
<field name="name" select="1" colspan="4" invisible="1"/>
|
||||
<field name="date" invisible="1"/>
|
||||
<field name="date_planned"/>
|
||||
<field name="location_id" select="1"/>
|
||||
<field name="location_dest_id" select="1"/>
|
||||
<field name="product_packaging" groups="base.group_extended"/>
|
||||
<field name="prodlot_id" select="1" context="product_id=product_id"/>
|
||||
<field name="tracking_id" select="1" groups="base.group_extended"/>
|
||||
<separator string="Move State" colspan="4"/>
|
||||
<field name="state" select="1"/>
|
||||
<group>
|
||||
<button name="force_assign" string="Force assignation" states="confirmed" type="object"/>
|
||||
<button name="cancel_assign" string="Cancel assignation" states="assigned" type="object"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
<group colspan="4" col="7">
|
||||
<label colspan="6"/>
|
||||
<button type="action" name="%(move_split)d" string="Split in Two"/>
|
||||
</group>
|
||||
<group colspan="4" col="8">
|
||||
<field name="state" readonly="1"/>
|
||||
<button name="button_confirm" string="Confirm" states="draft"/>
|
||||
<button name="action_assign" string="Assign" states="confirmed" type="object"/>
|
||||
<button name="force_assign" string="Force Assignation" states="confirmed" type="object"/>
|
||||
<button name="cancel_assign" string="Cancel Assignation" states="assigned" type="object"/>
|
||||
<button type="action" name="%(partial_picking)d" string="Validate" states="assigned"/>
|
||||
<button name="button_cancel" string="Cancel" states="assigned,confirmed,draft"/>
|
||||
</group>
|
||||
</page><page string="Notes">
|
||||
<field name="note" nolabel="1" colspan="4"/>
|
||||
</page><page string="Others info">
|
||||
<field name="origin" select="2"/>
|
||||
<field name="active" select="2"/>
|
||||
<field name="auto_picking"/>
|
||||
<newline/>
|
||||
<field name="move_type"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record model="ir.actions.act_window" id="action_picking_tree_delivery">
|
||||
<field name="name">Delivery Orders</field>
|
||||
<field name="res_model">stock.picking</field>
|
||||
|
|
@ -549,10 +619,24 @@
|
|||
<field name="domain">[('type','=','delivery')]</field>
|
||||
<field name="context">{'contact_display': 'partner'}</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_tree_delivery_view1">
|
||||
<field name="sequence" eval="1"/>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="view_id" ref="view_picking_delivery_tree"/>
|
||||
<field name="act_window_id" ref="action_picking_tree_delivery"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_tree_delivery_view2">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="view_picking_delivery_form"/>
|
||||
<field name="act_window_id" ref="action_picking_tree_delivery"/>
|
||||
</record>
|
||||
|
||||
<menuitem
|
||||
parent="menu_stock_root"
|
||||
id="menu_action_picking_tree_delivery"
|
||||
sequence="20"
|
||||
groups="base.group_extended"
|
||||
action="action_picking_tree_delivery"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_picking_tree2_delivery">
|
||||
|
|
@ -564,6 +648,18 @@
|
|||
<field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
|
||||
<field name="context">{'contact_display': 'partner'}</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_tree_delivery_view1_toproc">
|
||||
<field name="sequence" eval="1"/>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="view_id" ref="view_picking_delivery_tree"/>
|
||||
<field name="act_window_id" ref="action_picking_tree2_delivery"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_tree_delivery_view2_toproc">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="view_picking_delivery_form"/>
|
||||
<field name="act_window_id" ref="action_picking_tree2_delivery"/>
|
||||
</record>
|
||||
<menuitem
|
||||
parent="menu_action_picking_tree_delivery"
|
||||
action="action_picking_tree2_delivery"
|
||||
|
|
@ -578,11 +674,104 @@
|
|||
<field name="domain">[('state','=','confirmed'),('type','=','delivery')]</field>
|
||||
<field name="context">{'contact_display': 'partner'}</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_tree_delivery_view1_waiting">
|
||||
<field name="sequence" eval="1"/>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="view_id" ref="view_picking_delivery_tree"/>
|
||||
<field name="act_window_id" ref="action_picking_tree3_delivery"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_tree_delivery_view2_waiting">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="view_picking_delivery_form"/>
|
||||
<field name="act_window_id" ref="action_picking_tree3_delivery"/>
|
||||
</record>
|
||||
<menuitem
|
||||
parent="menu_action_picking_tree_delivery"
|
||||
id="menu_action_picking_tree3_delivery"
|
||||
action="action_picking_tree3_delivery"/>
|
||||
|
||||
#
|
||||
# Sending Products
|
||||
#
|
||||
|
||||
<record model="ir.ui.view" id="view_picking_out_tree">
|
||||
<field name="name">stock.picking.out.tree</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Packing list" color="red:state=='cancel'">
|
||||
<field name="name" select="1" colspan="4"/>
|
||||
<field name="date" select="1"/>
|
||||
<field name="address_id" select="1"/>
|
||||
<field name="invoice_state" readonly="1"/>
|
||||
<field name="origin" select="1"/>
|
||||
<field name="state" readonly="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_picking_out_form">
|
||||
<field name="name">stock.picking.out.form</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Packing list">
|
||||
<notebook>
|
||||
<page string="General Information">
|
||||
<field name="name" select="1"/>
|
||||
<field name="date" select="1"/>
|
||||
<newline/>
|
||||
<field name="address_id" select="2"/>
|
||||
<field name="move_lines" widget="one2many_list" colspan="4" nolabel="1">
|
||||
<form string="Stock Moves">
|
||||
<separator string="Move Information" colspan="4"/>
|
||||
<field name="product_id" colspan="4" select="1" on_change="onchange_product_id(product_id, parent.location_id, parent.location_dest_id)" context="location=parent.location_id"/>
|
||||
<field name="product_uom" select="1"/>
|
||||
<field name="product_qty" select="1"/>
|
||||
<field name="product_uos" groups="product.group_uos"/>
|
||||
<field name="product_uos_qty" groups="product.group_uos"/>
|
||||
<field name="name" select="1" colspan="4" invisible="1"/>
|
||||
<field name="date" invisible="1"/>
|
||||
<field name="date_planned"/>
|
||||
<field name="location_id" select="1"/>
|
||||
<field name="location_dest_id" select="1"/>
|
||||
<field name="product_packaging" groups="base.group_extended"/>
|
||||
<field name="prodlot_id" select="1" context="product_id=product_id"/>
|
||||
<field name="tracking_id" select="1" groups="base.group_extended"/>
|
||||
<separator string="Move State" colspan="4"/>
|
||||
<field name="state" select="1"/>
|
||||
<group>
|
||||
<button name="force_assign" string="Force assignation" states="confirmed" type="object"/>
|
||||
<button name="cancel_assign" string="Cancel assignation" states="assigned" type="object"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
<group colspan="4" col="7">
|
||||
<label colspan="6"/>
|
||||
<button type="action" name="%(move_split)d" string="Split in Two"/>
|
||||
</group>
|
||||
<group colspan="4" col="8">
|
||||
<field name="state" readonly="1"/>
|
||||
<button name="button_confirm" string="Confirm" states="draft"/>
|
||||
<button name="action_assign" string="Assign" states="confirmed" type="object"/>
|
||||
<button name="force_assign" string="Force Assignation" states="confirmed" type="object"/>
|
||||
<button name="cancel_assign" string="Cancel Assignation" states="assigned" type="object"/>
|
||||
<button type="action" name="%(partial_picking)d" string="Validate" states="assigned"/>
|
||||
<button name="button_cancel" string="Cancel" states="assigned,confirmed,draft"/>
|
||||
</group>
|
||||
</page><page string="Notes">
|
||||
<field name="note" nolabel="1" colspan="4"/>
|
||||
</page><page string="Others info">
|
||||
<field name="origin" select="2"/>
|
||||
<field name="active" select="2"/>
|
||||
<field name="auto_picking"/>
|
||||
<newline/>
|
||||
<field name="move_type"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_picking_tree">
|
||||
<field name="name">Sending Goods</field>
|
||||
|
|
@ -593,6 +782,18 @@
|
|||
<field name="domain">[('type','=','out')]</field>
|
||||
<field name="context">{'contact_display': 'partner'}</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_tree_out_view1_waiting">
|
||||
<field name="sequence" eval="1"/>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="view_id" ref="view_picking_out_tree"/>
|
||||
<field name="act_window_id" ref="action_picking_tree"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_tree_out_view2_waiting">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="view_picking_out_form"/>
|
||||
<field name="act_window_id" ref="action_picking_tree"/>
|
||||
</record>
|
||||
<menuitem
|
||||
parent="menu_stock_root"
|
||||
sequence="19"
|
||||
|
|
@ -608,10 +809,23 @@
|
|||
<field name="domain">[('state','=','assigned'),('type','=','out')]</field>
|
||||
<field name="context">{'contact_display': 'partner'}</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_tree2_out_view1">
|
||||
<field name="sequence" eval="1"/>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="view_id" ref="view_picking_out_tree"/>
|
||||
<field name="act_window_id" ref="action_picking_tree2"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_tree2_out_view2">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="view_picking_out_form"/>
|
||||
<field name="act_window_id" ref="action_picking_tree2"/>
|
||||
</record>
|
||||
<menuitem
|
||||
parent="menu_action_picking_tree"
|
||||
action="action_picking_tree2"
|
||||
action="action_picking_tree2"
|
||||
id="menu_picking_waiting"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_picking_tree3">
|
||||
<field name="name">Confirmed Packings Waiting Assignation</field>
|
||||
<field name="res_model">stock.picking</field>
|
||||
|
|
@ -621,6 +835,18 @@
|
|||
<field name="domain">[('state','=','confirmed'),('type','=','out')]</field>
|
||||
<field name="context">{'contact_display': 'partner'}</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_tree3_out_view1">
|
||||
<field name="sequence" eval="1"/>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="view_id" ref="view_picking_out_tree"/>
|
||||
<field name="act_window_id" ref="action_picking_tree3"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_tree3_out_view2">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="view_picking_out_form"/>
|
||||
<field name="act_window_id" ref="action_picking_tree3"/>
|
||||
</record>
|
||||
<menuitem
|
||||
parent="menu_action_picking_tree"
|
||||
id="menu_action_picking_tree3"
|
||||
|
|
@ -629,7 +855,21 @@
|
|||
#
|
||||
# Reception of Goods
|
||||
#
|
||||
|
||||
<record model="ir.ui.view" id="view_picking_in_tree">
|
||||
<field name="name">stock.picking.in.tree</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Packing list" color="red:state=='cancel'">
|
||||
<field name="name" select="1" colspan="4"/>
|
||||
<field name="date" select="1"/>
|
||||
<field name="address_id" select="1"/>
|
||||
<field name="invoice_state" readonly="1"/>
|
||||
<field name="origin" select="1"/>
|
||||
<field name="state" readonly="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_picking_in_form">
|
||||
<field name="name">stock.picking.in.form</field>
|
||||
<field name="model">stock.picking</field>
|
||||
|
|
@ -720,6 +960,7 @@
|
|||
<record model="ir.actions.act_window.view" id="action_invoice_tree5_view1">
|
||||
<field name="sequence" eval="1"/>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="view_id" ref="view_picking_in_tree"/>
|
||||
<field name="act_window_id" ref="action_picking_tree4"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_invoice_tree5_view2">
|
||||
|
|
@ -744,6 +985,18 @@
|
|||
<field name="domain">[('state','=','assigned'),('type','=','in')]</field>
|
||||
<field name="context">{'contact_display': 'partner'}</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_invoice_tree6_view1">
|
||||
<field name="sequence" eval="1"/>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="view_id" ref="view_picking_in_tree"/>
|
||||
<field name="act_window_id" ref="action_picking_tree5"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_invoice_tree6_view2">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="view_picking_in_form"/>
|
||||
<field name="act_window_id" ref="action_picking_tree5"/>
|
||||
</record>
|
||||
<menuitem
|
||||
parent="menu_action_picking_tree4"
|
||||
id="menu_action_picking_tree5"
|
||||
|
|
@ -758,6 +1011,18 @@
|
|||
<field name="context">{'contact_display': 'partner'}</field>
|
||||
<field name="domain">[('type','=','in')]</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_form_view1">
|
||||
<field name="sequence" eval="1"/>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="view_id" ref="view_picking_in_tree"/>
|
||||
<field name="act_window_id" ref="action_picking_form"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_picking_form_view2">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="view_picking_in_form"/>
|
||||
<field name="act_window_id" ref="action_picking_form"/>
|
||||
</record>
|
||||
<menuitem
|
||||
parent="menu_action_picking_tree4"
|
||||
id="menu_action_picking_form"
|
||||
|
|
@ -850,6 +1115,11 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<menuitem
|
||||
name="Low Level"
|
||||
id="menu_traceability_low"
|
||||
parent="menu_traceability"/>
|
||||
|
||||
<record model="ir.ui.view" id="view_move_form">
|
||||
<field name="name">stock.move.form</field>
|
||||
<field name="model">stock.move</field>
|
||||
|
|
@ -886,12 +1156,16 @@
|
|||
</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window" id="action_move_form2">
|
||||
<field name="name">Stock Moves</field>
|
||||
<field name="res_model">stock.move</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_move_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Traceability/Low Level/Moves" id="menu_action_move_form2" action="action_move_form2"/>
|
||||
<menuitem
|
||||
parent="menu_traceability_low"
|
||||
id="menu_action_move_form2"
|
||||
action="action_move_form2"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_move_form3">
|
||||
<field name="name">Draft Moves</field>
|
||||
|
|
@ -901,7 +1175,10 @@
|
|||
<field name="domain">[('state','=','draft')]</field>
|
||||
<field name="view_id" ref="view_move_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Traceability/Low Level/Moves/Draft Moves" id="menu_action_move_form3" action="action_move_form3"/>
|
||||
<menuitem
|
||||
parent="menu_action_move_form2"
|
||||
id="menu_action_move_form3"
|
||||
action="action_move_form3"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_move_form4">
|
||||
<field name="name">Assigned Moves</field>
|
||||
|
|
@ -911,7 +1188,23 @@
|
|||
<field name="domain">[('state','=','assigned')]</field>
|
||||
<field name="view_id" ref="view_move_tree"/>
|
||||
</record>
|
||||
<menuitem name="Inventory Control/Traceability/Low Level/Moves/Assigned Moves" id="menu_action_move_form4" action="action_move_form4"/>
|
||||
<menuitem
|
||||
parent="menu_action_move_form2"
|
||||
id="menu_action_move_form4"
|
||||
action="action_move_form4"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_picking_all">
|
||||
<field name="name">All Packings</field>
|
||||
<field name="res_model">stock.picking</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="context">{'contact_display': 'partner'}</field>
|
||||
</record>
|
||||
<menuitem
|
||||
parent="menu_traceability_low"
|
||||
id="menu_action_picking_all"
|
||||
action="action_picking_all"/>
|
||||
|
||||
|
||||
# -------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in New Issue