Merge lp:~camptocamp/openobject-addons/7.0-fix_1220716-rha+srt+afe into lp:openobject-addons/7.0
Status: | Needs review |
---|---|
Proposed branch: | lp:~camptocamp/openobject-addons/7.0-fix_1220716-rha+srt+afe |
Merge into: | lp:openobject-addons/7.0 |
Diff against target: |
126 lines (+61/-13) 4 files modified
purchase_requisition/purchase_requisition.py (+37/-6) purchase_requisition/test/cancel_purchase_requisition.yml (+6/-6) purchase_requisition/test/purchase_requisition.yml (+11/-0) purchase_requisition/test/purchase_requisition_demo.yml (+7/-1) |
To merge this branch: | bzr merge lp:~camptocamp/openobject-addons/7.0-fix_1220716-rha+srt+afe |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+209937@code.launchpad.net |
Description of the change
I rebased the changes of Rifakat <email address hidden> on top of the 7.0 branch, fixing the conflicts in the way Stefan Rijnhart (Therp) (stefan-therp) suggested in the other MP, and added fixes I made for OCB in order to repair the tests so that runbot should be green for this branch.
Unmerged revisions
- 9878. By Alexandre Fayolle - camptocamp
-
[FIX] purchase_
requisition: fix broken test cancel_
purchase_ requisition. yml:
* use a different requisition from the one processed int purchase_requision. yml
* fix the 'I delete requisition' step which used to destroy a purchase.orderpurchase_
requisition. yml:
* add a check taht the purchase.requisition cannot be cancelled if the purchase.order are not cancelled first. - 9877. By Rifakat Husen (OpenERP)
-
[IMP] refactorize code by adding new function to be reused from unlink() and tender_cancel()
- 9876. By Rifakat Husen (OpenERP)
-
[FIX] purchase_
requisition: restricitng deletion of PR and also imp for cancelling PR
Hi,
_requisition_ procurement_ cancel( ) would become private method, could we change the name? What do you say?
Regards.