From 5a95ae045c43d0f64f366476523663166c0c5dcf Mon Sep 17 00:00:00 2001 From: smen Date: Wed, 6 Oct 2021 09:29:24 +0200 Subject: [PATCH] Patch level : 12.0 nopatch Files correlati : Commento : Aggiornamento modulo "tc" --- src/tc/tc0300.cpp | 2 +- src/tc/tc0700.cpp | 2 +- src/tc/tc0701.cpp | 8 ++++---- src/tc/tc2300.cpp | 2 +- src/tc/tc2700.cpp | 45 +++++++++++++++++++++------------------------ src/tc/tc2700.h | 4 ++-- src/tc/tc2700a.h | 6 +++--- src/tc/tc3100.cpp | 4 ++-- src/tc/tc8300.cpp | 2 +- src/tc/tc9100.cpp | 3 +-- src/tc/tc9300.cpp | 3 +-- 11 files changed, 38 insertions(+), 43 deletions(-) diff --git a/src/tc/tc0300.cpp b/src/tc/tc0300.cpp index ee0910488..b7348b73e 100755 --- a/src/tc/tc0300.cpp +++ b/src/tc/tc0300.cpp @@ -7,7 +7,7 @@ #include "../include/attiv.h" #include "../include/mov.h" -#include "../cg/cglib01.h" +#include "../cg/cglib.h" #include "tcconf.h" class TTS_confditta : public TConfig_application diff --git a/src/tc/tc0700.cpp b/src/tc/tc0700.cpp index 3cc6da4f7..4964850c8 100755 --- a/src/tc/tc0700.cpp +++ b/src/tc/tc0700.cpp @@ -19,7 +19,7 @@ #include #include -#include "../cg/cg2103.h" +#include "../cg/cglib.h" bool TTS_mask::apply_filter(const TRecordset& righe) const { diff --git a/src/tc/tc0701.cpp b/src/tc/tc0701.cpp index a5531de42..a37d3dcd4 100755 --- a/src/tc/tc0701.cpp +++ b/src/tc/tc0701.cpp @@ -15,7 +15,7 @@ #include #include -#include "../cg/cglib01.h" +#include "../cg/cglib.h" #define TSINDETR 600 // e pensare che ne vendono migliaia #define TSACQDESTRIV 200 @@ -1556,7 +1556,7 @@ void TTS_sender::set_parameters() if (ric) { var.format("TS%s", (const char *)var.mid(3)); - _riclassifica.add(var, NULL); + _riclassifica.add(var); } } } @@ -1570,7 +1570,7 @@ void TTS_sender::set_parameters() long contoricl = bill2ricl(t, gr, co, so); // ok TString16 key; key.format("%08ld", contoricl); - _contiiva.add(key, NULL); + _contiiva.add(key); } for (i = 0, gr = configtc.get_int("TSGRIT", NULL, i); gr > 0; i++, gr = configtc.get_int("TSGRIT", NULL, i)) { @@ -1580,7 +1580,7 @@ void TTS_sender::set_parameters() long contoricl = bill2ricl(t, gr, co, so); // ok TString16 key; key.format("%08ld", contoricl); - _contirit.add(key, NULL); + _contirit.add(key); } } diff --git a/src/tc/tc2300.cpp b/src/tc/tc2300.cpp index 35e44d810..3353bfc56 100755 --- a/src/tc/tc2300.cpp +++ b/src/tc/tc2300.cpp @@ -7,7 +7,7 @@ #include "../include/attiv.h" #include "../include/mov.h" -#include "../cg/cglib01.h" +#include "../cg/cglib.h" #include "ipconf.h" class TIP_confditta : public TConfig_application diff --git a/src/tc/tc2700.cpp b/src/tc/tc2700.cpp index fdf265e7e..907dd8caf 100755 --- a/src/tc/tc2700.cpp +++ b/src/tc/tc2700.cpp @@ -12,8 +12,8 @@ #include #include #include -#include "../in/intra.h" -#include "../in/rintra.h" +#include +#include #include #include #include @@ -22,8 +22,6 @@ #include #include -#include "../cg/cglib01.h" -#include "../cg/cglib03.h" #define CFLD "C" #define INTFLD "INT" @@ -1472,7 +1470,7 @@ void TIP_sender::set_parameters() if (ric) { var.format("IP%s", (const char *)var.mid(3)); - _riclassifica.add(var, NULL); + _riclassifica.add(var); } } } @@ -1484,19 +1482,16 @@ TMask & TIP_sender::get_mask() if (_mask == NULL) { _mask = new TIP_mask("tc2700a"); - TDate to(TODAY); - TConfig configtc(CONFIG_DITTA, "tc"); - const TDate from(configtc.get("IPULTINV")); - if (from.ok()) - to.addmonth(-1); - to.set_end_month(); + TDate to; + TConfig configtc(CONFIG_DITTA, "tc"); + TDate from(configtc.get("IPULTINV")); + + if (from.ok()) + ++from; if (to <= from) - { to = from; - to.addmonth(1); - to.set_end_month(); - } + to.set_end_month(); _mask->set(F_DATA_DA, from); _mask->set(F_DATA_AL, to); } @@ -1515,10 +1510,19 @@ bool search_reg(const TRelation& rel, void* pJolly) return true; } -void TIP_sender::postprocess_movs(TRecordset & mov) +void TIP_sender::postprocess_movs(const TDate dal, const TDate al) { if (yesno_box(TR("Confermare il traferimento"))) { + TString query; + + query << "USE " << LF_MOV << " KEY 2 SELECT " << MOV_INVIATO << "!=\"X\"\n" << "FROM " << MOV_DATAREG << "=#DATA_DA\n" << "TO " << MOV_DATAREG << "=#DATA_AL"; + + TISAM_recordset mov(query); + + mov.set_var("#DATA_DA", dal); + mov.set_var("#DATA_AL", al); + TConfig configtc(CONFIG_DITTA); TMask & m = get_mask(); @@ -1599,14 +1603,7 @@ void TIP_sender::main_loop() _book->add(*_log); _book->preview(); if (!_errors) - { - TString query; - - query << "USE " << LF_MOV << " KEY 2 SELECT " << MOV_INVIATO << "!=\"X\"\n" << "FROM " << MOV_DATAREG << "=#DATA_DA\n" << "TO " << MOV_DATAREG << "=#DATA_AL"; - - TISAM_recordset mov(query); - postprocess_movs(mov); - } + postprocess_movs(m.get_date(F_DATA_DA), m.get_date(F_DATA_AL)); delete _book; delete _log; } diff --git a/src/tc/tc2700.h b/src/tc/tc2700.h index 6567d7dfc..6f3f6c486 100755 --- a/src/tc/tc2700.h +++ b/src/tc/tc2700.h @@ -5,7 +5,7 @@ #include #include #include -#include "../cg/cg2103.h" +#include "../cg/cglib.h" /////////////////////////////////////////////////////////// // TIP_mask @@ -178,7 +178,7 @@ public: virtual bool multi_activity() const { return true; } TAssoc_array & riclassifica() {return _riclassifica;} - virtual void postprocess_movs(TRecordset & mov); + virtual void postprocess_movs(const TDate dal, const TDate al); virtual void set_parameters(); // qui diff --git a/src/tc/tc2700a.h b/src/tc/tc2700a.h index 5e8e11a69..c68f87269 100755 --- a/src/tc/tc2700a.h +++ b/src/tc/tc2700a.h @@ -5,10 +5,10 @@ #define F_CLIENTI 103 #define F_FORNITORI 104 #define F_MOVIMENTI 106 -#define F_SCADENZE 107 +#define F_SCADENZE 107 #define F_CESPITI 108 -#define F_CATEGORIE 109 +#define F_CATEGORIE 109 #define F_INTRASTAT 110 -#define F_PATH 111 +#define F_PATH 111 #define F_DATA_DA 112 #define F_DATA_AL 113 diff --git a/src/tc/tc3100.cpp b/src/tc/tc3100.cpp index d235be2b7..8162afcff 100644 --- a/src/tc/tc3100.cpp +++ b/src/tc/tc3100.cpp @@ -16,7 +16,7 @@ #include "tc3100a.h" #include "../ve/velib.h" -#include "../cg/cg2103.h" +#include "../cg/cglib.h" #include "comuni.h" #include @@ -960,7 +960,7 @@ void TImportaEricsoft::upload_mov(const TFilename& file, TLog_report& log) ini_file.temp("eric", "ini"); ini = new TConfig(ini_file, "Transaction"); - char mode[2] = { TM_AUTOMATIC, '\0' }; + char mode[2] = { transaction_mode_automatic, '\0' }; long nreg = 0; daily_movs.set_var("#DATE", datareg.stringa()); diff --git a/src/tc/tc8300.cpp b/src/tc/tc8300.cpp index aa5c8ae53..cc030f190 100644 --- a/src/tc/tc8300.cpp +++ b/src/tc/tc8300.cpp @@ -1,5 +1,5 @@ #include "tc8.h" -#include "../cg/cg2101.h" +#include "../cg/cglib.h" #include #include diff --git a/src/tc/tc9100.cpp b/src/tc/tc9100.cpp index 87be62cbc..1fb7f9c9f 100755 --- a/src/tc/tc9100.cpp +++ b/src/tc/tc9100.cpp @@ -6,8 +6,7 @@ #include "tc9.h" #include "tc9100a.h" -#include "../cg/cg2101.h" -#include "../cg/cg2103.h" +#include "../cg/cglib.h" #include "../cg/cgsaldac.h" #include diff --git a/src/tc/tc9300.cpp b/src/tc/tc9300.cpp index f300c8ba0..86cd9f296 100755 --- a/src/tc/tc9300.cpp +++ b/src/tc/tc9300.cpp @@ -7,8 +7,7 @@ #include #include -#include "../cg/cglib01.h" -#include "../cg/cglib03.h" +#include "../cg/cglib.h" #include "tc0.h" #include "tc9300a.h"