diff --git a/modules/invoiceOut/front/descriptor/index.html b/modules/invoiceOut/front/descriptor/index.html index 92f0b9de54..e1dc579ab2 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"> - @@ -11,23 +11,23 @@
- {{$ctrl.invoiceOut.client.name}}
@@ -53,4 +53,7 @@ - \ No newline at end of file + + + diff --git a/print/templates/reports/invoice/sql/rectified.sql b/print/templates/reports/invoice/sql/rectified.sql index 49db8f68bc..79ce733e33 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 = ?