From 7cf8bfd0583e08bf45dd167eb1ec682c528d1af6 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 10 May 1995 09:28:43 +0000
Subject: [PATCH] Correatta generazione deleghe e spostato campo "con data"
 sulla maschera

git-svn-id: svn://10.65.10.50/trunk@1349 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg4300a.uml | 2 +-
 cg/cg4302.cpp  | 6 +++---
 cg/cg4305.cpp  | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cg/cg4300a.uml b/cg/cg4300a.uml
index 1cd9deeef..d4bad6eb8 100755
--- a/cg/cg4300a.uml
+++ b/cg/cg4300a.uml
@@ -116,7 +116,7 @@ END
 
 DATE CG43_FLD_DATA
 BEGIN
-	PROMPT 15 11  "con data "
+	PROMPT 18 11  "con data "
     HELP "Data di stampa del prospetto delle liquidazioni"
 	FLAGS "A"
 END
diff --git a/cg/cg4302.cpp b/cg/cg4302.cpp
index 29109d1ee..8c333b1a5 100755
--- a/cg/cg4302.cpp
+++ b/cg/cg4302.cpp
@@ -619,8 +619,8 @@ bool TLiquidazione_app::look_conc(TString& uffcon, TString& uffiva)
   // c'e', dal comune (primo non vuoto) se non
   
   // Assume _nditte correctly positioned
-  TString codana(_nditte->lfile().get("TIPOA"));
-  TString ana(_nditte->lfile().get("CODANAGR"));
+  TString ana(_nditte->lfile().get("TIPOA"));
+  TString codana(_nditte->lfile().get("CODANAGR"));
   // look anagrafica
   TLocalisamfile anagr(LF_ANAG);
   anagr.zero(); 
@@ -632,7 +632,7 @@ bool TLiquidazione_app::look_conc(TString& uffcon, TString& uffiva)
   TString com(anagr.get("COMRF")); 
   // se non c'e', residenza
   if (com.empty())
-    com = anagr.get("COMRIF");
+    com = anagr.get("COMRES");
   
   if (com.empty()) return FALSE;
   
diff --git a/cg/cg4305.cpp b/cg/cg4305.cpp
index c277590fb..843d06460 100755
--- a/cg/cg4305.cpp
+++ b/cg/cg4305.cpp
@@ -157,7 +157,8 @@ bool TLiquidazione_app::extract_delega(int month, TArray& desc)
   if (look_lim(month))
   {
     real topay = result_liq(month);
-    real intr  = _lim->get_real("R14");
+    topay += _lim->get_real("R14");
+    topay.round(-3);
                                          
     if (!topay.is_zero())
     {                                     
@@ -166,14 +167,15 @@ bool TLiquidazione_app::extract_delega(int month, TArray& desc)
 	  tt->add(_nditte->curr().get("RAGSOC"));
 	  tt->add(_freqviva);
       tt->add(topay.string());                 
-      tt->add(intr.string());                 
+      tt->add("");
+//      tt->add(intr.string());                 
     }
 
     if (topay.sign() > 0)
     {
       look_del(month, _isannual ? 2 : 1, TRUE);
       _del->put("R0",topay);
-      _del->put("R1",intr);
+//      _del->put("R1",intr);
       _del->rewrite();
 
 	  tt->add(_del->get("S7"));