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 2019-12-03 10:36:52 +01:00
commit 66eb4b9ca6
11 changed files with 218 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,3 @@
ba0.exe
Aggiunto controllo formato indirizzo mail da configurazione mail

31
cd/test/ba0904a.ini Normal file
View File

@ -0,0 +1,31 @@
[Main]
Demo=0
[ba0]
File(6) = ba0.exe|X
Patch = 0904
Versione = 21511200
[ba99]
Kill(0) = batbsce.txt|x
Kill(1) = wxmsw240.dll|x
Kill(2) = bastcms.rep|x
Kill(3) = bastcms.msk|x
Kill(4) = bastfsc.msk|x
Kill(5) = bastfsc.rep|x
Kill(6) = bastuue.msk|x
Kill(7) = bastuue.rep|x
[ba]
Data = 28-11-2019
Descrizione = Base
Dischi = 1
Moduli = sy
OEM =
Patch = 0904
PostProcess = bainst -0 BA
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

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

Binary file not shown.

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

@ -0,0 +1,3 @@
cg4.exe
Corretto aggiornamento saldi. riaggiungeva in dare i saldi iniziali

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

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

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

Binary file not shown.

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

@ -0,0 +1,3 @@
xvaga.dll
Corretto comando PowerShell per mail

21
cd/test/sy0904a.ini Normal file
View File

@ -0,0 +1,21 @@
[Main]
Demo=0
[sy1]
File(52) = xvaga.dll|X
Patch = 0904
Versione = 21511200
[sy]
Data = 28-11-2019
Descrizione = Sistema
Dischi = 1
Moduli =
OEM =
Patch = 904
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

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

Binary file not shown.

21
src/cg/cglib02.cpp
View File

@ -110,7 +110,7 @@ real TSaldo::saldofin_esprec(int annoes, int g, int c, long s, bool saldo_chiusu
const char flagsf = _saldi.get_char(SLD_FLAGSALFIN);
const real saldosf = _saldi.get_real(SLD_SALDOFIN);
real tot = pdare-pavere;
real tot = pdare - pavere;
if (flag == 'D') tot += saldo;
else tot -= saldo;
@ -332,7 +332,7 @@ bool TSaldo::ultima_immissione_verifica(int annoes,int g,int c,long s,int indbil
if (_saldo_iniziale.is_zero() && !(provv & 0x1))
{
if (indbil == 1 || indbil == 2 || indbil == 5)
_saldo_iniziale += saldofin_esprec(annoes,g,c,s, false, provv);
_saldo_iniziale += saldofin_esprec(annoes, g, c, s, false, provv);
}
esito = true;
@ -444,7 +444,7 @@ bool TSaldo::ultima_immissione_bilancio(int annoes,int g,int c,long s,int indbil
if (indbil == 1 || indbil == 2 || indbil == 5)
{
_prec = true;
_saldo_iniziale += saldofin_esprec(annoes,g,c,s,false,provv);
_saldo_iniziale += saldofin_esprec(annoes, g, c, s, false, provv);
}
_saldo = ZERO;
@ -460,7 +460,7 @@ bool TSaldo::ultima_immissione_bilancio(int annoes,int g,int c,long s,int indbil
_saldo += _saldofin; // no del saldo di chiusura inserita il 09-07-96
return esito;
}
}
const real& TSaldo::saldo_periodo(int g, int c, long s, const TDate& dal, const TDate& al,
int indbil, int provv)
@ -858,7 +858,9 @@ void TTab_conti::aggiorna_conto(const TBill& tcon,
if (!movimentato)
if (tc->dare().is_zero() && tc->avere().is_zero() &&
tc->saldofin().is_zero() && tc->darepro().is_zero() &&
tc->averepro().is_zero() && tc->saldo().is_zero())
tc->dareprob().is_zero() && tc->dareproc().is_zero() &&
tc->averepro().is_zero() && tc->avereprob().is_zero() &&
tc->avereproc().is_zero() && tc->saldo().is_zero())
remove(*tc, anno_es, scaricato);
}
@ -919,7 +921,7 @@ void TSaldo_agg::reset()
void TSaldo_agg::clear_saldi(int year)
{
TFast_isamfile saldi(LF_SALDI);
TLocalisamfile saldi(LF_SALDI);
set_anno_es(year);
saldi.zero();
@ -1047,13 +1049,6 @@ void TSaldo_agg::registra()
saldi.put(SLD_FLAGSALINI, flag_salini);
saldi.put(SLD_SALDO, si);
}
TImporto sld('D', tcon.saldo());
TImporto old_sld(saldi.get_char(SLD_FLAGSALINI), saldi.get_real(SLD_SALDO));
sld += old_sld;
sld.normalize();
saldi.put(SLD_FLAGSALINI, sld.sezione());
saldi.put(SLD_SALDO, sld.valore());
TImporto sf('D', tcon.saldofin());
TImporto old_sf(saldi.get_char(SLD_FLAGSALFIN), saldi.get_real(SLD_SALDOFIN));

2
src/xvaga/xvtmail.cpp
View File

@ -396,7 +396,7 @@ BOOLEAN xvt_powermail_send(const char* to, const char* cc, const char* ccn,
file.Close();
wxString command;
command << "PowerShell -ExecutionPolicy ByPass -NonInteractive -NoProfile -Command \"& {" << powerFile << "; exit $LastExitCode }\"";
command << R"(PowerShell -ExecutionPolicy ByPass -NonInteractive -NoProfile -Command "&{)" << powerFile << R"(; exit $LastExitCode }")";
BOOLEAN sys_command = (BOOLEAN)system(command);
if (!sys_command)