Merge lp:~camptocamp/stock-logistic-report/7.0-replace-print-actions-mdh into lp:stock-logistic-report

[Matthieu Dietrich @ camptocamp]

[IMP] modify both buttons 'Print Delivery Order' to use the Webkit report

This is an improvement of the fix introduced in lp:~camptocamp/stock-logistic-report/7.0-button-print-delivery-order.
The issue was that XPath in OpenERP replaces only the first element found, so the "Print Delivery Order" button for the 'done' state still used the old report instead of the new one.

Now, both buttons are matched and replaced.

Regards,
Matthieu Dietrich

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

review: Approve (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks

review: Approve (code review)

[Leonardo Pistone (lepistone)]

lgtm

review: Approve

[Leonardo Pistone (lepistone)]

I moved that to https://github.com/OCA/stock-logistics-reporting/pull/2

As it was approved here, I will merge it as soon as the tests pass.

Thanks!

Unmerged revisions

10. By Matthieu Dietrich @ camptocamp on 2014-07-01

[FIX] replace both Print buttons with the new action

=== modified file 'stock_picking_webkit/stock_view.xml'
--- stock_picking_webkit/stock_view.xml	2013-12-23 14:06:02 +0000
+++ stock_picking_webkit/stock_view.xml	2014-07-01 09:18:19 +0000
@@ -6,7 +6,10 @@
             <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="delivery.view_delivery_order_inherit_stock"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/header//button[@string='Print Delivery Order']" position="attributes">
+                <xpath expr="/form/header//button[@string='Print Delivery Order' and @states='confirmed,assigned']" position="attributes">
+                    <attribute name="name">%(stock.report_picking_list_out)d</attribute>
+                </xpath>
+                <xpath expr="/form/header//button[@string='Print Delivery Order' and @states='done']" position="attributes">
                     <attribute name="name">%(stock.report_picking_list_out)d</attribute>
                 </xpath>
             </field>