Patch level : 12.0 nopatch

Files correlati     :

Commento        :
Aggiornamento modulo "tc"

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

src/tc/tc0700.cpp

@@ -19,7 +19,7 @@
 #include <rmoviva.h>
 #include <multirel.h>
 
-#include "../cg/cg2103.h"
+#include "../cg/cglib.h"
 
 bool TTS_mask::apply_filter(const TRecordset& righe) const
 {

src/tc/tc0701.cpp

@@ -15,7 +15,7 @@
 #include <pconti.h>
 #include <utility.h>
 
-#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);
 	}
 }
 

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

src/tc/tc2700.cpp

@@ -12,8 +12,8 @@
 #include <causali.h>
 #include <clifo.h>
 #include <comuni.h>
-#include "../in/intra.h"
+#include <intra.h>
-#include "../in/rintra.h"
+#include <rintra.h>
 #include <mov.h>
 #include <rmov.h>
 #include <rmoviva.h>
@@ -22,8 +22,6 @@
 #include <multirel.h>
 #include <pconti.h>
 
-#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())
+		TDate to;
-			to.addmonth(-1);
+		TConfig configtc(CONFIG_DITTA, "tc");
-		to.set_end_month();
+		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)
-		{
+			postprocess_movs(m.get_date(F_DATA_DA), m.get_date(F_DATA_AL));
-			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);
-		}
 		delete _book;
 		delete _log;
   }

src/tc/tc2700.h

@@ -5,7 +5,7 @@
 #include <reprint.h>
 #include <reputils.h>
 #include <textset.h>
-#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

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

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 <mov.h>
@@ -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());

src/tc/tc8300.cpp

@@ -1,5 +1,5 @@
 #include "tc8.h"
-#include "../cg/cg2101.h"
+#include "../cg/cglib.h"
 
 #include <applicat.h>
 #include <automask.h>

src/tc/tc9100.cpp

@@ -6,8 +6,7 @@
 #include "tc9.h"
 #include "tc9100a.h"
 
-#include "../cg/cg2101.h"
+#include "../cg/cglib.h"
-#include "../cg/cg2103.h"
 #include "../cg/cgsaldac.h"
 #include <pconti.h>
 

src/tc/tc9300.cpp

@@ -7,8 +7,7 @@
 #include <utility.h>
 #include <textset.h>
 
-#include "../cg/cglib01.h"
+#include "../cg/cglib.h"
-#include "../cg/cglib03.h"
 
 #include "tc0.h"
 #include "tc9300a.h"