Merge pull request '5349-hotfix_report_invoice' (!1364) from 5349-hotfix_report_invoice into master

Reviewed-on: #1364
2023-03-03 11:43:28 +00:00 · 2023-03-03 11:43:28 +00:00 · 5984d6820b
parent 73c988b18e 8ac575419a
commit 5984d6820b
2 changed files with 15 additions and 11 deletions
--- a/modules/invoiceOut/front/descriptor/index.html
+++ b/modules/invoiceOut/front/descriptor/index.html
@ -54,3 +54,6 @@
 <vn-popup vn-id="summary">
    <vn-invoice-out-summary invoice-out="$ctrl.invoiceOut"></vn-invoice-out-summary>
 </vn-popup>
+<vn-client-descriptor-popover
+    vn-id="clientDescriptor">
+</vn-client-descriptor-popover>
--- 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
+    JOIN invoiceCorrectionType ict ON ict.id = ic.invoiceCorrectionTypeFk
 WHERE io.ref = ?