diff --git a/cd/test/ba0744.txt b/cd/test/ba0744.txt new file mode 100644 index 000000000..eb67bb338 --- /dev/null +++ b/cd/test/ba0744.txt @@ -0,0 +1,3 @@ +ba8.exe + +Aggiornato query e report con possibilità di effettuare queries utilizzando la nuova libreria del database \ No newline at end of file diff --git a/cd/test/ba0744a.ini b/cd/test/ba0744a.ini new file mode 100644 index 000000000..47280106d --- /dev/null +++ b/cd/test/ba0744a.ini @@ -0,0 +1,34 @@ +[Main] +Demo=0 + +[ba1] +Edit_4 = ba3 -0 +Edit_5 = ba3 -0 +Edit_6 = ba4 -1 +File(76) = ba8.exe|X +Patch = 0744 +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 = 25-03-2019 +Descrizione = Base +Dischi = 1 +Moduli = sy +OEM = +Patch = 744 +PostProcess = bainst -0 BA +PreProcess = +Prezzo(1) = +Prezzo(2) = +Versione = 21511200 + diff --git a/cd/test/ba0744a1.zip b/cd/test/ba0744a1.zip new file mode 100644 index 000000000..72394d839 Binary files /dev/null and b/cd/test/ba0744a1.zip differ diff --git a/cd/test/fp0744.txt b/cd/test/fp0744.txt new file mode 100644 index 000000000..981f64ea4 --- /dev/null +++ b/cd/test/fp0744.txt @@ -0,0 +1,6 @@ +fpmenu.men +fp1200a.msk +fp0.exe +fp1.exe + +Spostato programma \ No newline at end of file diff --git a/cd/test/fp0744a.ini b/cd/test/fp0744a.ini new file mode 100644 index 000000000..3f4f7282a --- /dev/null +++ b/cd/test/fp0744a.ini @@ -0,0 +1,22 @@ +[Main] +Demo=0 + +[fp1] +File(0) = fp0.exe|X +File(6) = fp1.exe|X +File(8) = fpmenu.men|X +File(9) = fp1200a.msk|X +Patch = 0744 +Versione = 21511200 + +[fp] +Data = 25-03-2019 +Descrizione = Fattura Elettronica +Dischi = 1 +Moduli = cg,ve +OEM = +Patch = 744 +PostProcess = +PreProcess = +Versione = 21511200 + diff --git a/cd/test/fp0744a1.zip b/cd/test/fp0744a1.zip new file mode 100644 index 000000000..490dfbbe0 Binary files /dev/null and b/cd/test/fp0744a1.zip differ diff --git a/cd/test/lv0746.txt b/cd/test/lv0746.txt new file mode 100644 index 000000000..e0b75e571 --- /dev/null +++ b/cd/test/lv0746.txt @@ -0,0 +1,3 @@ +lv3.exe + +Risitemata la ricerca della data di prossima consegna nelle bolle (IMPREMED) \ No newline at end of file diff --git a/cd/test/lv0746a.ini b/cd/test/lv0746a.ini new file mode 100644 index 000000000..b48f0ceac --- /dev/null +++ b/cd/test/lv0746a.ini @@ -0,0 +1,22 @@ +[Main] +Demo=0 + +[lv1] +Edit_168 = lv0 -3 +File(63) = lv3.exe|X +Patch = 746 +Versione = 21511200 + +[lv] +Data = 27-03-2019 +Descrizione = Gestione lavanderie +Dischi = 1 +Moduli = ve,mg +OEM = 2 +Patch = 746 +PostProcess = bainst -0 LV +PreProcess = +Prezzo(1) = +Prezzo(2) = +Versione = 21511200 + diff --git a/cd/test/lv0746a1.zip b/cd/test/lv0746a1.zip new file mode 100644 index 000000000..381d8f5a8 Binary files /dev/null and b/cd/test/lv0746a1.zip differ diff --git a/cd/test/sy0744.txt b/cd/test/sy0744.txt new file mode 100644 index 000000000..8a129ec8e --- /dev/null +++ b/cd/test/sy0744.txt @@ -0,0 +1,3 @@ +xvtdb.dll + +Aggiornata dll database \ No newline at end of file diff --git a/cd/test/sy0744a.ini b/cd/test/sy0744a.ini new file mode 100644 index 000000000..ed2f4641f --- /dev/null +++ b/cd/test/sy0744a.ini @@ -0,0 +1,21 @@ +[Main] +Demo=0 + +[sy1] +File(53) = xvtdb.dll|X +Patch = 744 +Versione = 21511200 + +[sy] +Data = 21-03-2019 +Descrizione = Sistema +Dischi = 1 +Moduli = +OEM = +Patch = 744 +PostProcess = +PreProcess = +Prezzo(1) = +Prezzo(2) = +Versione = 21511200 + diff --git a/cd/test/sy0744a1.zip b/cd/test/sy0744a1.zip new file mode 100644 index 000000000..1772b0024 Binary files /dev/null and b/cd/test/sy0744a1.zip differ diff --git a/cd/test/tf0744.txt b/cd/test/tf0744.txt new file mode 100644 index 000000000..ab4c552a3 --- /dev/null +++ b/cd/test/tf0744.txt @@ -0,0 +1,3 @@ +tf0.exe + +Sistemati calcoli IVA trimestrale con movimenti aventi il flag "periodo IVA precedente" \ No newline at end of file diff --git a/cd/test/tf0744a.ini b/cd/test/tf0744a.ini new file mode 100644 index 000000000..9bb2e85d6 --- /dev/null +++ b/cd/test/tf0744a.ini @@ -0,0 +1,19 @@ +[Main] +Demo=0 + +[tf1] +File(0) = tf0.exe|X +Patch = 0744 +Versione = 21511200 + +[tf] +Data = 25-03-2019 +Descrizione = Trasferimento fatture +Dischi = 1 +Moduli = cg +OEM = +Patch = 744 +PostProcess = +PreProcess = +Versione = 21511200 + diff --git a/cd/test/tf0744a1.zip b/cd/test/tf0744a1.zip new file mode 100644 index 000000000..b00c63ff0 Binary files /dev/null and b/cd/test/tf0744a1.zip differ diff --git a/cd/test/ve0744.txt b/cd/test/ve0744.txt new file mode 100644 index 000000000..65d02718d --- /dev/null +++ b/cd/test/ve0744.txt @@ -0,0 +1,3 @@ +ve5.exe + +Aggiunto controllo nel trasferimento documento per verificare che gli archivi siano compatibili (IMPREMED) \ No newline at end of file diff --git a/cd/test/ve0744a.ini b/cd/test/ve0744a.ini new file mode 100644 index 000000000..3cad5e11b --- /dev/null +++ b/cd/test/ve0744a.ini @@ -0,0 +1,129 @@ +[Main] +Demo=0 + +[ve1] +File(86) = ve5.exe|X +Patch = 744 +Versione = 21511200 + +[ve99] +Kill(0) = batbimb.msk|x +Kill(1) = batbacr.msk|x +Kill(2) = eftbbnp.msk|x +Kill(3) = bastgmc.rep|x +Kill(4) = bastabe.msk|x +Kill(5) = bastbnp.msk|x +Kill(6) = bastfrd.rep|x +Kill(7) = bastcra.rep|x +Kill(8) = ve7701a.ini|x +Kill(9) = bastgcg.rep|x +Kill(10) = batbstd.msk|x +Kill(11) = batbfca.msk|x +Kill(12) = batbnum.msk|x +Kill(13) = bastfrm.msk|x +Kill(14) = batbfsa.msk|x +Kill(15) = batbgsa.msk|x +Kill(16) = bastfrm.rep|x +Kill(17) = ve7400conf.ini|x +Kill(18) = bastgca.rep|x +Kill(19) = batbbnp.msk|x +Kill(20) = bastctr.rep|x +Kill(21) = batbprv.msk|x +Kill(22) = batbtri.msk|x +Kill(23) = batbcau.msk|x +Kill(24) = basteld.rep|x +Kill(25) = ve7700a.msk|x +Kill(26) = batbgca.msk|x +Kill(27) = efstbnp.rep|x +Kill(28) = ve7200a.msk|x +Kill(29) = basttip.rep|x +Kill(30) = bastcra.msk|x +Kill(31) = bastasf.rep|x +Kill(32) = bastcau.rep|x +Kill(33) = ve7500a.msk|x +Kill(34) = basttag.rep|x +Kill(35) = bastfrr.msk|x +Kill(36) = bastspp.msk|x +Kill(37) = bastums.rep|x +Kill(38) = batbabe.msk|x +Kill(39) = batbprs.msk|x +Kill(40) = batbgmc.msk|x +Kill(41) = bastgca.msk|x +Kill(42) = batbcaa.msk|x +Kill(43) = bastrfa.rep|x +Kill(44) = bastimb.rep|x +Kill(45) = ve7100a.msk|x +Kill(46) = basttri.rep|x +Kill(47) = basteld.msk|x +Kill(48) = batbtip.msk|x +Kill(49) = ve7.exe|x +Kill(50) = bastcau.msk|x +Kill(51) = bastrfc.rep|x +Kill(52) = batbrfc.msk|x +Kill(53) = bastubi.rep|x +Kill(54) = ve7300a.frm|x +Kill(55) = bastgmc.msk|x +Kill(56) = bastabe.rep|x +Kill(57) = batbfid.msk|x +Kill(58) = batbctr.msk|x +Kill(59) = bastums.msk|x +Kill(60) = bastasf.msk|x +Kill(61) = bastfrr.rep|x +Kill(62) = ve7600a.msk|x +Kill(63) = batbspp.msk|x +Kill(64) = batbtag.msk|x +Kill(65) = ve7300a.msk|x +Kill(66) = bastgcg.msk|x +Kill(67) = bastubi.msk|x +Kill(68) = bastnum.rep|x +Kill(69) = bastrfa.msk|x +Kill(70) = batbgcg.msk|x +Kill(71) = ve7400a.ini|x +Kill(72) = bastcaa.msk|x +Kill(73) = batbasf.msk|x +Kill(74) = bastfca.rep|x +Kill(75) = batbmre.msk|x +Kill(76) = baststd.msk|x +Kill(77) = batbspt.msk|x +Kill(78) = batbrfa.msk|x +Kill(79) = bastprs.msk|x +Kill(80) = bastimb.msk|x +Kill(81) = bastrfc.msk|x +Kill(82) = batbpro.msk|x +Kill(83) = bastctr.msk|x +Kill(84) = basttag.msk|x +Kill(85) = batbfrr.msk|x +Kill(86) = batbubi.msk|x +Kill(87) = ve7200a.frm|x +Kill(88) = batbfrd.msk|x +Kill(89) = bastfca.msk|x +Kill(90) = batbfrm.msk|x +Kill(91) = batbcra.msk|x +Kill(92) = bastnum.msk|x +Kill(93) = basttri.msk|x +Kill(94) = batbums.msk|x +Kill(95) = batbeld.msk|x +Kill(96) = efstbnp.msk|x +Kill(97) = bastcaa.rep|x +Kill(98) = bastspp.rep|x +Kill(99) = batbcld.msk|x +Kill(100) = bastfrd.msk|x +Kill(101) = ve7400a.msk|x +Kill(102) = bastbnp.rep|x +Kill(103) = baststd.rep|x +Kill(104) = basttip.msk|x +Kill(105) = bastprs.rep|x + +[ve] +Data = 25-03-2019 +Descrizione = Vendite +Dischi = 1 +Moduli = ba,cg9,pr9,mg9,sv9,in9,ef9 +OEM = +Patch = 744 +PostProcess = bainst -0 VE +PreProcess = +Prezzo(1) = +Prezzo(2) = +Versione = 21511200 + diff --git a/cd/test/ve0744a1.zip b/cd/test/ve0744a1.zip new file mode 100644 index 000000000..9b6dceccf Binary files /dev/null and b/cd/test/ve0744a1.zip differ diff --git a/src/lv/lv3100.cpp b/src/lv/lv3100.cpp index c50d901e0..846ba1f1c 100755 --- a/src/lv/lv3100.cpp +++ b/src/lv/lv3100.cpp @@ -566,13 +566,21 @@ bool TGestione_bolle_msk::lv_bolla_handler(TMask_field& f, KEY k) else { doc.put(DOC_CODCF, codcf); + ((TMask &)dmsk).set(F_CODCF, codcf); doc.put(DOC_DATADOC, datadoc); - doc.put(DOC_CODINDSP, indsped); - doc.put(DOC_CODCONT, codcont); - + ((TMask &)dmsk).set(F_DATADOC, datadoc); + doc.put(DOC_CODINDSP, indsped); + ((TMask &)dmsk).set(F_CODINDSP, indsped); + doc.put(DOC_CONTRATTO, codcont); + ((TMask &)dmsk).set(F_LVCODCONT, codcont); + const TDate dataprco = dmsk.proponi_dataprco(); - if (dataprco.ok() && dmsk.get(F_LVDATAPRCO).empty()) - doc.put("DATAPRCO", dataprco); + + if (dataprco.ok() && dmsk.get(F_LVDATAPRCO).blank()) + { + ((TMask &)dmsk).set(F_LVDATAPRCO, dataprco); + doc.put("DATAPRCO", dataprco); + } } if (dmsk._stcodcf == codcf && dmsk._stcodcont == codcont && nrighe > 0) diff --git a/src/tf/tf0200.cpp b/src/tf/tf0200.cpp index d7d812ba1..12206c11f 100644 --- a/src/tf/tf0200.cpp +++ b/src/tf/tf0200.cpp @@ -456,7 +456,10 @@ void TCom_liq_per_iva_msk::extractinator() // Per gli amici GTFO if(codiva.tipo() == "NS") continue; // Controllo che la registrazione sia di del mese che mi interessa o con flag "liquidazione periodo precedente" - if (cur_iva.get("23." MOV_DATAREG).as_date().month() == start || start == cur_iva.get("23." MOV_MESELIQ).as_int()) + const int month_reg = cur_iva.get("23." MOV_DATAREG).as_date().month(); + const int month_liq = cur_iva.get("23." MOV_MESELIQ).as_int(); + // month_liq viene valorizzato solo se è del mese precedente o sempre? Nei record vecchi ovviamente sarà a zero ma adesso che ci mette? + if ((month_reg == start && (month_liq == 0 || month_liq == month_reg)) || start == month_liq) { // Prendo il tipo di registro TRegistro reg(cur_iva.get(FIELD_NAME(LF_MOV, MOV_REG)).as_string(), anno); diff --git a/src/ve/ve5400.cpp b/src/ve/ve5400.cpp index 8ef04be8a..b28e0632a 100755 --- a/src/ve/ve5400.cpp +++ b/src/ve/ve5400.cpp @@ -232,6 +232,9 @@ bool TArchive_doc::restore_file(TIsamtempfile& src, bool update) { TFast_isamfile dst(src.num()); + if (src.curr().len() != dst.curr().len()) + if (!yesnocancel_box(FR("Il file %s da ripristinare non è compatibile con lo stesso file\n nell'installazione andrebbe rigenerato"), src.description())) + return false; TString msg; msg << TR("Trasferimento") << ' ' << dst.description(); TProgress_monitor pi(src.items(), msg); for (int err = src.first(); err == NOERR; err = src.next())