diff --git a/ca/ca3800.cpp b/ca/ca3800.cpp
index f31384353..fa4f6a165 100755
--- a/ca/ca3800.cpp
+++ b/ca/ca3800.cpp
@@ -529,6 +529,11 @@ const TVariant& TPrint_bilancio_cms_recordset::get(const char* column_name) cons
var.set(_vitaintera == true ? "SI" : "NO");
}
else
+ if (strcmp(column_name, "STAMPAFASI") == 0)
+ {
+ var.set(_use_fasi == true ? "X" : "");
+ }
+ else
if (strcmp(column_name, "AVANZAMENTO") == 0)
{
//Calcola lo stato di avanzamento della commessa
diff --git a/ca/ca3800a.rep b/ca/ca3800a.rep
index f1a7c8d8b..aee0e55bf 100755
--- a/ca/ca3800a.rep
+++ b/ca/ca3800a.rep
@@ -105,8 +105,26 @@
MESSAGE COPY,F3.101
+
+ STAMPAFASI != ""
+ CODCMS
+
+ 0 #CONTATORE !
+
+ STAMPAFASI
+
+
+ CODCMS
+
+
+ 0
+
+
+ 1
+#H4.3 \ incrementa il contatore per il numero di righe di fase
++!
CODCMS
@@ -122,11 +140,13 @@
- MESSAGE ADD,F3.69
+ MESSAGE ADD,F4.69
+MESSAGE ADD,F3.69
#RICAVI-#COSTI
- MESSAGE ADD,F3.169
+ MESSAGE ADD,F4.169
+MESSAGE ADD,F3.169
@@ -205,5 +225,16 @@ THEN
MESSAGE ADD,F2.169
+
+ (STAMPAFASI != "")(#H4.3 E; 1)
+
+
+
+
+ H4.2
+
+
+
+
USE SALDANA
\ No newline at end of file
diff --git a/ca/ca3883.cpp b/ca/ca3883.cpp
index 760c447b9..f2dcc702e 100755
--- a/ca/ca3883.cpp
+++ b/ca/ca3883.cpp
@@ -213,11 +213,14 @@ void TCRPA_report::offset_and_fill_columns(TReport_section& rep_sect,
new_field->set_field(str_arr.row(i));
TString ps = "MESSAGE ADD,F3.";
ps << new_field->id();
+ ps << "|ADD,F4.";
+ ps << new_field->id();
new_field->set_postscript(ps);
}
break;
- case 'F': //i footer devono calcolarsi i totali!
- if (rep_sect.level() > 1)
+ case 'F': //i footer devono calcolarsi i totali;ma i footer di totale fasi (4) non devono..
+ //..fare assolutamente nulla!
+ if (rep_sect.level() > 1 && rep_sect.level() < 4)
{
new_field->set_field("");
TString ps = "MESSAGE ADD,F";
@@ -266,7 +269,7 @@ bool TCRPA_report::generate_columns (TString_array& codici, TString_array& testa
offset_and_fill_columns(h0, testate, model_id);
//le testate di sezione devono resettare i campi totale dei corrispondenti footers
- for (int j = 3; j > 0; j--)
+ for (int j = 4; j > 0; j--)
{
TReport_section& head = section('H', j);
if (head.items() > 0)
@@ -286,7 +289,7 @@ bool TCRPA_report::generate_columns (TString_array& codici, TString_array& testa
}
//footers
- for (int i = 3; i > 0; i--)
+ for (int i = 4; i > 0; i--)
{
TReport_section& foot = section('F', i);