From 229fcb8bb22757193599ef575401c7dac7ace1a7 Mon Sep 17 00:00:00 2001
From: villa <villa@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 22 May 1996 10:40:53 +0000
Subject: [PATCH] Aggiustamenti XI e errori corretti disabilitato cg3500 in
 attesa di aggiornamento per saldi

git-svn-id: svn://10.65.10.50/trunk@2883 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg3.cpp     |  2 +-
 cg/cg3100a.uml |  2 +-
 cg/cg3200.cpp  |  2 +-
 cg/cg3300.cpp  |  7 +++----
 cg/cg3300a.uml |  8 ++++----
 cg/cg3300c.uml |  2 +-
 cg/cg4600.cpp  | 12 ++++--------
 7 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/cg/cg3.cpp b/cg/cg3.cpp
index 2a54d226f..edc903164 100755
--- a/cg/cg3.cpp
+++ b/cg/cg3.cpp
@@ -17,7 +17,7 @@ int main(int argc,char** argv)
         case 1: rt = cg3200(argc,argv) ; break;
         case 2: rt = cg3300(argc,argv) ; break;
         case 3: rt = cg3400(argc,argv) ; break;
-        case 4: rt = cg3500(argc,argv) ; break;
+//        case 4: rt = cg3500(argc,argv) ; break;
         default: error_box(usage, argv[0]) ; break;
         }
   return rt;
diff --git a/cg/cg3100a.uml b/cg/cg3100a.uml
index 9c61199e4..b2b26dda9 100755
--- a/cg/cg3100a.uml
+++ b/cg/cg3100a.uml
@@ -85,7 +85,7 @@ BEGIN
     MESSAGE FALSE ENABLE,F_STAMPA
 END
 
-RADIOBUTTON F_DECIDI 10
+RADIOBUTTON F_DECIDI 12
 BEGIN
     PROMPT 2 10 "Stampa "
     HELP "Indicare il criterio di scelta dei movimenti"
diff --git a/cg/cg3200.cpp b/cg/cg3200.cpp
index 75493a239..748882d40 100755
--- a/cg/cg3200.cpp
+++ b/cg/cg3200.cpp
@@ -1996,7 +1996,7 @@ print_action TMastrini_application::postprocess_page(int file, int counter)
     else
       if (_nummast == 2)             
       {                          
-        if (!counter)
+        if (!counter)                                                                                   
         { 
           if (_numcarat == 1)
             carica_array_totali132();
diff --git a/cg/cg3300.cpp b/cg/cg3300.cpp
index 21b66aae4..413409535 100755
--- a/cg/cg3300.cpp
+++ b/cg/cg3300.cpp
@@ -843,10 +843,9 @@ void CG3300_application::calcola ()
     _alleg->put (ALL_ANNO, _anno_stampa);
     _alleg->put (ALL_CODCF, _tipoa_richiesto);
 
-    TProgind    prnd (_alleg->items(), 
-                      format ("Calcolo in corso    \n",
-                              "Attendere prego...    "), 
-                      FALSE, TRUE); 
+    TProgind prnd(_alleg->items(), 
+                  "Elaborazione in corso...", 
+                  FALSE, TRUE); 
 
     if (_ricerca_att != "") 
       _alleg->curr().put (ALL_CODATT, _ricerca_att);
diff --git a/cg/cg3300a.uml b/cg/cg3300a.uml
index 06579fcb0..1440f1d83 100755
--- a/cg/cg3300a.uml
+++ b/cg/cg3300a.uml
@@ -86,13 +86,13 @@ END
 BOOLEAN F_ARROT
 BEGIN
   PROMPT 2 11 "Importi non arrotondati "
-  HELP "Indicare se vengano arrotondati gli importi"
+  HELP "Indicare se gli importi devono essere arrotondati"
 END
 
 BOOLEAN F_ANNO_PREC 
 BEGIN
   PROMPT 31 10 "Estratto anno precedente "
-  HELP "Indicare se stamapre solo il saldo dell'anno precedente"
+  HELP "Indicare se stampare solo il saldo dell'anno precedente"
 END
 
 BOOLEAN F_ATTIVITA 
@@ -114,7 +114,7 @@ END
 
 BOOLEAN F_RICALCOLA 
 BEGIN
-  PROMPT 46 13 "Ricalcola "
+  PROMPT 46 13 "Ricalcola"
   HELP "Indicare se ricalcolare ogni ditta prima di stampare"
 END
 
@@ -140,7 +140,7 @@ BEGIN
   DISPLAY "Codice" CODDITTA
   DISPLAY "Ragione sociale @50" RAGSOC
   OUTPUT F_A_DITTA CODDITTA 
-  VALIDATE F_A_DITTA >= F_DA_DITTA
+  VALIDATE F_A_DITTA>=F_DA_DITTA
 END
 
 BUTTON DLG_OK 9 2
diff --git a/cg/cg3300c.uml b/cg/cg3300c.uml
index 1a689c147..af3846944 100755
--- a/cg/cg3300c.uml
+++ b/cg/cg3300c.uml
@@ -89,7 +89,7 @@ BEGIN
   DISPLAY "Codice" CODDITTA
   DISPLAY "Ragione sociale @50" RAGSOC
   OUTPUT F_A_DITTA CODDITTA 
-  VALIDATE F_A_DITTA >= F_DA_DITTA
+  VALIDATE F_A_DITTA>=F_DA_DITTA
 END
 
 BUTTON DLG_OK 9 3
diff --git a/cg/cg4600.cpp b/cg/cg4600.cpp
index 9a1e30ea0..10eb640bc 100755
--- a/cg/cg4600.cpp
+++ b/cg/cg4600.cpp
@@ -1174,9 +1174,9 @@ void CG4600_application::chiudi_attivita()
       j      = 0; 
       numrig = 0;
       
-      for (_saldi->read(_isgteq); ; _saldi->next())
+      for (int err = _saldi->read(_isgteq); ; _saldi->next())
       {
-        if (_saldi->curr() > (*_rec) || _saldi->eof()) 
+        if (_saldi->curr() > (*_rec) || _saldi->eof() || err != NOERR) 
         {
           // Aggiungo un ulteriore riga di movimento contenente la somma
           // di tutti i saldi aventi lo stesso conto, indicandola
@@ -1200,15 +1200,11 @@ void CG4600_application::chiudi_attivita()
           compila_mov = FALSE;
         }
 
-        //numrig++;
-        s               = _saldi->get_long(SLD_SOTTOCONTO);
-        //sale.calcola_ultima_immissione(_annoesch,0,g,c,s,indbil);
+        s  = _saldi->get_long(SLD_SOTTOCONTO);
         sale.ultima_immissione_bilancio(_annoesch,g,c,s,indbil, 1);
-        _saldo          = sale.saldo();
-        //_saldo = ZERO;
+        _saldo  = sale.saldo();
         const int dbkey = _saldi->getkey();
         _saldi->setkey(1);
-//        TString sldstr = _saldo.string();
         
         if (_saldo == ZERO) continue;       // *** TBC qui fa ciclo infinito