From 22f594b2cb6a719751c353f01fcd68e04555895f Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Fri, 17 Jan 2025 00:37:46 +0100 Subject: [PATCH] Patch level : 12.00 1376 Files correlati : cg0.exe cg0700a.msk recdesc/dir13.xml recdesc/trc13.xml recdesc/dir18.xml recdesc/trc18.xml ba4100a.msk Bug : Commento: Aggiunti campi TIPOPERS ALLEG PADESTIN PFAX FAX agli occasionali Nel file ini dei clienti i campi impostati CODISTATCF CODISTATNASC decodificano il codice comune cliente e il codice comune di nascita Nel file ini dei clienti occasionali i campi impostati CODISTAT CODISTATNASC decodificano il codice comune cliente e il codice comune di nascita Campo codice istat zerofilled e aggiunta relativa chiave --- src/include/maskfld.cpp | 33 +++++++++++++++++---------------- src/include/occas.h | 21 +++++++++++++++++++++ 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/include/maskfld.cpp b/src/include/maskfld.cpp index 7ebd485f7..52db8b1a3 100755 --- a/src/include/maskfld.cpp +++ b/src/include/maskfld.cpp @@ -1926,23 +1926,24 @@ void TEditable_field::set_prompt(const char* p) // Certified 90% void TEditable_field::set_field(const TString& fr) { - if (_field != NULL) - { - if (fr.blank()) - { - delete _field; - _field = NULL; - } - else - *_field = fr; - } - else - { - if (fr.full()) - _field = new TFieldref(fr, 0); - } -} + TString f = fr; + if (f.starts_with("\"")) + f.strip("\""); + if (_field != nullptr) + { + if (fr.blank()) + safe_delete(_field); + else + *_field = f; + + } + else + { + if (f.full()) + _field = new TFieldref(f, 0); + } +} // Certified 100% // Legge il valore attuale del campo in formato RAW diff --git a/src/include/occas.h b/src/include/occas.h index 5113b4efa..6958264e7 100755 --- a/src/include/occas.h +++ b/src/include/occas.h @@ -15,4 +15,25 @@ #define OCC_COFI "COFI" #define OCC_PAIV "PAIV" +#define OCC_SESSO "SESSO" +#define OCC_STATOPAIV "STATOPAIV" +#define OCC_REFERENTE "REFERENTE" +#define OCC_TIPOPERS "TIPOPERS" +#define OCC_ALLEG "ALLEG" +#define OCC_PADESTIN "PADESTIN" +#define OCC_BYMAIL "BYMAIL" +#define OCC_MAIL "MAIL" +#define OCC_DOCMAIL "DOCMAIL" +#define OCC_PEC "PEC" +#define OCC_PTEL "PTEL" +#define OCC_TEL "TEL" +#define OCC_PTEL2 "PTEL2" +#define OCC_TEL2 "TEL2" +#define OCC_PTEL3 "PTEL3" +#define OCC_TEL3 "TEL3" +#define OCC_PFAX "PFAX" +#define OCC_FAX "FAX" +#define OCC_UTENTE "UTENTE" +#define OCC_DATAAGG "DATAAGG" + #endif