From 3bb7772bb7433bee12fda7bb8b49a73ce6b9f365 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 31 Oct 1994 13:44:56 +0000
Subject: [PATCH] Risolti conflitti

git-svn-id: svn://10.65.10.50/trunk@497 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg4400.cpp | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/cg/cg4400.cpp b/cg/cg4400.cpp
index 05b8a2664..c2355968a 100755
--- a/cg/cg4400.cpp
+++ b/cg/cg4400.cpp
@@ -1456,19 +1456,10 @@ print_action CG4400_application::postprocess_print(int file, int counter)
 bool CG4400_application::set_print(int n)
 {
   TMask m("cg4400a");
-<<<<<<< cg4400.cpp
 
   const bool ok = set_ditte(m);
-=======
-  int giorni_del_mese; 
->>>>>>> 1.17
   
-<<<<<<< cg4400.cpp
   if (ok)
-=======
-  //  bool ok = set_ditte(m);
-  if (set_ditte(m))
->>>>>>> 1.17
     if (_selected.ones() > 0l)
     {
       _annoes      = m.get_int(ANNO);//in realta' e' l'anno IVA !!!
@@ -1488,6 +1479,7 @@ bool CG4400_application::set_print(int n)
       // senno' data_da e' letta dal registro
       else   //stampe definitive
       {
+        int giorni_del_mese; 
         if ( (_tipo_stampa == 1) || (_tipo_stampa == 4) )
           _fino_a_mese = m.get_int(FINO_A_MESE);
         else  //stampa su libro unico
@@ -1513,13 +1505,8 @@ bool CG4400_application::set_print(int n)
       stampa_registri_IVA(m);
     }
     else warning_box("Nessuna ditta selezionata!"); 
-<<<<<<< cg4400.cpp
-  
-  return ok;
-=======
+
   return FALSE;
-  //  return ok;
->>>>>>> 1.17
 }
 
 void CG4400_application::stampa_registri_IVA(const TMask& m) 
@@ -1544,16 +1531,6 @@ void CG4400_application::stampa_registri_IVA(const TMask& m)
       if (!ok) continue;
 
       if (!_stampa_tutti_i_registri)
-<<<<<<< cg4400.cpp
-      {
-        *_cur = 0L;
-        const long items = _cur->items();
-        if (items > 0)
-          print();
-        if (_tipo_stampa != 3)  
-          aggiorna_reg();  
-      }  
-=======
       {
         (*_cur) = 0L;          
         const long item = _cur->items();
@@ -1561,7 +1538,6 @@ void CG4400_application::stampa_registri_IVA(const TMask& m)
           print();
         if (_tipo_stampa != 3) aggiorna_reg();   
       }  
->>>>>>> 1.17
       else
       {
         TString16 codtab;