Merge lp:~camptocamp/ocb-addons/ocb-7.0-fix-1108228-hip-afe into lp:ocb-addons

Proposed by Alexandre Fayolle - camptocamp
Status: Merged
Merged at revision: 9579
Proposed branch: lp:~camptocamp/ocb-addons/ocb-7.0-fix-1108228-hip-afe
Merge into: lp:ocb-addons
Diff against target: 19 lines (+10/-0)
1 file modified
stock/wizard/stock_invoice_onshipping_view.xml (+10/-0)
To merge this branch: bzr merge lp:~camptocamp/ocb-addons/ocb-7.0-fix-1108228-hip-afe
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) code review Approve
Stefan Rijnhart (Opener) Approve
Christophe CHAUVET code review, not test Approve
Review via email:
To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

this is used in production

Revision history for this message
Christophe CHAUVET (christophe-chauvet) wrote :

Hi Alexandre

It's ok for me, ne a difficult patch to review


review: Approve (code review, not test)
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Thanks! I checked that its the same as the original patch by the OpenERP dev on trunk (and that it makes sense).

Email address of the original author is not recognized by Launchpad, maybe it's a tinyerp address. Could be checked out at merge time.

review: Approve
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Hi Holger,

thanks for the merge. At merge time, you don't have to specify the --fixes argument. This is already included in the merged revisions. It also tells Launchpad that the series branch fixes the bug, which is technically correct but not informative. The --fixes argument should be applied to the bug fixing branch only.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock/wizard/stock_invoice_onshipping_view.xml'
2--- stock/wizard/stock_invoice_onshipping_view.xml 2012-10-23 16:05:04 +0000
3+++ stock/wizard/stock_invoice_onshipping_view.xml 2013-09-27 10:40:01 +0000
4@@ -40,5 +40,15 @@
5 view_type="form"
6 target="new"
7 id="action_stock_invoice_onshipping"/>
9+ <act_window name="Create Invoices"
10+ res_model="stock.invoice.onshipping"
11+ src_model="stock.picking"
12+ key2="client_action_multi"
13+ multi="True"
14+ view_mode="form"
15+ view_type="form"
16+ target="new"
17+ id="action_stock_invoice_onshipping"/>
18 </data>
19 </openerp>