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

Merge branch 'R12.00' of http://10.65.20.33/sirio/CAMPO/campo into R12.00

Browse Source
This commit is contained in:
smen 2022-02-04 17:14:38 +01:00
commit 73bf1a78b9
4 changed files with 104 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cd/test/cg1110.txt Normal file
View File

@ -0,0 +1,3 @@
cg1.exe
Nel bilancio la data dell' ultimo movimento poteva non appartenere all'esercizio selezionato

98
cd/test/cg1110a.ini Normal file
View File

@ -0,0 +1,98 @@
[Main]
Demo=0
[cg1]
File(9) = cg1.exe|X
Patch = 1110
Versione = 21511200
[cg99]
Kill(0) = batbcve.msk|x
Kill(1) = bastreg.rep|x
Kill(2) = cg2fppro.msk|x
Kill(3) = bastvet.rep|x
Kill(4) = batbcco.msk|x
Kill(5) = batbivd.msk|x
Kill(6) = bastarb.msk|x
Kill(7) = batbreg.msk|x
Kill(8) = bastivd.msk|x
Kill(9) = batbtra.msk|x
Kill(10) = batbesc.msk|x
Kill(11) = batbver.msk|x
Kill(12) = bastpdb.msk|x
Kill(13) = batbind.msk|x
Kill(14) = batblia.msk|x
Kill(15) = bastcfi.rep|x
Kill(16) = batbleg.msk|x
Kill(17) = bastleg.rep|x
Kill(18) = batbnot.msk|x
Kill(19) = bastvet.msk|x
Kill(20) = bastcco.msk|x
Kill(21) = bastcam.rep|x
Kill(22) = bastcve.rep|x
Kill(23) = bastntb.rep|x
Kill(24) = batblia.msk|x
Kill(25) = batbzon.msk|x
Kill(26) = batblbu.msk|x
Kill(27) = batbinl.msk|x
Kill(28) = bastcco.rep|x
Kill(29) = bastndo.msk|x
Kill(30) = bastscc.msk|x
Kill(31) = bastesc.msk|x
Kill(32) = bastmsp.msk|x
Kill(33) = batbcfi.msk|x
Kill(34) = bastzon.rep|x
Kill(35) = bastdpn.msk|x
Kill(36) = bastdpn.rep|x
Kill(37) = bastver.msk|x
Kill(38) = batbpor.msk|x
Kill(39) = bastver.rep|x
Kill(40) = batbarb.msk|x
Kill(41) = batbmsp.msk|x
Kill(42) = batbdpn.msk|x
Kill(43) = batbins.msk|x
Kill(44) = bastcam.msk|x
Kill(45) = bastcve.msk|x
Kill(46) = bastpdb.rep|x
Kill(47) = bastscc.rep|x
Kill(48) = bastpor.msk|x
Kill(49) = bastarb.rep|x
Kill(50) = batbpdb.msk|x
Kill(51) = bastntb.msk|x
Kill(52) = batbtit.msk|x
Kill(53) = cgtbcon.msk|x
Kill(54) = batbndo.msk|x
Kill(55) = bastpor.rep|x
Kill(56) = bastndo.rep|x
Kill(57) = bastesc.rep|x
Kill(58) = batbntb.msk|x
Kill(59) = batbscc.msk|x
Kill(60) = bastzon.msk|x
Kill(61) = bastmsp.rep|x
Kill(62) = batbvet.msk|x
Kill(63) = batbdel.msk|x
Kill(64) = bastnot.rep|x
Kill(65) = batbcam.msk|x
Kill(66) = bastnot.msk|x
Kill(67) = bastreg.msk|x
Kill(68) = bastleg.msk|x
Kill(69) = bastivd.rep|x
Kill(70) = bastcfi.msk|x
[cg]
Data = 13-01-2022
Descrizione = Contabilita' Generale
Dischi = 1
Edit_19 = cg0 -0
Edit_20 = cg0 -1
Edit_26 = cg0 -4
Edit_5 = cg0 -5
Moduli = ba
OEM =
Patch = 1110
PostProcess = bainst -0 CG
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/cg1110a1.zip Normal file
View File

Binary file not shown.

4
src/cg/cg1500.cpp
View File

@ -1497,11 +1497,11 @@ bool TStampa_bilanci::calcola(int g, int c, long s)
//calcolo i movimenti del periodo
if (check_mov(_stampa_mov_prov, provvis))
{
conto_mov = true;
if (data.ok() && esercizi().esercizio(data).codice() == _annoes)
_u_max = fnc_max(_u_max, data);
if ((data >= _dataini) && (data < _dal)) //calcolo i progressivi precedenti
{
conto_mov = true;
_mov_ap |= caus.apertura();
if (sezione == 'D')
_prg_prec_dare += importo;
@ -1511,6 +1511,7 @@ bool TStampa_bilanci::calcola(int g, int c, long s)
else
if (data >= _dal && data <= _al && !caus.apertura())
{
conto_mov = true;
if (sezione == 'D')
_mov_periodo_dare += importo;
else
@ -1960,6 +1961,7 @@ void TStampa_bilanci::leggi_clifo(const TArray& gccf)
}
int aprec = ese.pred(anno);
saldi.zero();
saldi.put(SLD_ANNOES, anno); // W96SALDI del 05-06-96
saldi.put(SLD_FLSCA, false);