diff --git a/tp/tp0900.cpp b/tp/tp0900.cpp
index da6876a9f..a7b436196 100755
--- a/tp/tp0900.cpp
+++ b/tp/tp0900.cpp
@@ -602,7 +602,22 @@ void TDichiarazione_CONAI::elabora(const TMask& mask) const
TDichiarazione_CONAI_report rep;
bool ok = rep.load(nome_report);
//setta il recordset...
- csv->set_var("#EMAIL", TVariant("CAZZO"), true);
+ /*switch (mask.get_int(F_PERIODO))
+ {
+ case 1:
+ csv->set_var("#TRIMESTRE", NULL_VARIANT);
+ csv->set_var("#MESE", NULL_VARIANT);
+ break;
+ case 2:
+ csv->set_var("#MESE", NULL_VARIANT);
+ break;
+ case 3:
+ csv->set_var("#TRIMESTRE", NULL_VARIANT);
+ break;
+ default:
+ break;
+ }*/
+ csv->set_var("#EMAIL", TVariant("Manca la email"), true);
rep.set_recordset(csv);
//..e poi carica i valori sulla maschera nel report!!!!
rep.mask2report(mask);
diff --git a/tp/tp0900ca.rep b/tp/tp0900ca.rep
index 0bd71f2d6..eb8fd2eb2 100755
--- a/tp/tp0900ca.rep
+++ b/tp/tp0900ca.rep
@@ -3,17 +3,125 @@
Dichiarazione CONAI carta 6.1
+
+ #PERIODO
+
+ MESSAGE HIDE,@2|HIDE,@3
+ MESSAGE HIDE,@3|SHOW,@2
+ MESSAGE HIDE,@2|SHOW,@3
+
+
+
+
+ IF(#PERIODO="1","X","")
+
#ANNO
+
+
+ IF(#PERIODO="2","X","")
+
+
+
+ 2
+ IF(#TRIMESTRE="1","X","")
+
+
+
+ 2
+ IF(#TRIMESTRE="2","X","")
+
+
+
+ 2
+ IF(#TRIMESTRE="3","X","")
+
+
+
+ 2
+ IF(#TRIMESTRE="4","X","")
+
+
+
+ IF(#PERIODO="3","X","")
+
+
+
+ 3
+ IF(#MESE="1","X","")
+
+
+
+ 3
+ IF(#MESE="2","X","")
+
+
+
+ 3
+ IF(#MESE="3","X","")
+
+
+
+ 3
+ IF(#MESE="4","X","")
+
+
+
+ 3
+ IF(#MESE="5","X","")
+
+
+
+ 3
+ IF(#MESE="6","X","")
+
+
+
+ 3
+ IF(#MESE="7","X","")
+
+
+
+ 3
+ IF(#MESE="8","X","")
+
+
+
+ 3
+ IF(#MESE="9","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
- #INDRES
+ #INDIR
#PAIV
diff --git a/tp/tp0900es.rep b/tp/tp0900es.rep
index 99417bc6e..015b07f2a 100755
--- a/tp/tp0900es.rep
+++ b/tp/tp0900es.rep
@@ -3,12 +3,92 @@
Scheda Esenzione CONAI 6.3
-
+
+
+ IF(#PERIODO="1","X","")
+
+
#ANNO
+
+
+ IF(#PERIODO="2","X","")
+
+
+
+ IF(#TRIMESTRE="1","X","")
+
+
+
+ IF(#TRIMESTRE="2","X","")
+
+
+
+ IF(#TRIMESTRE="3","X","")
+
+
+
+ IF(#TRIMESTRE="4","X","")
+
+
+
+ IF(#PERIODO="3","X","")
+
+
+
+ IF(#MESE="1","X","")
+
+
+
+ IF(#MESE="2","X","")
+
+
+
+ IF(#MESE="3","X","")
+
+
+
+ IF(#MESE="4","X","")
+
+
+
+ IF(#MESE="5","X","")
+
+
+
+ IF(#MESE="6","X","")
+
+
+
+ IF(#MESE="7","X","")
+
+
+
+ IF(#MESE="8","X","")
+
+
+
+ IF(#MESE="9","X","")
+
+
+
+ IF(#MESE="10","X","")
+
+
+
+ IF(#MESE="11","X","")
+
+
+
+ IF(#MESE="12","X","")
+
#SOCIO
+
+
+ IF(#PRODUT="2","X","")
+
#RAGSOC