Corretti particolari piu' o meno estetici delle maschere

git-svn-id: svn://10.65.10.50/trunk@262 c028cbd2-c16b-5b4b-a496-9718f37d4682

cg/cg0200.cpp

@@ -452,7 +452,7 @@ TSheet_field& CG0200_application::indsp_sheet() const
 
 void CG0200_application::reset_sheet()
 {
-  TToken_string  nulla("|**Nessuno**||||");
+  const TToken_string nulla("|**Nessuno**||||");
 
   app().field_sheet(F_CODINDDOC)->destroy();
   app().field_sheet(F_CODINDDOC)->add(nulla);

cg/cg1700a.uml

@@ -1,6 +1,6 @@
 #include "cg1700.h"
 
-PAGE "" -1 -1 70 10
+PAGE "" -1 -1 70 8
 
 NUMBER F_CODDITTA 5
 BEGIN
@@ -27,14 +27,14 @@ BEGIN
   FLAGS "A"
 END
 
-BUTTON DLG_OK 9 2
+BUTTON DLG_OK 10 2
 BEGIN 
-  PROMPT 30 8 ""
+  PROMPT -12 -1 ""
 END
 
-BUTTON DLG_QUIT 9 2
+BUTTON DLG_QUIT 10 2
 BEGIN
-  PROMPT 46 8 ""
+  PROMPT -22 -1 ""
 END
 
 ENDPAGE

cg/cg5000a.uml

@@ -1,6 +1,6 @@
 #include "cg5000a.h"
 
-PAGE "Parametri contabilita' studio" -1 -1 76 20
+PAGE "Parametri contabilita' studio" -1 -1 76 16
 
 GROUPBOX DLG_NULL 74 4 
 BEGIN
@@ -109,36 +109,12 @@ BEGIN
 	FIELD InTr(3)
 END
 
-BOOLEAN CHK_CODAPN
-BEGIN
-	PROMPT 2 14 "Controllo dare/avere in gestione primanota differita"
-	FIELD CoDaPn
-END
-
-BOOLEAN CHK_NOVIIP
-BEGIN
-	PROMPT 2 15 "Non visualizza Incasso e Pagamento in automatico"
-	FIELD NoViIP
-END
-
-BOOLEAN CHK_NOVIPC
-BEGIN
-	PROMPT 2 16 "Non visualizza parte contabile in immissione documenti"
-	FIELD NoViPC
-END
-
-BOOLEAN CHK_GSACMI
-BEGIN
-	PROMPT 2 17 "Gestione anno di competenza per movimenti IVA"
-	FIELD GsAcMi
-END
-
-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
 	PROMPT -12 -1 ""
 END
 
-BUTTON DLG_QUIT 7 2 
+BUTTON DLG_QUIT 10 2 
 BEGIN
 	PROMPT -22 -1 ""
 END

cg/cglib.h

@@ -1,20 +1,13 @@
 #ifndef __CGLIB_H
 #define __CGLIB_H
 
+#ifndef __ASSOC_H
+#include <assoc.h>
+#endif
+
 #ifndef __ISAM_H
 #include <isam.h>
 #endif
-#ifndef __REAL_H
-#include <real.h>
-#endif
-#ifndef __DATE_H
-#include <date.h>
-#endif
-
-#include <assoc.h>
-//#include <utility.h>
-//#include <config.h>
-//#include <applicat.h>
 
 #include "conto.h"
 
@@ -64,10 +57,10 @@ public:
   bool calcola_clifo(int, int, int, int, int);
   TRectype& ricerca_progr_prec(int, int, int, long);
   real saldofin_esprec(int,int,int,long); 
-  real saldo() {return _saldo;}
-  real saldoini() {return _saldo_iniziale;}
-  real prgdare() {return _prg_dare;}
-  real prgavere() {return _prg_avere;}
+  real saldo() const {return _saldo;}
+  real saldoini() const {return _saldo_iniziale;}
+  real prgdare() const {return _prg_dare;}
+  real prgavere() const {return _prg_avere;}
   bool calcola(int,int,int,int,long,const TDate&,const TDate&,int,bool,
                const TDate&,const TDate&,const TDate&,bool);
   bool prg_attuali(int,TConto&,int,real&,real&);
@@ -109,19 +102,19 @@ public:
                  char sezione, bool somma=TRUE);  
 
   void set_anno_es(int anno) { _anno_es = anno; }
-  int anno_es() { return _anno_es; }
+  int anno_es() const { return _anno_es; }
 
   void set_movap (bool movap) { _movap = movap; }
-  bool movap() { return _movap; }
+  bool movap() const { return _movap; }
 
   void set_movprovv (bool p) { _provv = p; }
-  bool movprovv() { return _provv; }
+  bool movprovv() const { return _provv; }
 
-  void set_data_ulmov (TDate& data) { _data_ulmov = data; }
-  TDate& data_ulmov() { return _data_ulmov; }
+  void set_data_ulmov (const TDate& data) { _data_ulmov = data; }
+  const TDate& data_ulmov() const { return _data_ulmov; }
 
   void set_num_ulmov (long num) { _num_ulmov = num; }
-  long num_ulmov() { return _num_ulmov; }
+  long num_ulmov() const { return _num_ulmov; }
 
   void reset(); // pulisce l'array dei conti
   TSaldo_agg();

cg/cglib01.cpp

@@ -2,12 +2,10 @@
 // calcolo dei saldi
 
 #include <applicat.h>
-#include <date.h>
-#include <real.h>
-#include <lffiles.h>
+#include <config.h>
 #include <isam.h>
 #include <utility.h>
-#include <config.h>
+
 #include <rmov.h>
 #include <mov.h>
 #include <saldi.h> 
@@ -106,7 +104,7 @@ real Saldo::calcola_saldo_iniziale(int annoes,int g,int c,long s,int indbil)
      return pdaresca-saldoini-paveresca;
 }
 
-/*
+
 bool Saldo::calcola(int annoes, int annoesprec,int g, int c, long s,
 		    const TDate& data_inf, const TDate& data_sup,
 			    int indbil, bool controllo_competenza, const TDate& inizio_es,
@@ -124,7 +122,7 @@ bool Saldo::calcola(int annoes, int annoesprec,int g, int c, long s,
  
   return TRUE;
 }
-*/
+
 
 const char* Saldo::causale_chiusura_es()
 {