Merge lp:~openerp-commiter/openobject-addons/6.0-bug-739172-dhs into lp:openobject-addons/6.0

Proposed by Dhruti Shastri(OpenERP)
Status: Merged
Merged at revision: 4504
Proposed branch: lp:~openerp-commiter/openobject-addons/6.0-bug-739172-dhs
Merge into: lp:openobject-addons/6.0
Diff against target: 34 lines (+5/-5)
1 file modified
stock/stock.py (+5/-5)
To merge this branch: bzr merge lp:~openerp-commiter/openobject-addons/6.0-bug-739172-dhs
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+56127@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stock/stock.py'
--- stock/stock.py 2011-03-29 15:45:24 +0000
+++ stock/stock.py 2011-04-04 10:16:39 +0000
@@ -1248,9 +1248,9 @@
12481248
1249 if new_picking:1249 if new_picking:
1250 move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})1250 move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})
1251 for move in complete:1251 for move in complete:
1252 if prodlot_ids.get(move.id):1252 if prodlot_ids.get(move.id):
1253 move_obj.write(cr, uid, [move.id], {'prodlot_id': prodlot_ids[move.id]})1253 move_obj.write(cr, uid, [move.id], {'prodlot_id': prodlot_ids[move.id]})
1254 for move in too_many:1254 for move in too_many:
1255 product_qty = move_product_qty[move.id]1255 product_qty = move_product_qty[move.id]
1256 defaults = {1256 defaults = {
@@ -1463,7 +1463,7 @@
1463 _description = "Stock Move"1463 _description = "Stock Move"
1464 _order = 'date_expected desc, id'1464 _order = 'date_expected desc, id'
1465 _log_create = False1465 _log_create = False
1466 1466
1467 def action_partial_move(self, cr, uid, ids, context=None):1467 def action_partial_move(self, cr, uid, ids, context=None):
1468 if context is None: context = {}1468 if context is None: context = {}
1469 partial_id = self.pool.get("stock.partial.move").create(1469 partial_id = self.pool.get("stock.partial.move").create(
@@ -1481,7 +1481,7 @@
1481 'domain': '[]',1481 'domain': '[]',
1482 'context': context1482 'context': context
1483 }1483 }
1484 1484
14851485
1486 def name_get(self, cr, uid, ids, context=None):1486 def name_get(self, cr, uid, ids, context=None):
1487 res = []1487 res = []