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

[Alexandre Fayolle - camptocamp]

Port of https://code.launchpad.net/~camptocamp/openobject-addons/7.0-fix-1108228-hip-afe/+merge/187994 to OCB

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

this is used in production

[Christophe CHAUVET (christophe-chauvet)]

Hi Alexandre

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

Regards,

review: Approve (code review, not test)

[Stefan Rijnhart (Opener) (stefan-opener)]

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

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[Stefan Rijnhart (Opener) (stefan-opener)]

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.

=== modified file 'stock/wizard/stock_invoice_onshipping_view.xml'
--- stock/wizard/stock_invoice_onshipping_view.xml	2012-10-23 16:05:04 +0000
+++ stock/wizard/stock_invoice_onshipping_view.xml	2013-09-27 10:40:01 +0000
@@ -40,5 +40,15 @@
             view_type="form"
             target="new"
             id="action_stock_invoice_onshipping"/>
+
+        <act_window name="Create Invoices"
+            res_model="stock.invoice.onshipping"
+            src_model="stock.picking"
+            key2="client_action_multi"
+            multi="True"
+            view_mode="form"
+            view_type="form"
+            target="new"
+            id="action_stock_invoice_onshipping"/>
     </data>
 </openerp>