From 5d908fd5f9e3ff6d553ab90ce24a1698f6e12979 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 13 Nov 2024 09:33:28 +0100
Subject: [PATCH] feat: refs #7641 improve style

---
 .../reports/entry-order/assets/css/style.css  |  5 ++++
 .../reports/entry-order/entry-order.html      | 25 ++++++++++++-------
 .../reports/entry-order/locale/es.yml         |  3 ++-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/print/templates/reports/entry-order/assets/css/style.css b/print/templates/reports/entry-order/assets/css/style.css
index 1a5ea3eb6..858ae704e 100644
--- a/print/templates/reports/entry-order/assets/css/style.css
+++ b/print/templates/reports/entry-order/assets/css/style.css
@@ -22,4 +22,9 @@ h3 {
 .column-oriented  th, 
 .column-oriented  td{
     padding: 5px
+}
+
+[row] {
+    display: flex;
+    column-gap: 5px;
 }
\ No newline at end of file
diff --git a/print/templates/reports/entry-order/entry-order.html b/print/templates/reports/entry-order/entry-order.html
index 5ce306827..cbdfa631f 100644
--- a/print/templates/reports/entry-order/entry-order.html
+++ b/print/templates/reports/entry-order/entry-order.html
@@ -41,12 +41,13 @@
             <table class="column-oriented vn-mt-ml border-collapse">
                 <thead>
                     <tr>
-                        <th width="5%">{{$t('reference')}}</th>
+                        <th width="5%">{{$t('code')}}</th>
                         <th class="number">{{$t('boxes')}}</th>
                         <th width="1px" class="number"></th>
                         <th class="number">{{$t('packing')}}</th>
-                        <th width="25%">{{$t('concept')}}</th>
-                        <th width="45%">{{$t('tags')}}</th>
+                        <th width="5%">{{$t('concept')}}</th>
+                        <th width="20%">{{$t('reference')}}</th>
+                        <th width="20%">{{$t('tags')}}</th>
                         <th width="5%" class="number">{{$t('quantity')}}</th>
                         <th width="1px" class="number"></th>
                         <th width="5%" class="number">{{$t('price')}}</th>
@@ -56,15 +57,20 @@
                 </thead>
                 <tbody v-for="buy in buys">
                     <tr>
-                        <td width="5%">{{buy.comment}}</td>
+                        <td width="5%">{{buy.itemFk}}</td>
                         <td class="number">{{buy.stickers}}</td>
                         <td width="1px" class="number">x</td>
                         <td class="number align-left">{{buy.packing}}</td>
-                        <td width="25%" class="nowrap">{{buy.name}}</td>
-                        <td width="45%" class="font light-gray tags">
-                            <span v-if="buy.value5" class="nowrap"><strong>{{buy.tag5}} → </strong>{{buy.value5}}</span>
-                            <span v-if="buy.value6" class="nowrap"><strong>{{buy.tag6}} → </strong>{{buy.value6}}</span>
-                            <span v-if="buy.value7" class="nowrap"><strong>{{buy.tag7}} → </strong>{{buy.value7}}</span>
+                        <td width="5%" class="nowrap">{{buy.name}}</td>
+                        <td width="20%">referencia de prueba</td>
+                        <td width="20%" class="font light-gray tags" row>
+                            <div>
+                                <div class="nowrap">Color<strong>→ Lavanda</strong></div>
+                                <div class="nowrap">Altura<strong>→ 100cm</strong></div>
+                            </div>
+                            <div>
+                                <span class="nowrap">label<strong>→ valor</strong></span>
+                            </div>
                         </td>
                         <td width="5%" class="number">{{buy.quantity | number($i18n.locale)}}</td>
                         <td width="1px" class="number">x</td>
@@ -83,6 +89,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td></td>
                         <td class="number">{{getTotalBy('quantity') | number($i18n.locale)}}</td>
                         <td></td>
                         <td></td>
diff --git a/print/templates/reports/entry-order/locale/es.yml b/print/templates/reports/entry-order/locale/es.yml
index 5a6716ba1..9ec357802 100644
--- a/print/templates/reports/entry-order/locale/es.yml
+++ b/print/templates/reports/entry-order/locale/es.yml
@@ -16,4 +16,5 @@ entry: Entrada {0}
 supplierData: Datos del proveedor
 notes: Notas
 reference: Referencia
-tags: Tags
\ No newline at end of file
+tags: Etiquetas
+code: Código
\ No newline at end of file