Correzione programma gestione DNINST

Correzione allineamento campi in maschera Banche
Correzione allineamento campi in maschera Contatti

git-svn-id: svn://10.65.10.50/branches/R_10_00@22653 c028cbd2-c16b-5b4b-a496-9718f37d4682

ba/ba0103.cpp

@@ -600,11 +600,16 @@ bool TOutlook_mask::can_be_closed() const
     TBook_field& bf = book_field();
     if (bf.pages() > 0)
     {
-      TMask cm(TR("Chiusura applicazioni"), 1, 50, 7);
+      TMask cm(TR("Chiusura applicazioni"), 1, 50, 8);
-      cm.add_radio(DLG_USER, 0, TR("Azione"),  1, 0, 48, "0|1", 
+
-                   TR("Non chiudere le applicazioni in esecuzione|Chiusura forzata (solo in caso d'emergenza)"));
+      TToken_string options;
+      options = TR("Non chiudere le applicazioni in esecuzione");
+      options.add(TR("Chiusura forzata (solo in caso d'emergenza)"));
+      cm.add_radio(DLG_USER, 0, TR("Azione"),  1, 0, 48, "0|1", options);
+
       cm.add_button(DLG_OK, 0, "", -12, -1, 10, 2);
       cm.add_button(DLG_CANCEL, 0, "", -22, -1, 10, 2);
+
       if (cm.run() == K_ENTER && cm.get_int(DLG_USER))
         bf.kill_processes();
     }

ba/ba2800a.h

@@ -1,22 +1,30 @@
-#define F_DNINST    201
+#define F_ZIP_ON      201
-#define F_DSN       202
+#define F_ZIP_WWW     202
-#define F_FTP       203
+#define F_ZIP_USR     203
-#define F_DNINST_ON 211
+#define F_ZIP_PWD     204
-#define F_DSN_ON    212
+ 
-#define F_FTP_ON    213
+#define F_DSN_ON      211
+#define F_DSN_WWW     212
+#define F_DSN_USR     213
+#define F_DSN_PWD     214
 
-#define F_SORT      219
+#define F_XML_ON      221
-#define F_DNSHEET   220
+#define F_XML_WWW     222
+#define F_XML_USR     223
+#define F_XML_PWD     224
 
-#define F_NUMBER    101
+#define F_SORT        198
-#define F_OEM       102
+#define F_DNSHEET     199
-#define F_OWNER     103
+
-#define F_SUSPEND   104
+#define F_NUMBER      101
-#define F_KILLED    105
+#define F_OEM         102
-#define F_DBOEM     106
+#define F_OWNER       103
-#define F_DBOWNER   107
+#define F_SUSPEND     104
-#define F_DBSUSPEND 108
+#define F_KILLED      105
-#define F_DBKILLED  109
+#define F_DBOEM       106
-#define F_ATOEM     110
+#define F_DBOWNER     107
-#define F_ATOWNER   111
+#define F_DBSUSPEND   108
-#define F_ATACCESS  112
+#define F_DBKILLED    109
+#define F_ATOEM       110
+#define F_ATOWNER     111
+#define F_ATACCESS    112

ba/ba2800a.uml

@@ -27,44 +27,88 @@ ENDPAGE
 
 PAGE "Gestione attivazioni" 0 2 0 0
 
-BOOLEAN F_DNINST_ON
+BOOLEAN F_ZIP_ON
 BEGIN
   PROMPT 1 0 "DNINST (HTTP/FTP)"
-  MESSAGE FALSE DISABLE,F_DNINST
+  MESSAGE FALSE DISABLE,1@
-  MESSAGE TRUE ENABLE,F_DNINST
+  MESSAGE TRUE ENABLE,1@
 END
 
-STRING F_DNINST 256 50
+STRING F_ZIP_WWW 32 20
 BEGIN
-  PROMPT 28 0 ""
+  PROMPT 22 0 ""
   CHECKTYPE REQUIRED
+  GROUP 1
+END
+
+STRING F_ZIP_USR 32 20
+BEGIN
+  PROMPT 46 0 ""
+  CHECKTYPE REQUIRED
+  GROUP 1
+END
+
+STRING F_ZIP_PWD 32 10
+BEGIN
+  PROMPT 68 0 ""
+  CHECKTYPE REQUIRED
+  GROUP 1
 END
 
 BOOLEAN F_DSN_ON
 BEGIN
   PROMPT 1 1 "DSN (ODBC)"
