From ad85706042c727621388127e5ddf1d0ac5622d54 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 23 Jul 1997 08:01:53 +0000
Subject: [PATCH] cg2100.cpp  Aggiunti campi richiesti da Emilio sul .ini
 cg2200.cpp  Corretta gestione movimenti provvisori

git-svn-id: svn://10.65.10.50/trunk@4887 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg2100.cpp | 19 ++++++++++++++-----
 cg/cg2200.cpp |  2 ++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/cg/cg2100.cpp b/cg/cg2100.cpp
index 81a303414..79973fafe 100755
--- a/cg/cg2100.cpp
+++ b/cg/cg2100.cpp
@@ -1535,11 +1535,16 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
 void TPrimanota_application::mask2ini(const TMask& msk, TConfig& ini)
 {
   TRelation_application::mask2ini(msk, ini);
-                                            
-  ini.set("DESCRCAUS", msk.get(F_DESCRCAUS));
-  const TEsercizio& annoes = _esercizi[msk.get_int(F_ANNOES)];
-  ini.set("INIZIOES", annoes.inizio());
-  ini.set("FINEES", annoes.fine());
+  
+  const char mov_cesp = causale().link_cespiti();
+  if (mov_cesp > ' ')
+  {
+    ini.set("MOVCESP", mov_cesp);
+    ini.set("DESCRCAUS", msk.get(F_DESCRCAUS));
+    const TEsercizio& annoes = _esercizi[msk.get_int(F_ANNOES)];
+    ini.set("INIZIOES", annoes.inizio());
+    ini.set("FINEES", annoes.fine());
+  }
   
   int i, f;                                    
   for (i = 0; i < _rel->cg_items(); i++)
@@ -1619,6 +1624,10 @@ bool TPrimanota_application::link_cesp(const TMask& msk, const char* action)
   }
   if (i < 0)
     return FALSE;
+    
+  // Controlla l'esistenza del programma cespiti
+  if (!fexist("cespcg.exe"))    
+    return FALSE;
                        
   TFilename cespini;
   cespini.tempdir();
diff --git a/cg/cg2200.cpp b/cg/cg2200.cpp
index 1ad9f95a7..92c9ec672 100755
--- a/cg/cg2200.cpp
+++ b/cg/cg2200.cpp
@@ -299,6 +299,8 @@ bool TProvvisori_app::menu(MENU_TAG)
 
     m.reset();
     KEY key = m.run();
+    if (key != K_ENTER && key != K_DEL)
+      break;
     
     TString16 from_d = m.get(F_FROMDATE);    
     TString16 to_d = m.get(F_TODATE);