From 5fbedf1ae13bf5125a7ca3138fa554c977552aee Mon Sep 17 00:00:00 2001 From: Mattia Tollari <mtt.tollari@gmail.com> Date: Tue, 31 Jul 2018 16:53:37 +0200 Subject: [PATCH] Patch level : 12.0 614 Files correlati : fp Commento : Commit non fatto della roba descritta prima, avevo salvato? --- src/fp/fp0100.cpp | 18 ++++++++++++++++++ src/fp/fp0100a.h | 2 ++ src/fp/fp0100a.uml | 28 ++++++++++++++++++++++++---- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/fp/fp0100.cpp b/src/fp/fp0100.cpp index cb8817737..035c2cb91 100644 --- a/src/fp/fp0100.cpp +++ b/src/fp/fp0100.cpp @@ -41,6 +41,8 @@ void TParametri_mask::save_all() const ini_set_string(CONFIG_DITTA, "fp", "flddest", get(F_FLDDEST)); ini_set_string(CONFIG_DITTA, "fp", "fldusrdest", get(F_FLDUSRDEST)); ini_set_string(CONFIG_DITTA, "fp", "cofitras", get(F_COFI)); + ini_set_bool(CONFIG_DITTA, "fp", "gestioneallegati", get(F_ESPORTAALLEG)); + ini_set_bool(CONFIG_DITTA, "fp", "allegafatt", get(F_ESPORTADOC)); } void TParametri_mask::load_all() @@ -52,6 +54,8 @@ void TParametri_mask::load_all() set(F_FLDDEST, ini_get_string(CONFIG_DITTA, "fp", "flddest")); set(F_FLDUSRDEST, ini_get_string(CONFIG_DITTA, "fp", "fldusrdest")); set(F_COFI, ini_get_string(CONFIG_DITTA, "fp", "cofitras")); + set(F_ESPORTAALLEG, ini_get_bool(CONFIG_DITTA, "fp", "gestioneallegati")); + set(F_ESPORTADOC, ini_get_bool(CONFIG_DITTA, "fp", "allegafatt")); } void TParametri_mask::tipi_import() @@ -191,6 +195,20 @@ bool TParametri_mask::on_field_event(TOperable_field& o, TField_event e, long jo } } break; + case F_ESPORTAALLEG: + { + const bool esporta = get_bool(F_ESPORTAALLEG); + field(F_FLDDEST).check_type(esporta ? CHECK_REQUIRED : CHECK_NONE); + field(F_FLDUSRDEST).check_type(esporta ? CHECK_REQUIRED : CHECK_NONE); + field(F_ESPORTADOC).enable(esporta); + if (e == fe_modify && !esporta) + { + set(F_FLDDEST, ""); + set(F_FLDUSRDEST, ""); + set(F_ESPORTADOC, ""); + } + } + break; default: break; } diff --git a/src/fp/fp0100a.h b/src/fp/fp0100a.h index e05cea82d..3fdd14a1f 100644 --- a/src/fp/fp0100a.h +++ b/src/fp/fp0100a.h @@ -5,6 +5,8 @@ #define F_FLDDEST 105 #define F_FLDUSRDEST 106 #define F_COFI 107 +#define F_ESPORTAALLEG 108 +#define F_ESPORTADOC 109 #define F_SETPATCH 201 #define F_ENPTYTABLE 202 diff --git a/src/fp/fp0100a.uml b/src/fp/fp0100a.uml index 66f4f8ad6..84da19f00 100644 --- a/src/fp/fp0100a.uml +++ b/src/fp/fp0100a.uml @@ -3,12 +3,16 @@ TOOLBAR "topbar" 0 0 0 2 #include <stdbar.h> +/* + BUTTON DLG_ELABORA 2 2 BEGIN PROMPT 1 1 "Imp. Tipi Doc" PICTURE TOOL_ELABORA FLAGS "HD" END +*/ + ENDPAGE PAGE "Configurazione FP" 0 2 0 0 @@ -49,24 +53,40 @@ END GROUPBOX DLG_NULL 78 3 BEGIN - PROMPT 1 9 "@BTrasmittente" + PROMPT 1 7 "@BTrasmittente" END STRING F_COFI 16 BEGIN - PROMPT 2 10 "Codice fiscale trasmittente " + PROMPT 2 8 "Codice fiscale trasmittente " CHECKTYPE REQUIRED END +GROUPBOX DLG_NULL 78 6 +BEGIN + PROMPT 1 10 "@BConfigurazione Allegati" +END + +BOOLEAN F_ESPORTAALLEG +BEGIN + PROMPT 2 11 "Abilita esportazione allegati" +END + +BOOLEAN F_ESPORTADOC +BEGIN + PROMPT 2 12 "Allega pdf documento nell'XML" + FLAGS "D" +END + STRING F_FLDDEST 300 50 BEGIN - PROMPT 2 6 "Destinazione Server " + PROMPT 2 13 "Destinazione Server " FLAGS "" END STRING F_FLDUSRDEST 300 50 BEGIN - PROMPT 2 7 "Destinazione User " + PROMPT 2 14 "Destinazione User " DSELECT FLAGS "" END