From 47fd81deea5f0a9c8b29382e00e14e9e68c28979 Mon Sep 17 00:00:00 2001
From: Alessandro Bonazzi <alexbonazzi5652@gmail.com>
Date: Fri, 5 Nov 2021 00:55:31 +0100
Subject: [PATCH] Patch level         : 12.0 nopatch Files correlati     :
 Commento        :
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

aggiunta possibilità di mettere in Ccn nelle mail l'indirizzo del mittenteNella stampa fido caricati i giorni rischio dalla configurazione vendite.
---
 src/ve/ve0200c.uml | 4 ----
 src/ve/ve0200d.uml | 4 ----
 src/ve/ve0200e.uml | 3 ---
 src/ve/ve0200f.uml | 2 --
 src/ve/ve0200g.uml | 3 ---
 src/ve/ve1800.cpp  | 6 +++---
 src/ve/velib07.cpp | 7 ++++++-
 src/ve/velib07.h   | 2 ++
 8 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/ve/ve0200c.uml b/src/ve/ve0200c.uml
index a6f9697c4..c49789920 100755
--- a/src/ve/ve0200c.uml
+++ b/src/ve/ve0200c.uml
@@ -111,9 +111,5 @@ DISPLAY "Sottoconto" SOTTOCONTO
 COPY OUTPUT F_SCOIMCODCON1
 CHECKTYPE NORMAL
 END
-
 ENDPAGE
-
 ENDMASK
-
-
diff --git a/src/ve/ve0200d.uml b/src/ve/ve0200d.uml
index ee42723a8..83e7bdeef 100755
--- a/src/ve/ve0200d.uml
+++ b/src/ve/ve0200d.uml
@@ -292,9 +292,5 @@ COPY OUTPUT F_SPBOCODCON3A
 WARNING "Il conto deve essere un costo o una attività"
 CHECKTYPE NORMAL
 END
-
 ENDPAGE
-
 ENDMASK
-
-
diff --git a/src/ve/ve0200e.uml b/src/ve/ve0200e.uml
index 897049e9d..07d3be84f 100755
--- a/src/ve/ve0200e.uml
+++ b/src/ve/ve0200e.uml
@@ -252,8 +252,5 @@ BEGIN
   FLAGS "U"
   FIELD CMSCNTFIELD
 END
-
 ENDPAGE
-
-
 ENDMASK
diff --git a/src/ve/ve0200f.uml b/src/ve/ve0200f.uml
index bb3092295..99f720ee6 100755
--- a/src/ve/ve0200f.uml
+++ b/src/ve/ve0200f.uml
@@ -423,7 +423,5 @@ BEGIN
   NUM_EXPR {(#F_EX_PERCIVA5>=0.0)&&(#F_EX_PERCIVA5<=100.0)}
   WARNING "Inserire una percentuale tra 0 e 100"
 END
-
 ENDPAGE
-
 ENDMASK
diff --git a/src/ve/ve0200g.uml b/src/ve/ve0200g.uml
index dec36f0b6..7480f139e 100755
--- a/src/ve/ve0200g.uml
+++ b/src/ve/ve0200g.uml
@@ -1040,8 +1040,5 @@ BEGIN
   FIELD DEC_USER[18]
   GROUP 28
 END
-
 ENDPAGE
-
 ENDMASK
-
diff --git a/src/ve/ve1800.cpp b/src/ve/ve1800.cpp
index 5bb0b9c21..bbea634f6 100644
--- a/src/ve/ve1800.cpp
+++ b/src/ve/ve1800.cpp
@@ -22,8 +22,8 @@ void TListaFido_app::main_loop()
 	TDocument_report report;
 
 	m.set(F_REPORT, "ve18001");
-	((TButton_tool&)m.field(DLG_PREVIEW)).set_exit_key('A');
-	((TButton_tool&)m.field(DLG_PRINT)).set_exit_key('P');
+	((TButton_tool&)m.field(DLG_PREVIEW)).set_exit_key(K_VISUALIZE);
+	((TButton_tool&)m.field(DLG_PRINT)).set_exit_key(K_PRINT);
 	
 	KEY k;
 
@@ -67,7 +67,7 @@ void TListaFido_app::main_loop()
 
 		book.add(report);
 		if (book.pages() > 0)
-			if (k == 'A')
+			if (k == K_VISUALIZE)
 				book.preview();
 			else
 				book.print();
diff --git a/src/ve/velib07.cpp b/src/ve/velib07.cpp
index 6ab17222b..f22c7760a 100755
--- a/src/ve/velib07.cpp
+++ b/src/ve/velib07.cpp
@@ -753,7 +753,7 @@ bool TDocument_report::msg_fido(TVariant_stack& stack)
 	if (selector & 1)
 		value += calcola_saldo_contabile('C', codcf, _data_fido);
 	if (selector & 2)
-		value += calcola_esposto_da_saldaconto('C', codcf, _data_fido, 10);
+		value += calcola_esposto_da_saldaconto('C', codcf, _data_fido, _riskdays);
 	if(selector & 4)
 		value += calcola_fido_da_documenti('C', codcf, _data_fido, EMPTY_STRING);
 	
@@ -796,6 +796,11 @@ bool TDocument_report::execute_usr_word(unsigned int opcode, TVariant_stack& sta
   return true;
 }
 
+TDocument_report::TDocument_report()
+{
+	_riskdays = ini_get_int(CONFIG_DITTA, "VE", "FIDO_RISKDAYS");
+}
+
 /////////////////////////////////////////
 //  Metodi non appartenenti a classi
 /////////////////////////////////////////
diff --git a/src/ve/velib07.h b/src/ve/velib07.h
index bc10e5959..b36ba61f0 100755
--- a/src/ve/velib07.h
+++ b/src/ve/velib07.h
@@ -109,6 +109,7 @@ class TDocument_report : public TReport
 {
   size_t _first_msg;
 	TDate _data_fido;
+	int _riskdays;
 
 protected:
   virtual size_t get_usr_words(TString_array& words) const;
@@ -128,6 +129,7 @@ public:
   virtual bool set_recordset(TRecordset * set) { return TReport::set_recordset(set);}
 	void set_datafido(const TDate& data);
   bool load(const char* name);
+	TDocument_report();
 };
 
 ///////////////////////////////////////////////