From e2b26d45229a4999978dca0815ec76fa47cf48f4 Mon Sep 17 00:00:00 2001
From: clesgow <quwo@odoo.com>
Date: Fri, 8 Mar 2024 15:34:07 +0100
Subject: [PATCH] [FIX] product_expiry: use new dict for lot zpl labels

The previous fix ae3ec52 introduced a dict to display the values
required in the zpl label template.
This change didn't also update the template inheriting this one, hence
the need for this fix.

closes odoo/odoo#157160

X-original-commit: 416d29a59fb310071c2b7ed25e3032968b23d966
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 .../report/report_lot_barcode.xml             | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/product_expiry/report/report_lot_barcode.xml b/addons/product_expiry/report/report_lot_barcode.xml
index 7ac43200d6c..78945209b19 100644
--- a/addons/product_expiry/report/report_lot_barcode.xml
+++ b/addons/product_expiry/report/report_lot_barcode.xml
@@ -21,50 +21,50 @@
 
 <template id="label_lot_template_view_expiry" inherit_id="stock.label_lot_template_view">
     <xpath expr="//t[@name='datamatrix_lot']" position="before">
-        <t t-if="lot.use_expiration_date">
-            <t t-if="lot.use_date">
-                <t t-set="final_barcode" t-value="(final_barcode or '') + '15' + lot.use_date.strftime('%y%m%d')"/>
+        <t t-if="lot['lot_record'].use_expiration_date">
+            <t t-if="lot['lot_record'].use_date">
+                <t t-set="final_barcode" t-value="(final_barcode or '') + '15' + lot['lot_record'].use_date.strftime('%y%m%d')"/>
 ^FO100,150
-^A0N,44,33^FDBest before: <t t-out="lot.use_date" t-options='{"widget": "date"}'/>^FS
+^A0N,44,33^FDBest before: <t t-out="lot['lot_record'].use_date" t-options='{"widget": "date"}'/>^FS
             </t>
-            <t t-if="lot.expiration_date">
-                <t t-set="final_barcode" t-value="(final_barcode or '') + '17' + lot.expiration_date.strftime('%y%m%d')"/>
-                    <t t-if="not lot.use_date">
+            <t t-if="lot['lot_record'].expiration_date">
+                <t t-set="final_barcode" t-value="(final_barcode or '') + '17' + lot['lot_record'].expiration_date.strftime('%y%m%d')"/>
+                    <t t-if="not lot['lot_record'].use_date">
 ^FO100,150
                     </t>
                     <t t-else="">
 ^FO100,200
                     </t>
-^A0N,44,33^FDUse by: <t t-out="lot.expiration_date" t-options='{"widget": "date"}'/>^FS
+^A0N,44,33^FDUse by: <t t-out="lot['lot_record'].expiration_date" t-options='{"widget": "date"}'/>^FS
             </t>
         </t>
     </xpath>
     <xpath expr="//t[@name='code128_barcode']" position="before">
-        <t t-elif="lot.use_expiration_date and (lot.use_date or lot.expiration_date)">
+        <t t-elif="lot['lot_record'].use_expiration_date and (lot['lot_record'].use_date or lot['lot_record'].expiration_date)">
 ^FO100,50
-^A0N,44,33^FD<t t-out="lot.product_id.display_name"/>^FS
+^A0N,44,33^FD<t t-out="lot['display_name_markup']"/>^FS
 ^FO100,100
-^A0N,44,33^FDLN/SN: <t t-out="lot.name"/>^FS
-            <t t-if="lot.use_date">
+^A0N,44,33^FDLN/SN: <t t-out="lot['name']"/>^FS
+            <t t-if="lot['lot_record'].use_date">
 ^FO100,150
-^A0N,44,33^FDBest before: <t t-out="lot.use_date" t-options='{"widget": "date"}'/>^FS
-                <t t-if="lot.expiration_date">
+^A0N,44,33^FDBest before: <t t-out="lot['lot_record'].use_date" t-options='{"widget": "date"}'/>^FS
+                <t t-if="lot['lot_record'].expiration_date">
 ^FO100,200
-^A0N,44,33^FDUse by: <t t-out="lot.expiration_date" t-options='{"widget": "date"}'/>^FS
+^A0N,44,33^FDUse by: <t t-out="lot['lot_record'].expiration_date" t-options='{"widget": "date"}'/>^FS
 ^FO100,250^BY3
                 </t>
                 <t t-else="">
 ^FO100,200^BY3
                 </t>
 ^BCN,100,Y,N,N
-^FD<t t-out="lot.name"/>^FS
+^FD<t t-out="lot['name']"/>^FS
             </t>
-            <t t-elif="lot.expiration_date">
+            <t t-elif="lot['lot_record'].expiration_date">
 ^FO100,150
-^A0N,44,33^FDUse by: <t t-out="lot.expiration_date" t-options='{"widget": "date"}'/>^FS
+^A0N,44,33^FDUse by: <t t-out="lot['lot_record'].expiration_date" t-options='{"widget": "date"}'/>^FS
 ^FO100,200^BY3
 ^BCN,100,Y,N,N
-^FD<t t-out="lot.name"/>^FS
+^FD<t t-out="lot['name']"/>^FS
             </t>
         </t>
     </xpath>