root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'R_10_00' of http://10.65.20.17:7990/scm/campo/campo into R_10_00

Browse Source
This commit is contained in:
Mattia Tollari 2018-10-05 14:56:21 +02:00
commit 0fd32ec773
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ca/ca3700.cpp
View File

@ -932,7 +932,7 @@ void TPrint_rendiconto_ca_recordset::calc_pagato(TRectype& tmprec, const TRectyp
if (riga_fatt != NULL)
{
TImporto tot = riga_fatt->calcola_pagato_al(false, _pagato_al, _pagato_al, _pagato_al, 0x15);
TImporto tot = riga_fatt->calcola_pagato_al(false, _pagato_al, _pagato_al, _pagato_al, 0x5);
tot.normalize(sezione_normale);
const real totpagato = tot.valore();

11
src/ca/ca3700a.rep
View File

@ -4,20 +4,19 @@
<font face="Courier New" size="7" />
<section type="Head" height="5" pattern="1">
<font italic="1" face="Courier New" bold="1" size="8" />
<field x="1" type="Stringa" width="50" pattern="1">
<font italic="1" face="Courier New" bold="1" size="9" />
<field x="1" type="Stringa" width="50" height="1.2" pattern="1">
<source>#SYSTEM.RAGSOC</source>
</field>
<field x="70" type="Testo" width="10" pattern="1" text="Data stampa">
<field x="67" type="Testo" width="15" height="1.2" pattern="1" text="Data stampa">
<font italic="1" face="Courier New" size="8" />
</field>
<field x="82" type="Data" width="10" pattern="1">
<field x="82" type="Data" width="15" height="1.2" pattern="1">
<source>#SYSTEM.DATE</source>
</field>
<field x="157" type="Testo" width="4" pattern="1" text="Pag.">
<field x="157" type="Testo" width="4" height="1.2" pattern="1" text="Pag.">
<font italic="1" face="Courier New" size="8" />
</field>
<field x="161" type="Numero" align="right" width="3" pattern="1">
<field x="161" type="Numero" align="right" width="3" height="1.2" pattern="1">
<source>#REPORT.PAGE</source>
</field>
<field border="2" x="1" y="2" type="Linea" width="169" height="0" pattern="1" />