From 3a18522797feca26b306bf5433a0ccf12fd4ff74 Mon Sep 17 00:00:00 2001
From: smen <smen@sirio-is.it>
Date: Thu, 30 Sep 2021 09:54:47 +0200
Subject: [PATCH] Patch level         : 12.0 1082f Files correlati     :
 ve1.exe

Commento        :
Completato e corretto modulo "Stampa fido cliente" e relativo report
---
 src/ve/ve1800.cpp  |  2 +-
 src/ve/ve18001.rep |  4 ++--
 src/ve/ve1800a.h   |  2 +-
 src/ve/ve1800a.uml |  2 +-
 src/ve/velib07.cpp | 14 +++++++++++---
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/ve/ve1800.cpp b/src/ve/ve1800.cpp
index 65c28df98..5bb0b9c21 100644
--- a/src/ve/ve1800.cpp
+++ b/src/ve/ve1800.cpp
@@ -38,7 +38,7 @@ void TListaFido_app::main_loop()
 
 		TISAM_recordset * recset = (TISAM_recordset*)report.recordset();
 
-		if (m.get_bool(F_CONFIDO))
+		if (!m.get_bool(F_CONFIDO))
 		{
 
 			TString query = recset->query_text();
diff --git a/src/ve/ve18001.rep b/src/ve/ve18001.rep
index 007b851f7..c7700267b 100644
--- a/src/ve/ve18001.rep
+++ b/src/ve/ve18001.rep
@@ -25,7 +25,7 @@
   </field>
   <field y="3" deactivated="" type="Testo" valign="center" hidden="" link="" dynamic_height="" shade_offset="" width="6" codval="" id="6" pattern="1" hide_zero="" text="Codice" />
   <field x="60" y="3" deactivated="" type="Testo" valign="center" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="18" codval="" id="7" pattern="1" hide_zero="" text="Fido" />
-  <field x="7" y="3" deactivated="" type="Testo" valign="center" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="8" pattern="1" hide_zero="" text="Ragione sociale" />
+  <field x="9" y="3" deactivated="" type="Testo" valign="center" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="8" pattern="1" hide_zero="" text="Ragione sociale" />
   <field x="79" y="3" deactivated="" type="Testo" valign="center" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="18" codval="" id="11" pattern="1" hide_zero="" text="Saldo" />
   <field deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="8" codval="" id="13" pattern="1" hide_zero="" text="Ditta:" />
   <field x="130" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="6" codval="" id="13" pattern="1" hide_zero="" text="Data:" />
@@ -45,7 +45,7 @@
    <font face="Courier New" bold="1" size="8" />
    <source>CODCF</source>
   </field>
-  <field x="7" deactivated="" type="Stringa" valign="bottom" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="102" pattern="1" hide_zero="" text="">
+  <field x="9" deactivated="" type="Stringa" valign="bottom" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="102" pattern="1" hide_zero="" text="">
    <source>RAGSOC</source>
   </field>
   <field x="60" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="18" codval="" id="103" pattern="1" hide_zero="" text="###.###.###,@@">
diff --git a/src/ve/ve1800a.h b/src/ve/ve1800a.h
index d37279df5..114fe65ec 100644
--- a/src/ve/ve1800a.h
+++ b/src/ve/ve1800a.h
@@ -5,4 +5,4 @@
 
 #define F_ADATA			 105
 #define F_REPORT		 106
-#define F_CONFIDO		 107
\ No newline at end of file
+#define F_CONFIDO		 107
diff --git a/src/ve/ve1800a.uml b/src/ve/ve1800a.uml
index 80ab881cd..8dcceafab 100644
--- a/src/ve/ve1800a.uml
+++ b/src/ve/ve1800a.uml
@@ -82,7 +82,7 @@ END
 
 BOOLEAN F_CONFIDO
 BEGIN
-	PROMPT 2 9 "Fido diverso da 0 "
+	PROMPT 2 9 "Includi clienti con fido 0 "
 END
 
 STRING F_REPORT 50
diff --git a/src/ve/velib07.cpp b/src/ve/velib07.cpp
index cedac3db9..6ab17222b 100755
--- a/src/ve/velib07.cpp
+++ b/src/ve/velib07.cpp
@@ -846,6 +846,7 @@ static real calcola_saldo_contabile(const char tipocf, const long codcf, const T
     datainies.set_month(1);
   }
 
+	bool adoggi = (datacalc==datafines) || (datacalc == today) ;
   const TString_array& a = mastro(tipocf);
 
   //per tutti i mastri selezionati va a calcolare il saldo del cliente/fornitore in input
@@ -854,11 +855,18 @@ static real calcola_saldo_contabile(const char tipocf, const long codcf, const T
     const int gruppo = row->get_int(0);
     const int conto = row->get_int(1);
     const int indbil = row->get_int(2);
+		TSaldo s;
+		real saldo;
 
-    TSaldo saldo;
-    real saldo_periodo = saldo.saldo_periodo(Competenza, gruppo, conto, codcf, datainies, datacalc, indbil, false);
+		if (adoggi)
+			s.ultima_immissione_bilancio(codes, gruppo, conto, codcf, indbil, 1, false);
+		else
+		{
+			s.set_annoes(codes);
+			s.data_limite_bilancio(Competenza, gruppo, conto, codcf, datainies, datacalc, indbil, 1);
+		}
 
-    saldone += saldo_periodo;
+    saldone += s.saldo();
   }
   return saldone;
 }