From 9c5bbf8a20dd7a8f9c0b7fae87328cb3e82394b2 Mon Sep 17 00:00:00 2001
From: Simone Palacino <simo.palacino@gmail.com>
Date: Tue, 11 Jun 2019 10:21:35 +0200
Subject: [PATCH] Patch level         : 12.0 820 Files correlati     : cg2.exe
 Commento            : - Correzione maschera cg2300a per compatibilita' con
 schermi piu' piccoli - Visualizzate solo registrazioni con flag liq. mese
 prec. - Modificate posizioni campi prima nota

---
 src/cg/cg2100c.uml | 4 ++--
 src/cg/cg2300.cpp  | 6 +++---
 src/cg/cg2300a.uml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cg/cg2100c.uml b/src/cg/cg2100c.uml
index e3e9f0b4f..6b583d805 100755
--- a/src/cg/cg2100c.uml
+++ b/src/cg/cg2100c.uml
@@ -611,13 +611,13 @@ END
 
 BOOLEAN F_COLFPPRO
 BEGIN
-	PROMPT 1 18 "Registrazione collegata a FPPRO"
+	PROMPT 1 20 "Registrazione collegata a FPPRO"
 	FLAGS "D"
 END
 
 STRING F_PROKEY 80
 BEGIN
-  PROMPT 1 18 "db key"
+  PROMPT 1 19 "db key"
   HELP "Chiave database"
 	FIELD KEYFPPRO
 	FLAGS "H"
diff --git a/src/cg/cg2300.cpp b/src/cg/cg2300.cpp
index c70fd367e..422e4e968 100644
--- a/src/cg/cg2300.cpp
+++ b/src/cg/cg2300.cpp
@@ -214,9 +214,9 @@ void TCompetenze_mask::fill()
 		for (; movs.next() == NOERR && movs.get_date(MOV_DATAREG) <= dataend; )
 		{
 			const int month_liq = movs.get_int(MOV_MESELIQ);
-			TDate datareg(movs.get(MOV_DATAREG));
-			TDate datacomp(movs.get(MOV_DATACOMP));
-			if (month_liq == 0 && datacomp < datareg || month_liq != 0 && month_liq < datareg.month())
+			const TDate datareg(movs.get(MOV_DATAREG));
+			const TDate datacomp(movs.get(MOV_DATACOMP));
+			if (month_liq != 0)
 			{
 				_regs.insert(_regs.end(), movs.get_int(MOV_NUMREG));
 
diff --git a/src/cg/cg2300a.uml b/src/cg/cg2300a.uml
index a0ad8f501..a0ca4e472 100644
--- a/src/cg/cg2300a.uml
+++ b/src/cg/cg2300a.uml
@@ -50,7 +50,7 @@ BEGIN
 	CHECKTYPE REQUIRED
 END
 
-SPREADSHEET F_MOVS 0 10
+SPREADSHEET F_MOVS 0 9
 BEGIN
 	PROMPT 1 1 ""
 	ITEMS "Numero"
@@ -71,7 +71,7 @@ BEGIN
   FLAGS "Z"
 END
 
-SPREADSHEET F_CONTC 0 -1
+SPREADSHEET F_CONTC 0 -2
 BEGIN
 	PROMPT 1 14 ""
 	ITEMS "Gruppo\nControp.@5"