diff --git a/cd/test/tp0966.txt b/cd/test/tp0966.txt
new file mode 100644
index 000000000..8eec6aad4
--- /dev/null
+++ b/cd/test/tp0966.txt
@@ -0,0 +1,7 @@
+tp0900ac.rep
+tp0900al.rep
+tp0900ca.rep
+tp0900le.rep
+tp0900ve.rep
+
+Corrette immagini di sfondo nelle dichiarazioni CONAI
diff --git a/cd/test/tp0966a.ini b/cd/test/tp0966a.ini
new file mode 100644
index 000000000..e9cdd8ed9
--- /dev/null
+++ b/cd/test/tp0966a.ini
@@ -0,0 +1,25 @@
+[Main]
+Demo=0
+
+[tp1]
+File(6) = tp0900ac.rep|X
+File(8) = tp0900al.rep|X
+File(10) = tp0900ca.rep|X
+File(16) = tp0900le.rep|X
+File(24) = tp0900ve.rep|X
+Patch = 0966
+Versione = 21511200
+
+[tp]
+Data = 04-06-2020
+Descrizione = Trasferimento PACK
+Dischi = 1
+Moduli = ve
+OEM =
+Patch = 966
+PostProcess =
+PreProcess =
+Prezzo(1) =
+Prezzo(2) =
+Versione = 21511200
+
diff --git a/cd/test/tp0966a1.zip b/cd/test/tp0966a1.zip
new file mode 100644
index 000000000..e74d8ab31
Binary files /dev/null and b/cd/test/tp0966a1.zip differ
diff --git a/src/ci/ci1400.cpp b/src/ci/ci1400.cpp
index c3f157419..4b7b3a6f1 100755
--- a/src/ci/ci1400.cpp
+++ b/src/ci/ci1400.cpp
@@ -246,7 +246,7 @@ void TRil_ore_cms_mask::elabora() const
format_report_month(get_int(F_ANNO), m, rep);
//query sul file interessato (commessa o centro di costo)
- TString16 cms_cdc;
+ TString30 cms_cdc;
TString query_cms_cdc;
TString msg, code_name;
const char tipo_cms_cdc = get(F_CMSOCDC)[0];
diff --git a/src/include/strings.h b/src/include/strings.h
index 2c2fe60cf..8c242d598 100755
--- a/src/include/strings.h
+++ b/src/include/strings.h
@@ -446,6 +446,23 @@ public:
};
+class TString30 : public TFixed_string
+{
+ char _str30[36];
+
+protected:
+ virtual TObject* dup() const { return new TString30(_str30); }
+
+public:
+ TString30(const char* s = "") : TFixed_string(_str30, 31) { set(s); }
+ TString30(const TString& s) : TFixed_string(_str30, 31) { set(s); }
+ TString30(const TString30& s) : TFixed_string(_str30, 31) { set(s); }
+ const TString& operator =(const char* s) { return set(s); }
+ const TString& operator =(const TString& s) { return set((const char*)s); }
+ const TString& operator =(const TString30& s) { return set((const char*)s); }
+};
+
+
class TString40 : public TFixed_string
{
char _str40[48];
diff --git a/src/tp/tp0900ac.rep b/src/tp/tp0900ac.rep
index 8db47d85a..e88d1dd8a 100755
--- a/src/tp/tp0900ac.rep
+++ b/src/tp/tp0900ac.rep
@@ -1,10 +1,10 @@
-
+
Dichiarazione CONAI acciaio 6.1
-
+
-
+
#PERIODO
MESSAGE HIDE,2@|HIDE,3@
@@ -12,138 +12,138 @@
MESSAGE HIDE,2@|SHOW,3@
-
+
IF(#PERIODO="1","X","")
-
+
#ANNO
-
+
IF(#PERIODO="2","X","")
-
+
2
IF(#TRIMESTRE="3","X","")
-
+
2
IF(#TRIMESTRE="6","X","")
-
+
2
IF(#TRIMESTRE="9","X","")
-
+
2
IF(#TRIMESTRE="12","X","")
-
+
IF(#PERIODO="3","X","")
-
+
3
IF(#MESE="01","X","")
-
+
3
IF(#MESE="02","X","")
-
+
3
IF(#MESE="03","X","")
-
+
3
IF(#MESE="04","X","")
-
+
3
IF(#MESE="05","X","")
-
+
3
IF(#MESE="06","X","")
-
+
3
IF(#MESE="07","X","")
-
+
3
IF(#MESE="08","X","")
-
+
3
IF(#MESE="09","X","")
-
+
3
IF(#MESE="10","X","")
-
+
3
IF(#MESE="11","X","")
-
+
3
IF(#MESE="12","X","")
-
+
#SOCIO
-
+
IF(#PRODUT="1","X","")
-
+
IF(#PRODUT="2","X","")
-
+
#RAGSOC
-
+
#INDIR
-
+
#PAIV
-
+
#COFI
-
+
#RESP
-
+
#TEL
-
+
#EMAIL
-
-
+
+
J
0 #F2.101 !
0
@@ -153,54 +153,54 @@
0
#F2.104 !
-
-
- "tp0900pl.png"
+
-
-
+
+
CODNUM
-
+
ANNO
-
+
NDOC
-
+
DATADOC
-
+
CODCLI
-
+
NUM(SOTTOCL[3,4])
#THIS @
#F2.100 !
-
+
CONAIA
#THIS @
#F2.101 @
+
#F2.101 !
-
+
CONAIB
#THIS @
#F2.102 @
+
#F2.102 !
-
+
CONAIBxC
#THIS @
#F2.103 @
+
#F2.103 !
-
+
#101 @
#102 @
+
@@ -209,43 +209,43 @@ DUP
#F2.104
+!
-
+
DESCR
#THIS @
#F2.200 !
-
+
-
+
#SYSTEM.DATE
-
+
-
+
-
+
-
+
#103 @
#102 @
F;
#THIS !
-
+
#101 @
#102 @
+
#THIS !
-
+
#102 @
#104 @
@@ -253,12 +253,12 @@ DUP
#THIS !
-
-
-
+
+
+
-
+
#THIS @
1000 F;
@@ -269,7 +269,7 @@ DUP
+
#F0.101 !
-
+
#THIS @
1000 F;
@@ -280,36 +280,36 @@ DUP
+
#F0.102 !
-
+
#THIS @
#F0.103 @
+
#F0.103 !
-
+
#103 @
#102 @
F;
#THIS !
-
+
#101 @
#102 @
+
#THIS !
-
+
#102 @
#104 @
*
#THIS !
-
+
-
+
\ No newline at end of file
diff --git a/src/tp/tp0900al.rep b/src/tp/tp0900al.rep
index 951c3df1e..9f1e28c75 100755
--- a/src/tp/tp0900al.rep
+++ b/src/tp/tp0900al.rep
@@ -1,10 +1,10 @@
-
+
Dichiarazione CONAI alluminio 6.1
-
+
-
+
#PERIODO
MESSAGE HIDE,2@|HIDE,3@
@@ -12,138 +12,138 @@
MESSAGE HIDE,2@|SHOW,3@
-
+
IF(#PERIODO="1","X","")
-
+
#ANNO
-
+
IF(#PERIODO="2","X","")
-
+
2
IF(#TRIMESTRE="3","X","")
-
+
2
IF(#TRIMESTRE="6","X","")
-
+
2
IF(#TRIMESTRE="9","X","")
-
+
2
IF(#TRIMESTRE="12","X","")
-
+
IF(#PERIODO="3","X","")
-
+
3
IF(#MESE="01","X","")
-
+
3
IF(#MESE="02","X","")
-
+
3
IF(#MESE="03","X","")
-
+
3
IF(#MESE="04","X","")
-
+
3
IF(#MESE="05","X","")
-
+
3
IF(#MESE="06","X","")
-
+
3
IF(#MESE="07","X","")
-
+
3
IF(#MESE="08","X","")
-
+
3
IF(#MESE="09","X","")
-
+
3
IF(#MESE="10","X","")
-
+
3
IF(#MESE="11","X","")
-
+
3
IF(#MESE="12","X","")
-
+
#SOCIO
-
+
IF(#PRODUT="1","X","")
-
+
IF(#PRODUT="2","X","")
-
+
#RAGSOC
-
+
#INDIR
-
+
#PAIV
-
+
#COFI
-
+
#RESP
-
+
#TEL
-
+
#EMAIL
-
-
+
+
J
0 #F2.101 !
0
@@ -153,54 +153,54 @@
0
#F2.104 !
-
-
- "tp0900pl.png"
+
-
-
+
+
CODNUM
-
+
ANNO
-
+
NDOC
-
+
DATADOC
-
+
CODCLI
-
+
NUM(SOTTOCL[3,4])
#THIS @
#F2.100 !
-
+
CONAIA
#THIS @
#F2.101 @
+
#F2.101 !
-
+
CONAIB
#THIS @
#F2.102 @
+
#F2.102 !
-
+
CONAIBxC
#THIS @
#F2.103 @
+
#F2.103 !
-
+
#101 @
#102 @
+
@@ -209,43 +209,43 @@ DUP
#F2.104
+!
-
+
DESCR
#THIS @
#F2.200 !
-
+
-
+
#SYSTEM.DATE
-
+
-
+
-
+
-
+
#103 @
#102 @
F;
#THIS !
-
+
#101 @
#102 @
+
#THIS !
-
+
#102 @
#104 @
@@ -253,12 +253,12 @@ DUP
#THIS !
-
-
-
+
+
+
-
+
#THIS @
1000 F;
@@ -269,7 +269,7 @@ DUP
+
#F0.101 !
-
+
#THIS @
1000 F;
@@ -280,36 +280,36 @@ DUP
+
#F0.102 !
-
+
#THIS @
#F0.103 @
+
#F0.103 !
-
+
#103 @
#102 @
F;
#THIS !
-
+
#101 @
#102 @
+
#THIS !
-
+
#102 @
#104 @
*
#THIS !
-
+
-
+
\ No newline at end of file
diff --git a/src/tp/tp0900ca.rep b/src/tp/tp0900ca.rep
index 5b7d977f0..e04ff8c85 100755
--- a/src/tp/tp0900ca.rep
+++ b/src/tp/tp0900ca.rep
@@ -1,10 +1,10 @@
-
+
Dichiarazione CONAI carta 6.1
-
+
-
+
#PERIODO
MESSAGE HIDE,2@|HIDE,3@
@@ -12,138 +12,138 @@
MESSAGE HIDE,2@|SHOW,3@
-
+
IF(#PERIODO="1","X","")
-
+
#ANNO
-
+
IF(#PERIODO="2","X","")
-
+
2
IF(#TRIMESTRE="3","X","")
-
+
2
IF(#TRIMESTRE="6","X","")
-
+
2
IF(#TRIMESTRE="9","X","")
-
+
2
IF(#TRIMESTRE="12","X","")
-
+
IF(#PERIODO="3","X","")
-
+
3
IF(#MESE="01","X","")
-
+
3
IF(#MESE="02","X","")
-
+
3
IF(#MESE="03","X","")
-
+
3
IF(#MESE="04","X","")
-
+
3
IF(#MESE="05","X","")
-
+
3
IF(#MESE="06","X","")
-
+
3
IF(#MESE="07","X","")
-
+
3
IF(#MESE="08","X","")
-
+
3
IF(#MESE="09","X","")
-
+
3
IF(#MESE="10","X","")
-
+
3
IF(#MESE="11","X","")
-
+
3
IF(#MESE="12","X","")
-
+
#SOCIO
-
+
IF(#PRODUT="1","X","")
-
+
IF(#PRODUT="2","X","")
-
+
#RAGSOC
-
+
#INDIR
-
+
#PAIV
-
+
#COFI
-
+
#RESP
-
+
#TEL
-
+
#EMAIL
-
-
+
+
J
0 #F2.101 !
0
@@ -153,54 +153,54 @@
0
#F2.104 !
-
-
- "tp0900pl.png"
+
-
-
+
+
CODNUM
-
+
ANNO
-
+
NDOC
-
+
DATADOC
-
+
CODCLI
-
+
NUM(SOTTOCL[3,4])
#THIS @
#F2.100 !
-
+
CONAIA
#THIS @
#F2.101 @
+
#F2.101 !
-
+
CONAIB
#THIS @
#F2.102 @
+
#F2.102 !
-
+
CONAIBxC
#THIS @
#F2.103 @
+
#F2.103 !
-
+
#101 @
#102 @
+
@@ -209,43 +209,43 @@ DUP
#F2.104
+!
-
+
DESCR
#THIS @
#F2.200 !
-
+
-
+
#SYSTEM.DATE
-
+
-
+
-
+
-
+
#103 @
#102 @
F;
#THIS !
-
+
#101 @
#102 @
+
#THIS !
-
+
#102 @
#104 @
@@ -253,12 +253,12 @@ DUP
#THIS !
-
-
-
+
+
+
-
+
#THIS @
1000 F;
@@ -269,7 +269,7 @@ DUP
+
#F0.101 !
-
+
#THIS @
1000 F;
@@ -280,36 +280,36 @@ DUP
+
#F0.102 !
-
+
#THIS @
#F0.103 @
+
#F0.103 !
-
+
#103 @
#102 @
F;
#THIS !
-
+
#101 @
#102 @
+
#THIS !
-
+
#102 @
#104 @
*
#THIS !
-
+
-
+
\ No newline at end of file
diff --git a/src/tp/tp0900le.rep b/src/tp/tp0900le.rep
index 3a1a9f142..b16b3119a 100755
--- a/src/tp/tp0900le.rep
+++ b/src/tp/tp0900le.rep
@@ -1,10 +1,10 @@
-
+
Dichiarazione CONAI legno 6.1
-
+
-
+
#PERIODO
MESSAGE HIDE,2@|HIDE,3@
@@ -12,138 +12,138 @@
MESSAGE HIDE,2@|SHOW,3@
-
+
IF(#PERIODO="1","X","")
-
+
#ANNO
-
+
IF(#PERIODO="2","X","")
-
+
2
IF(#TRIMESTRE="3","X","")
-
+
2
IF(#TRIMESTRE="6","X","")
-
+
2
IF(#TRIMESTRE="9","X","")
-
+
2
IF(#TRIMESTRE="12","X","")
-
+
IF(#PERIODO="3","X","")
-
+
3
IF(#MESE="01","X","")
-
+
3
IF(#MESE="02","X","")
-
+
3
IF(#MESE="03","X","")
-
+
3
IF(#MESE="04","X","")
-
+
3
IF(#MESE="05","X","")
-
+
3
IF(#MESE="06","X","")
-
+
3
IF(#MESE="07","X","")
-
+
3
IF(#MESE="08","X","")
-
+
3
IF(#MESE="09","X","")
-
+
3
IF(#MESE="10","X","")
-
+
3
IF(#MESE="11","X","")
-
+
3
IF(#MESE="12","X","")
-
+
#SOCIO
-
+
IF(#PRODUT="1","X","")
-
+
IF(#PRODUT="2","X","")
-
+
#RAGSOC
-
+
#INDIR
-
+
#PAIV
-
+
#COFI
-
+
#RESP
-
+
#TEL
-
+
#EMAIL
-
-
+
+
J
0 #F2.101 !
0
@@ -153,54 +153,54 @@
0
#F2.104 !
-
-
- "tp0900pl.png"
+
-
-
+
+
CODNUM
-
+
ANNO
-
+
NDOC
-
+
DATADOC
-
+
CODCLI
-
+
NUM(SOTTOCL[3,4])
#THIS @
#F2.100 !
-
+
CONAIA
#THIS @
#F2.101 @
+
#F2.101 !
-
+
CONAIB
#THIS @
#F2.102 @
+
#F2.102 !
-
+
CONAIBxC
#THIS @
#F2.103 @
+
#F2.103 !
-
+
#101 @
#102 @
+
@@ -209,43 +209,43 @@ DUP
#F2.104
+!
-
+
DESCR
#THIS @
#F2.200 !
-
+
-
+
#SYSTEM.DATE
-
+
-
+
-
+
-
+
#103 @
#102 @
F;
#THIS !
-
+
#101 @
#102 @
+
#THIS !
-
+
#102 @
#104 @
@@ -253,12 +253,12 @@ DUP
#THIS !
-
-
-
+
+
+
-
+
#THIS @
1000 F;
@@ -269,7 +269,7 @@ DUP
+
#F0.101 !
-
+
#THIS @
1000 F;
@@ -280,36 +280,36 @@ DUP
+
#F0.102 !
-
+
#THIS @
#F0.103 @
+
#F0.103 !
-
+
#103 @
#102 @
F;
#THIS !
-
+
#101 @
#102 @
+
#THIS !
-
+
#102 @
#104 @
*
#THIS !
-
+
-
+
\ No newline at end of file
diff --git a/src/tp/tp0900ve.rep b/src/tp/tp0900ve.rep
index 2c2262bc2..3789b22c8 100755
--- a/src/tp/tp0900ve.rep
+++ b/src/tp/tp0900ve.rep
@@ -1,10 +1,10 @@
-
+
Dichiarazione CONAI vetro 6.1
-
+
-
+
#PERIODO
MESSAGE HIDE,2@|HIDE,3@
@@ -12,138 +12,138 @@
MESSAGE HIDE,2@|SHOW,3@
-
+
IF(#PERIODO="1","X","")
-
+
#ANNO
-
+
IF(#PERIODO="2","X","")
-
+
2
IF(#TRIMESTRE="3","X","")
-
+
2
IF(#TRIMESTRE="6","X","")
-
+
2
IF(#TRIMESTRE="9","X","")
-
+
2
IF(#TRIMESTRE="12","X","")
-
+
IF(#PERIODO="3","X","")
-
+
3
IF(#MESE="01","X","")
-
+
3
IF(#MESE="02","X","")
-
+
3
IF(#MESE="03","X","")
-
+
3
IF(#MESE="04","X","")
-
+
3
IF(#MESE="05","X","")
-
+
3
IF(#MESE="06","X","")
-
+
3
IF(#MESE="07","X","")
-
+
3
IF(#MESE="08","X","")
-
+
3
IF(#MESE="09","X","")
-
+
3
IF(#MESE="10","X","")
-
+
3
IF(#MESE="11","X","")
-
+
3
IF(#MESE="12","X","")
-
+
#SOCIO
-
+
IF(#PRODUT="1","X","")
-
+
IF(#PRODUT="2","X","")
-
+
#RAGSOC
-
+
#INDIR
-
+
#PAIV
-
+
#COFI
-
+
#RESP
-
+
#TEL
-
+
#EMAIL
-
-
+
+
J
0 #F2.101 !
0
@@ -153,54 +153,54 @@
0
#F2.104 !
-
-
- "tp0900pl.png"
+
-
-
+
+
CODNUM
-
+
ANNO
-
+
NDOC
-
+
DATADOC
-
+
CODCLI
-
+
NUM(SOTTOCL[3,4])
#THIS @
#F2.100 !
-
+
CONAIA
#THIS @
#F2.101 @
+
#F2.101 !
-
+
CONAIB
#THIS @
#F2.102 @
+
#F2.102 !
-
+
CONAIBxC
#THIS @
#F2.103 @
+
#F2.103 !
-
+
#101 @
#102 @
+
@@ -209,43 +209,43 @@ DUP
#F2.104
+!
-
+
DESCR
#THIS @
#F2.200 !
-
+
-
+
#SYSTEM.DATE
-
+
-
+
-
+
-
+
#103 @
#102 @
F;
#THIS !
-
+
#101 @
#102 @
+
#THIS !
-
+
#102 @
#104 @
@@ -253,12 +253,12 @@ DUP
#THIS !
-
-
-
+
+
+
-
+
#THIS @
1000 F;
@@ -269,7 +269,7 @@ DUP
+
#F0.101 !
-
+
#THIS @
1000 F;
@@ -280,36 +280,36 @@ DUP
+
#F0.102 !
-
+
#THIS @
#F0.103 @
+
#F0.103 !
-
+
#103 @
#102 @
F;
#THIS !
-
+
#101 @
#102 @
+
#THIS !
-
+
#102 @
#104 @
*
#THIS !
-
+
-
+
\ No newline at end of file