diff --git a/cd/test/ce0956.txt b/cd/test/ce0956.txt new file mode 100644 index 000000000..52154ee7c --- /dev/null +++ b/cd/test/ce0956.txt @@ -0,0 +1,4 @@ +ce3.exe +ce3900.msk + +Corretto ordinamento e l'interfaccia della stampa registro cespiti sintetico \ No newline at end of file diff --git a/cd/test/ce0956a.ini b/cd/test/ce0956a.ini new file mode 100644 index 000000000..9ec2256c3 --- /dev/null +++ b/cd/test/ce0956a.ini @@ -0,0 +1,24 @@ +[Main] +Demo=0 + +[ce1] +Edit_4 = ce0 -0 +Edit_5 = ce0 -0 +File(30) = ce3.exe|X +File(47) = ce3900.msk|X +Patch = 956 +Versione = 21511200 + +[ce] +Data = 05-12-2019 +Descrizione = Cespiti +Dischi = 1 +Moduli = ba,cg +OEM = +Patch = 956 +PostProcess = bainst -0 CE +PreProcess = +Prezzo(1) = +Prezzo(2) = +Versione = 21511200 + diff --git a/cd/test/ce0956a1.zip b/cd/test/ce0956a1.zip new file mode 100644 index 000000000..48d6701a9 Binary files /dev/null and b/cd/test/ce0956a1.zip differ diff --git a/cd/test/ve0956.txt b/cd/test/ve0956.txt new file mode 100644 index 000000000..700bc4724 --- /dev/null +++ b/cd/test/ve0956.txt @@ -0,0 +1,6 @@ +ve0.exe +ve5.exe +ve1.exe +ve6.exe + +Corretta contabilizzazione note di credito split-payment e reverse charge nel saldaconto. \ No newline at end of file diff --git a/cd/test/ve0956a.ini b/cd/test/ve0956a.ini new file mode 100644 index 000000000..f2e8826ea --- /dev/null +++ b/cd/test/ve0956a.ini @@ -0,0 +1,140 @@ +[Main] +Demo=0 + +[ve0] +File(20) = ve0.exe|X +Patch = 956 +Versione = 21511200 + +[ve1] +File(40) = ve1.exe|X +File(257) = ve5.exe|X +Patch = 956 +Versione = 21511200 + +[ve6] +File(243) = ve6.exe|X +Patch = 956 +Versione = 21511200 + +[ve99] +Kill(0) = batbcld.msk|x +Kill(1) = bastspp.rep|x +Kill(2) = ve7400a.ini|x +Kill(3) = batbeld.msk|x +Kill(4) = batbstd.msk|x +Kill(5) = bastcau.msk|x +Kill(6) = bastprs.msk|x +Kill(7) = efstbnp.msk|x +Kill(8) = ve7300a.msk|x +Kill(9) = batbcra.msk|x +Kill(10) = batbgmc.msk|x +Kill(11) = bastctr.rep|x +Kill(12) = bastgca.msk|x +Kill(13) = bastgmc.msk|x +Kill(14) = basttip.rep|x +Kill(15) = bastfrr.rep|x +Kill(16) = bastctr.msk|x +Kill(17) = bastfrr.msk|x +Kill(18) = batbcaa.msk|x +Kill(19) = batbfrr.msk|x +Kill(20) = ve7701a.ini|x +Kill(21) = bastasf.msk|x +Kill(22) = batbctr.msk|x +Kill(23) = bastrfc.msk|x +Kill(24) = basteld.rep|x +Kill(25) = bastabe.rep|x +Kill(26) = bastprs.rep|x +Kill(27) = bastfrd.rep|x +Kill(28) = batbfrm.msk|x +Kill(29) = bastrfc.rep|x +Kill(30) = ve7300a.frm|x +Kill(31) = batbfid.msk|x +Kill(32) = bastcaa.msk|x +Kill(33) = bastcaa.rep|x +Kill(34) = batbasf.msk|x +Kill(35) = bastfrm.rep|x +Kill(36) = bastgca.rep|x +Kill(37) = ve7100a.msk|x +Kill(38) = ve7500a.msk|x +Kill(39) = batbspt.msk|x +Kill(40) = bastubi.rep|x +Kill(41) = bastfca.rep|x +Kill(42) = bastums.rep|x +Kill(43) = batbgca.msk|x +Kill(44) = baststd.msk|x +Kill(45) = batbprv.msk|x +Kill(46) = basteld.msk|x +Kill(47) = batbubi.msk|x +Kill(48) = batbums.msk|x +Kill(49) = bastimb.msk|x +Kill(50) = eftbbnp.msk|x +Kill(51) = basttri.rep|x +Kill(52) = ve7400conf.ini|x +Kill(53) = bastfrd.msk|x +Kill(54) = ve7400a.msk|x +Kill(55) = bastbnp.msk|x +Kill(56) = bastnum.msk|x +Kill(57) = bastcra.msk|x +Kill(58) = ve7700a.msk|x +Kill(59) = batbtri.msk|x +Kill(60) = batbgsa.msk|x +Kill(61) = bastabe.msk|x +Kill(62) = batbfrd.msk|x +Kill(63) = bastasf.rep|x +Kill(64) = batbgcg.msk|x +Kill(65) = efstbnp.rep|x +Kill(66) = bastfca.msk|x +Kill(67) = baststd.rep|x +Kill(68) = batbfsa.msk|x +Kill(69) = basttri.msk|x +Kill(70) = bastnum.rep|x +Kill(71) = basttag.rep|x +Kill(72) = batbtag.msk|x +Kill(73) = bastspp.msk|x +Kill(74) = ve7200a.frm|x +Kill(75) = batbfca.msk|x +Kill(76) = ve7.exe|x +Kill(77) = bastrfa.msk|x +Kill(78) = batbspp.msk|x +Kill(79) = ve7200a.msk|x +Kill(80) = batbcau.msk|x +Kill(81) = batbrfa.msk|x +Kill(82) = batbmre.msk|x +Kill(83) = bastums.msk|x +Kill(84) = bastfrm.msk|x +Kill(85) = batbabe.msk|x +Kill(86) = bastcau.rep|x +Kill(87) = batbnum.msk|x +Kill(88) = basttag.msk|x +Kill(89) = batbrfc.msk|x +Kill(90) = batbbnp.msk|x +Kill(91) = basttip.msk|x +Kill(92) = ve7600a.msk|x +Kill(93) = batbtip.msk|x +Kill(94) = bastgcg.msk|x +Kill(95) = bastbnp.rep|x +Kill(96) = bastgcg.rep|x +Kill(97) = bastrfa.rep|x +Kill(98) = batbacr.msk|x +Kill(99) = batbimb.msk|x +Kill(100) = bastubi.msk|x +Kill(101) = batbprs.msk|x +Kill(102) = bastgmc.rep|x +Kill(103) = bastimb.rep|x +Kill(104) = bastcra.rep|x +Kill(105) = batbpro.msk|x + +[ve] +Data = 27-02-2020 +Descrizione = Vendite +Dischi = 1 +Moduli = ba,cg9,pr9,mg9,sv9,in9,ef9 +OEM = +Patch = 956 +PostProcess = bainst -0 VE +PreProcess = +Prezzo(1) = +Prezzo(2) = +Versione = 21511200 + diff --git a/cd/test/ve0956a1.zip b/cd/test/ve0956a1.zip new file mode 100644 index 000000000..a0e7c5dc0 Binary files /dev/null and b/cd/test/ve0956a1.zip differ diff --git a/src/ce/ce3900.cpp b/src/ce/ce3900.cpp index 6bce065bb..8b6eabbc0 100755 --- a/src/ce/ce3900.cpp +++ b/src/ce/ce3900.cpp @@ -22,6 +22,9 @@ #include "movce.h" #include "salce.h" +#define SORT_DATACOMP 0x1 +#define SORT_CAT 0x2 + //////////////////////////////////////////////////////// // MASCHERA //////////////////////////////////////////////////////// @@ -133,13 +136,16 @@ void TStampa_sintetica_recordset::set_filter(const TStampa_sintetica_mask& msk) query << "&&(STR(BETWEEN(CODCAT,#DACAT,#ACAT)))"; } //ordinamenti - if (!msk.get_bool(F_SORT_BY_CESP)) + + const int sort_type = msk.get_int(F_SORT); + + if (!(sort_type & SORT_CAT)) { query << "\nBY "; - if (msk.get_bool(F_SORT_BY_DTCOMP)) - query << "DTCOMP|"; - - query << "CODCAT|CODIMP|CODLOC|IDCESPITE"; + if (sort_type & SORT_DATACOMP) + query << "DTCOMP|CODCAT|CODIMP|CODLOC|IDCESPITE"; + else + query << "IDCESPITE"; } @@ -375,11 +381,12 @@ void TStampa_sintetica::main_loop() //report e book dei report TReport_book book; TStampa_sintetica_rep rep; + const int sort_type = mask.get_int(F_SORT); - if (mask.get_bool(F_SORT_BY_CESP)) - rep.load("ce3900b"); - else + if (sort_type & SORT_CAT) rep.load("ce3900a"); + else + rep.load("ce3900b"); rep.set_filter(mask); book.add(rep); diff --git a/src/ce/ce3900.h b/src/ce/ce3900.h index 8a4ca8d4d..42a2c0954 100755 --- a/src/ce/ce3900.h +++ b/src/ce/ce3900.h @@ -26,5 +26,4 @@ #define F_DESCDC 125*/ #define F_REPORT 126 -#define F_SORT_BY_CESP 127 -#define F_SORT_BY_DTCOMP 128 +#define F_SORT 127 diff --git a/src/ce/ce3900.uml b/src/ce/ce3900.uml index 4add6f8c0..30bede67f 100755 --- a/src/ce/ce3900.uml +++ b/src/ce/ce3900.uml @@ -156,23 +156,15 @@ BEGIN PROMPT 42 14 "Escludere i cespiti alienati" END -GROUPBOX DLG_NULL 39 3 +RADIOBUTTON F_SORT 78 BEGIN - PROMPT 1 16 "@bOrdinamenti" + PROMPT 1 16 "@bOrdinamento" + ITEM "2|Categoria+Cespite" + ITEM "0|Cespite" + ITEM "3|Categoria+Completamento" + ITEM "1|Completamento" + FLAGS "Z" END - -BOOLEAN F_SORT_BY_CESP -BEGIN - PROMPT 2 17 "Per cespite" - MESSAGE TRUE "",F_SORT_BY_DTCOMP -END - -BOOLEAN F_SORT_BY_DTCOMP -BEGIN - PROMPT 20 17 "Per data completamento" - MESSAGE TRUE "",F_SORT_BY_CESP -END - ENDPAGE ENDMASK