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

[FIX] stock: fixed crossdock route priority + [IMP] added the possibility to group picking by group_id 

bzr revid: qdp-launchpad@openerp.com-20131022160312-p5o0i7fd6m6kd21y
This commit is contained in:
Quentin (OpenERP) 2013-10-22 18:03:12 +02:00
parent 533d176df7
commit 87450a8f13
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/stock/stock.py
View File

@ -664,7 +664,11 @@ class stock_picking(osv.osv):
'product_id': fields.related('move_lines', 'product_id', type='many2one', relation='product.product', string='Product'),#?
'location_id': fields.related('move_lines', 'location_id', type='many2one', relation='stock.location', string='Location', readonly=True),
'location_dest_id': fields.related('move_lines', 'location_dest_id', type='many2one', relation='stock.location', string='Destination Location', readonly=True),
'group_id': fields.related('move_lines', 'group_id', type='many2one', relation='procurement.group', string='Procurement Group', readonly=True),
'group_id': fields.related('move_lines', 'group_id', type='many2one', relation='procurement.group', string='Procurement Group', readonly=True,
store={
'stock.picking': (lambda cr, uid, ids, c: ids, ['move_lines'], 10),
'stock.move': (_get_pickings, ['group_id', 'picking_id'], 10),
}),
}
_defaults = {
@ -2434,6 +2438,7 @@ class stock_warehouse(osv.osv):
'product_selectable': True,
'product_categ_selectable': True,
'active': warehouse.delivery_steps != 'ship_only' and warehouse.reception_steps != 'one_step',
'sequence': 20,
}
def create_routes(self, cr, uid, ids, warehouse, context=None):

2
addons/stock/stock_view.xml
View File

@ -751,6 +751,7 @@
<field name="state"/>
<field name="priority"/>
<field name="picking_type_id" invisible="1"/>
<field name="group_id" invisible="1"/>
</tree>
</field>
</record>
@ -862,6 +863,7 @@
<filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/>
<filter string="Origin" domain="[]" context="{'group_by':'origin'}"/>
<filter string="Picking Type" domain="[]" context="{'group_by':'picking_type_id'}"/>
<filter string="Procurement Group" domain="[]" context="{'group_by':'group_id'}"/>
</group>
</search>
</field>