-  MESSAGE FALSE DISABLE,F_DSN
+  MESSAGE FALSE DISABLE,2@
-  MESSAGE TRUE ENABLE,F_DSN
+  MESSAGE TRUE ENABLE,2@
 END
 
-STRING F_DSN 256 50
+STRING F_DSN_WWW 256 20
 BEGIN
-  PROMPT 28 1 ""
+  PROMPT 22 1 ""
   CHECKTYPE REQUIRED
   FLAGS "B"
+  GROUP 2
 END
 
-BOOLEAN F_FTP_ON
+STRING F_DSN_USR 32 20
+BEGIN
+  PROMPT 46 1 ""
+  GROUP 2
+END
+
+STRING F_DSN_PWD 32 10
+BEGIN
+  PROMPT 68 1 ""
+  GROUP 2
+END
+
+BOOLEAN F_XML_ON
 BEGIN
   PROMPT 1 2 "XML (FTP)"
-  MESSAGE FALSE DISABLE,F_FTP
+  MESSAGE FALSE DISABLE,3@
-  MESSAGE TRUE ENABLE,F_FTP
+  MESSAGE TRUE ENABLE,3@
 END
 
-STRING F_FTP 256 50
+STRING F_XML_WWW 50 20
 BEGIN
-  PROMPT 28 2 ""
+  PROMPT 22 2 ""
   CHECKTYPE REQUIRED
+  FLAGS "G"
+  GROUP 3
+END
+
+STRING F_XML_USR 32 20
+BEGIN
+  PROMPT 46 2 ""
+  CHECKTYPE REQUIRED
+  GROUP 3
+END
+
+STRING F_XML_PWD 32 10
+BEGIN
+  PROMPT 68 2 ""
+  CHECKTYPE REQUIRED
+  GROUP 3
 END
 
 LIST F_SORT 1 16
@@ -73,6 +117,7 @@ BEGIN
   ITEM "0|Chiave"
   ITEM "1|Rivenditore"
   ITEM "2|Cliente"
+  ITEM "3|Accesso"
 END
 
 SPREADSHEET F_DNSHEET

ba/ba3100.cpp

@@ -75,7 +75,7 @@ public:
 HIDDEN inline TGeneric_table_app& app() { return (TGeneric_table_app&)main_app(); }
 
 TGeneric_table_app::TGeneric_table_app() 
-                  : _exist_journal(FALSE), _stampa_intest(FALSE)
+                  : _exist_journal(false), _stampa_intest(false)
 {
 }
 
@@ -242,7 +242,7 @@ HIDDEN bool tiporeg_handler(TMask_field& f, KEY k)
     return f.error_box(TR("Non e' possibile avere due registri dichiarazioni d'intenti nello stesso anno"));
   if (k == K_SPACE)
 		f.mask().enable_page(1, tipo != REG_DICHINT);
-  return TRUE;
+  return true;
 }
 
 HIDDEN bool printer_handler(TMask_field& f, KEY k)
@@ -272,7 +272,7 @@ HIDDEN bool printer_handler(TMask_field& f, KEY k)
         return f.error_box(TR("Nessun registro selezionato")); 
     }    
   }
-  return TRUE;  
+  return true;  
 }
 
 char TGeneric_table_app::frequenza_versamenti(long firm, int year) const
@@ -304,7 +304,7 @@ HIDDEN bool ditta_handler(TMask_field& f, KEY k)
     TFirm firm(ditta);
     f.mask().set(F_CODVAL, firm.codice_valuta());
   }
-  return TRUE;
+  return true;
 }
 
 HIDDEN bool coddel_handler(TMask_field& f, KEY k)
@@ -334,7 +334,7 @@ HIDDEN bool coddel_handler(TMask_field& f, KEY k)
             const bool isdel = anag.get_long("TIPOSTDEL") == 0l;
             
             if (titcf && isdel)
-              return TRUE; // Se e' titolare CF e ha scelto la delega vanno abilitati sia 
+              return true; // Se e' titolare CF e ha scelto la delega vanno abilitati sia 
                            // Il codice conc. che la banca
             if (id == F_CONCESSIONE)
             {
@@ -355,7 +355,7 @@ HIDDEN bool coddel_handler(TMask_field& f, KEY k)
         }
       }
   }
-  return TRUE;
+  return true;
 }
 
 HIDDEN bool intdel_handler(TMask_field& f, KEY k)
