openerp-community-reviewer team mailing list archive

["Matthieu Dietrich @ camptocamp" <matthieu.dietrich@xxxxxxxxxxxxxx>]

Matthieu Dietrich @ camptocamp has proposed merging lp:~camptocamp/stock-logistic-report/7.0-replace-print-actions-mdh into lp:stock-logistic-report.

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

Requested reviews:
  Guewen Baconnier @ Camptocamp (gbaconnier-c2c)

For more details, see:
https://code.launchpad.net/~camptocamp/stock-logistic-report/7.0-replace-print-actions-mdh/+merge/225126

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
-- 
https://code.launchpad.net/~camptocamp/stock-logistic-report/7.0-replace-print-actions-mdh/+merge/225126
Your team Stock and Logistic Core Editors is subscribed to branch lp:stock-logistic-report.

=== 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>