OpenERP for Humanitarian NGOs

Merge lp://qastaging/~camptocamp/openerp-humanitarian-ngo/add-bid_selected_state_on_po-nbi into lp://qastaging/openerp-humanitarian-ngo/purchase-wkfl

Proposed by Nicolas Bessi - Camptocamp on 2014-01-08

Status:	Merged
Approved by:	Yannick Vaucher @ Camptocamp on 2014-02-06
Approved revision:	79
Merged at revision:	73
Proposed branch:	lp://qastaging/~camptocamp/openerp-humanitarian-ngo/add-bid_selected_state_on_po-nbi
Merge into:	lp://qastaging/openerp-humanitarian-ngo/purchase-wkfl
Diff against target:	253 lines (+96/-25) 6 files modified purchase_extended/model/purchase_order.py (+8/-2) purchase_extended/test/process/bid2order.yml (+8/-3) purchase_extended/workflow/purchase_order.xml (+14/-0) purchase_requisition_extended/model/purchase_order.py (+2/-0) purchase_requisition_extended/model/purchase_requisition.py (+63/-20) purchase_requisition_extended/view/purchase_requisition.xml (+1/-0)
To merge this branch:	bzr merge lp://qastaging/~camptocamp/openerp-humanitarian-ngo/add-bid_selected_state_on_po-nbi
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Yannick Vaucher @ Camptocamp	code review, no tests		Approve on 2014-02-06
Romain Deheele - Camptocamp (community)	code review		Approve on 2014-02-06
Joël Grand-Guillaume @ camptocamp	code review + test	2014-01-08	Approve on 2014-02-06
Review via email: mp+200799@code.qastaging.launchpad.net

[ADD] a bid selected state on PO
[FIX] confirmation of cost estimate. PO in state bid will be cancel too

Add a bid selected state on PO
Fix confirmation of cost estimate. PO in state bid will be cancel too

Revision history for this message

Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote on 2014-01-08:

Add a bid selected state on PO
Fix confirmation of cost estimate. PO in state bid will be cancel too

74. By Nicolas Bessi <email address hidden> on 2014-01-08: [FIX] on change product line on po line to allows manual creation of purchase order
75. By Nicolas Bessi <email address hidden> on 2014-01-09: [FIX] test do not use draftbid state but sent state as we can not send context to the server
76. By Joël Grand-Guillaume @ camptocamp on 2014-01-28: [ADD] The pricelist on the requisition and bid creation process
77. By Joël Grand-Guillaume @ camptocamp on 2014-01-29: [IMP] Add a pricelist in tendering process
78. By Nicolas Bessi - Camptocamp on 2014-02-06: [MRG] from head

Revision history for this message

Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote on 2014-02-06:

LGTM, Thanks !

review: Approve (code review + test)

Revision history for this message

Romain Deheele - Camptocamp (romaindeheele) wrote on 2014-02-06:

LGTM,

Romain

review: Approve (code review)

79. By Yannick Vaucher @ Camptocamp on 2014-02-06: [IMP] assign single dict value using key instead of using update

Revision history for this message

Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote on 2014-02-06:

LGTM

review: Approve (code review, no tests)

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

People subscribed via source and target branches

to all changes: