From 018bd9c8e4e193feb91507b8afd5f62a952f6202 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 14 Dec 2009 16:15:44 +0000
Subject: [PATCH] Patch level         :  10.0 patch 549 Files correlati     :
 lv3 Ricompilazione Demo : [ ] Commento            : Aggiunta funzionalit'
 aggiuntiva bottone annulla

git-svn-id: svn://10.65.10.50/trunk@19769 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 lv/lv3400.cpp | 59 +++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 48 insertions(+), 11 deletions(-)

diff --git a/lv/lv3400.cpp b/lv/lv3400.cpp
index 590b9993b..081c2a77b 100755
--- a/lv/lv3400.cpp
+++ b/lv/lv3400.cpp
@@ -905,21 +905,58 @@ bool TEvasione_ter_msk::on_field_event(TOperable_field& f, TField_event e, long
   case DLG_CANCEL:
     if (e == fe_button && jolly == 0)
     {
-      show(F_TBARCODE);
-      show(F_TPACCHI);
-      show(F_TQTAPACCO);
-      show(F_TQTACON);
-      show(F_TQTADACON);
+      if(field(F_TRIGHE).shown())
+      {
+        show(F_TBARCODE);
+        show(F_TPACCHI);
+        show(F_TQTAPACCO);
+        show(F_TQTACON);
+        show(F_TQTADACON);
 
-      enable(DLG_SELECT);
-      enable(DLG_ELABORA);
+        enable(DLG_SELECT);
+        enable(DLG_ELABORA);
 
-      hide(F_TRIGHE);
+        hide(F_TRIGHE);
 
-      field(F_TBARCODE).set_focus();
+        field(F_TBARCODE).set_focus();
 
-      _autoselect = 1;
-      return false;
+        _autoselect = 1;
+        return false;
+      }
+      else
+      {
+        show(F_TCHIAVE);
+        show(F_TCODNUM);
+        show(F_TDESCR);
+        show(F_TTPDOC);
+        show(F_TANNO);
+        show(F_TDATAPRCO);
+
+        hide(F_TCODCF);
+        hide(F_TRAGSOC);
+        hide(F_TBARCODE);
+        hide(F_TPACCHI);
+        hide(F_TQTAPACCO);
+        hide(F_TQTACON);
+        hide(F_TQTADACON);
+
+        disable(DLG_SELECT);
+        disable(DLG_PREVIEW);
+        disable(DLG_ELABORA);
+        disable(DLG_SAVEREC);
+        disable(DLG_CANCEL);
+        
+        reset(F_TDATADOC);
+        reset(F_TNDOC);
+
+        enable(F_TNDOC);
+
+        _ra.destroy();
+
+        field(F_TCHIAVE).set_focus();
+
+        return false;
+      }
     }
     break;
   case DLG_SAVEREC: