From 9df3692609f31b9c0a1e36705c5e6fa2d476b201 Mon Sep 17 00:00:00 2001
From: cris <cris@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 2 Feb 1999 14:49:57 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            : Data iscrizione = data prima donazione se
 vuota (se la prima donazione non e' dettagliata)

git-svn-id: svn://10.65.10.50/trunk@7745 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 at/at5400.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/at/at5400.cpp b/at/at5400.cpp
index a582c53a0..3bc216e4d 100755
--- a/at/at5400.cpp
+++ b/at/at5400.cpp
@@ -90,11 +90,16 @@ bool TRiordinaSog::create()
 				sog.put(SOG_CATDON, catfin2);
 	  }
 	  TDate dataiscsog = sog.get_date(SOG_DATAISC);
-	  if (dataiscsog.empty() && dataisc)
-	  {
-			const TRectype& riga = _sdonazioni->row(1);
-			sog.put(SOG_DATAISC,riga.get(DON_DATADON));
-		}				  	
+	  if (!dataiscsog.ok() && dataisc)
+	  {                 
+			if (!sog.get_date(SOG_DATAPRISI) == NULLDATE)
+				sog.put(SOG_DATAISC,sog.get(SOG_DATAPRISI));
+			else
+  		{
+				const TRectype& riga = _sdonazioni->row(1);
+				sog.put(SOG_DATAISC,riga.get(DON_DATADON));
+			}				  	
+		}					
 		_soggetti->rewrite();			
 	}
   stop_run();