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
1=== modified file 'stock/stock.py'
2--- stock/stock.py 2011-03-29 15:45:24 +0000
3+++ stock/stock.py 2011-04-04 10:16:39 +0000
4@@ -1248,9 +1248,9 @@
5
6 if new_picking:
7 move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})
8- for move in complete:
9- if prodlot_ids.get(move.id):
10- move_obj.write(cr, uid, [move.id], {'prodlot_id': prodlot_ids[move.id]})
11+ for move in complete:
12+ if prodlot_ids.get(move.id):
13+ move_obj.write(cr, uid, [move.id], {'prodlot_id': prodlot_ids[move.id]})
14 for move in too_many:
15 product_qty = move_product_qty[move.id]
16 defaults = {
17@@ -1463,7 +1463,7 @@
18 _description = "Stock Move"
19 _order = 'date_expected desc, id'
20 _log_create = False
21-
22+
23 def action_partial_move(self, cr, uid, ids, context=None):
24 if context is None: context = {}
25 partial_id = self.pool.get("stock.partial.move").create(
26@@ -1481,7 +1481,7 @@
27 'domain': '[]',
28 'context': context
29 }
30-
31+
32
33 def name_get(self, cr, uid, ids, context=None):
34 res = []