diff --git a/cg/cg4300.cpp b/cg/cg4300.cpp index f1fd3ad13..528f40616 100755 --- a/cg/cg4300.cpp +++ b/cg/cg4300.cpp @@ -596,6 +596,26 @@ bool TLiquidazione_app::what_freq_handler(TMask_field& f, KEY key) return TRUE; } +bool TLiquidazione_app::lst_tm_handler(TMask_field& f, KEY key) +{ + if (key == K_SPACE) + { + TString s(f.get()); + if (s == "13") + { + f.mask().field(CG43_LST_CALC_13A).show(); + f.mask().field(CG43_LST_CALC).hide(); + f.mask().field(CG43_LST_CALC).set("3"); + } + else + { + f.mask().field(CG43_LST_CALC_13A).hide(); + f.mask().field(CG43_LST_CALC).show(); + } + } + return TRUE; +} + void TLiquidazione_app::reset_choices(TMask& m) { _selected.reset(); @@ -659,6 +679,8 @@ bool TLiquidazione_app::set_liquidazione() m.set_handler(CG43_FLD_DFR, fr_ditt_handler); m.set_handler(CG43_RDB_VERS, what_freq_handler); m.set_handler(CG43_FLD_ANNO, ch_year_handler); + m.set_handler(CG43_LST_MESE, lst_tm_handler); + m.set_handler(CG43_LST_TRIM, lst_tm_handler); m.field(CG43_FLD_SELECTED).set(format("%ld",_selected.ones())); diff --git a/cg/cg4300.h b/cg/cg4300.h index 2d7af2946..45a7a7444 100755 --- a/cg/cg4300.h +++ b/cg/cg4300.h @@ -334,6 +334,7 @@ protected: static bool to_ditt_handler(TMask_field& f, KEY key); static bool fr_ditt_handler(TMask_field& f, KEY key); static bool what_freq_handler(TMask_field& f, KEY key); + static bool lst_tm_handler(TMask_field& f, KEY key); static TLiquidazione_app& app() { return (TLiquidazione_app&)main_app(); } diff --git a/cg/cg4300a.h b/cg/cg4300a.h index 62f5b3133..0a9f9014e 100755 --- a/cg/cg4300a.h +++ b/cg/cg4300a.h @@ -13,4 +13,5 @@ #define CG43_FLD_DTO 114 #define CG43_LST_CALC 115 #define CG43_CHK_FINAL 116 +#define CG43_LST_CALC_13A 117 diff --git a/cg/cg4300a.uml b/cg/cg4300a.uml index 39d71eec2..11da10696 100755 --- a/cg/cg4300a.uml +++ b/cg/cg4300a.uml @@ -84,6 +84,14 @@ BEGIN ITEM "3|Da inizio anno" END +LIST CG43_LST_CALC_13A 15 +BEGIN + PROMPT 4 8 "Ricalcola " + HELP "Indicare se rifare il calcolo durante la stampa" + ITEM "3|Da inizio anno" + FLAGS "H" +END + GROUPBOX DLG_NULL 60 3 BEGIN PROMPT 4 10 "Stampa"