From 4066d1869ee6800778a899fdfa2c56f4585e53d6 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Dufays <pydu@odoo.com>
Date: Thu, 22 Dec 2022 14:50:30 +0000
Subject: [PATCH] [FIX] stock: fix digest tip layout

The text and the image were overlapping in the digest tip about "Tip: Speed up
inventory operations with barcodes". This solves the problem.

Technical note: actually, the layout has been broken in 15.2 because the image
has been updated with another ratio (from that version the CDN is used instead
of an image on the server). To support more client and as it looks ok even on
small device even with the 2 columns (text-image), we have used a table for the
layout.

Task-3097167

closes odoo/odoo#111737

X-original-commit: 7b6c82f2bc0f0d3931d6bd7c571cf4854eb4bd86
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
---
 addons/digest/data/digest_data.xml | 10 ----------
 addons/stock/data/digest_data.xml  | 25 +++++++++++++------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/addons/digest/data/digest_data.xml b/addons/digest/data/digest_data.xml
index 956c9ea9d07..b4cd5515874 100644
--- a/addons/digest/data/digest_data.xml
+++ b/addons/digest/data/digest_data.xml
@@ -245,16 +245,6 @@
                 #powered {
                     margin-top: 15px;
                 }
-                .tip_twocol {
-                    overflow: auto;
-                    margin-top: 15px;
-                }
-                .tip_twocol_left {
-                    text-align: left;
-                }
-                .tip_twocol_img {
-                    width: 90%;
-                }
             }
 
             @media only screen and (min-width: 651px) {
diff --git a/addons/stock/data/digest_data.xml b/addons/stock/data/digest_data.xml
index bb086e05f12..74b61a7e87b 100644
--- a/addons/stock/data/digest_data.xml
+++ b/addons/stock/data/digest_data.xml
@@ -6,18 +6,19 @@
             <field name="sequence">1000</field>
             <field name="group_id" ref="stock.group_stock_user" />
             <field name="tip_description" type="html">
-<div>
-    <p class="tip_title">Tip: Speed up inventory operations with barcodes</p>
-    <div class="tip_twocol">
-        <div class="tip_twocol_left" style="float: left; width: 45%;">
-            <img src="https://download.odoocdn.com/digests/stock/static/src/img/barcode.gif" class="tip_twocol_img" />
-        </div>
-        <div style="float: left; width: 55%;">
-            <p class="tip_content" style="margin: 0;">Enjoy a quick-paced experience with the Odoo barcode app. It is blazing fast and works even without a stable internet connection. It supports all flows: inventory adjustments, batch picking, moving lots or pallets, low inventory checks, etc. Go to the "Apps" menu to activate the barcode interface.</p>
-        </div>
-    </div>
-    <div style="clear: both;" />
-</div>
+<p class="tip_title">Tip: Speed up inventory operations with barcodes</p>
+<table role="presentation" cellspacing="0" cellpadding="0" border="0" style="width: 100%; margin-top: 5px;">
+    <tbody>
+        <tr>
+            <td width="33%">
+                <img src="https://download.odoocdn.com/digests/stock/static/src/img/barcode.gif" width="100%"/>
+            </td>
+            <td width="67%" style="padding-left: 20px; vertical-align: text-top;">
+                <p class="tip_content">Enjoy a quick-paced experience with the Odoo barcode app. It is blazing fast and works even without a stable internet connection. It supports all flows: inventory adjustments, batch picking, moving lots or pallets, low inventory checks, etc. Go to the "Apps" menu to activate the barcode interface.</p>
+            </td>
+        </tr>
+    </tbody>
+</table>
             </field>
         </record>
     </data>