From a4369094c640e90df3670193109131ffff696508 Mon Sep 17 00:00:00 2001
From: mtollari <mtollari@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 16 Jun 2017 15:31:04 +0000
Subject: [PATCH] Patch level         : 12.0 no-patch Files correlati     : sc2
 Commento            : Aggiunto booleano per la stampa dei decimali

git-svn-id: svn://10.65.10.50/branches/R_10_00@23871 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 src/sc/sc2600.cpp  | 7 +++++--
 src/sc/sc2600.h    | 9 +++++----
 src/sc/sc2600a.uml | 6 ++++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/sc/sc2600.cpp b/src/sc/sc2600.cpp
index 969ad18d9..5a9c101ac 100755
--- a/src/sc/sc2600.cpp
+++ b/src/sc/sc2600.cpp
@@ -150,7 +150,10 @@ void TProspettoScadenze::print_real(TString& dest, const real& num)
   const bool stampa_in_valuta = _stvaluta && !_codval.blank();
   const TString& val = stampa_in_valuta ? _codval : EMPTY_STRING;
   const TCurrency cur(num, val);
-  dest = cur.string(true);
+  TString elaCur = cur.string(true);
+  if(!_m->get_bool(F_DECIMALI))
+	  elaCur = elaCur.sub(0, elaCur.find(","));
+  dest = elaCur;
   dest.right_just(10);
 }
 
@@ -955,7 +958,7 @@ void TProspettoScadenze::print_totali(int nriga)
   reset_row(nriga);
 	if (_excel)
 	  export_totali_rows();
-	print_totali_rows(nriga,0);
+	print_totali_rows(nriga, 0);
 }
 
 void TProspettoScadenze::print_header()
diff --git a/src/sc/sc2600.h b/src/sc/sc2600.h
index 92af91e16..43d2c58aa 100755
--- a/src/sc/sc2600.h
+++ b/src/sc/sc2600.h
@@ -7,8 +7,9 @@
 #define F_DATASCADUTO    105
 #define F_GIORNI         106
 #define F_VALUTA         107
-#define F_SCADINFASCE		 201
-#define F_SCADFASCE			 202
+#define F_DECIMALI		 108
+#define F_SCADINFASCE	 201
+#define F_SCADFASCE		 202
 #define F_ASCADINFASCE	 203
-#define F_ASCADFASCE		 204
-#define F_NMESI					 205
+#define F_ASCADFASCE	 204
+#define F_NMESI			 205
diff --git a/src/sc/sc2600a.uml b/src/sc/sc2600a.uml
index 0262371a8..555f8ecf2 100755
--- a/src/sc/sc2600a.uml
+++ b/src/sc/sc2600a.uml
@@ -73,6 +73,12 @@ BEGIN
   HELP "Selezionare se si vuole la stampa in valuta"
 END
 
+BOOLEAN F_DECIMALI
+BEGIN
+  PROMPT 29 7 "Stampa decimali"
+  HELP "Selezionare se si vuole stampare i decimali"
+END
+
 RADIOBUTTON SC_CLIFO 20
 BEGIN
   PROMPT 1 9 "Selezione"