@@ -383,7 +383,7 @@ HIDDEN bool intdel_handler(TMask_field& f, KEY k)
     else if (!imp.is_zero() && imp == intr)
       return f.error_box(TR("Incoerenza importo versato e interessi"));
   }
-  return TRUE;
+  return true;
 }                       
 
 HIDDEN bool impdel_handler(TMask_field& f, KEY k)
@@ -424,7 +424,7 @@ HIDDEN bool impdel_handler(TMask_field& f, KEY k)
         return f.yesno_box(FR("Importo inferiore a %s. Registrare ugualmente?"), lim.string("."));
     }
   }
-  return TRUE;
+  return true;
 }                       
 
 HIDDEN bool mese_handler(TMask_field& f, KEY k)
@@ -454,7 +454,7 @@ HIDDEN bool mese_handler(TMask_field& f, KEY k)
           attiv.put("CODATT",attprev);
           if (attiv.read() != NOERR) attiv.zero();
           bool benzinaio = attiv.get_bool("ART74_4");
-          bool gest4 = FALSE;
+          bool gest4 = false;
           if (benzinaio) 
           {
             TConfig cnf(CONFIG_DITTA, "cg");
@@ -479,7 +479,7 @@ HIDDEN bool mese_handler(TMask_field& f, KEY k)
       }
     }   
   } 
-  return TRUE;
+  return true;
 }
 
 HIDDEN bool key_handler(TMask& m, KEY k)
@@ -490,7 +490,7 @@ HIDDEN bool key_handler(TMask& m, KEY k)
     if (k == K_SHIFT+K_F12)
       m.enable(-3);
   }
-  return TRUE;
+  return true;
 }
 
 bool TGeneric_table_app::valute_decimals_handler(TMask_field& f, KEY k)
@@ -511,7 +511,7 @@ bool TGeneric_table_app::valute_decimals_handler(TMask_field& f, KEY k)
 
 bool TGeneric_table_app::change_decimals_handler(TMask_field& f, KEY k)
 {
-  if (k == K_TAB && f.to_check(k, TRUE))
+  if (k == K_TAB && f.to_check(k, true))
   {     
     TMask& m = f.mask();
     const int dec = m.get_int(FLD_TABCAM_I2);
@@ -536,7 +536,7 @@ bool TGeneric_table_app::change_decimals_handler(TMask_field& f, KEY k)
     }
     m.set(FLD_TABCAM_R10, cambio);
   }
-  return TRUE;
+  return true;
 }
 
 bool TGeneric_table_app::codcab_handler(TMask_field& f, KEY k)
@@ -549,7 +549,7 @@ bool TGeneric_table_app::codcab_handler(TMask_field& f, KEY k)
     if (rec.empty())
       return f.error_box(FR("Il codice ABI %s non esiste"), (const char*)abi);
   }
-  return TRUE;
+  return true;
 }
 
 bool TGeneric_table_app::codmag_handler(TMask_field& f, KEY k)

ba/ba4700a.uml

@@ -84,7 +84,7 @@ BEGIN
   FIELD CODALT
 END
 
-GROUPBOX DLG_NULL 76 6
+GROUPBOX DLG_NULL 76 4
 BEGIN
   PROMPT 1 6 "@bCliente/Fornitore"
 END
@@ -101,13 +101,14 @@ NUMBER F_CODCF 6
 BEGIN
   PROMPT 16 7 ""
   USE LF_CLIFO 
-  INPUT TIPOCF F_TIPOCF
+  INPUT TIPOCF F_TIPOCF SELECT
   DISPLAY "Codice" CODCF
   DISPLAY "Ragione Sociale@50" RAGSOC
   DISPLAY "Cod. Alt.@15" RICALT
   DISPLAY "Codice Fiscale@16" COFI
   DISPLAY "Partita IVA@15" PAIV
   OUTPUT F_CODCF CODCF
+  OUTPUT F_RAGSOC RAGSOC
   CHECKTYPE NORMAL
   FIELD CODCF
 END

ba/batbban.uml

@@ -28,7 +28,7 @@ NUMBER F_CODICECAB 5
 BEGIN
   PROMPT 28 1 "Codice CAB "
   FIELD CODTAB[6,10]
-  FLAGS "Z"
+  FLAGS "GZ"
   KEY 1
   USE %BAN
   INPUT CODTAB[1,5] F_CODICEABI