From 8ac575419a195374eccc85490e1ac369ab76ecb8 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 3 Mar 2023 12:31:20 +0100
Subject: [PATCH] fix: no mostraba la factura rectificada correcta

---
 modules/invoiceOut/front/descriptor/index.html    | 15 +++++++++------
 print/templates/reports/invoice/sql/rectified.sql | 11 ++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/modules/invoiceOut/front/descriptor/index.html b/modules/invoiceOut/front/descriptor/index.html
index 92f0b9de5..e1dc579ab 100644
--- a/modules/invoiceOut/front/descriptor/index.html
+++ b/modules/invoiceOut/front/descriptor/index.html
@@ -3,7 +3,7 @@
     description="$ctrl.invoiceOut.ref"
     summary="$ctrl.$.summary">
     <slot-dot-menu>
-        <vn-invoice-out-descriptor-menu 
+        <vn-invoice-out-descriptor-menu
             invoice-out="$ctrl.invoiceOut"
             parent-reload="$ctrl.reload()"
         />
@@ -11,23 +11,23 @@
     <slot-body>
         <div class="attributes">
             <vn-label-value
-                label="Date" 
+                label="Date"
                 value="{{$ctrl.invoiceOut.issued | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value
-                label="Import" 
+                label="Import"
                 value="{{$ctrl.invoiceOut.amount | currency: 'EUR': 2}}">
             </vn-label-value>
             <vn-label-value
                 label="Client">
-                <span 
+                <span
                     ng-click="clientDescriptor.show($event, $ctrl.invoiceOut.client.id)"
                     class="link">
                     {{$ctrl.invoiceOut.client.name}}
                 </span>
             </vn-label-value>
             <vn-label-value
-                label="Company" 
+                label="Company"
                 value="{{$ctrl.invoiceOut.company.code}}">
             </vn-label-value>
         </div>
@@ -53,4 +53,7 @@
 </vn-descriptor-content>
 <vn-popup vn-id="summary">
     <vn-invoice-out-summary invoice-out="$ctrl.invoiceOut"></vn-invoice-out-summary>
-</vn-popup>
\ No newline at end of file
+</vn-popup>
+<vn-client-descriptor-popover
+    vn-id="clientDescriptor">
+</vn-client-descriptor-popover>
diff --git a/print/templates/reports/invoice/sql/rectified.sql b/print/templates/reports/invoice/sql/rectified.sql
index 49db8f68b..79ce733e3 100644
--- a/print/templates/reports/invoice/sql/rectified.sql
+++ b/print/templates/reports/invoice/sql/rectified.sql
@@ -1,10 +1,11 @@
 SELECT
-    io.amount,
-    io.ref,
-    io.issued,
+    io2.amount,
+    io2.ref,
+    io2.issued,
     ict.description
 FROM invoiceOut io
     JOIN invoiceCorrection ic ON ic.correctingFk = io.id
-    JOIN invoiceCorrectionType ict ON ict.id = ic.invoiceCorrectionTypeFk
+    JOIN invoiceOut io2 ON io2.id = ic.correctedFk
     LEFT JOIN ticket t ON t.refFk = io.ref
-WHERE io.ref = ?
\ No newline at end of file
+    JOIN invoiceCorrectionType ict ON ict.id = ic.invoiceCorrectionTypeFk
+WHERE io.ref = ?