diff --git a/ca/ca3800a.rep b/ca/ca3800a.rep index e56a68513..d6b61987f 100755 --- a/ca/ca3800a.rep +++ b/ca/ca3800a.rep @@ -24,17 +24,17 @@ - + - + ANNO - + - + TIPOSTIMA @@ -43,10 +43,10 @@
  • - + - + DEPTH @@ -54,14 +54,21 @@
  • - + - + VITAINTERA - + + + + + + FASESPEC + +
    LEVEL C; 2 @@ -132,7 +139,7 @@ IF(#H4.3=0;DESCRIZ;"") - + FASE @@ -227,7 +234,7 @@ THEN
    - (STAMPAFASI != "")(#H4.3 E; 1) + (STAMPAFASI != "")(#H4.3 E; 0)(TIPOSTIMA!='T')(FASESPEC=="") diff --git a/ca/ca3883.cpp b/ca/ca3883.cpp index c1cf26a7b..18db7d2ed 100755 --- a/ca/ca3883.cpp +++ b/ca/ca3883.cpp @@ -835,6 +835,11 @@ const TVariant& TPrint_saldana_recordset::get(const char* column_name) const var.set(_use_fasi == true ? "X" : ""); } else + if (strcmp(column_name, "FASESPEC") == 0) + { + var.set(_fase); + } + else if (strcmp(column_name, "AVANZAMENTO") == 0) { //Calcola lo stato di avanzamento della commessa