diff --git a/ca/ca3100.uml b/ca/ca3100.uml
index dcfb421fa..0b757ad45 100755
--- a/ca/ca3100.uml
+++ b/ca/ca3100.uml
@@ -10,13 +10,13 @@ END
BUTTON DLG_PRINT 10 2
BEGIN
- PROMPT -15 -11 "~Stampa"
+ PROMPT -12 -1 "~Stampa"
MESSAGE EXIT,K_ENTER
END
BUTTON DLG_QUIT 10 2
BEGIN
- PROMPT -55 -11 ""
+ PROMPT -22 -1 ""
END
ENDPAGE
diff --git a/ca/ca3200.uml b/ca/ca3200.uml
index b97fdc62b..7c2612e1a 100755
--- a/ca/ca3200.uml
+++ b/ca/ca3200.uml
@@ -10,13 +10,13 @@ END
BUTTON DLG_PRINT 10 2
BEGIN
- PROMPT -15 -11 "~Stampa"
+ PROMPT -12 -1 "~Stampa"
MESSAGE EXIT,K_ENTER
END
BUTTON DLG_QUIT 10 2
BEGIN
- PROMPT -55 -11 ""
+ PROMPT -22 -1 ""
END
ENDPAGE
diff --git a/ca/ca3200a.rep b/ca/ca3200a.rep
index 163054086..484de6675 100755
--- a/ca/ca3200a.rep
+++ b/ca/ca3200a.rep
@@ -14,28 +14,28 @@
#REPORT.PAGE
-
-
- CODCCOSTO
+
+
+ #COSTO
CA_FORMAT_COSTO
-
+
MESSAGE ISAMREAD,CDC,CODCOSTO=RMOVANA.CODCCOSTO,DESCRIZ
-
- CODCMS
+
+ #COMMESSA
CA_FORMAT_COMMESSA
-
+
MESSAGE ISAMREAD,COMMESSE,CODCMS=RMOVANA.CODCMS,DESCRIZ
-
- CODFASE
+
+ #FASE
CA_FORMAT_FASE
-
+
MESSAGE ISAMREAD,FASI,CODFASE=RMOVANA.CODFASE,DESCRIZ
@@ -52,9 +52,9 @@ MESSAGE RESET,F1.102
MESSAGE RESET,F2.101
MESSAGE RESET,F2.102
-MESSAGE RESET,F2.103
-MESSAGE RESET,F2.104
-MESSAGE RESET,F2.105
+MESSAGE RESET,F2.201
+MESSAGE RESET,F2.202
+
@@ -74,11 +74,26 @@ MESSAGE RESET,F2.105
-
+
-
-
+
+
+ SALDOINI:DARE
+ MESSAGE COPY,B1.103
+
+
+
+ SALDOINI:AVERE
+ #THIS @
+DUP
+0 E; IF
+ -1 *
+ "B1.103" +!
+ELSE
+ DROP
+THEN
+
DATACOMP
@@ -117,9 +132,15 @@ MESSAGE RESET,F2.105
"A" =
IF
0 #THIS !
+ELSE
+#THIS @
+"B1.103"
++!
THEN
+
- MESSAGE ADD,F2.101
+ MESSAGE ADD,F2.101
+
IMPORTO
@@ -127,26 +148,28 @@ THEN
"D" =
IF
0 #THIS !
+ELSE
+#THIS @
+-1 *
+"B1.103"
++!
THEN
MESSAGE ADD,F2.102
-
- "RMOVANA.SEZIONE" @
-"D" =
-IF
-0 #THIS !
-THEN
-
- MESSAGE ADD,F2.103
+
+ MESSAGE COPY,F3.103
-
+
-
+
+
+
+
@@ -155,15 +178,26 @@ THEN
-
+
+ #101+#H2.201
+
+
+
+ #102+#H2.202
+
+
+
+ #201-#202
-
+
USE RMOVANA KEY 2
JOIN MOVANA INTO NUMREG==NUMREG
diff --git a/ca/calib02.cpp b/ca/calib02.cpp
index c462607e6..fc3aaa191 100755
--- a/ca/calib02.cpp
+++ b/ca/calib02.cpp
@@ -168,7 +168,7 @@ TImporto TAnal_balance::saldo_fine_anno(const char* conto, const char* costo,
if (commessa && *commessa)
{
if (select.not_empty()) select << "&&";
- select << "(CODCMS=='" << commessa << "')";
+ select << "(COMMESSA=='" << commessa << "')";
}
if (fase && *fase)
{
@@ -232,14 +232,6 @@ bool TAnal_balance::saldo_movimenti(const char* conto, const char* costo,
TString query, select;
- if (dataini.ok())
- select << "(ANSI(107.DATACOMP)>=" << dataini.date2ansi() << ")";
- if (al.ok())
- {
- if (select.not_empty())
- select << "&&";
- select << "(ANSI(107.DATACOMP)<=" << al.date2ansi() << ")";
- }
if (costo && *costo)
{
if (select.not_empty())
@@ -266,12 +258,12 @@ bool TAnal_balance::saldo_movimenti(const char* conto, const char* costo,
query << "FROM CODCONTO=" << conto;
if (dataini.ok())
- query << " DATAREG=" << TDate(dataini-90L).string();
+ query << " DATACOMP=" << dataini.string();
query << "\n";
query << "TO CODCONTO=" << conto;
if (al.ok())
- query << " DATAREG=" << al.string();
+ query << " DATACOMP=" << al.string();
query << "\n";
TISAM_recordset rmovana(query);
@@ -292,7 +284,7 @@ bool TAnal_balance::saldo_movimenti(const char* conto, const char* costo,
if ((ntipomov & tipo) == 0)
continue;
- const TDate data = rmovana.get("107.DATACOMP").as_date();
+ const TDate data = rmovana.get(RMOVANA_DATACOMP).as_date();
const TImporto imp(rmovana.get(RMOVANA_SEZIONE).as_string()[0],
rmovana.get(RMOVANA_IMPORTO).as_real());
if (data >= dal)