From 97d8da52e1962898e4697a2329a7ad2d50d328fa Mon Sep 17 00:00:00 2001 From: luca Date: Mon, 17 Jan 2011 14:06:40 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:10.0?= =?UTF-8?q?=20Files=20correlati=20=20=20=20=20:=20Ricompilazione=20Demo=20?= =?UTF-8?q?:=20[=20]=20Commento=20=20=20=20=20=20=20=20=20=20=20=20:=20agg?= =?UTF-8?q?iunto=20modulo=20CT=20(tracciabilit=C3=A0=20cup-cig)=20modifich?= =?UTF-8?q?e=20alle=20librerie=20per=20poterlo=20usare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/branches/R_10_00@21442 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/campo.aut | 2 +- include/dongle.cpp | 6 +++--- include/modaut.h | 2 +- include/recset.cpp | 7 ++++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/campo.aut b/include/campo.aut index 4a2288f46..1cc62f818 100755 --- a/include/campo.aut +++ b/include/campo.aut @@ -1,5 +1,5 @@ ba Base -74 +ct Tracciabilita' CUP 75 76 77 Gestione Percipienti diff --git a/include/dongle.cpp b/include/dongle.cpp index 93a434687..02b4ac441 100755 --- a/include/dongle.cpp +++ b/include/dongle.cpp @@ -854,9 +854,9 @@ word TDongle::module_name2code(const char* mod) const if (real::is_natural(mod)) { i = atoi(mod); - // Trasforma i numeri da 74 a 77 nei codici da M74AUT a M77AUT - if (i >= 74 && i <= 77) - i += M74AUT-74; + // Trasforma il numero 77 nel codice M77AUT + if (i == 77) + i = M77AUT; } else { diff --git a/include/modaut.h b/include/modaut.h index 291ec3ff9..aa105aa5d 100755 --- a/include/modaut.h +++ b/include/modaut.h @@ -2,7 +2,7 @@ #define __MODAUT_H #define BAAUT 0 -#define M74AUT 1 +#define CTAUT 1 #define M75AUT 2 #define M76AUT 3 #define M77AUT 4 diff --git a/include/recset.cpp b/include/recset.cpp index b68f5d536..610a5ae53 100755 --- a/include/recset.cpp +++ b/include/recset.cpp @@ -646,7 +646,12 @@ void TRecordset::parsed_text(TString& sql) const sql.cut(pos); if (var.type() == _datefld) - s.format("%ld", var.as_date().date2ansi()); + { + if (var.is_empty()) + s.cut(0) << *apici << *apici; + else + s.format("%ld", var.as_date().date2ansi()); + } else { s = var.as_string();