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

[FIX] fixes 

bzr revid: qdp-launchpad@openerp.com-20130730140505-4g9k59j3xzkq0pkx
This commit is contained in:
Quentin (OpenERP) 2013-07-30 16:05:05 +02:00
parent 3fe258af58
commit 9c9f1746a1
3 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/stock/procurement.py
View File

@ -83,7 +83,8 @@ class procurement_order(osv.osv):
'location_dest_id': procurement.rule_id.location_id.id,
'move_dest_id': procurement.move_dest_id and procurement.move_dest_id.id or False,
'group_id': procurement.group_id and procurement.group_id.id or False,
'rule_id': procurement.rule_id.id,
'rule_id': procurement.rule_id.id,
'picking_type_id': procurement.rule_id.picking_type_id.id,
}
def _run(self, cr, uid, procurement, context=None):

16
addons/stock/stock.py
View File

@ -567,8 +567,8 @@ class stock_picking(osv.osv):
context = context or {}
for pick in self.browse(cr, uid, ids, context=context):
ids2 = [move.id for move in pick.move_lines]
move_obj.action_cancel(cr, uid, ids2, ctx)
move_obj.unlink(cr, uid, ids2, ctx)
move_obj.action_cancel(cr, uid, ids2, context=context)
move_obj.unlink(cr, uid, ids2, context=context)
return super(stock_picking, self).unlink(cr, uid, ids, context=context)
# Methods for partial pickings
@ -1102,11 +1102,13 @@ class stock_move(osv.osv):
return False
context = context or {}
pick_obj = self.pool.get("stock.picking")
picks = pick_obj.search(cr, uid, [
('group_id', '=', move.group_id and move.group_id.id or False),
('location_id', '=', move.location_id.id),
('location_dest_id', '=', move.location_dest_id.id),
('state', 'in', ['confirmed', 'auto'])], context=context)
picks = []
if move.group_id:
picks = pick_obj.search(cr, uid, [
('group_id', '=', move.group_id.id),
('location_id', '=', move.location_id.id),
('location_dest_id', '=', move.location_dest_id.id),
('state', 'in', ['confirmed', 'auto'])], context=context)
if picks:
pick = picks[0]
else:

23
addons/stock/stock_view.xml
View File

@ -670,7 +670,7 @@
</record>
<record id="action_picking_tree" model="ir.actions.act_window">
<field name="name">Internal Moves</field>
<field name="name">Moves</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@ -689,23 +689,6 @@
</field>
</record>
<record model="ir.actions.act_window.view" id="action_picking_tree_tree_view">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="vpicktree"/>
<field name="act_window_id" ref="action_picking_tree"/>
</record>
<record model="ir.actions.act_window.view" id="action_picking_tree_form_view">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="view_picking_form"/>
<field name="act_window_id" ref="action_picking_tree"/>
</record>
<menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="0"/>
<record id="view_move_tree" model="ir.ui.view">
<field name="name">stock.move.tree</field>
<field name="model">stock.move</field>
@ -944,8 +927,6 @@
<field name="res_model">stock</field>
</record>
<menuitem action="action_stock_stock_ui" id="menu_action_stock_stock_ui" parent="menu_stock_warehouse_mgmt" sequence="4"/>
<!--
Reception Picking (By Stock Move)
From stock_partial_move_view
@ -1207,7 +1188,7 @@
</div>
<div class="oe_items_list">
<div>
<a name="%(action_picking_tree)d" type="action">
<a name="%(action_picking_tree)d" type="action" domain="[('picking_type_id', '=', record.id)]" context="{'toto': 1}">
<field name="count_picking"/>
<t t-esc="record.name.raw_value"/>
</a>