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

Merge pull request '2974 - Get amount unpaid from customer_risk' (#686) from 2974-receipt_amountUnpaid into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #686
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
This commit is contained in:
Carlos Jimenez Ruiz 2021-07-01 08:59:31 +00:00
parent b4d46f6876 347c1ae197
commit 8ef5c56a98
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/export-structure.sh
View File

@ -3,7 +3,6 @@
SCHEMAS=( SCHEMAS=(
account account
bs bs
bi
cache cache
edi edi
hedera hedera

3
modules/client/front/balance/create/index.html
View File

@ -60,7 +60,8 @@
<vn-horizontal> <vn-horizontal>
<vn-input-number <vn-input-number
ng-model="$ctrl.deliveredAmount" ng-model="$ctrl.deliveredAmount"
label="Delivered amount"> label="Delivered amount"
step="0.01">
</vn-input-number> </vn-input-number>
<vn-input-number <vn-input-number
disabled="true" disabled="true"

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

@ -1,9 +1,11 @@
SELECT SELECT
r.id, r.id,
r.amountPaid, r.amountPaid,
r.amountUnpaid, 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
AND cr.companyFk = r.companyFk
WHERE r.id = ? WHERE r.id = ?