From 9d4dd3f3c94158eaff45939797bf8be683515e41 Mon Sep 17 00:00:00 2001
From: villa <villa@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 20 Oct 1995 11:24:01 +0000
Subject: [PATCH] Kaciottelle segnalate da Patrizia

git-svn-id: svn://10.65.10.50/trunk@1981 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/ba3700.cpp  |  3 ++-
 ba/ba3700.h    | 32 ++++++++++++++++----------------
 ba/ba3700a.uml |  8 +++++---
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/ba/ba3700.cpp b/ba/ba3700.cpp
index 5b452efe4..2daee82e9 100755
--- a/ba/ba3700.cpp
+++ b/ba/ba3700.cpp
@@ -119,6 +119,7 @@ int BA3700_application::read(TMask& m)
 
   TString code(m.get(F_CODICE));
   int ir = m.get_int(F_INT_RATE); if (ir == 0) ir = -1;
+  if (_pag != NULL) delete _pag;
   shuttle._pag = _pag = new TPagamento(code);
   _pag->set_sheet(*_cs, ir);
   if (_pag->n_rate() > 1)
@@ -165,7 +166,7 @@ bool BA3700_application::intervallo_rate(TMask_field& f, KEY k)
 {          
   // ricalcola tutte le scadenze
   // occorre pag->set_intervallo_rate(intervallo)       
-  if (k != K_TAB || f.mask().query_mode()) return TRUE;
+  if (k != K_TAB || f.mask().query_mode() || !f.focusdirty()) return TRUE;
   
   sht* s = (sht*)get_app_data();
   TPagamento*    pag = s->_pag;
diff --git a/ba/ba3700.h b/ba/ba3700.h
index 388f6f3b8..12ca2c31d 100755
--- a/ba/ba3700.h
+++ b/ba/ba3700.h
@@ -3,20 +3,20 @@
 #define TAB_CPG "%CPG"
 #define TAB_RPG "%RPG"
 
-#define F_CODICE 101
-#define F_DESC 102
-#define F_SHEET_RPG 103
-#define F_INIZIOSCAD 104
-#define F_MESECOMM 105
-#define F_TIPO_PRIMA_RATA 106
-#define F_RATE_DIFF 108
-#define F_INT_RATE 109
-#define F_NUM_RATE 110
-#define F_TIPO_RATA 111
-#define F_EQUAL_FROM 112
-#define F_START_RATA 113
-#define F_ULT_CLASS 114
-#define F_FIXSCAD_1 115  
-#define F_FIXSCAD_2 116
-#define F_FIXSCAD_3 117
+#define F_CODICE 201
+#define F_DESC 202
+#define F_SHEET_RPG 203
+#define F_INIZIOSCAD 204
+#define F_MESECOMM 205
+#define F_TIPO_PRIMA_RATA 206
+#define F_RATE_DIFF 208
+#define F_INT_RATE 209
+#define F_NUM_RATE 210
+#define F_TIPO_RATA 211
+#define F_EQUAL_FROM 212
+#define F_START_RATA 213
+#define F_ULT_CLASS 214
+#define F_FIXSCAD_1 215  
+#define F_FIXSCAD_2 216
+#define F_FIXSCAD_3 217
 
diff --git a/ba/ba3700a.uml b/ba/ba3700a.uml
index 489bd9356..59fe3e202 100755
--- a/ba/ba3700a.uml
+++ b/ba/ba3700a.uml
@@ -107,7 +107,8 @@ BEGIN
    ITEM "6|Lettera di credito"           
    ITEM "7|Tratta accettata"           
    ITEM "8|Rapporti interban. diretti"           
-   ITEM "9|Bonifici"           
+   ITEM "9|Bonifici"                        
+   FIELD %CPG->S4
 END
 
 NUMBER F_INT_RATE 3
@@ -139,7 +140,8 @@ BEGIN
   DISPLAY "Descrizione@50" S0
   OUTPUT F_ULT_CLASS CODTAB[2,2]
   CHECKTYPE NORMAL 
-  HELP "Codice default per ulteriore classificazione della data"
+  HELP "Codice default per ulteriore classificazione della data" 
+  FIELD %CPG->S5
 END
 
 /**********************************************************************
@@ -265,7 +267,7 @@ BEGIN
   ITEM "5|Paghero'"
   ITEM "6|Lettera di credito"
   ITEM "7|Tratta accettata"
-  ITEM "8|Rapporti interbancari diretti"           
+  ITEM "8|Rapporti interb. diretti"           
   ITEM "9|Bonifici"           
   ITEM "10|Altro pagamento"
 END