odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]stock_picking_wave: add wave_id field in stock_picking in/out view(s) 

bzr revid: csn@openerp.com-20130701143909-yq3r3d4ho1z86f0z
This commit is contained in:
Cedric Snauwaert 2013-07-01 16:39:09 +02:00
parent 7e33764455
commit 28d89cc504
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/stock_picking_wave/stock_picking_wave.py
View File

@ -28,7 +28,7 @@ class stock_picking_wave(osv.osv):
class stock_picking(osv.osv):
_inherit = "stock.picking"
_columns = {
'wave_id': fields.many2one('picking.wave', 'Picking Wave', help='Picking wave associated to this picking'),
'wave_id': fields.many2one('stock.picking.wave', 'Picking Wave', help='Picking wave associated to this picking'),
}
def wave_confirm_picking(self, cr, uid, ids, context=None):
@ -49,4 +49,16 @@ class stock_picking(osv.osv):
"""
for id in ids:
workflow.trg_validate(uid, 'stock.picking', id, 'button_cancel', cr)
return True
return True
class stock_picking_in(osv.osv):
_inherit = "stock.picking.in"
_columns = {
'wave_id': fields.many2one('stock.picking.wave', 'Picking Wave', help='Picking wave associated to this picking'),
}
class stock_picking_out(osv.osv):
_inherit = "stock.picking.out"
_columns = {
'wave_id': fields.many2one('stock.picking.wave', 'Picking Wave', help='Picking wave associated to this picking'),
}

37
addons/stock_picking_wave/stock_picking_wave_view.xml
View File

@ -78,5 +78,42 @@
</field>
</record>
<menuitem action="action_picking_wave" id="menu_action_picking_wave" parent="stock.menu_stock_warehouse_mgmt" sequence="30"/>
<record model="ir.ui.view" id="view_stock_picking_wave_inherit">
<field name="name">stock.picking.wave.inherit.form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='auto_picking']" position="after">
<field name="wave_id"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="view_stock_picking_in_wave_inherit">
<field name="name">stock.picking.in.wave.inherit.form</field>
<field name="model">stock.picking.in</field>
<field name="inherit_id" ref="stock.view_picking_in_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='auto_picking']" position="after">
<field name="wave_id"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="view_stock_picking_out_wave_inherit">
<field name="name">stock.picking.out.wave.inherit.form</field>
<field name="model">stock.picking.out</field>
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='auto_picking']" position="after">
<field name="wave_id"/>
</xpath>
</field>
</record>
</data>
</openerp>