pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] stock: Internal note displayed in Delivery slip

Browse Source 
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>
This commit is contained in:
Goffin Simon
2020-05-05 15:35:26 +00:00
parent 9b33848ad9
commit 3c2a2f7aa3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/models/product.py
+1 -1
View File
@@ -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
addons/stock/report/report_deliveryslip.xml
+2 -2
View File
@@ -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>