From d02ab18b42421573c5e3999b294486a439b8e78b Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 29 May 2008 15:02:14 +0000
Subject: [PATCH] Patch level         :10.0 Files correlati     :
 Ricompilazione Demo : [ ] Commento            :riporti dalla 5.0

git-svn-id: svn://10.65.10.50/trunk@16674 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ca/ca3800.uml  | 10 +++++-----
 ca/ca3800a.rep | 14 ++++++++++----
 ca/calib01.cpp |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ca/ca3800.uml b/ca/ca3800.uml
index 595bb3d3c..4c57e9955 100755
--- a/ca/ca3800.uml
+++ b/ca/ca3800.uml
@@ -123,14 +123,14 @@ BEGIN
   PROMPT 1 11 "Includere esercizi successivi (vita intera)"
 END
 
-RADIOBUTTON F_TIPOSTIMA 1 42
+RADIOBUTTON F_TIPOSTIMA 1 32
 BEGIN
-  PROMPT 34 9 "Tipo di stima"
-  ITEM "T|Costi preventivi\Ricavi preventivi (Tempo)"
+  PROMPT 44 9 "Tipo di stima"
+  ITEM "T|Costi prev.\Ricavi prev. (Tempo)"
   MESSAGE SHOW,F_TIPODETR|ENABLE,F_TIPODETR
-  ITEM "C|Costi consuntivi\Ricavi preventivi"
+  ITEM "C|Costi cons.\Ricavi prev."
   MESSAGE CLEAR,F_TIPODETR|HIDE,F_TIPODETR
-  ITEM "R|Costi consuntivi\Ricavi consuntivi"
+  ITEM "R|Costi cons.\Ricavi cons."
   MESSAGE CLEAR,F_TIPODETR|HIDE,F_TIPODETR
 END
 
diff --git a/ca/ca3800a.rep b/ca/ca3800a.rep
index 6cad0c710..bac93add7 100755
--- a/ca/ca3800a.rep
+++ b/ca/ca3800a.rep
@@ -151,6 +151,7 @@
   <condition>(STAMPAFASI != "" )||(STAMPACDC != "")</condition>
   <groupby>CODCMS</groupby>
   <font italic="1" face="Arial Narrow" bold="1" size="8" />
+  <postscript description="H4 POSTSCRIPT">MESSAGE RESET,B1.200</postscript>
   <field type="Stringa" width="1" id="1" pattern="1">
    <source>STAMPAFASI</source>
   </field>
@@ -224,6 +225,12 @@ THEN
 #THIS !</prescript>
   </field>
   <field x="91.5" type="Testo" align="center" width="2" id="171" pattern="1" text="%" />
+  <field type="Numero" hidden="1" align="right" width="1" id="200" pattern="1">
+   <prescript description="B1.200 PRESCRIPT">#THIS @
+1
++
+#THIS !</prescript>
+  </field>
  </section>
  <section type="Foot">
   <field border="1" x="1" y="0.25" type="Linea" width="169" height="0" pattern="1" />
@@ -294,10 +301,9 @@ MESSAGE RESET,169</postscript>
 MESSAGE RESET,169</postscript>
   </field>
  </section>
- <section type="Foot" level="4" height="1.25">
-  <condition>((STAMPAFASI !="")||(STAMPACDC !=""))&#26;&#26;(#H4.3 &#3E; 0)&#26;&#26;(TIPOSTIMA!='T')&#26;&#26;(FASESPEC=="")</condition>
-  <font italic="1" face="Arial Narrow" bold="1" size="8" />
-  <field border="1" x="2" type="Linea" width="169" height="0" pattern="1" />
+ <section type="Foot" level="4" height="1">
+  <condition>(#B1.200&#3E;1)&#26;&#26;((STAMPAFASI !="")||(STAMPACDC !=""))&#26;&#26;(#H4.3 &#3E; 0)&#26;&#26;(TIPOSTIMA!='T')&#26;&#26;(FASESPEC=="")</condition>
+  <font italic="1" face="Arial Narrow" size="8" />
   <field x="22" type="Testo" width="15" pattern="1" text="Totali commessa" />
   <field x="2" type="Stringa" bg_color="#C0C0C0" width="20" id="2" pattern="1">
    <source>H4.2</source>
diff --git a/ca/calib01.cpp b/ca/calib01.cpp
index 5b72c2490..715d71480 100755
--- a/ca/calib01.cpp
+++ b/ca/calib01.cpp
@@ -717,7 +717,7 @@ bool TSimple_anal_msk::on_field_event(TOperable_field& o, TField_event e, long j
   switch (o.dlg())
   {
   case F_TREE:
-    if (e == fe_select)
+    if (e == fe_button)
     {
       if (edit_mode() && !dirty())
         set_mode(MODE_QUERY);