diff --git a/tp/tp0900.cpp b/tp/tp0900.cpp
index 7af1bf1a1..da6876a9f 100755
--- a/tp/tp0900.cpp
+++ b/tp/tp0900.cpp
@@ -51,6 +51,8 @@ bool TDichiarazione_CONAI_mask::on_field_event(TOperable_field& o, TField_event
/////////////////////////////////////////////////////////////
class TDichiarazione_CONAI_report : public TReport
{
+protected:
+virtual bool use_mask() { return false; }
public:
TDichiarazione_CONAI_report() {}
};
@@ -61,11 +63,28 @@ public:
class TDichiarazione_CONAI_csv_recordset : public TCSV_recordset
{
+protected:
+ //virtual const TVariant& get(const char* field_name) const;
public:
TDichiarazione_CONAI_csv_recordset();
};
+/*const TDichiarazione_CONAI_csv_recordset::get(const char* field_name) const
+{
+ if (*field_name == '#')
+ {
+ if (strcmp(field_name, "#RAGSOC") == 0)
+ {
+ TVariant& var = get_tmp_var();
+ var = mask.;
+ }
+ return var;
+ }
+ return NULL_VARIANT;
+}*/
+
+
TDichiarazione_CONAI_csv_recordset::TDichiarazione_CONAI_csv_recordset()
: TCSV_recordset("CSV(,)\n")
{
@@ -583,6 +602,7 @@ 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);
rep.set_recordset(csv);
//..e poi carica i valori sulla maschera nel report!!!!
rep.mask2report(mask);
@@ -601,6 +621,7 @@ void TDichiarazione_CONAI::elabora(const TMask& mask) const
void TDichiarazione_CONAI::main_loop()
{
TDichiarazione_CONAI_mask mask;
+ mask.field(F_FIRM).check(RUNNING_CHECK);
while (mask.run() == K_ENTER)
{
elabora(mask);
diff --git a/tp/tp0900a.h b/tp/tp0900a.h
index dd55a389e..32f751284 100755
--- a/tp/tp0900a.h
+++ b/tp/tp0900a.h
@@ -6,8 +6,7 @@
#define F_PAIV 103
#define F_COFI 104
#define F_DENCOM 105
-#define F_INDRES 106
-#define F_CIVRES 107
+#define F_INDIR 106
#define F_PERIODO 111
#define F_ANNO 112
diff --git a/tp/tp0900a.uml b/tp/tp0900a.uml
index e0506dd93..7bc3f6cdb 100755
--- a/tp/tp0900a.uml
+++ b/tp/tp0900a.uml
@@ -34,10 +34,13 @@ NUMBER F_FIRM 5
BEGIN
PROMPT 2 1 ""
USE LF_NDITTE
+ JOIN LF_ANAG TO LF_NDITTE KEY 1 INTO TIPOA=TIPOA CODANAGR=CODANAGR
INPUT CODDITTA F_FIRM
OUTPUT F_RAGSOC RAGSOC
- CHECKTYPE REQUIRED
+ OUTPUT F_PAIV LF_ANAG->PAIV
+ OUTPUT F_COFI LF_ANAG->COFI
FLAGS "DF"
+ CHECKTYPE FORCED
END
STRING F_RAGSOC 60
@@ -47,26 +50,12 @@ BEGIN
FIELD #RAGSOC
END
-STRING F_PAIV 16
-BEGIN
- PROMPT 2 2 "iva"
- FLAGS "D"
- FIELD #PAIV
-END
-
-STRING F_COFI 16
-BEGIN
- PROMPT 45 2 "cofi"
- FLAGS "D"
- FIELD #COFI
-END
-
GROUPBOX DLG_NULL 78 3
BEGIN
PROMPT 1 3 "@bPeriodo da considerare"
END
-RADIOBUTTON F_PERIODO 38
+RADIOBUTTON F_PERIODO 39
BEGIN
PROMPT 2 3 ""
ITEM "1|Annuale" MESSAGE HIDE,F_TRIMESTRE|HIDE,F_MESE
@@ -154,6 +143,24 @@ BEGIN
FIELD #RESP
END
+STRING F_PAIV 16
+BEGIN
+ PROMPT 2 16 "IVA "
+ FIELD #PAIV
+END
+
+STRING F_COFI 16
+BEGIN
+ PROMPT 25 16 "C.F."
+ FIELD #COFI
+END
+
+STRING F_INDIR 60 33
+BEGIN
+ PROMPT 2 17 "Indirizzo "
+ FIELD #INDIR
+END
+
RADIOBUTTON F_PRODUT 27
BEGIN
PROMPT 51 15 "Iscritto in quanto:"
diff --git a/tp/tp0900ca.rep b/tp/tp0900ca.rep
index 1c09342d6..0bd71f2d6 100755
--- a/tp/tp0900ca.rep
+++ b/tp/tp0900ca.rep
@@ -27,7 +27,8 @@
#TEL
-
+
+
#EMAIL
diff --git a/tp/tp0900es.rep b/tp/tp0900es.rep
index 49dd538ac..99417bc6e 100755
--- a/tp/tp0900es.rep
+++ b/tp/tp0900es.rep
@@ -13,7 +13,7 @@
#RAGSOC
- #INDRES
+ #INDIR
#PAIV
@@ -27,7 +27,8 @@
#TEL
-
+
+
#EMAIL
@@ -85,31 +86,40 @@
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
#SYSTEM.DATE
-
-
-
-
+
+
+
+
-
+
-
+