Merge lp:~arthru/ocb-addons/fix-1334657 into lp:ocb-addons

Proposed by arthru
Status: Rejected
Rejected by: Holger Brunn (Therp)
Proposed branch: lp:~arthru/ocb-addons/fix-1334657
Merge into: lp:ocb-addons
Diff against target: 19 lines (+1/-1)
1 file modified
procurement/schedulers.py (+1/-1)
To merge this branch: bzr merge lp:~arthru/ocb-addons/fix-1334657
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) Disapprove
Pedro Manuel Baeza Needs Resubmitting
Review via email: mp+224623@code.launchpad.net

Description of the change

Fix the bug lp:1334657 : makes it possible to exit the loop

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

This project is now hosted on https://github.com/OCA/OCB. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

review: Needs Resubmitting
Revision history for this message
arthru (arthru) wrote :

Resubmited as pull request #29.

The method you recommended does not work for OCB as OCB in github is a combination of server, addons and web, and the branch in LP is just addons.

I just used the patch in git...

Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

Development for 7.0 has moved to github on https://github.com/OCA/ocb - please move your merge proposal there if it is still valid.

(I close and reject this in order to have a cleaner overview for 6.1 MPs which indeed have to be done on launchpad)

review: Disapprove

Unmerged revisions

10220. By Arthur Vuillard <email address hidden>

Fix bug lp:1334657

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'procurement/schedulers.py'
--- procurement/schedulers.py 2014-03-10 08:54:20 +0000
+++ procurement/schedulers.py 2014-06-26 13:31:59 +0000
@@ -82,7 +82,6 @@
82 if maxdate >= proc.date_planned:82 if maxdate >= proc.date_planned:
83 wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)83 wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
84 else:84 else:
85 offset += 1
86 report_later += 185 report_later += 1
8786
88 if proc.state == 'exception':87 if proc.state == 'exception':
@@ -91,6 +90,7 @@
91 proc.product_id.name))90 proc.product_id.name))
92 report_except += 191 report_except += 1
93 report_total += 192 report_total += 1
93 offset += len(ids)
94 if use_new_cursor:94 if use_new_cursor:
95 cr.commit()95 cr.commit()
96 if not ids:96 if not ids: