Merge lp:~camptocamp/openobject-addons/7.0-purchase_requisition-fixes-gbr into lp:~openerp-dev/openobject-addons/7.0-purchase-improvement-csn-jba

Proposed by Guewen Baconnier @ Camptocamp
Status: Needs review
Proposed branch: lp:~camptocamp/openobject-addons/7.0-purchase_requisition-fixes-gbr
Merge into: lp:~openerp-dev/openobject-addons/7.0-purchase-improvement-csn-jba
To merge this branch: bzr merge lp:~camptocamp/openobject-addons/7.0-purchase_requisition-fixes-gbr
Reviewer Review Type Date Requested Status
Joël Grand-Guillaume @ camptocamp (community) code review + tests Approve
Jacques-Etienne Baudoux Pending
Cedric Snauwaert (OpenERP) Pending
Review via email:

Commit message

[IMP] introduce methods to customize how the purchase quotations are generated from the bids, cleanings

Description of the change

Hi Cedric,

I made some changes on the purchase_requisition module, can you review and merge it in your branch before you make a proposal for your own branch please?

 - Extracted _prepare_po_from_tender() and _prepare_po_line_from_tender() from generate_po() in purchase_requisition so we can customize the values in sub-modules
 - took the opportunity improve generate_po() (rev. 26)
 - some fixes (see details in bzr log)


To post a comment you must log in.
Revision history for this message
Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote :

Hi Cedric,

Would be good to have this one included before you propose your branch to be merged in trunk.



review: Approve (code review + tests)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

I just received this notification: Launchpad encountered an internal error during the following operation: generating the diff for a merge proposal. It was logged with id OOPS-d3750cfe9a7aaea702cd6dece54299ca. Sorry for the inconvenience.

So we have no diff here... I don't know if we can regenerate it.

BTW you may want to do a merge from the main branch before merging this one because this has been done here.

Unmerged revisions

37. By Guewen Baconnier @ Camptocamp on 2013-09-06

[FIX] open_product_line() returns an action, the action should not propagate the current context but use its own one (so it will have the correct active_model, active_ids and so on)

36. By Jacques-Etienne Baudoux on 2013-09-04

[IMP]purchase_requisition: fixed pep8 in last fix

35. By Jacques-Etienne Baudoux on 2013-09-04

[FIX]purchase_requisition: generated PO must be linked to the call for bids, but not for manual PO copy. Also, at PO generation, ensure the selected bid is in state bid

34. By Guewen Baconnier @ Camptocamp on 2013-09-04

[FIX] use context_today for the date of the purchase order

33. By Guewen Baconnier @ Camptocamp on 2013-09-04

[FIX] purchase_requisition.date_start is a datetime field

32. By Guewen Baconnier @ Camptocamp on 2013-08-29

[MRG] from main branch

31. By Guewen Baconnier @ Camptocamp on 2013-08-27

[FIX] purchase_order.date_order should be UTC when we write in the server and local TZ when we set the _defaults (for the webclient)

30. By Guewen Baconnier @ Camptocamp on 2013-08-27

[FIX] the field on purchase.order is date_order, not order_date

29. By Guewen Baconnier @ Camptocamp on 2013-08-23

[MRG] from lp:ocb-addons/7.0

28. By Guewen Baconnier @ Camptocamp on 2013-08-22

[IMP] extracted '_prepare' method to be able to customize the creation of po from tenders

Diff calculation failed

Calculating the branch diff failed. You can manually schedule an update if required.


People subscribed via source and target branches

to all changes: