diff --git a/cd/test/cg1140.txt b/cd/test/cg1140.txt new file mode 100644 index 000000000..80cb50de8 --- /dev/null +++ b/cd/test/cg1140.txt @@ -0,0 +1,5 @@ +cg2100c.msk +cg2100t.msk +cg2.exe + +Nelle fatture intra l'identificativo SDI viene recuperato da FPPRO e scritto sulla fattura di acquisto e sulla regolarizzazione \ No newline at end of file diff --git a/cd/test/cg1140a.ini b/cd/test/cg1140a.ini new file mode 100644 index 000000000..f9728bd6f --- /dev/null +++ b/cd/test/cg1140a.ini @@ -0,0 +1,100 @@ +[Main] +Demo=0 + +[cg2] +File(51) = cg2.exe|X +File(54) = cg2100c.msk|X +File(62) = cg2100t.msk|X +Patch = 1140 +Versione = 21511200 + +[cg99] +Kill(0) = bastesc.rep|x +Kill(1) = bastcam.msk|x +Kill(2) = bastivd.msk|x +Kill(3) = bastscc.rep|x +Kill(4) = bastcam.rep|x +Kill(5) = batbcve.msk|x +Kill(6) = batbndo.msk|x +Kill(7) = bastmsp.msk|x +Kill(8) = bastivd.rep|x +Kill(9) = bastarb.msk|x +Kill(10) = batbdel.msk|x +Kill(11) = cgtbcon.msk|x +Kill(12) = bastzon.msk|x +Kill(13) = bastcco.msk|x +Kill(14) = bastleg.msk|x +Kill(15) = bastreg.rep|x +Kill(16) = batbleg.msk|x +Kill(17) = cg2fppro.msk|x +Kill(18) = bastpdb.rep|x +Kill(19) = bastdpn.rep|x +Kill(20) = batbind.msk|x +Kill(21) = bastzon.rep|x +Kill(22) = bastesc.msk|x +Kill(23) = batbzon.msk|x +Kill(24) = bastpdb.msk|x +Kill(25) = batbpdb.msk|x +Kill(26) = batbreg.msk|x +Kill(27) = batbarb.msk|x +Kill(28) = batbnot.msk|x +Kill(29) = bastarb.rep|x +Kill(30) = bastvet.msk|x +Kill(31) = batblbu.msk|x +Kill(32) = batbinl.msk|x +Kill(33) = bastpor.msk|x +Kill(34) = batbdpn.msk|x +Kill(35) = bastpor.rep|x +Kill(36) = bastndo.rep|x +Kill(37) = bastcfi.rep|x +Kill(38) = bastcve.rep|x +Kill(39) = bastver.rep|x +Kill(40) = bastcco.rep|x +Kill(41) = bastntb.msk|x +Kill(42) = bastleg.rep|x +Kill(43) = batbcam.msk|x +Kill(44) = batbivd.msk|x +Kill(45) = bastnot.msk|x +Kill(46) = batblia.msk|x +Kill(47) = batbcco.msk|x +Kill(48) = bastreg.msk|x +Kill(49) = bastndo.msk|x +Kill(50) = bastscc.msk|x +Kill(51) = batbmsp.msk|x +Kill(52) = bastvet.rep|x +Kill(53) = batbntb.msk|x +Kill(54) = batbtit.msk|x +Kill(55) = batbesc.msk|x +Kill(56) = bastntb.rep|x +Kill(57) = bastver.msk|x +Kill(58) = batblia.msk|x +Kill(59) = bastmsp.rep|x +Kill(60) = batbpor.msk|x +Kill(61) = bastcfi.msk|x +Kill(62) = batbscc.msk|x +Kill(63) = batbins.msk|x +Kill(64) = bastdpn.msk|x +Kill(65) = bastnot.rep|x +Kill(66) = batbver.msk|x +Kill(67) = bastcve.msk|x +Kill(68) = batbvet.msk|x +Kill(69) = batbtra.msk|x +Kill(70) = batbcfi.msk|x + +[cg] +Data = 21-04-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 = 1140 +PostProcess = bainst -0 CG +PreProcess = +Prezzo(1) = +Prezzo(2) = +Versione = 21511200 + diff --git a/cd/test/cg1140a1.zip b/cd/test/cg1140a1.zip new file mode 100644 index 000000000..7b3e856f8 Binary files /dev/null and b/cd/test/cg1140a1.zip differ diff --git a/src/ci/ci1300.cpp b/src/ci/ci1300.cpp index 1724a8c60..e982112c5 100755 --- a/src/ci/ci1300.cpp +++ b/src/ci/ci1300.cpp @@ -281,9 +281,6 @@ void TRil_ore_ris_mask::elabora_risorsa(const TString& curr_risorsa, const int c const real tot_ore_uso_risorsa_nel_periodo = tot_ore * giorni_lavorativi / giorni_lavorativi_rilore; const TString8 tpora = rilore_recset.get_string(RILORE_TPORA); const TString8 tpassenza = cache().get("&ORE", tpora, "S2"); - - if (tpassenza == "OA") - int i = 1; //crea la chiave per l'assoc_array TToken_string key;