diff --git a/src/ef/ef0800.cpp b/src/ef/ef0800.cpp index 02f62d9f3..0a8c0618a 100755 --- a/src/ef/ef0800.cpp +++ b/src/ef/ef0800.cpp @@ -617,7 +617,9 @@ void TContabilizzazione_effetti_app::join_rows(TArray& customers, TAssoc_array& { TBill zio; TRectype riga(_movimento->cg(0)); - if (!abbuoni_pas.is_zero()) + + riga.zero(RMV_DESCR); + if (!abbuoni_pas.is_zero()) { _caus->bill(9, zio); zio.put(riga); if (!zio.ok()) _error = cau_abb_error; diff --git a/src/include/f182.dir b/src/include/f182.dir new file mode 100644 index 000000000..5a6192e5c --- /dev/null +++ b/src/include/f182.dir @@ -0,0 +1,3 @@ +182 +0 +$dblog|||319|0|Log Transazioni||| diff --git a/src/include/f182.trr b/src/include/f182.trr new file mode 100644 index 000000000..116ee8590 --- /dev/null +++ b/src/include/f182.trr @@ -0,0 +1,20 @@ +182 +15 +TIMESTAMP|3|10|0|Data e Ora +FILE|2|4|0|File +KEY|1|200|0|Chiave 1 +RECNO|3|10|0|Numero di record +DATA|5|8|0|Data +ORA|7|1|0|Ora +CMDLINE|1|40|0|Command line +YEAR|2|4|0|Anno +RELEASE|2|3|0|Release +TAG|2|4|0|Tag +PATCH|1|4|0|Patch +CMD|2|1|0|Comando +USER|1|15|0|Utente +SESSION|2|4|0|Sessione +TRANS|11|10|0|Transazione +2 +TIMESTAMP+FILE+RECNO| +FILE+KEY+TIMESTAMP|X diff --git a/src/include/lffiles.h b/src/include/lffiles.h index db16ad240..1ac4238be 100755 --- a/src/include/lffiles.h +++ b/src/include/lffiles.h @@ -199,6 +199,7 @@ #define LF_FPCADG 179 #define LF_CONART 180 #define LF_F9CART 181 +#define LF_DBLOG 182 #define LF_EXTERNAL 1000 // Files with id >= are considered to be externals diff --git a/src/include/strings.h b/src/include/strings.h index 7fd64fb55..2c2fe60cf 100755 --- a/src/include/strings.h +++ b/src/include/strings.h @@ -654,8 +654,10 @@ public: void add(int n, int pos = -1); // @cmember Aggiunge un reale void add(const real r, int pos = -1); - // @cmember Aggiunge un reale - void add(const TDate d, int pos = -1); + // @cmember Aggiunge un reale + void add(const TDate d, int pos = -1); + // @cmember Aggiunge un booleano + void add(bool on, int pos = -1) { add(on ? "X" : ""); } // @cmember Inserisce una stringa void insert_at(const char* s, int n); // @cmember Toglie la stringa di posizione pos diff --git a/src/include/utility.h b/src/include/utility.h index 3320559ec..158a7e7c1 100755 --- a/src/include/utility.h +++ b/src/include/utility.h @@ -16,7 +16,7 @@ #include #define STRINGIFY(x) #x -#define SAFE_DELETE(p) { if( (p) != nullptr ) delete (p); (p) = nullptr; } +#define SAFE_DELETE(p) safe_delete(p) #define TOSTRING(x) STRINGIFY(x) #define DEBUG_ENABLED is_debug_station() @@ -24,6 +24,10 @@ bool sirio_codesigning(const TFilename& filename, bool verify = false); #define SIRIOSIGN(filename) sirio_codesigning((const TFilename&)((filename)), false) #define SIRIOSIGN_VERIFY(filename) sirio_codesigning((const TFilename&)((filename)), true) +template void safe_delete(T*& a) { + delete a; + a = nullptr; +} class TPerformance_profiler : public TObject { diff --git a/src/li/f154.dir b/src/li/f154.dir index c9ee9cf1a..ea24e6c93 100755 --- a/src/li/f154.dir +++ b/src/li/f154.dir @@ -1,3 +1,3 @@ 154 0 -$letint|0|0|90|0|Lettere d'intento||| +$letint|0|0|114|0|Lettere d'intento||| diff --git a/src/li/f154.trr b/src/li/f154.trr index fe886c97d..5fca717f3 100755 --- a/src/li/f154.trr +++ b/src/li/f154.trr @@ -1,5 +1,5 @@ 154 -14 +17 ANNO|2|4|0|Anno NUMPROT|3|6|0|Numero protocollo DATAREG|5|8|0|Data di registrazione @@ -14,6 +14,9 @@ DAL|5|8|0|Data inizio periodo AL|5|8|0|Data fine periodo STAMPATO|8|1|0|Stampato INVIATO|8|1|0|Inviato +PROTINTF|1|17|0|Numero di protocollo passato dall agenzia delle entrate (prima parte) +PROTINTS|1|6|0|Numero di protocollo passato dall agenzia delle entrate (seconda parte) +CHIUSA|8|1|0|Indica se una lettera di intento è chiusa 2 ANNO+NUMPROT| CODCLI+ANNO+NUMPROT|X