OpenERP-USA Localization

Merge lp:~serpent-consulting-services/openerp-usa/stock_assigned_picker-bin_location into lp:openerp-usa/6.0

  1. stock_assigned_picker-bin_location
  2. Merge into openerp-usa-6.0
Proposed by Serpent Consulting Services
Status: Merged
Merged at revision: 117
Proposed branch: lp:~serpent-consulting-services/openerp-usa/stock_assigned_picker-bin_location
Merge into: lp:openerp-usa/6.0
Diff against target: 19 lines (+5/-4)
1 file modified
stock_assigned_picker/report/pick_list.py (+5/-4)
To merge this branch: bzr merge lp:~serpent-consulting-services/openerp-usa/stock_assigned_picker-bin_location
Reviewer Review Type Date Requested Status
npg Pending
Review via email: mp+133726@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_assigned_picker/report/pick_list.py'
2--- stock_assigned_picker/report/pick_list.py 2012-10-25 15:30:09 +0000
3+++ stock_assigned_picker/report/pick_list.py 2012-11-09 18:07:25 +0000
4@@ -57,10 +57,11 @@
5 ship_ids = picking_pool.search(self.cr, self.uid, [('assigned_picker', '=', id), ('state', 'in', ['assigned'])])
6 for pick in picking_pool.browse(self.cr, self.uid, ship_ids):
7 for move in pick.move_lines:
8- if (move.product_id.name, move.location_id.name, move.product_id.default_code, move.location_dest_id.name) not in orig:
9- orig[(move.product_id.name, move.location_id.name, move.product_id.default_code, move.location_dest_id.name)] = []
10- ret[(move.product_id.name, move.location_id.name, move.product_id.default_code, move.location_dest_id.name)] = ret.get((move.product_id.name, move.location_id.name, move.product_id.default_code,move.location_dest_id.name), 0) + move.product_qty
11- orig[(move.product_id.name, move.location_id.name, move.product_id.default_code, move.location_dest_id.name)].append(pick.origin)
12+ bin_loc = move.product_id.loc_rack or ''
13+ if (move.product_id.name, move.location_id.name, move.product_id.default_code, bin_loc) not in orig:
14+ orig[(move.product_id.name, move.location_id.name, move.product_id.default_code, bin_loc)] = []
15+ ret[(move.product_id.name, move.location_id.name, move.product_id.default_code, bin_loc)] = ret.get((move.product_id.name, move.location_id.name, move.product_id.default_code,bin_loc), 0) + move.product_qty
16+ orig[(move.product_id.name, move.location_id.name, move.product_id.default_code, bin_loc)].append(pick.origin)
17 for key in ret:
18 ret[key] = (ret[key], orig[key])
19 temp_res = [(x, y) for x, y in ret.items()]

Subscribers

People subscribed via source and target branches