From f613ce968d4d57eef6c215f38411737bcb458171 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Fri, 21 Oct 2022 10:05:28 +0000
Subject: [PATCH] [FIX] base, stock, delivery: replace support datamatrix
 barcode printing

This reverts commit 3ebe1185a497718a4d2a303d363a1a923dd9effe.

The code ECC200DataMatrix already exist in reportlab (that is already a dependance).
Some differences:
- ECC200DataMatrix only supports a Type 12 (44x44) C40 encoded data matrix.
  (214 alphanumeric characters and 14 to 27% of error correcting rate)
- pylibdmtx support more type and add a default to 24x24. So it means a
  (52 characters and 20 to 35% error correcting rate). It's also smaller
  to display.

We consider the gain too small compare to maintain an extra lib.

It also fix blured datamatrix in stock report if they contains too much
data.

*If you want to test 001234560000000018 is a valid sscc for package

closes odoo/odoo#106620

X-original-commit: 54ef19f41ffc4a6f715474b65a4183a7fa75feea
Related: odoo/enterprise#34422
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/delivery/views/report_package_barcode.xml |  2 +-
 addons/stock/i18n/stock.pot                      |  3 +--
 addons/stock/report/report_lot_barcode.xml       |  4 ++--
 addons/stock/report/report_package_barcode.xml   | 12 ++++++------
 addons/stock/views/res_config_settings_views.xml |  2 +-
 odoo/addons/base/models/ir_actions_report.py     | 14 ++++----------
 6 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/addons/delivery/views/report_package_barcode.xml b/addons/delivery/views/report_package_barcode.xml
index c1976e3459e..f37e723b63f 100644
--- a/addons/delivery/views/report_package_barcode.xml
+++ b/addons/delivery/views/report_package_barcode.xml
@@ -35,7 +35,7 @@
             </t>
         </xpath>
         <xpath expr="//div[hasclass('o_packaging_type')]" position="after">
-            <t t-if="o.valid_sscc and env['ir.actions.report'].datamatrix_available()">
+            <t t-if="o.valid_sscc">
                 <!-- SSCC uses weight if necessary/available, standard barcode will not -->
                 <div t-if="o.shipping_weight" class="col-auto"><strong>Shipping Weight: </strong><span t-field="o.shipping_weight"/> <t t-out="o.weight_uom_name"/></div>
                 <div t-elif="o.weight" class="col-auto"><strong>Weight: </strong><span t-field="o.weight"/> <t t-out="o.weight_uom_name"/></div>
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index c5a2a965bb6..8d93df69184 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -8486,8 +8486,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid ""
 "Use GS1 nomenclature datamatrix whenever barcodes are printed for lots and "
-"serial numbers. Printing datamatrix requires extra software. If software "
-"can't be found then 1D barcodes will be printed."
+"serial numbers."
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/report/report_lot_barcode.xml b/addons/stock/report/report_lot_barcode.xml
index 76d8b1fc203..76dfe877cdb 100644
--- a/addons/stock/report/report_lot_barcode.xml
+++ b/addons/stock/report/report_lot_barcode.xml
@@ -23,13 +23,13 @@
                                     <div class="o_label_4x12" name="lot_name">
                                         LN/SN: <span t-field="o.name"/>
                                     </div>
-                                    <t t-if="env.user.has_group('stock.group_stock_lot_print_gs1') and env['ir.actions.report'].datamatrix_available()">
+                                    <t t-if="env.user.has_group('stock.group_stock_lot_print_gs1')">
                                         <!-- ensure we clear barcode string when multi-record print -->
                                         <t t-set="final_barcode" t-value="''"/>
                                         <t t-if="o.product_id.valid_ean" t-set="final_barcode" t-value="'01' + '0' * (14 - len(o.product_id.barcode)) + o.product_id.barcode"/>
                                         <t name="gs1_datamatrix_lot" t-if="o.product_id.tracking == 'lot'" t-set="final_barcode" t-value="(final_barcode or '') + '10' + o.name"/>
                                         <t t-elif="o.product_id.tracking == 'serial'" t-set="final_barcode" t-value="(final_barcode or '') + '21' + o.name"/>
