From aadb01c6631a8840c7a583cdb9ad74b37dba1418 Mon Sep 17 00:00:00 2001
From: bonazzi <bonazzi@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 8 Feb 2018 19:32:36 +0000
Subject: [PATCH] Patch level         : 12.0 528 Files correlati     : ce3.exe
 ce3900.msk ce4.exe

richieste da CRPA
Stampa registro cespiti sintetico : aggiunto ordinamento per data di acquisto (completamento)
Stampa cespiti per analitica : sistemato il calcolo del costo storico

git-svn-id: svn://10.65.10.50/branches/R_10_00@24357 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 src/ce/ce3900.cpp | 11 +++++++++--
 src/ce/ce3900.h   |  1 +
 src/ce/ce3900.uml |  7 +++++++
 src/ce/ce4500.cpp |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/ce/ce3900.cpp b/src/ce/ce3900.cpp
index 24ecfe6e2..b5e5866f3 100755
--- a/src/ce/ce3900.cpp
+++ b/src/ce/ce3900.cpp
@@ -133,8 +133,15 @@ void TStampa_sintetica_recordset::set_filter(const TStampa_sintetica_mask& msk)
       query << "&&(STR(BETWEEN(CODCAT,#DACAT,#ACAT)))";
 	}
   //ordinamenti
-  if (!msk.get_bool(F_SORT_BY_CESP))
-	  query << "\nBY CODCAT|CODIMP|CODLOC|IDCESPITE";
+	if (!msk.get_bool(F_SORT_BY_CESP))
+	{
+		query << "\nBY ";
+		if (msk.get_bool(F_SORT_BY_DTCOMP))
+			query << "DTCOMP|";
+
+		query << "CODCAT|CODIMP|CODLOC|IDCESPITE";
+	}
+
 
   //setta la nuova complicata query nel report (che avrebbe solo USE CESPI)
 	set(query);
diff --git a/src/ce/ce3900.h b/src/ce/ce3900.h
index 1589a3e34..8a4ca8d4d 100755
--- a/src/ce/ce3900.h
+++ b/src/ce/ce3900.h
@@ -27,3 +27,4 @@
 
 #define F_REPORT					126
 #define F_SORT_BY_CESP    127
+#define F_SORT_BY_DTCOMP  128
diff --git a/src/ce/ce3900.uml b/src/ce/ce3900.uml
index af6cd80ad..4add6f8c0 100755
--- a/src/ce/ce3900.uml
+++ b/src/ce/ce3900.uml
@@ -164,6 +164,13 @@ END
 BOOLEAN F_SORT_BY_CESP
 BEGIN
   PROMPT 2 17 "Per cespite"
+	MESSAGE TRUE "",F_SORT_BY_DTCOMP
+END
+
+BOOLEAN F_SORT_BY_DTCOMP
+BEGIN
+  PROMPT 20 17 "Per data completamento"
+	MESSAGE TRUE "",F_SORT_BY_CESP
 END
 
 ENDPAGE
diff --git a/src/ce/ce4500.cpp b/src/ce/ce4500.cpp
index 90df5fa2c..85cf12c95 100755
--- a/src/ce/ce4500.cpp
+++ b/src/ce/ce4500.cpp
@@ -224,7 +224,7 @@ bool TPrint_anal_cespi_rep::get_usr_val(const TString& name, TVariant& var) cons
 
   if (name.starts_with("#COSTOI"))	//variazione del valore annuale (saldo finale - saldo iniziale)
 	{
-		const real val_fin = val_amm(_cespite.sal_ini());
+		const real val_fin = _cespite.sal_ini().get_real(SALCE_CSTO);
 
     var = val_fin * percutil;
 		return true;