From 937e4f1f0cbffcc323dcee3ae987311dbc734fad Mon Sep 17 00:00:00 2001
From: Alessandro Bonazzi <alexbonazzi5652@gmail.com>
Date: Wed, 21 Apr 2021 16:54:47 +0200
Subject: [PATCH] Patch level         : 12.0 nopatch Files correlati     :

---
 src/cg/cglib05.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/src/cg/cglib05.cpp b/src/cg/cglib05.cpp
index 2788b61d1..ea0e16020 100644
--- a/src/cg/cglib05.cpp
+++ b/src/cg/cglib05.cpp
@@ -19,6 +19,58 @@ bool TRiepilogoIVA_report::set_recordset(TRecordset * set)
 	return ok;
 }
 
+bool TRiepilogoIVA_report::get_usr_val(const TString& name, TVariant& var) const
+{
+  TRiepilogoIVA_recordset * rs = (TRiepilogoIVA_recordset *)recordset();
+
+  if (name == "#FROMDATE")
+  {
+    var = rs->from();
+    return true;
+  }
+  else
+  {
+    if (name == "#TODATE")
+    {
+      var = rs->to();
+      return true;
+    }
+    else
+    {
+      if (name == "#ANNO")
+      {
+        var = rs->anno();
+        return true;
+      }
+      else
+      {
+        if (name == "#CODATT")
+        {
+          var = rs->codatt();
+          return true;
+        }
+        else
+        {
+          if (name == "#DAMESE")
+          {
+            var = (long)rs->da_mese();
+            return true;
+          }
+          else
+          {
+            if (name == "#AMESE")
+            {
+              var = (long)rs->a_mese();
+              return true;
+            }
+          }
+        }
+      }
+    }
+  }
+  return TReport::get_usr_val(name, var);
+}
+
 ///////////////////////////////////////////////////////////
 // TRiepilogoIVA_recordset
 ///////////////////////////////////////////////////////////
@@ -77,6 +129,8 @@ void TRiepilogoIVA_recordset::requery()
 	  recset.set_var("#ANNO", (long)anno(), true);
 		if (codatt().full())
 			recset.set_var("#CODATT", codatt(), true);
+    else
+      recset.set_var("#CODATT", "", true);
 		recset.set_var("#DAMESE", (long)da_mese(), true);
   	recset.set_var("#AMESE", (long)a_mese(), true);
 		for (bool ok = recset.move_first(); ok; ok = recset.move_next())