-                                        <div t-if="final_barcode" t-att-style="'position:absolute; right:.5px; bottom:.5px'" t-out="final_barcode" t-options="{'widget': 'barcode', 'symbology': 'DataMatrix', 'width': 45, 'height': 45}"/>
+                                        <div t-if="final_barcode" t-att-style="'position:absolute; right:.5px; bottom:.5px'" t-out="final_barcode" t-options="{'widget': 'barcode', 'symbology': 'ECC200DataMatrix', 'img_style': 'width:17mm; height:17mm'}"/>
                                     </t>
                                     <t t-else="">
                                         <div t-field="o.name" t-options="{'widget': 'barcode', 'img_style': 'width:100%; height:35%'}"/>
diff --git a/addons/stock/report/report_package_barcode.xml b/addons/stock/report/report_package_barcode.xml
index ec5108af68a..f722a92ab76 100644
--- a/addons/stock/report/report_package_barcode.xml
+++ b/addons/stock/report/report_package_barcode.xml
@@ -16,11 +16,11 @@
                               <h1 t-field="o.name" class="mt0 float-start"/>
                             </th>
                             <th name="td_pk_barcode" style="text-align: center">
-                                <t t-if="o.valid_sscc and env['ir.actions.report'].datamatrix_available()">
+                                <t t-if="o.valid_sscc">
                                     <div class="row text-start">
                                         <t t-set="barcode" t-value="'00' + o.name"/>
                                         <t t-if="o.pack_date" t-set="barcode" t-value="barcode + '13' + o.pack_date.strftime('%y%m%d')"/>
-                                        <div class="col-3" name="datamatrix_barcode" style="margin: 0px 20px 40px 60px" t-out="barcode" t-options="{'widget': 'barcode', 'symbology': 'DataMatrix', 'width': 100, 'height': 100}"/>
+                                        <div class="col-3" name="datamatrix_barcode" style="margin: 0px 20px 40px 60px" t-out="barcode" t-options="{'widget': 'barcode', 'symbology': 'ECC200DataMatrix', 'width': 100, 'height': 100}"/>
                                     </div>
                                 </t>
                                 <t t-else="">
@@ -42,7 +42,7 @@
                     </div>
                     <table class="table table-sm table-striped" style="border-bottom: 0px solid white !important;">
                         <t t-set="has_serial_number" t-value="o.quant_ids.mapped('lot_id')" />
-                        <t t-set="has_ean_barcode" t-value="env['ir.actions.report'].datamatrix_available() and any(valid_ean for valid_ean in o.quant_ids.product_id.mapped('valid_ean'))" />
+                        <t t-set="has_ean_barcode" t-value="any(valid_ean for valid_ean in o.quant_ids.product_id.mapped('valid_ean'))" />
                         <thead>
                             <tr>
                                 <th>Product</th>
@@ -84,7 +84,7 @@
                                         <!-- TODO: lot/sn ALWAYS has to be last part of barcode since left padding '0's = different sn/lot name match when scanning => fix when FNC1 can be used,  -->
                                         <t name="product_barcode_lot_datamatrix" t-if="l.product_id.tracking == 'lot' and l.lot_id" t-set="product_barcode" t-value="product_barcode + '10' + l.lot_id.name"/>
                                         <t t-elif="l.product_id.tracking == 'serial' and l.lot_id" t-set="product_barcode" t-value="product_barcode + '21' +  l.lot_id.name"/>
-                                        <span t-out="product_barcode" t-options="{'widget': 'barcode', 'symbology': 'DataMatrix', 'width': 45, 'height': 45}"/>
+                                        <span t-out="product_barcode" t-options="{'widget': 'barcode', 'symbology': 'ECC200DataMatrix', 'img_style': 'width:17mm;height:17mm'}"/>
                                     </t>
                                 </td>
                             </tr>
