Unifield Addons

Merge lp:~unifield-team/unifield-addons/bklg-22 into lp:unifield-addons

  1. bklg-22
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4651
Proposed branch: lp:~unifield-team/unifield-addons/bklg-22
Merge into: lp:unifield-addons
Diff against target: 28 lines (+4/-3)
2 files modified
procurement/schedulers.py (+2/-1)
stock/stock.py (+2/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/bklg-22
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+254385@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 'procurement/schedulers.py'
2--- procurement/schedulers.py 2014-10-02 19:51:54 +0000
3+++ procurement/schedulers.py 2015-03-27 12:51:12 +0000
4@@ -306,7 +306,8 @@
5
6 prods = location_obj._product_virtual_get(cr, uid,
7 op.location_id.id, [opl.product_id.id],
8- {'uom': opl.product_uom_id.id})[opl.product_id.id]
9+ {'uom': opl.product_uom_id.id},
10+ ['confirmed', 'waiting', 'assigned', 'done', 'hidden'])[opl.product_id.id]
11
12 if prods < opl.product_min_qty:
13 qty = max(opl.product_min_qty, opl.product_max_qty)-prods
14
15=== modified file 'stock/stock.py'
16--- stock/stock.py 2015-02-05 16:24:18 +0000
17+++ stock/stock.py 2015-03-27 12:51:12 +0000
18@@ -360,8 +360,8 @@
19 location_ids = self.search(cr, uid, [('location_id', 'child_of', ids)])
20 return self._product_get_multi_location(cr, uid, location_ids, product_ids, context, states)
21
22- def _product_virtual_get(self, cr, uid, id, product_ids=False, context=None, states=['done']):
23- return self._product_all_get(cr, uid, id, product_ids, context, ['confirmed', 'waiting', 'assigned', 'done'])
24+ def _product_virtual_get(self, cr, uid, id, product_ids=False, context=None, states=['confirmed', 'waiting', 'assigned', 'done']):
25+ return self._product_all_get(cr, uid, id, product_ids, context, states=states)
26
27 def _product_reserve(self, cr, uid, ids, product_id, product_qty, location_dest_id, context=None, lock=False):
28 """

Subscribers

People subscribed via source and target branches

to all changes: