diff --git a/ca/ca2200.cpp b/ca/ca2200.cpp index 0b626fb95..b8b5b213e 100755 --- a/ca/ca2200.cpp +++ b/ca/ca2200.cpp @@ -285,7 +285,17 @@ void TRib_movanal_app::main_loop() arec.put(MOVANA_DATACOMP, al); _cache_rip.set_esercizio(mask.get_int(F_ANNO)); - TCursor cur_movana(&rel_movana, "BLOCCATO!=\"X\"", 2, &darec, &arec); + const TString & tipo = mask.get(F_CLASSEMOV); + TString filter; + + if (tipo.blank()) + filter = "BLOCCATO!=\"X\""; + else + if (tipo == "N") + filter = "(BLOCCATO!=\"X\")&&(TIPOMOV==\"\")"; + else + filter = "(BLOCCATO!=\"X\")&&(TIPOMOV!=\"\")"; + TCursor cur_movana(&rel_movana, filter, 2, &darec, &arec); const long items = cur_movana.items(); if (items > 0) { diff --git a/ca/ca2200a.h b/ca/ca2200a.h index 1404b0e22..47d865530 100755 --- a/ca/ca2200a.h +++ b/ca/ca2200a.h @@ -5,6 +5,7 @@ #define F_DEFINITIVO 203 #define F_ANNO 204 #define F_COMPATTA 205 +#define F_CLASSEMOV 206 //Devono valere un numero piu' alto di S_CDC12 (che attualmente e' 112) senno' non nascono in fila nello.. //..sheet #define F_CODCAUS 113 diff --git a/ca/ca2200a.uml b/ca/ca2200a.uml index 30358e3fc..9fafbb379 100755 --- a/ca/ca2200a.uml +++ b/ca/ca2200a.uml @@ -56,6 +56,16 @@ BEGIN ADD NONE END +LIST F_CLASSEMOV 22 +BEGIN + PROMPT 36 2 "Classe movimento " + ITEM " |Tutti" + ITEM "N|Normali" + ITEM "P|Preventivo/Variazioni" +END + + + DATA F_DATAINI BEGIN PROMPT 2 3 "Dalla data "