From 0217311cd81e5600770e1b66f6a5b5e074ecbdee Mon Sep 17 00:00:00 2001
From: villa <villa@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 4 Jan 1995 09:37:27 +0000
Subject: [PATCH] Allineata scelta ditte tra liquidazione, acconto e deleghe
 per scelta anno liquidazione

git-svn-id: svn://10.65.10.50/trunk@821 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg4300.cpp | 4 +++-
 cg/cg4305.cpp | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cg/cg4300.cpp b/cg/cg4300.cpp
index 274ed181b..b07f9c6de 100755
--- a/cg/cg4300.cpp
+++ b/cg/cg4300.cpp
@@ -274,6 +274,7 @@ bool TLiquidazione_app::set_print(int n)
     break;
   case 2: // estrazione deleghe
     _isprint = FALSE;
+    build_ditte_sheet(all);
     while (set_deleghe()) 
     { 
       if (_calcall || _selected.ones() > 0l)
@@ -295,6 +296,7 @@ bool TLiquidazione_app::set_print(int n)
     break;
   case 3: // calcolo acconto
     _isprint = TRUE;
+    build_ditte_sheet(all);
     while (set_acconto()) 
     { 
       if (_calcall || _selected.ones() > 0l)
@@ -390,8 +392,8 @@ void TLiquidazione_app::build_nomiditte(TProgind* pnd)
     else      d->add("??"); 
     
     _nomiditte.add(d);  
-    if (pnd) pnd->addstatus(1);
   }
+  if (pnd) pnd->addstatus(1);
   TApplication::set_firm(__firm);
 }
 
diff --git a/cg/cg4305.cpp b/cg/cg4305.cpp
index 897eda6f3..e0c72cb8a 100755
--- a/cg/cg4305.cpp
+++ b/cg/cg4305.cpp
@@ -13,7 +13,10 @@
 // -------------------------------------------------- estrazione deleghe
 bool TLiquidazione_app::set_deleghe()
 {
-  TMask m("cg4300b.msk");
+  TMask m("cg4300b.msk");  
+  
+  m.field(FLD_CGB_YEAR).set_handler(ch_year_handler);    
+  
   int k = 0;
   long j;
   _calcall = FALSE;
@@ -142,6 +145,7 @@ bool TLiquidazione_app::set_acconto()
 {
   TMask m("cg4300c.msk");
   m.set(CHK_CGC_PRINT,"X");
+  m.field(FLD_CGC_YEAR).set_handler(ch_year_handler);
 
   int k = 0;  long j;