@@ -102,11 +102,11 @@
             <t>
                 <div class="page">
                     <div class="oe_structure"/>
-                    <t t-if="o.valid_sscc and env['ir.actions.report'].datamatrix_available()">
+                    <t t-if="o.valid_sscc">
                         <div class="row">
                             <t t-set="barcode" t-value="'00' + o.name"/>
                             <t t-if="o.pack_date" t-set="barcode" t-value="barcode + '13' + o.pack_date.strftime('%y%m%d')"/>
-                            <div class="col-5 text-end" name="datamatrix_barcode" style="margin: 0px 20px 40px 60px" t-out="barcode" t-options="{'widget': 'barcode', 'symbology': 'DataMatrix', 'width': 200, 'height': 200}"/>
+                            <div class="col-5 text-end" name="datamatrix_barcode" style="margin: 0px 20px 40px 60px" t-out="barcode" t-options="{'widget': 'barcode', 'symbology': 'ECC200DataMatrix', 'width': 200, 'height': 200}"/>
                             <div class="col-7 text-start" style="font-size:20px;">
                                 <div class="row">SSCC: <span t-field="o.name"/></div>
                                 <div t-if="o.pack_date" class="row">Pack Date: <span t-field="o.pack_date"/></div>
diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml
index 4e43367f592..7c6c2978b47 100644
--- a/addons/stock/views/res_config_settings_views.xml
+++ b/addons/stock/views/res_config_settings_views.xml
@@ -350,7 +350,7 @@
                                         <field name="group_stock_lot_print_gs1" class="col-lg-1 ml16 mr0"/>
                                         <div class="col ps-0">
                                             <label for="group_stock_lot_print_gs1"/>
-                                            <div class="text-muted">Use GS1 nomenclature datamatrix whenever barcodes are printed for lots and serial numbers. Printing datamatrix requires extra software. If software can't be found then 1D barcodes will be printed.</div>
+                                            <div class="text-muted">Use GS1 nomenclature datamatrix whenever barcodes are printed for lots and serial numbers.</div>
                                         </div>
                                     </div>
                                 </div>
diff --git a/odoo/addons/base/models/ir_actions_report.py b/odoo/addons/base/models/ir_actions_report.py
index a44078447ec..d682b0e10e1 100644
--- a/odoo/addons/base/models/ir_actions_report.py
+++ b/odoo/addons/base/models/ir_actions_report.py
@@ -42,12 +42,6 @@ try:
 except Exception:
     pass
 
-datamatrix_available = True
-try:
-    from pylibdmtx import pylibdmtx
-except Exception:
-    _logger.info('A package may be missing to print Data Matrix barcodes: pylibdmtx or libdmtx.')
-    datamatrix_available = False
 
 def _get_wkhtmltopdf_bin():
     return find_in_path('wkhtmltopdf')
@@ -221,7 +215,7 @@ class IrActionsReport(models.Model):
 
         :return: Boolean
         '''
-        return datamatrix_available
+        return True
 
     def get_paperformat(self):
         return self.paperformat_id or self.env.company.paperformat_id
@@ -542,9 +536,9 @@ class IrActionsReport(models.Model):
         elif barcode_type == 'auto':
             symbology_guess = {8: 'EAN8', 13: 'EAN13'}
             barcode_type = symbology_guess.get(len(value), 'Code128')
-        elif barcode_type == 'DataMatrix' and not self.datamatrix_available():
-            # fallback to avoid stacktrack because reportlab won't recognize the type and error message isn't useful/will be blocking
-            barcode_type = 'Code128'
+        elif barcode_type == 'DataMatrix':
+            # Prevent a crash due to a lib change from pylibdmtx to reportlab
+            barcode_type = 'ECC200DataMatrix'
         elif barcode_type == 'QR':
             # for `QR` type, `quiet` is not supported. And is simply ignored.
             # But we can use `barBorder` to get a similar behaviour.