Unifield Addons

Merge lp:~unifield-team/unifield-addons/us-407 into lp:unifield-addons

  1. us-407
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4667
Proposed branch: lp:~unifield-team/unifield-addons/us-407
Merge into: lp:unifield-addons
Diff against target: 25 lines (+8/-0)
1 file modified
procurement/schedulers.py (+8/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/us-407
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+263871@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 2015-04-08 15:30:51 +0000
3+++ procurement/schedulers.py 2015-07-06 09:08:31 +0000
4@@ -67,6 +67,12 @@
5 cr = pooler.get_db(use_new_cursor).cursor()
6 wf_service = netsvc.LocalService("workflow")
7
8+ if context.get('run_id'):
9+ run_ids = self.pool.get('procurement.purchase.compute.all.running').search(cr, uid, [], context=context)
10+ while len(run_ids) > 1:
11+ time.sleep(5)
12+ run_ids = self.pool.get('procurement.purchase.compute.all.running').search(cr, uid, [], context=context)
13+
14 procurement_obj = self.pool.get('procurement.order')
15 if not ids:
16 ids = procurement_obj.search(cr, uid, [], order="date_planned")
17@@ -160,6 +166,8 @@
18 self._hook_request_vals(cr, uid, request_vals=request_vals, context=context)
19 request.create(cr, uid, request_vals)
20
21+ if context.get('run_id'):
22+ self.pool.get('procurement.purchase.compute.all.running').unlink(cr, uid, [context.get('run_id')], context=context)
23 if use_new_cursor:
24 cr.commit()
25 finally:

Subscribers

People subscribed via source and target branches

to all changes: