diff --git a/ca/ca3800b.rep b/ca/ca3800b.rep
index 6f9a81061..a26b16079 100755
--- a/ca/ca3800b.rep
+++ b/ca/ca3800b.rep
@@ -117,20 +117,6 @@
MESSAGE COPY,F3.101
-
- STAMPAFASI != ""
- CODCMS
-
-
- STAMPAFASI
-
-
- CODCMS
-
-
- 0
-
-
1 #H4.3 \ incrementa il contatore per il numero di righe di fase
@@ -151,8 +137,7 @@
- MESSAGE ADD,F4.69
-MESSAGE ADD,F3.69
+ MESSAGE ADD,F3.69
#RICAVI-#COSTI
@@ -242,17 +227,5 @@ MESSAGE RESET,169
MESSAGE RESET,169
-
- (STAMPAFASI != "")(#H4.3 E; 0)(TIPOSTIMA!='T')(FASESPEC=="")
-
-
-
- H4.2
-
-
-
- MESSAGE RESET,169
-
-
USE SALDANA
\ No newline at end of file
diff --git a/ca/ca3800c.rep b/ca/ca3800c.rep
index 6bfd3e128..895c8c003 100755
--- a/ca/ca3800c.rep
+++ b/ca/ca3800c.rep
@@ -117,20 +117,6 @@
MESSAGE COPY,F3.101
-
- STAMPACDC != ""
- CODCMS
-
-
- STAMPACDC
-
-
- CODCMS
-
-
- 0
-
-
1 #H4.3 \ incrementa il contatore per il numero di righe di cdc
@@ -151,8 +137,7 @@
- MESSAGE ADD,F4.69
-MESSAGE ADD,F3.69
+ MESSAGE ADD,F3.69
#RICAVI-#COSTI
@@ -242,17 +227,5 @@ MESSAGE RESET,169
MESSAGE RESET,169
-
- (STAMPACDC != "")(#H4.3 E; 0)(TIPOSTIMA!='T')(CDCSPEC=="")
-
-
-
- H4.2
-
-
-
- MESSAGE RESET,169
-
-
USE SALDANA
\ No newline at end of file
diff --git a/ca/ca3883.cpp b/ca/ca3883.cpp
index 21a879561..75576bb20 100755
--- a/ca/ca3883.cpp
+++ b/ca/ca3883.cpp
@@ -222,9 +222,11 @@ 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);
+
+ if (find_section('F', 4) != NULL)
+ ps << "|ADD,F4." << new_field->id();
+
+ new_field->set_postscript(ps);
}
break;
case 'F': //i footer devono calcolarsi i totali;ma i footer di totale fasi (4) non devono..
@@ -298,7 +300,7 @@ bool TCRPA_report::generate_columns (TString_array& codici, TString_array& testa
}
//footers
- for (int i = 4; i > 0; i--)
+ for (int i = find_max_level('F') - 1; i > 0; i--)
{
TReport_section& foot = section('F', i);
@@ -813,10 +815,12 @@ void TPrint_saldana_recordset::requery()
switch (_tipostampa)
{
case 1:
+ case 4:
if (_fase.full())
query << " SELECT FASE=\"" << _fase << "\"";
break;
case 2:
+ case 8:
if (_cdc.full())
query << " SELECT COSTO=\"" << _cdc << "\"";
break;