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

Browse Source
This commit is contained in:
Simone Palacino 2019-02-28 12:47:13 +01:00
commit 4417f38f35
7 changed files with 243 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,3 @@
cg4.exe
Corretto calcolo rimborsi in liquidazione per il credito utilizzabile

94
cd/test/cg0714a.ini Normal file
View File

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

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

Binary file not shown.

5
cd/test/ve0714.txt Normal file
View File

@ -0,0 +1,5 @@
ve0.exe
ve0100a.msk
Migliorata la segnalazione quando c'é una divisione per zero
Corretta la ricerca per ragione sociale nella maschera di quey dei documenti interattivi in modo che sia case insensitive (Metacalabria)

130
cd/test/ve0714a.ini Normal file
View File

@ -0,0 +1,130 @@
[Main]
Demo=0
[ve1]
File(0) = ve0.exe|X
File(1) = ve0100a.msk|X
Patch = 714
Versione = 21511200
[ve99]
Kill(0) = batbcld.msk|x
Kill(1) = bastspp.rep|x
Kill(2) = bastbnp.msk|x
Kill(3) = bastgmc.rep|x
Kill(4) = batbgsa.msk|x
Kill(5) = bastfrm.msk|x
Kill(6) = batbfca.msk|x
Kill(7) = bastgcg.rep|x
Kill(8) = bastprs.rep|x
Kill(9) = basttip.msk|x
Kill(10) = bastfrr.rep|x
Kill(11) = bastrfa.rep|x
Kill(12) = ve7200a.frm|x
Kill(13) = batbfrd.msk|x
Kill(14) = bastcaa.msk|x
Kill(15) = batbprv.msk|x
Kill(16) = ve7400conf.ini|x
Kill(17) = bastfca.msk|x
Kill(18) = batbasf.msk|x
Kill(19) = efstbnp.rep|x
Kill(20) = batbgca.msk|x
Kill(21) = bastums.rep|x
Kill(22) = bastctr.msk|x
Kill(23) = ve7.exe|x
Kill(24) = basteld.rep|x
Kill(25) = batbtri.msk|x
Kill(26) = batbfrr.msk|x
Kill(27) = batbmre.msk|x
Kill(28) = ve7701a.ini|x
Kill(29) = batbtag.msk|x
Kill(30) = bastasf.rep|x
Kill(31) = batbrfa.msk|x
Kill(32) = bastrfc.rep|x
Kill(33) = ve7200a.msk|x
Kill(34) = eftbbnp.msk|x
Kill(35) = batbrfc.msk|x
Kill(36) = basttag.rep|x
Kill(37) = bastgca.rep|x
Kill(38) = bastprs.msk|x
Kill(39) = ve7300a.frm|x
Kill(40) = bastabe.msk|x
Kill(41) = batbnum.msk|x
Kill(42) = bastspp.msk|x
Kill(43) = batbbnp.msk|x
Kill(44) = bastubi.msk|x
Kill(45) = batbcaa.msk|x
Kill(46) = bastnum.rep|x
Kill(47) = batbfsa.msk|x
Kill(48) = bastrfa.msk|x
Kill(49) = bastimb.rep|x
Kill(50) = bastgmc.msk|x
Kill(51) = batbgcg.msk|x
Kill(52) = bastgcg.msk|x
Kill(53) = batbstd.msk|x
Kill(54) = batbfid.msk|x
Kill(55) = basttag.msk|x
Kill(56) = batbctr.msk|x
Kill(57) = batbspp.msk|x
Kill(58) = bastums.msk|x
Kill(59) = bastfrm.rep|x
Kill(60) = ve7100a.msk|x
Kill(61) = bastasf.msk|x
Kill(62) = bastabe.rep|x
Kill(63) = bastrfc.msk|x
Kill(64) = basteld.msk|x
Kill(65) = batbpro.msk|x
Kill(66) = batbtip.msk|x
Kill(67) = bastubi.rep|x
Kill(68) = bastcau.rep|x
Kill(69) = batbprs.msk|x
Kill(70) = batbubi.msk|x
Kill(71) = bastcau.msk|x
Kill(72) = basttri.rep|x
Kill(73) = ve7400a.ini|x
Kill(74) = bastgca.msk|x
Kill(75) = bastcaa.rep|x
Kill(76) = baststd.rep|x
Kill(77) = ve7400a.msk|x
Kill(78) = batbcau.msk|x
Kill(79) = bastctr.rep|x
Kill(80) = baststd.msk|x
Kill(81) = bastimb.msk|x
Kill(82) = ve7500a.msk|x
Kill(83) = bastfrr.msk|x
Kill(84) = ve7600a.msk|x
Kill(85) = bastfrd.rep|x
Kill(86) = basttip.rep|x
Kill(87) = bastfca.rep|x
Kill(88) = bastnum.msk|x
Kill(89) = batbums.msk|x
Kill(90) = ve7300a.msk|x
Kill(91) = bastcra.rep|x
Kill(92) = ve7700a.msk|x
Kill(93) = batbspt.msk|x
Kill(94) = basttri.msk|x
Kill(95) = batbeld.msk|x
Kill(96) = batbcra.msk|x
Kill(97) = batbfrm.msk|x
Kill(98) = batbacr.msk|x
Kill(99) = batbimb.msk|x
Kill(100) = batbgmc.msk|x
Kill(101) = bastcra.msk|x
Kill(102) = bastbnp.rep|x
Kill(103) = bastfrd.msk|x
Kill(104) = efstbnp.msk|x
Kill(105) = batbabe.msk|x
[ve]
Data = 26-02-2019
Descrizione = Vendite
Dischi = 1
Moduli = ba,cg9,pr9,mg9,sv9,in9,ef9
OEM =
Patch = 714
PostProcess = bainst -0 VE
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

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

Binary file not shown.

15
src/cg/cg4301.cpp
View File

@ -1184,7 +1184,10 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array &
if (date.year() != year_int) // Controlla anno di appartenenza, altrimenti is_date_ok potrebbe non funzionare
continue;
}
#ifdef DBG
if (nr == 35363)
int i = 1;
#endif
const TRectype& rcs = _cur->curr(LF_CAUSALI);
const TDate datareg = _mov->get_date(MOV_DATAREG);
const TDate datadoc = _mov->get_date(MOV_DATADOC);
@ -4167,8 +4170,12 @@ void TLiquidazione_app::write_liq(int month, const char* codatts)
if (risul > ZERO)
{
if (gestione_manuale_credito_compensabile)
credito_utilizzabile -= lim.get_real("R15");
credito_utilizzato_iva = min(risul, credito_utilizzabile);
{
credito_utilizzato_iva = lim.get_real("R15");
credito_utilizzato_iva = min(risul, credito_utilizzato_iva);
}
else
credito_utilizzato_iva = min(risul, credito_utilizzabile);
res_cred += credito_utilizzato_iva;
risultato -= credito_utilizzato_iva;
}
@ -4523,7 +4530,7 @@ void TLiquidazione_app::write_liq(int month, const char* codatts)
const TRectype & lia = get_lia();
const bool gestione_manuale_credito_compensabile = lia.get_bool("B6");
// if (!gestione_manuale_credito_compensabile)
if (!gestione_manuale_credito_compensabile)
lim.put("R15", credito_utilizzato_iva);
if (month == 13)