From 2f3efa15ba8e2a832aff010ddc114c39192576b9 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 11 Nov 2024 16:13:25 +0100
Subject: [PATCH] feat: refs #6583 rollback

---
 .../reports/entry-order/assets/css/style.css  |  5 ---
 .../reports/entry-order/entry-order.html      | 44 +++++++++----------
 2 files changed, 22 insertions(+), 27 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..767b1185a 100644
--- a/print/templates/reports/entry-order/assets/css/style.css
+++ b/print/templates/reports/entry-order/assets/css/style.css
@@ -17,9 +17,4 @@ h3 {
 .tags {
     font-size: 10px;
     margin: 0;
-}
-
-.column-oriented  th, 
-.column-oriented  td{
-    padding: 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 77545ef9b..e5d3bfb6d 100644
--- a/print/templates/reports/entry-order/entry-order.html
+++ b/print/templates/reports/entry-order/entry-order.html
@@ -41,36 +41,36 @@
             <table class="column-oriented vn-mt-ml border-collapse">
                 <thead>
                     <tr>
-                        <th width="5%">{{$t('reference')}}</th>
                         <th class="number">{{$t('boxes')}}</th>
-                        <th width="1px" class="number"></th>
+                        <th width="5%" class="number"></th>
                         <th class="number">{{$t('packing')}}</th>
-                        <th width="25%">{{$t('concept')}}</th>
-                        <th width="45%">{{$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>
-                        <th width="1px" class="number"></th>
-                        <th width="5%" class="number">{{$t('amount')}}</th>
+                        <th width="40%">{{$t('concept')}}</th>
+                        <th width="10%">{{$t('reference')}}</th>
+                        <th width="10%">{{$t('tags')}}</th>
+                        <th width="10%" class="number">{{$t('quantity')}}</th>
+                        <th width="5%" class="number"></th>
+                        <th width="15%" class="number">{{$t('price')}}</th>
+                        <th width="5%" class="number"></th>
+                        <th width="15%" class="number">{{$t('amount')}}</th>
                     </tr>
                 </thead>
                 <tbody v-for="buy in buys">
                     <tr>
-                        <td width="5%">{{buy.comment}}</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 class="nowrap"><strong>{{buy.tag5}} → </strong>{{buy.value5}}</span>
-                            <span class="nowrap"><strong>{{buy.tag6}} → </strong>{{buy.value6}}</span>
-                            <span class="nowrap"><strong>{{buy.tag7}} → </strong>{{buy.value7}}</span>
+                        <td width="5%" class="number">x</td>
+                        <td class="number">{{buy.packing}}</td>
+                        <td width="40%" class="nowrap">{{buy.name}}</td>
+                        <td width="10%">{{buy.comment}}</td>
+                        <td width="10%" 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>
-                        <td width="5%" class="number">{{buy.quantity | number($i18n.locale)}}</td>
-                        <td width="1px" class="number">x</td>
-                        <td width="5%" class="number">{{buy.buyingValue | currency('EUR', $i18n.locale)}}</td>
-                        <td width="1px" class="number">=</td>
-                        <td width="5%" class="number align-left">
+                        <td width="10%" class="number">{{buy.quantity | number($i18n.locale)}}</td>
+                        <td width="5%" class="number">x</td>
+                        <td width="15%" class="number">{{buy.buyingValue | currency('EUR', $i18n.locale)}}</td>
+                        <td width="5%" class="number">=</td>
+                        <td width="15%" class="number">
                             {{buy.buyingValue * buy.quantity | currency('EUR', $i18n.locale)}}
                         </td>
                     </tr>