From 85c7336d923edccbac888dfd8f367744a8ed5a56 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 28 Jun 2024 14:52:19 +0200
Subject: [PATCH] refs #7644 Minor changes

---
 .../reports/entry-label/assets/css/style.css  | 29 +++---------
 .../reports/entry-label/entry-label.html      | 46 +++++++++----------
 .../reports/entry-label/entry-label.js        |  3 +-
 .../reports/entry-label/options.json          |  2 +-
 .../reports/entry-label/sql/entry.sql         |  2 +-
 5 files changed, 32 insertions(+), 50 deletions(-)

diff --git a/print/templates/reports/entry-label/assets/css/style.css b/print/templates/reports/entry-label/assets/css/style.css
index ccafa7078a..0d4a2891da 100644
--- a/print/templates/reports/entry-label/assets/css/style.css
+++ b/print/templates/reports/entry-label/assets/css/style.css
@@ -1,10 +1,6 @@
 html {
-    height: 100%;
-    margin-top: -6px;
-}
-* {
-    box-sizing: border-box;
     font-family: "Roboto", "Helvetica", "Arial", sans-serif;
+    margin-top: -7px;
     font-size: 28px;
 }
 table {
@@ -17,9 +13,6 @@ td {
     padding: 5px;
     width: 100%;
 }
-#barcode {
-    text-align: center;
-}
 span {
     font-size: 48px;
     font-weight: bold;
@@ -30,29 +23,19 @@ span {
     font-size: 18px;
     display: block;
 }
-.flex-container {
-    display: flex;
-    justify-content: space-between;
-}
-.flex-item {
-    flex: 1;
-}
-.section {
+.cell {
+    width: 157px;
     height: 50px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 }
+.barcode {
+    text-align: center;
+}
 #variant {
     width: 314px;
 }
 #producer {
     width: 471px;
-}
-.cell {
-    width: 157px;
-}
-
-#leftBox {
-    border-right: 1px solid;
 }
\ No newline at end of file
diff --git a/print/templates/reports/entry-label/entry-label.html b/print/templates/reports/entry-label/entry-label.html
index 6973adbea9..53980c5346 100644
--- a/print/templates/reports/entry-label/entry-label.html
+++ b/print/templates/reports/entry-label/entry-label.html
@@ -4,14 +4,14 @@
     <tbody>
         <tr>
             <td colspan="2">
-                <div id="variant" class="section">
-                    <span class="lbl">Variedad:</span>
+                <div id="variant" class="cell">
+                    <span class="lbl">Variedad</span>
                     {{buy.name}}
                 </div>
             </td>
             <td>
                 <div class="cell">
-                    <span class="lbl">Medida:</span>
+                    <span class="lbl">Medida</span>
                     {{buy.size}}
                 </div>
             </td>
@@ -19,68 +19,68 @@
         <tr>
             <td>
                 <div class="cell">
-                    <span class="lbl">Categoría:</span>
+                    <span class="lbl">Categoría</span>
                     {{buy.category}}
                 </div>
             </td>
             <td>
                 <div class="cell">
-                    <span class="lbl">Color:</span>
+                    <span class="lbl">Color</span>
                     {{buy.color}}
             </div>
             </td>
             <td>
                 <div class="cell">
-                    <span class="lbl">Origen:</span>
-                    {{buy.origin}}
+                    <span class="lbl">Origen</span>
+                    {{buy.code}}
                 </div>
             </td>
         </tr>
         <tr>
             <td>
                 <div class="cell">
-                    <span class="lbl">Packing:</span>
+                    <span class="lbl">Packing</span>
                     {{buy.packing}}
                     </div>
             </td>
             <td>
                 <div class="cell">
-                    <span class="lbl">Grouping:</span>
+                    <span class="lbl">Grouping</span>
                     {{buy.grouping}}
                 </div>
             </td>
             <td>
                 <div class="cell">
-                    <span class="lbl">Und. venta:</span>
+                    <span class="lbl">Ud. venta</span>
                     {{buy.stems}}
                 </div>
             </td>
         </tr>
         <tr>
-            <td colspan="3" id="barcode">
+            <td colspan="3" class="barcode">
                 <div v-html="getBarcode(buy.id)"></div>
                 <span>{{buy.id}}</span>
             </td>
         </tr>
         <tr>
             <td colspan="3">
-                <div  id="producer" class="section">
-                    <span class="lbl">Productor:</span>
+                <div id="producer" class="cell">
+                    <span class="lbl">Productor</span>
                     {{buy.producer}}
                 </div>
             </td>
         </tr>
         <tr>
-            <td colspan="3">
-                <div class="flex-container">
-                    <div class="flex-item" id="leftBox">
-                            <span class="lbl">Control:</span>
-                        06/11
-                    </div>
-                    <div class="flex-item">
-                        <span class="lbl">Caja nº:</span>
-                        {{`${buy.labelNum} / ${maxLabelNum}`}}
-                    </div>
+            <td colspan="2">
+                <div class="cell">
+                    <span class="lbl">Control</span>
+                    06 / 11
+                </div>
+             </td>
+            <td>
+                <div class="cell">
+                    <span class="lbl">Caja nº</span>
+                    {{`${buy.labelNum} / ${maxLabelNum}`}}
                 </div>
             </td>
         </tr>
diff --git a/print/templates/reports/entry-label/entry-label.js b/print/templates/reports/entry-label/entry-label.js
index 62186df4ca..e3788261a4 100755
--- a/print/templates/reports/entry-label/entry-label.js
+++ b/print/templates/reports/entry-label/entry-label.js
@@ -7,8 +7,7 @@ module.exports = {
     mixins: [vnReport],
     async serverPrefetch() {
         this.buys = await this.rawSqlFromDef('entry', [this.id]);
-        const maxLabelNum = Math.max(...this.buys.map(buy => buy.labelNum));
-        this.maxLabelNum = maxLabelNum;
+        this.maxLabelNum = Math.max(...this.buys.map(buy => buy.labelNum));
     },
     methods: {
         getBarcode(id) {
diff --git a/print/templates/reports/entry-label/options.json b/print/templates/reports/entry-label/options.json
index d2ed03e321..4ed0461b30 100644
--- a/print/templates/reports/entry-label/options.json
+++ b/print/templates/reports/entry-label/options.json
@@ -1,6 +1,6 @@
 {
     "width": "10cm",
-    "height": "10.3cm",
+    "height": "10cm",
     "margin": {
         "top": "0.17cm",
         "right": "0.2cm",
diff --git a/print/templates/reports/entry-label/sql/entry.sql b/print/templates/reports/entry-label/sql/entry.sql
index 21511df64c..50b34bd03f 100644
--- a/print/templates/reports/entry-label/sql/entry.sql
+++ b/print/templates/reports/entry-label/sql/entry.sql
@@ -3,7 +3,7 @@ SELECT ROW_NUMBER() OVER(ORDER BY b.id) labelNum,
 		i.`size`,
 		i.category,
 		ink.id color,
-		o.code origin,
+		o.code,
 		b.packing,
 		b.`grouping`,
 		i.stems,