From 3e443ad5ced8090ee005bfa79add11e60c30a654 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 16 Oct 2024 12:22:57 +0200
Subject: [PATCH 1/2] fix: refs #7230 producer fix

---
 print/templates/reports/delivery-note/delivery-note.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html
index c1701e084..ccf2fbfb4 100644
--- a/print/templates/reports/delivery-note/delivery-note.html
+++ b/print/templates/reports/delivery-note/delivery-note.html
@@ -58,6 +58,7 @@
                         <th width="5%">{{$t('reference')}}</th>
                         <th class="number">{{$t('quantity')}}</th>
                         <th width="50%">{{$t('concept')}}</th>
+                        <th width="50%">{{$t('producer')}}</th>
                         <th class="number" v-if="showPrices">{{$t('price')}}</th>
                         <th class="centered" width="5%" v-if="showPrices">{{$t('discount')}}</th>
                         <th class="centered" v-if="showPrices">{{$t('vat')}}</th>
@@ -69,7 +70,7 @@
                         <td width="5%">{{sale.itemFk}}</td>
                         <td class="number">{{sale.quantity}}</td>
                         <td width="50%">{{sale.concept}}</td>
-                        <td class="number" v-if="showPrices">{{sale.price | currency('EUR', $i18n.locale)}}</td>
+                        <td width="5%" class="font light-gray" v-if="sale.subName">{{sale.subName}}</td>
                         <td class="centered" width="5%" v-if="showPrices">{{(sale.discount / 100) | percentage}}</td>
                         <td class="centered" v-if="showPrices">{{sale.vatType}}</td>
                         <td class="number" v-if="showPrices">
@@ -81,7 +82,6 @@
                             <span v-if="sale.value5"> <strong>{{sale.tag5}}</strong> {{sale.value5}} </span>
                             <span v-if="sale.value6"> <strong>{{sale.tag6}}</strong> {{sale.value6}} </span>
                             <span v-if="sale.value7"> <strong>{{sale.tag7}}</strong> {{sale.value7}} </span>
-                            <span v-if="sale.subName"> <strong>{{$t('producer')}}</strong> {{ sale.subName }}</span>
                         </td>
                     </tr>
                 </tbody>
-- 
2.40.1


From 5de4a11e8b2a236bb4055253fa1c19dd9ae04e80 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 16 Oct 2024 13:53:20 +0200
Subject: [PATCH 2/2] fix: refs #7230 fix line

---
 print/templates/reports/delivery-note/delivery-note.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html
index ccf2fbfb4..89bc07488 100644
--- a/print/templates/reports/delivery-note/delivery-note.html
+++ b/print/templates/reports/delivery-note/delivery-note.html
@@ -71,6 +71,7 @@
                         <td class="number">{{sale.quantity}}</td>
                         <td width="50%">{{sale.concept}}</td>
                         <td width="5%" class="font light-gray" v-if="sale.subName">{{sale.subName}}</td>
+                        <td class="number" v-if="showPrices">{{sale.price | currency('EUR', $i18n.locale)}}</td>
                         <td class="centered" width="5%" v-if="showPrices">{{(sale.discount / 100) | percentage}}</td>
                         <td class="centered" v-if="showPrices">{{sale.vatType}}</td>
                         <td class="number" v-if="showPrices">
-- 
2.40.1