From 3b7a9f52df3446f86f5ed457595139fdabf4562b Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 22 May 1995 09:57:46 +0000
Subject: [PATCH] Aggiunta stampa localita'

git-svn-id: svn://10.65.10.50/trunk@1381 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/ba6100.cpp |  3 +++
 ba/ba6100.h   |  2 +-
 ba/ba6101.cpp | 12 ++++++------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ba/ba6100.cpp b/ba/ba6100.cpp
index 4db59637a..01c5ad296 100755
--- a/ba/ba6100.cpp
+++ b/ba/ba6100.cpp
@@ -176,6 +176,7 @@ void TAnaprint_app::preprocess_etichette()
     _civ     = get_field(LF_ANAG,"CIVCORR");
     _stato   = look_tab("%STA",get_field(LF_ANAG,"STATOCORR"));
     _cap     = get_field(LF_ANAG,"CAPCORR");
+    _loc     = get_field(LF_ANAG,"LOCCORR");
     _com     = cc.get("DENCOM");
     _prov    = cc.get("PROVCOM");
     if (_cap.empty())
@@ -189,6 +190,7 @@ void TAnaprint_app::preprocess_etichette()
     _stato   = "" ; // look_tab("%STA",get_field(LF_ANAG,"STATORF"));
     _cap     = get_field(LF_ANAG,"CAPRF");
     cc      = look_com(get_field(LF_ANAG,"COMRF"));
+    _loc     = "";
     _com     = cc.get("DENCOM");
     _prov    = cc.get("PROVCOM");
     if (_cap.empty())
@@ -202,6 +204,7 @@ void TAnaprint_app::preprocess_etichette()
     _stato   = ""; //look_tab("%STA",get_field(LF_ANAG,"STATORES"));
     _cap     = get_field(LF_ANAG,"CAPRES");
     cc       = look_com(get_field(LF_ANAG,"COMRES"));
+    _loc     = "";
     _com     = cc.get("DENCOM");
     _prov    = cc.get("PROVCOM");
     if (_cap.empty())
diff --git a/ba/ba6100.h b/ba/ba6100.h
index aba7e9f9d..b86ba1a61 100755
--- a/ba/ba6100.h
+++ b/ba/ba6100.h
@@ -41,7 +41,7 @@ class TAnaprint_app : public TPrintapp
   bool _is_piv, _is_cod;
   bool* _frpos;
   TString _cod, _cofi, _name, _surname, _address, 
-  _cap, _prov, _com, _civ, _stato, _phone;                 
+  _cap, _prov, _loc, _com, _civ, _stato, _phone;                 
   TString16 _sex;
   
   int _ana_link, _dit_link;
diff --git a/ba/ba6101.cpp b/ba/ba6101.cpp
index 6ba5697d2..3e6e522f8 100755
--- a/ba/ba6101.cpp
+++ b/ba/ba6101.cpp
@@ -56,8 +56,8 @@ void TAnaprint_app::set_scheda_anagiu()
           (const char*)b);
   
   set_row(15,"");
-  set_row(16,"Corrispondenza@20gIndirizzo @35s",
-          FLD(LF_ANAG,"INDCORR"));
+  set_row(16,"Corrispondenza@20gIndirizzo @35s @35s",
+          FLD(LF_ANAG,"INDCORR"), FLD(LF_ANAG, "LOCCORR"));
   
   com = current_cursor()->curr(LF_ANAG).get("COMCORR");
   cc = look_com(com);
@@ -225,8 +225,8 @@ void TAnaprint_app::set_scheda_anafis()
           );
   
   set_row(15,"");
-  set_row(16,"Corrispondenza@20gIndirizzo @s",
-          FLD(LF_ANAG,"INDCORR"));
+  set_row(16,"Corrispondenza@20gIndirizzo @s  @s",
+          FLD(LF_ANAG,"INDCORR"), FLD(LF_ANAG, "LOCCORR"));
   
   com = current_cursor()->curr(LF_ANAG).get("COMCORR");
   cc = look_com(com);
@@ -836,8 +836,8 @@ void TAnaprint_app::set_etichette()
   }
 
   set_row(_ind_row,TString(format("@%dg#t #t", _ind_col)), &_address, &_civ);
-  set_row(_ind_row+1, TString(format("@%dg#t #t #t", _ind_col)), 
-          &_cap, &_com, &_prov);
+  set_row(_ind_row+1, TString(format("@%dg#t #t #t #t", _ind_col)), 
+          &_loc, &_cap, &_com, &_prov);
   
   if (!_stato.empty())
   {