verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge pull request 'fixes #5088 client.balance quitar texto en balance' (!1280) from 5088-quitar-texto-clientBalance into dev
gitea/salix/pipeline/head There was a failure building this commit Details 

Reviewed-on: #1280
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Alexandre Riera 2023-01-30 11:13:27 +00:00
parent ce1bdaec17 46ee12de6d
commit 39835069f9
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
print/templates/reports/receipt/receipt.html
View File

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

11
print/templates/reports/receipt/sql/receipt.sql
View File

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