From f063dde4e79b80f46aaa4ebee64edac8dc14fdf8 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 20 Nov 1997 16:20:40 +0000
Subject: [PATCH] Aggiunto indirizzi di posta elettrica alla stampa dei clifo

git-svn-id: svn://10.65.10.50/trunk@5651 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg1200.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/cg/cg1200.cpp b/cg/cg1200.cpp
index 705c6bb64..dbde7c404 100755
--- a/cg/cg1200.cpp
+++ b/cg/cg1200.cpp
@@ -44,7 +44,7 @@ class TPrintclifo_app : public TPrintapp
   int _startrow, _rows_et, _cols_et, _startcol;
 
   // variable field slots
-  TString _piva,_cpercip,_fax,_telex,_name,_telefono,_indir,_localita;               
+  TString _piva,_cpercip,_fax,_telex,_email,_name,_telefono,_indir,_localita;               
   TString _cod_from,_cod_to,_data_stampa,_cofi,_d_c_ric,_d_alleg;
   TString _datanas,_comprov,_comnasc,_comune,_prov;
   long    _codice;   
@@ -122,7 +122,7 @@ const char* TPrintclifo_app::look_tab(const char* tabname, TString& cod,
 
 const char* TPrintclifo_app::descrizione_conto_ric(int gruppo, int conto, long sottoc)
 {
-  TLocalisamfile pconti(LF_PCON, FALSE);
+  TLocalisamfile pconti(LF_PCON);
   
   pconti.setkey(1);
   pconti.zero();
@@ -139,7 +139,7 @@ const char* TPrintclifo_app::descrizione_conto_ric(int gruppo, int conto, long s
 
 const char* TPrintclifo_app::descrizione_allegato(char tipocf,long cod)
 {
-  TLocalisamfile clifo(LF_CLIFO, FALSE);
+  TLocalisamfile clifo(LF_CLIFO);
   
   clifo.setkey(1);
   clifo.zero();
@@ -212,6 +212,7 @@ bool TPrintclifo_app::preprocess_page(int file, int counter)
     _telex = get_field(LF_CLIFO, CLI_PTELEX); 
     if (!_telex.empty()) _telex << "/";
     _telex << get_field(LF_CLIFO, CLI_TELEX);
+    _email = get_field(LF_CLIFO, CLI_MAIL); 
     _indir = get_field(LF_CLIFO, CLI_INDCF);
     g_ric  = atoi(get_field(LF_CLIFO, CLI_GRUPPORIC));     
     c_ric  = atoi(get_field(LF_CLIFO, CLI_CONTORIC));
@@ -356,7 +357,7 @@ print_action TPrintclifo_app::postprocess_print(int file, int counter)
 bool gest_vend()
 {
   TConfig c(CONFIG_DITTA,"cg");
-  return (c.get("GesVen") == "X");
+  return c.get_bool("GesVen");
 }
 
 bool rdbtype_handler(TMask_field& f, KEY k)
@@ -409,7 +410,7 @@ void TPrintclifo_app::set_page(int file, int counter)
 
 void TPrintclifo_app::ultimo_codice(char tipocf)
 {
-  TLocalisamfile clifo(LF_CLIFO,FALSE);
+  TLocalisamfile clifo(LF_CLIFO);
   
   char tipopr = tipocf;
   
@@ -532,6 +533,7 @@ void TPrintclifo_app::header_elenco()
   set_header(j++, "  Codice Ragione sociale");
   set_header(j++, "@9gIndirizzo@56gC.A.P.@63gLocalita'");
   set_header(j++, "@9gTelefoni@90gFAX @115gTelex");
+  set_header(j++, "@9gIndirizzo posta elettronica");
   set_header(j++, "@9gLuogo di nascita@45gData@56gPartita IVA   Codice fiscale");
   set_header(j++, "@9gConto di costo/ricavo@56gCodice allegato@90gPercipiente 770");
   set_header(j, (const char *)(TString(132).fill('-')));
@@ -636,13 +638,14 @@ void TPrintclifo_app::set_elenco()
           FLD(LF_CLIFO, CLI_CODCF,"@@@@@@"), &_name);
   set_row(2,"@9g#t@56g@s@63g#t", &_indir, FLD(LF_CLIFO, CLI_CAPCF),&_comprov);
   set_row(3,"@9g#t@90g#t@115g#t", &_telefono, &_fax, &_telex);
-  set_row(4,"@9g#t@45g#t@56g#t@69g#t",&_comnasc, &_datanas, &_piva,&_cofi);
-  set_row(5,"@9g@3n @3n @6n #t@56g@n #t@90g#t",FLD(LF_CLIFO,CLI_GRUPPORIC),
+  set_row(4,"@9g#t", &_email);
+  set_row(5,"@9g#t@45g#t@56g#t@69g#t",&_comnasc, &_datanas, &_piva,&_cofi);
+  set_row(6,"@9g@3n @3n @6n #t@56g@n #t@90g#t",FLD(LF_CLIFO,CLI_GRUPPORIC),
           FLD(LF_CLIFO,CLI_CONTORIC), FLD(LF_CLIFO, CLI_SOTTOCRIC),&_d_c_ric,
           FLD(LF_CLIFO, CLI_CODALLEG), &_d_alleg, &_cpercip);
   
   for(int i = 0; i < _interline; i++)
-    set_row(i+5,"");
+    set_row(i+6,"");
 }
 
 void TPrintclifo_app::set_rubriche()