Merge lp:~openerp-dev/openobject-addons/trunk-bug-1108228-hip into lp:openobject-addons

[Hiral Patel (OpenERP)]

[Ajay Patel (OpenERP) (ajay-openerp)]

seems ok..

Thanks,
Amit

review: Approve

Unmerged revisions

8523. By Hiral Patel (OpenERP) on 2013-01-29

[trunk][FIX] action_stock_invoice_onshipping missing on stock.picking

=== modified file 'stock/wizard/stock_invoice_onshipping_view.xml'
--- stock/wizard/stock_invoice_onshipping_view.xml	2012-11-29 22:26:45 +0000
+++ stock/wizard/stock_invoice_onshipping_view.xml	2013-01-29 12:23:21 +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>