From 435e47385d777391750593702dfd39db2aaaad2d Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Mon, 20 Apr 2020 08:25:30 +0000
Subject: [PATCH] [FIX] stock: Internal note displayed in Delivery slip

Steps to reproduce the bug:

- Let's consider a consumable product P with an internal note IN
- Create a SO with P and confirm it
- Process the delivery and validate it
- Print the delivery slip

Bug:

The internal note NI was displayed on the delivery slip.

Fine tuning of https://github.com/odoo/odoo/commit/038221f3180a7a8888503553dbb5eb57875ef3a6

opw:2227613

closes odoo/odoo#49860

X-original-commit: 9b6ea1cdbed02c0f2ccd3e2608e4caf12c8c24ac
Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
---
 addons/stock/report/report_deliveryslip.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml
index 9d9b5dbdf71..5b6eb5aed6b 100644
--- a/addons/stock/report/report_deliveryslip.xml
+++ b/addons/stock/report/report_deliveryslip.xml
@@ -44,7 +44,7 @@
                             <tr t-foreach="lines" t-as="move">
                                 <td>
                                     <span t-field="move.product_id"/>
-                                    <p t-if="move.description_picking != move.product_id.description">
+                                    <p t-if="move.description_picking != move.product_id.description and move.description_picking != move.product_id.name">
                                         <span t-field="move.description_picking"/>
                                     </p>
                                 </td>
@@ -70,7 +70,7 @@
                             <tr t-foreach="o.move_line_ids" t-as="move_line">
                                 <td>
                                     <span t-field="move_line.product_id"/>
-                                    <p t-if="move_line.move_id.description_picking != move_line.product_id.name">
+                                    <p t-if="move_line.move_id.description_picking != move_line.product_id.description and move_line.move_id.description_picking != move_line.product_id.name">
                                         <span t-field="move_line.move_id.description_picking"/>
                                     </p>
                                 </td>