From 82bded9fceadef72deebe7546af59863a731592c Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Wed, 28 Aug 2024 22:40:58 +0200 Subject: [PATCH] Patch level : 12.00 1330 Files correlati : cg0700a.msk ve0100o.msk f18.dir f18.trr Commento: Sistemati clienti occasionali --- src/ve/ve0100o.h | 11 +++ src/ve/ve0100o.uml | 165 +++++++++++++++++++++++++++++++++++++-------- src/ve/ve1300.cpp | 3 +- 3 files changed, 150 insertions(+), 29 deletions(-) diff --git a/src/ve/ve0100o.h b/src/ve/ve0100o.h index ef1cf3764..1b7c347b3 100755 --- a/src/ve/ve0100o.h +++ b/src/ve/ve0100o.h @@ -19,5 +19,16 @@ #define O_DENCOMNAS 114 #define O_LOCALITA 115 #define O_STATOPAIV 116 +#define O_REFERENTE 117 +#define O_BYMAIL 118 +#define O_MAIL 119 +#define O_DOCMAIL 120 +#define O_PEC 121 +#define O_PTEL 122 +#define O_TEL 123 +#define O_PTEL2 124 +#define O_TEL2 125 +#define O_PTEL3 126 +#define O_TEL3 127 #endif diff --git a/src/ve/ve0100o.uml b/src/ve/ve0100o.uml index 4369e3fee..2ae86ce8b 100755 --- a/src/ve/ve0100o.uml +++ b/src/ve/ve0100o.uml @@ -71,26 +71,26 @@ BEGIN VALIDATE PI_FUNC O_STATOPAIV END -GROUPBOX DLG_NULL 70 5 +GROUPBOX DLG_NULL 80 5 BEGIN - PROMPT 1 3 "Dati residenza" + PROMPT 1 5 "@bDati residenza" END STRING O_INDIRIZZO 40 BEGIN - PROMPT 2 4 "Indirizzo " + PROMPT 2 6 "Indirizzo " FIELD INDIR END STRING O_NUMERO 6 BEGIN - PROMPT 55 4 "Numero " + PROMPT 55 6 "Numero " FIELD CIV END STRING O_STATO 3 BEGIN - PROMPT 2 5 "Stato " + PROMPT 2 7 "Stato " HELP "Stato di residenza della persona" FIELD STATO FLAGS "U" @@ -104,72 +104,87 @@ END STRING O_COMUNE 4 BEGIN - PROMPT 27 5 "Comune " + PROMPT 15 7 "Comune " FIELD COM FLAGS "U" USE LF_COMUNI INPUT STATO O_STATO INPUT COM O_COMUNE + DISPLAY "Stato" STATO DISPLAY "Codice" COM DISPLAY "Denominazione@50" DENCOM + OUTPUT O_STATO STATO OUTPUT O_COMUNE COM OUTPUT O_DENCOM DENCOM OUTPUT O_CAP CAPCOM CHECKTYPE NORMAL + ADD RUN ba4 -0 +END + +STRING O_DENCOM 50 45 +BEGIN + PROMPT 30 7 "" + HELP "Nome del comune di residenza della persona" + USE LF_COMUNI KEY 2 + INPUT STATO O_STATO + INPUT DENCOM O_DENCOM + DISPLAY "Denominazione@50" DENCOM + DISPLAY "Stato" STATO + DISPLAY "Codice@10" COM + COPY OUTPUT O_COMUNE + //CHECKTYPE NORMAL + ADD RUN ba4 -0 +END + +STRING O_LOCALITA 35 +BEGIN + PROMPT 2 8 "Localita' " + FIELD LOCALITA + HELP "Localita' del recapito" END NUMBER O_CAP 5 BEGIN - PROMPT 56 5 "C.A.P. " + PROMPT 56 8 "C.A.P. " HELP "CAP della residenza della persona" FIELD CAP + FLAGS "ZF" END -STRING O_DENCOM 50 +GROUPBOX DLG_NULL 80 4 BEGIN - PROMPT 2 6 "Denominazione " - HELP "Nome del comune di residenza della persona" - USE LF_COMUNI KEY 2 - INPUT DENCOM O_DENCOM - DISPLAY "Denominazione@50" DENCOM - DISPLAY "Codice@10" COM - COPY OUTPUT O_COMUNE - CHECKTYPE NORMAL + PROMPT 1 10 "@bDati nascita" END -GROUPBOX DLG_NULL 70 4 +LIST O_SESSO 1 7 BEGIN - PROMPT 1 8 "Dati nascita" -END - -LIST O_SESSO 1 12 -BEGIN - PROMPT 2 9 "Sesso " + PROMPT 2 11 "Sesso " ITEM "M|Maschio" ITEM "F|Femmina" + FIELD SESSO END DATE O_DATANAS BEGIN - PROMPT 23 9 "Data " + PROMPT 23 11 "Data " FIELD DNASC END STRING O_STATONAS 3 BEGIN - PROMPT 41 9 "Stato " + PROMPT 41 11 "Stato " FIELD STATONASC FLAGS "U" COPY USE O_STATO INPUT CODTAB O_STATONAS COPY DISPLAY O_STATO OUTPUT O_STATONAS CODTAB - CHECKTYPE NORMAL + //CHECKTYPE NORMAL END STRING O_COMUNENAS 4 BEGIN - PROMPT 55 9 "Comune " + PROMPT 57 11 "Comune " FIELD COMNASC FLAGS "U" COPY USE O_COMUNE @@ -183,7 +198,7 @@ END STRING O_DENCOMNAS 50 BEGIN - PROMPT 2 10 "Denominazione " + PROMPT 2 12 "Denominazione " COPY USE O_DENCOM INPUT DENCOM O_DENCOMNAS COPY DISPLAY O_DENCOM @@ -191,6 +206,100 @@ BEGIN CHECKTYPE NORMAL END +STRING O_REFERENTE 50 +BEGIN +PROMPT 2 14 "Referente " +FIELD REFERENTE +END + +TEXT DLG_NULL +BEGIN + PROMPT 2 15 "E-Mail" +END + +STRING O_MAIL 50 25 +BEGIN + PROMPT 2 16 "Normale " + FIELD MAIL +END + +BOOLEAN O_BYMAIL +BEGIN + PROMPT 40 16 "Consenso spedizione doc tramite email" + FIELD BYMAIL + MESSAGE FALSE CLEAR,O_DOCMAIL + MESSAGE TRUE ENABLE,O_DOCMAIL +END + +STRING O_DOCMAIL 50 25 +BEGIN + PROMPT 2 17 "Documenti " + FIELD DOCMAIL + CHECKTYPE REQUIRED +END + +STRING O_PEC 80 45 +BEGIN + PROMPT 2 18 "Pec " + FIELD PEC +END + +STRING O_PTEL 5 +BEGIN + PROMPT 2 19 "Telefono " + FIELD PTEL + HELP "Prefisso telefonico primo recapito" +END + +STRING O_TEL 20 15 +BEGIN + PROMPT 18 19 "/" + FIELD TEL + HELP "Numero telefonico primo recapito" +END + +STRING O_PTEL2 5 +BEGIN + PROMPT 11 20 " " + FIELD PTEL2 + HELP "Prefisso telefonico secondo recapito" +END + +STRING O_TEL2 20 15 +BEGIN +PROMPT 18 20 "/" +FIELD TEL2 +HELP "Numero telefonico secondo recapito" +END + +STRING O_PTEL3 5 +BEGIN + PROMPT 11 21 " " + FIELD PTEL3 + HELP "Prefisso telefonico terzo recapito" +END + +STRING O_TEL3 20 15 +BEGIN + PROMPT 18 21 "/" + FIELD TEL3 + HELP "Numero telefonico terzo recapito" +END + +STRING DLG_NULL 50 32 +BEGIN + PROMPT 1 -1 "Ultimo aggiornamento " + FLAGS "D" + FIELD UTENTE +END + +DATE DLG_NULL +BEGIN + PROMPT 60 -1 "" + FLAGS "D" + FIELD DATAAGG +END ENDPAGE ENDMASK + diff --git a/src/ve/ve1300.cpp b/src/ve/ve1300.cpp index e3a48af0e..4f04cdf74 100755 --- a/src/ve/ve1300.cpp +++ b/src/ve/ve1300.cpp @@ -295,7 +295,7 @@ protected: void output_values(const TRectype& rec, const TString& output); void reset_values(const TString& output); - bool msg_cliente(TVariant_stack& stack); + bool msg_cliente(TVariant_stack& stack, bool is_indsped = false); bool msg_parent_doc(TVariant_stack& stack); bool msg_parent_row(TVariant_stack& stack); bool msg_riepilogo_iva(TVariant_stack& stack); @@ -1495,6 +1495,7 @@ bool TReport_doc_app::print_loop(TRecordset& doc, TOutput_mode mode, bool final_ } TReport_doc& report = reports.get(profilo); + if (send_mail) { if (mail_loop)