From 49f3651ba7682cc6915fefc264b1b3cf1b3f7d75 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 20 Dec 2005 12:45:01 +0000
Subject: [PATCH] Patch level         :2.2 274 Files correlati    
 :traferimento proforma Ricompilazione Demo : [ ] Commento           
 :aggiunto un costruttore ai movimenti analitici.Necessario per il
 trasferimento proforma

git-svn-id: svn://10.65.10.50/trunk@13633 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ca/calib01.cpp | 30 +++++++++++++++++++++++++++++-
 ca/calib01.h   |  1 +
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/ca/calib01.cpp b/ca/calib01.cpp
index e1abd1750..a87731497 100755
--- a/ca/calib01.cpp
+++ b/ca/calib01.cpp
@@ -1,8 +1,8 @@
-#include <currency.h>
 #include <dongle.h>
 #include <modaut.h>
 #include <tree.h>
 
+#include <mov.h>
 #include <pconti.h>
 
 #include "calib01.h"
@@ -1378,6 +1378,34 @@ TAnal_mov::TAnal_mov(long numreg) : TMultiple_rectype(LF_MOVANA)
     read(numreg);
 }
 
+
+TAnal_mov::TAnal_mov(const TRectype& rec) : TMultiple_rectype(LF_MOVANA)
+{
+	add_file(LF_RMOVANA, RMOVANA_NUMRIG);
+
+	long numreg = 0;
+	switch(rec.num())
+	{
+	case LF_MOV:
+	case LF_RMOV:
+	case LF_RMOVIVA:
+		{
+			TLocalisamfile movana(LF_MOVANA);
+			movana.setkey(3);
+			movana.put(MOVANA_NUMREGCG, rec.get(MOV_NUMREG));
+			if (movana.read() == NOERR)
+				numreg = movana.get_long(MOVANA_NUMREG);
+		}
+		break;
+	default: 
+		numreg = rec.get_long(MOVANA_NUMREG);
+		break;
+	}
+
+	if (numreg > 0)
+    read(numreg);
+}
+
 ///////////////////////////////////////////////////////////
 // TAnal_rip
 ///////////////////////////////////////////////////////////
diff --git a/ca/calib01.h b/ca/calib01.h
index 0cf872fae..c11893ea5 100755
--- a/ca/calib01.h
+++ b/ca/calib01.h
@@ -158,6 +158,7 @@ public:
 public:
   int read(long numreg, word lockop = _nolock); // Funzione read di comodo
   TAnal_mov(long numreg = 0);
+	TAnal_mov(const TRectype& rec);	//accetta LF_MOVANA,LF_RMOVANA,LF_MOV
 };
 
 ///////////////////////////////////////////////////////////