Merge branch 'dev' into 5070-route-tickets-link-maps

print/templates/reports/receipt/receipt.html

@@ -4,9 +4,9 @@
             <div class="content">
                 <h1 class="title centered uppercase">{{$t('title')}}</h1>
                 <p class="centered">
-                    Recibo de <strong class="uppercase">{{client.socialName}}</strong>, la cantidad de
-                    <strong>{{receipt.amountPaid}} €</strong> en concepto de 'entrega a cuenta', quedando pendiente en
-                    la cuenta del cliente un saldo de <strong>{{receipt.amountUnpaid}} €</strong>.
+                    Recibo de <strong class="uppercase">{{client.socialName}}</strong>,
+                    la cantidad de <strong>{{receipt.amountPaid}} €</strong>
+                    en concepto de 'entrega a cuenta'.
                 </p>
                 <div class="signature">
                     <img v-bind:src="getReportSrc('signature.png')" />

print/templates/reports/receipt/sql/receipt.sql

@@ -1,11 +1,10 @@
-SELECT 
-    r.id, 
-    r.amountPaid, 
-    cr.amount AS amountUnpaid, 
-    r.payed, 
+SELECT
+    r.id,
+    r.amountPaid,
+    r.payed,
     r.companyFk
 FROM receipt r
     JOIN client c ON c.id = r.clientFk
     JOIN vn.clientRisk cr ON cr.clientFk = c.id
         AND cr.companyFk = r.companyFk
-WHERE r.id = ?
+WHERE r.id = ?