From 3c2a2f7aa3218fa0f677f3bbcde97616f92de607 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Tue, 5 May 2020 06:57:16 +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 in Dutch
- Create a SO with dutch partner P and confirm it
- Process the delivery and validate it
- Print the delivery slip

Bug:

The internal note IN was displayed on the delivery slip.
The internal note must never appear on a delivery slip.

opw:2227613

closes odoo/odoo#50689

X-original-commit: 4b8d9806c6ee0a85812041f25080617daa7b10f1
Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
---
 addons/stock/models/product.py              | 2 +-
 addons/stock/report/report_deliveryslip.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/models/product.py b/addons/stock/models/product.py
index e80aa0e6aea..ea9529e58b3 100644
--- a/addons/stock/models/product.py
+++ b/addons/stock/models/product.py
@@ -220,7 +220,7 @@ class Product(models.Model):
         if picking_code == 'incoming':
             return self.description_pickingin or description
         if picking_code == 'outgoing':
-            return self.description_pickingout or description
+            return self.description_pickingout or self.name
         if picking_code == 'internal':
             return self.description_picking or description
 
diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml
index 5b6eb5aed6b..925fed297ee 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 and move.description_picking != move.product_id.name">
+                                    <p t-if="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.description and move_line.move_id.description_picking != move_line.product_id.name">
+                                    <p t-if="move_line.move_id.description_picking != move_line.product_id.name">
                                         <span t-field="move_line.move_id.description_picking"/>
                                     </p>
                                 </td>