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

Patch level : 12.0 1082f

Browse Source 
Files correlati     : ve1.exe

Commento        :
Completato e corretto modulo "Stampa fido cliente" e relativo report
This commit is contained in:
smen 2021-09-30 09:54:47 +02:00
parent 0b32353224
commit 3a18522797
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ve/ve1800.cpp
View File

@ -38,7 +38,7 @@ void TListaFido_app::main_loop()
TISAM_recordset * recset = (TISAM_recordset*)report.recordset(); TISAM_recordset * recset = (TISAM_recordset*)report.recordset();
if (m.get_bool(F_CONFIDO)) if (!m.get_bool(F_CONFIDO))
{ {
TString query = recset->query_text(); TString query = recset->query_text();

4
src/ve/ve18001.rep
View File

@ -25,7 +25,7 @@
</field> </field>
<field y="3" deactivated="" type="Testo" valign="center" hidden="" link="" dynamic_height="" shade_offset="" width="6" codval="" id="6" pattern="1" hide_zero="" text="Codice" /> <field y="3" deactivated="" type="Testo" valign="center" hidden="" link="" dynamic_height="" shade_offset="" width="6" codval="" id="6" pattern="1" hide_zero="" text="Codice" />
<field x="60" y="3" deactivated="" type="Testo" valign="center" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="18" codval="" id="7" pattern="1" hide_zero="" text="Fido" /> <field x="60" y="3" deactivated="" type="Testo" valign="center" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="18" codval="" id="7" pattern="1" hide_zero="" text="Fido" />
<field x="7" y="3" deactivated="" type="Testo" valign="center" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="8" pattern="1" hide_zero="" text="Ragione sociale" /> <field x="9" y="3" deactivated="" type="Testo" valign="center" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="8" pattern="1" hide_zero="" text="Ragione sociale" />
<field x="79" y="3" deactivated="" type="Testo" valign="center" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="18" codval="" id="11" pattern="1" hide_zero="" text="Saldo" /> <field x="79" y="3" deactivated="" type="Testo" valign="center" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="18" codval="" id="11" pattern="1" hide_zero="" text="Saldo" />
<field deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="8" codval="" id="13" pattern="1" hide_zero="" text="Ditta:" /> <field deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="8" codval="" id="13" pattern="1" hide_zero="" text="Ditta:" />
<field x="130" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="6" codval="" id="13" pattern="1" hide_zero="" text="Data:" /> <field x="130" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="6" codval="" id="13" pattern="1" hide_zero="" text="Data:" />
@ -45,7 +45,7 @@
<font face="Courier New" bold="1" size="8" /> <font face="Courier New" bold="1" size="8" />
<source>CODCF</source> <source>CODCF</source>
</field> </field>
<field x="7" deactivated="" type="Stringa" valign="bottom" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="102" pattern="1" hide_zero="" text=""> <field x="9" deactivated="" type="Stringa" valign="bottom" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="102" pattern="1" hide_zero="" text="">
<source>RAGSOC</source> <source>RAGSOC</source>
</field> </field>
<field x="60" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="18" codval="" id="103" pattern="1" hide_zero="" text="###.###.###,@@"> <field x="60" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="18" codval="" id="103" pattern="1" hide_zero="" text="###.###.###,@@">

2
src/ve/ve1800a.h
View File

@ -5,4 +5,4 @@
#define F_ADATA 105 #define F_ADATA 105
#define F_REPORT 106 #define F_REPORT 106
#define F_CONFIDO 107 #define F_CONFIDO 107

2
src/ve/ve1800a.uml
View File

@ -82,7 +82,7 @@ END
BOOLEAN F_CONFIDO BOOLEAN F_CONFIDO
BEGIN BEGIN
PROMPT 2 9 "Fido diverso da 0 " PROMPT 2 9 "Includi clienti con fido 0 "
END END
STRING F_REPORT 50 STRING F_REPORT 50

14
src/ve/velib07.cpp
View File

@ -846,6 +846,7 @@ static real calcola_saldo_contabile(const char tipocf, const long codcf, const T
datainies.set_month(1); datainies.set_month(1);
} }
bool adoggi = (datacalc==datafines) || (datacalc == today) ;
const TString_array& a = mastro(tipocf); const TString_array& a = mastro(tipocf);
//per tutti i mastri selezionati va a calcolare il saldo del cliente/fornitore in input //per tutti i mastri selezionati va a calcolare il saldo del cliente/fornitore in input
@ -854,11 +855,18 @@ static real calcola_saldo_contabile(const char tipocf, const long codcf, const T
const int gruppo = row->get_int(0); const int gruppo = row->get_int(0);
const int conto = row->get_int(1); const int conto = row->get_int(1);
const int indbil = row->get_int(2); const int indbil = row->get_int(2);
TSaldo s;
real saldo;
TSaldo saldo; if (adoggi)
real saldo_periodo = saldo.saldo_periodo(Competenza, gruppo, conto, codcf, datainies, datacalc, indbil, false); s.ultima_immissione_bilancio(codes, gruppo, conto, codcf, indbil, 1, false);
else
{
s.set_annoes(codes);
s.data_limite_bilancio(Competenza, gruppo, conto, codcf, datainies, datacalc, indbil, 1);
}
saldone += saldo_periodo; saldone += s.saldo();
} }
return saldone; return saldone;
} }