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.33/sirio/CAMPO/campo into R_10_00

Browse Source
This commit is contained in:
Simone Palacino 2020-02-05 18:06:37 +01:00
commit f04781d289
7 changed files with 70 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,3 @@
ca2.exe
Corretto il calcolo del primo esercizio da ricostruire nella ricostruzione dei saldi di analitica

22
cd/test/ca0936a.ini Normal file
View File

@ -0,0 +1,22 @@
[Main]
Demo=0
[ca2]
Edit_107 = ca2 -0
File(22) = ca2.exe|X
Patch = 0936
Versione = 21511200
[ca]
Data = 03-02-2020
Descrizione = Contabilita' Analitica
Dischi = 1
Moduli = ba,cg
OEM =
Patch = 936
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

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

Binary file not shown.

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

@ -0,0 +1,3 @@
mg3300.msk
Inserita maschera mancante nella patch 918 del 08/01/20

29
cd/test/mg0936a.ini Normal file
View File

@ -0,0 +1,29 @@
[Main]
Demo=0
[mg3]
File(24) = mg3300.msk|X
Patch = 0936
Versione = 21511200
[mg99]
Kill(0) = batbfcg.msk|x
Kill(1) = batbubi.msk|x
Kill(2) = efstbnp.rep|x
Kill(3) = efstbnp.msk|x
Kill(4) = eftbbnp.msk|x
Kill(5) = bastfcg.msk|x
[mg]
Data = 03-02-2020
Descrizione = Magazzino
Dischi = 1
Moduli = ba,cg9,ve9,pr9,ef9
OEM =
Patch = 0936
PostProcess = bainst -0 MG
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

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

Binary file not shown.

12
src/ca/ca2300.cpp
View File

@ -37,6 +37,7 @@ bool TRic_saldi_msk::on_field_event(TOperable_field& o, TField_event e, long jol
//..durata pluriennale, da istruzioni adolfiche) ed esegue dall'esercizio contenente tale data il ricalcolo.. //..durata pluriennale, da istruzioni adolfiche) ed esegue dall'esercizio contenente tale data il ricalcolo..
//..dei saldi (Silvan non sei nessuno!) //..dei saldi (Silvan non sei nessuno!)
const int selected_anno = atoi(o.get()); const int selected_anno = atoi(o.get());
TEsercizi_contabili esc; TEsercizi_contabili esc;
TDate datainiesc, datafinesc; TDate datainiesc, datafinesc;
esc.code2range(selected_anno, datainiesc, datafinesc); esc.code2range(selected_anno, datainiesc, datafinesc);
@ -55,10 +56,19 @@ bool TRic_saldi_msk::on_field_event(TOperable_field& o, TField_event e, long jol
break; break;
const TDate curr_date = recset.get(MOVANA_DATACOMP).as_date(); const TDate curr_date = recset.get(MOVANA_DATACOMP).as_date();
if (curr_date < datacomp) const TDate fcomp_date = recset.get(MOVANA_DATAFCOMP).as_date();
if (esc.date2esc(fcomp_date) >= selected_anno && curr_date < datacomp)
{
const long numreg = recset.get(MOVANA_NUMREG).as_int();
const bool autofcomp = recset.get(MOVANA_AUTOFCOMP).as_bool();
datacomp = curr_date; datacomp = curr_date;
} }
}
const int first_anno = esc.date2esc(datacomp); const int first_anno = esc.date2esc(datacomp);
set(F_FIRST_ANNO, first_anno); set(F_FIRST_ANNO, first_anno);
} }
break; break;