diff --git a/ca/ca3200.cpp b/ca/ca3200.cpp
index 6aeebc5c7..06c36da29 100755
--- a/ca/ca3200.cpp
+++ b/ca/ca3200.cpp
@@ -551,7 +551,7 @@ void TPrint_mastrini_ca_rep::set_filter(const TPrint_mastrini_ca_mask& msk, int
TPrint_mastrini_ca_recordset* recset = NULL;
- const char* const query ="USE RMOVANA KEY 2\nJOIN MOVANA INTO NUMREG==NUMREG";
+ const char* const query ="USE RMOVANA KEY 2\nJOIN MOVANA INTO NUMREG==NUMREG\nJOIN MOV TO MOVANA INTO NUMREG==NUMREGCG";
switch (tipoconti)
{
case 1:
diff --git a/ca/ca3200a.rep b/ca/ca3200a.rep
index 897a55b72..1417e001f 100755
--- a/ca/ca3200a.rep
+++ b/ca/ca3200a.rep
@@ -73,24 +73,25 @@ MESSAGE RESET,F2.202
CODCONTO
CA_FORMAT_CONTO_DESCR
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
SALDOINI:DARE
MESSAGE COPY,B1.103
-
+
SALDOINI:AVERE
#THIS @
DUP
@@ -110,36 +111,38 @@ THEN
NUMREG != 0
-
+
DATACOMP
MESSAGE COPY,F3.131
-
+
NUMREG
-
-
+
+
NUMRIG
-
+
+
DESCR
-
+
MOVANA.NUMREGCG
-
+
MOVANA.DATADOC
-
+
MOVANA.NUMDOC
-
+
MOVANA.CODCAUS
-
+
+
MESSAGE ISAMREAD,CAUS,CODCAUS=MOVANA.CODCAUS,DESCR
-
+
IMPORTO
"RMOVANA.SEZIONE" @
"A" =
@@ -155,7 +158,7 @@ THEN
MESSAGE ADD,F2.101
-
+
IMPORTO
"RMOVANA.SEZIONE" @
"D" =
@@ -171,60 +174,69 @@ THEN
MESSAGE ADD,F2.102
-
+
MESSAGE COPY,F3.103
+
+ MOV.TIPO
+
+
+ MOV.CODCF
+
+
+
+ MESSAGE ISAMREAD,CLIFO,TIPOCF=#104!CODCF=#105,RAGSOC
+
-
+
-
+
-
+
-
+
#101-#102
-
+
-
+
-
+
MESSAGE ADD,F1.101
-
+
MESSAGE ADD,F1.102
-
+
#101+#H2.201
-
+
#102+#H2.202
-
+
#201-#202
@@ -232,18 +244,19 @@ THEN
USE RMOVANA KEY 2
-JOIN MOVANA INTO NUMREG==NUMREG
+JOIN MOVANA INTO NUMREG==NUMREG
+JOIN MOV TO MOVANA INTO NUMREG==NUMREGCG
: SCAMBIA_CAMPI ( F1 F2 -- )
VARIABLE _X1 \ coordinate del campo F1
VARIABLE _Y1