From 63f52519e71d733485a0c0fb004cd2ab8f43fce3 Mon Sep 17 00:00:00 2001
From: "Solan Delvenne (sode)" <sode@odoo.com>
Date: Tue, 13 Dec 2022 17:25:29 +0000
Subject: [PATCH] [FIX] snailmail: Fix base snailmail layouts

Due to some changes to the layout and to some upcoming changes to the
service provider's validation area, the layout had to be fixed to avoid
validation errors.

closes odoo/odoo#108559

X-original-commit: 0ba4a7ea649846b796161206b5ea011cf6fcda27
Signed-off-by: Florian Daloze (fda) <fda@odoo.com>
Signed-off-by: Solan Delvenne (sode) <sode@odoo.com>
---
 .../scss/snailmail_external_layout_asset.scss | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/addons/snailmail/static/src/scss/snailmail_external_layout_asset.scss b/addons/snailmail/static/src/scss/snailmail_external_layout_asset.scss
index 0e33b903047..8fc43c5b400 100644
--- a/addons/snailmail/static/src/scss/snailmail_external_layout_asset.scss
+++ b/addons/snailmail/static/src/scss/snailmail_external_layout_asset.scss
@@ -1,13 +1,12 @@
 /*Modifications for the Standard and Boxed document layouts */
 .article.o_report_layout_standard.o_company_1_layout, .article.o_report_layout_boxed.o_company_1_layout {
     > .pt-5 {
+        padding-top: 0 !important;
 		> .address.row {
-			width: 100.5% !important;
-    		height: 55mm;
-			margin-top: -13mm;
-			> div[name="address"] {
-				padding-top: 5mm;
-			}
+            width: 117% !important;
+            height: 68mm !important;
+            margin-top: -4mm !important;
+            line-height: 1.1em;
         }
     }
 }
@@ -15,30 +14,34 @@
 /*Modifications for Bold and Striped document layouts*/
 .article.o_report_layout_bold.o_company_1_layout, .article.o_report_layout_striped.o_company_1_layout {
     > .address.row {
-		width: 100.5% !important;
-		height: 60mm;
-		margin-top: -6mm;
-		> div[name="address"] {
-	    	padding-top: 13mm;
-		}
+        width: 117% !important;
+        height: 68mm !important;
+        margin-top: -4mm !important;
+        line-height: 1.1em;
     }
 }
 
+/* Modifications for all layouts */
 div .address.row > div[name="address"] {
     position: relative !important;
-    width: 103mm !important;
+    margin-left: 47.5% !important;
     background-color: #ffffff;
     > address {
 		width: 100% !important;
 		position: absolute !important;
 		bottom: 0 !important;
-		padding-left: 6mm;
+		padding-left: 5mm;
 		padding-top: 3mm;
         height: 33mm;
 		max-height: 33mm;
     }
 }
 
+div .header.o_company_1_layout > div[class$="_header"] {
+    overflow: hidden !important;
+    max-height: 150px;
+}
+
 /* Follow-up Letters */
 div .row.fallback_header {
     margin-top: -4mm !important;