From 42bcf39815bf8468bbfb14445602da6908834624 Mon Sep 17 00:00:00 2001
From: cris <cris@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 2 Sep 1998 14:07:52 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            : Scadenze per con.: azzero len footer prima
 della stampa e possibilita' di non selezionare il tipo controllo (li stampa
 tutti)

git-svn-id: svn://10.65.10.50/trunk@7014 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 at/at6700.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/at/at6700.cpp b/at/at6700.cpp
index ce48a63a9..93c4c23f1 100755
--- a/at/at6700.cpp
+++ b/at/at6700.cpp
@@ -180,10 +180,10 @@ bool TScadenzeControlli::preprocess_page(int file, int counter)
 		{
 			const TRectype& riga = app()._scontrolli->row(app()._scontrolli->rows());
 			TDate prossdata = riga.get_date(CON_PROSSDATA);
-		
+		  TString80 prosstipo = riga.get(CON_PROSSTIPO);
 			TString80 rigastampa;
 			rigastampa = "";
-			rigastampa << "@72g"<<prossdata<<" ";
+			rigastampa << "@72g"<<prosstipo << " " << prossdata<<" ";
 			rigastampa << riga.get(CON_RESPONSAB);
 			_rigastampa = rigastampa;
 		}			
@@ -286,8 +286,10 @@ bool TScadenzeControlli::filter_func_scadenzectrl(const TRelation* rel)
 			const TRectype& riga = app()._scontrolli->row(app()._scontrolli->rows());
 			TString16 prosstipo = riga.get(CON_PROSSTIPO);
 			TDate prossdata = riga.get_date(CON_PROSSDATA);
-			if (!((prosstipo == app()._tipo1) && (prossdata >= app()._dataini) && (prossdata <= app()._datafin)))
-				filtrato = FALSE;				
+			if (!((prossdata >= app()._dataini) && (prossdata <= app()._datafin)))
+				filtrato = FALSE;								
+			if ((app()._tipo1.not_empty()) && (!(prosstipo == app()._tipo1)))
+					filtrato = FALSE;								
 		}
 		else
 			filtrato = FALSE;
@@ -368,6 +370,7 @@ bool TScadenzeControlli::set_print(int)
   		_categorie.add((const char*) catses);
 		current_cursor()->set_filterfunction(filter_func_scadenzectrl,TRUE);
 		reset_print();		
+		printer().footerlen(0);		
     crea_intestazione();
     return TRUE;
   }