diff --git a/at/at4100.cpp b/at/at4100.cpp
index ddb3e900d..458167da4 100755
--- a/at/at4100.cpp
+++ b/at/at4100.cpp
@@ -55,6 +55,7 @@ class TStampaScadenze : public TPrintapp
   TParagraph_string _cognome_nome, _dencom;
   TDate 						_data_stampa;
   TDate							_dataini, _datafin, _dataultid;
+  int								_intminconv;
 	bool							_usomodo, _usasez;
 	TString16					_giorni;
 	TString16					_procdon, _modo, _ab01, _ab02, _ab03, _rh;
@@ -156,6 +157,55 @@ void TStampaScadenze::filtra_sezioni()
 	current_cursor()->setregion(da, a);
 }	
 
+/*
+void TStampaScadenze::posizione()
+{
+	TPrint_section& corpo = _form_car->get_body();
+	const TString16 codsez = current_cursor()->curr().get(SOG_CODSEZ);		
+	const TString16 codsot = current_cursor()->curr().get(SOG_CODSOT);		
+	dati_sezione(codsez, codsot);
+	corpo.reset();
+  TForm_item& intest1 = corpo.find_field(CAR_INTEST1);
+  intest1.set(_intest1);
+  TForm_item& intest2 = corpo.find_field(CAR_INTEST2);
+  intest2.set(_intest2);
+  TForm_item& intest3 = corpo.find_field(CAR_INTEST3);
+  intest3.set(_intest3);
+  TForm_item& intest4 = corpo.find_field(CAR_INTEST4);
+  intest4.set(_intest4);
+  TForm_item& invito = corpo.find_field(CAR_INVITOPER);
+	invito.set(_invitoper);
+  TForm_item& data = corpo.find_field(CAR_DATA);
+	data.set(_data);
+  TForm_item& presso1 = corpo.find_field(CAR_PRESSO1);
+	presso1.set(_presso1);
+  TForm_item& presso2 = corpo.find_field(CAR_PRESSO2);
+	presso2.set(_presso2);
+  TForm_item& presso3 = corpo.find_field(CAR_PRESSO3);
+	presso3.set(_presso3);
+  TForm_item& presso4 = corpo.find_field(CAR_PRESSO4);
+	presso4.set(_presso4);
+  TForm_item& orario = corpo.find_field(CAR_ORARIO);
+	orario.set(_orario);
+  TForm_item& datacart = corpo.find_field(CAR_DATACART);
+	datacart.set(_datacart);
+  TForm_item& note = corpo.find_field(CAR_NOTE);
+	note.set(_note);
+	corpo.update();
+	bool ripeti = TRUE;
+	while (ripeti)
+	{
+		for (word i = 0; i < corpo.height(); i++)
+		{
+			TPrintrow& riga = corpo.row(i);
+			set_row(i+1,riga);
+			printer().print(riga);
+		}
+		ripeti = !(yesno_box("Il modulo e' posizionato correttamente?"));
+	}		
+}
+*/  
+  
 void TStampaScadenze::set_page(int file, int cnt)
 {
 	// costruzione etichette
@@ -341,6 +391,8 @@ bool TStampaScadenze::filter_func_scadenze(const TRelation* rel)
 			datapross = sog.get(SOG_DATAPROSSI);					
 		else
 			datapross = sog.get(SOG_DATAPROSAF);
+		if (sog.get_int(SOG_TOTDON) == 0)			
+			datapross+=app()._intminconv;
 		if (datapross.ok())			
 		{
 	  	if (app()._dataini.ok())
@@ -506,6 +558,7 @@ bool TStampaScadenze::set_print(int m)
     add_file(LF_SOGGETTI);
     _dataini 		= _msk->get(F_DATAINI);
     _datafin 		= _msk->get(F_DATAFIN);
+    _intminconv = _msk->get_int(F_INTMINCONV);
     _dataultid 	= _msk->get(F_DATAULTID);
     _procdon 		= _msk->get(F_PROCDON1);
     _usomodo 		= _msk->get_bool(F_USOMODO);
@@ -656,10 +709,10 @@ bool TStampaScadenze::user_create()
 
 bool TStampaScadenze::user_destroy()
 {
+  delete _form_car;
+  delete _form_eti;
   delete _msk;
   delete _rel;
-  delete _form_eti;
-  delete _form_car;
   return TRUE;
 }
 
diff --git a/at/at4100a.h b/at/at4100a.h
index 77484e443..307676e44 100755
--- a/at/at4100a.h
+++ b/at/at4100a.h
@@ -41,6 +41,7 @@
 #define F_AB02          316
 #define F_AB03          317
 #define F_RHANTID       318
+#define F_INTMINCONV    319
 
 #define F_ELENCO    401
 #define F_COMPLETO  402
diff --git a/at/at4100a.uml b/at/at4100a.uml
index dfef891f4..571782291 100755
--- a/at/at4100a.uml
+++ b/at/at4100a.uml
@@ -1,5 +1,38 @@
 #include "at4100a.h"
 
+TOOLBAR "" 0 20 0 2
+
+BUTTON F_ELENCO 9 2
+BEGIN
+        PROMPT -15 -11 "E~lenco"
+        MESSAGE EXIT,F_ELENCO
+END
+
+BUTTON F_COMPLETO 9 2
+BEGIN
+        PROMPT -25 -11 "~Completo"
+        MESSAGE EXIT,F_COMPLETO
+END
+
+BUTTON F_ETICHETTE 9 2
+BEGIN
+        PROMPT -35 -11 "~Etichette"
+        MESSAGE EXIT,F_ETICHETTE
+END
+
+BUTTON F_CARTOLINE 9 2
+BEGIN
+        PROMPT -45 -11 "C~artoline"
+        MESSAGE EXIT,F_CARTOLINE
+END
+
+BUTTON DLG_QUIT 9 2
+BEGIN
+        PROMPT -55 -11 ""
+END
+
+ENDPAGE
+
 PAGE "Stampa scadenze di donazione" -1 -1 78 20
 
 GROUPBOX DLG_NULL 77 4
@@ -329,7 +362,7 @@ BEGIN
    PROMPT 2 15 "Blocco per id. precedente a "
 END
 
-GROUPBOX DLG_NULL 25 8
+GROUPBOX DLG_NULL 25 6
 BEGIN
    PROMPT 53 9 "Dati gruppo-ematici"
 END
@@ -358,39 +391,9 @@ BEGIN
    #include "rh.h"
 END
 
-
-GROUPBOX DLG_NULL 77 4
+NUMBER F_INTMINCONV 4
 BEGIN
-        PROMPT 1 17 "Stampa"
-END
-
-BUTTON F_ELENCO 9 2
-BEGIN
-        PROMPT -15 18 "Elenco"
-        MESSAGE EXIT,F_ELENCO
-END
-
-BUTTON F_COMPLETO 9 2
-BEGIN
-        PROMPT -25 18 "Completo"
-        MESSAGE EXIT,F_COMPLETO
-END
-
-BUTTON F_ETICHETTE 9 2
-BEGIN
-        PROMPT -35 18 "Etichette"
-        MESSAGE EXIT,F_ETICHETTE
-END
-
-BUTTON F_CARTOLINE 9 2
-BEGIN
-        PROMPT -45 18 "Cartoline"
-        MESSAGE EXIT,F_CARTOLINE
-END
-
-BUTTON DLG_QUIT 9 2
-BEGIN
-        PROMPT -55 18 ""
+   PROMPT 54 15 "Int.min.conv. "
 END
 
 ENDPAGE