From 41bea4125cc898bbcc7ca14fa5be112512c67d8e Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Tue, 24 Jul 2018 12:02:27 +0200
Subject: [PATCH] [FIX] stock: Delivery slip with quantity = 0 until validation

Partial backport of https://github.com/odoo/odoo/commit/ccafe50500a803fe8c8345ab0318128a92bce3b5

Now the initial demand is used when the state is not done.

opw:1867906
---
 addons/stock/report/report_deliveryslip.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml
index e3163700ff8..11b274e84ab 100644
--- a/addons/stock/report/report_deliveryslip.xml
+++ b/addons/stock/report/report_deliveryslip.xml
@@ -49,7 +49,7 @@
                             </tr>
                         </tbody>
                     </table>
-                    <table class="table table-condensed mt48" t-if="not o.move_line_ids">
+                    <table class="table table-condensed mt48" t-if="o.state!='done'">
                         <thead>
                             <tr>
                                 <th><strong>Product</strong></th>
@@ -57,16 +57,17 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr t-foreach="o.move_lines" t-as="move">
+                            <t t-set="lines" t-value="o.move_lines.filtered(lambda x: x.product_uom_qty)"/>
+                            <tr t-foreach="lines" t-as="move">
                                 <td><span t-field="move.product_id"/></td>
                                 <td>
-                                    <span t-field="move.quantity_done"/>
+                                    <span t-field="move.product_uom_qty"/>
                                     <span t-field="move.product_uom"/>
                                 </td>
                             </tr>
                         </tbody>
                     </table>
-                    <table class="table table-condensed mt48" t-if="o.move_line_ids">
+                    <table class="table table-condensed mt48" t-if="o.move_line_ids and o.state=='done'">
                         <t t-set="has_serial_number" t-value="o.move_line_ids.mapped('lot_id')" groups="stock.group_production_lot"/>
                         <thead>
                             <tr>