pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merged Dhruti's branch for the bugfix of lp:739172

Browse Source 
bzr revid: jvo@tinyerp.com-20110404103003-p9b0uz7pvwte8al3
This commit is contained in:
Jay Vora (OpenERP)
2011-04-04 16:00:03 +05:30
parent 11466383f0 9c03ea93f1
commit 16a91fe13d
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/stock.py
+5 -5
View File
@@ -1248,9 +1248,9 @@ class stock_picking(osv.osv):
if new_picking:
move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})
for move in complete:
if prodlot_ids.get(move.id):
move_obj.write(cr, uid, [move.id], {'prodlot_id': prodlot_ids[move.id]})
for move in complete:
if prodlot_ids.get(move.id):
move_obj.write(cr, uid, [move.id], {'prodlot_id': prodlot_ids[move.id]})
for move in too_many:
product_qty = move_product_qty[move.id]
defaults = {
@@ -1463,7 +1463,7 @@ class stock_move(osv.osv):
_description = "Stock Move"
_order = 'date_expected desc, id'
_log_create = False
def action_partial_move(self, cr, uid, ids, context=None):
if context is None: context = {}
partial_id = self.pool.get("stock.partial.move").create(
@@ -1481,7 +1481,7 @@ class stock_move(osv.osv):
'domain': '[]',
'context': context
}
def name_get(self, cr, uid, ids, context=None):
res = []
addons/stock/wizard/stock_partial_picking.py
+1 -3
View File
@@ -142,8 +142,6 @@ class stock_partial_picking(osv.osv_memory):
@return: A dictionary which of fields with values.
"""
pick_obj = self.pool.get('stock.picking')
move_obj = self.pool.get('stock.move')
location_obj = self.pool.get('stock.location')
picking_ids = context.get('active_ids', False)
partial = self.browse(cr, uid, ids[0], context=context)
@@ -168,7 +166,7 @@ class stock_partial_picking(osv.osv_memory):
'product_currency': move.currency.id,
})
pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
return {}
return {'type': 'ir.actions.act_window_close'}
stock_partial_picking()