From 19f75eaeea1e51e65a3fab898f4a5a579a11a5ae Mon Sep 17 00:00:00 2001
From: villa <villa@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 27 Jan 1995 09:33:29 +0000
Subject: [PATCH] Ultimi cazzerulli

git-svn-id: svn://10.65.10.50/trunk@926 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg4301.cpp | 2 +-
 cg/cg4304.cpp | 5 ++---
 cg/cg4400.h   | 4 ----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/cg/cg4301.cpp b/cg/cg4301.cpp
index 672dca98c..f0354634e 100755
--- a/cg/cg4301.cpp
+++ b/cg/cg4301.cpp
@@ -744,7 +744,7 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt)
          */
         if (tipodoc == "CR" || tipodoc == "RF" || tipodoc == "SC")
         {
-            _pim_r->put("I0",LORDO);
+          _pim_r->put("I0",LORDO);
           // questi sono corrispettivi davvero; comportamento normale 
           if (tipoiva == "VE")   // da ventilare
           {
diff --git a/cg/cg4304.cpp b/cg/cg4304.cpp
index 2543edbfe..527277c5a 100755
--- a/cg/cg4304.cpp
+++ b/cg/cg4304.cpp
@@ -1063,8 +1063,7 @@ void TLiquidazione_app::set_grand(_DescrItem& d)
         if (iva >= IVA_DA_RIPORTARE || _isannual || _isriepilogo)
           set_row(rw++,"@23gIVA DA VERSARE@75g%r",&iva);
         else
-          set_row(rw++,"@23gIVA DA VERSARE@85g0 (%s < 50.000)", 
-                  (const char*)iva.string(".")); 
+          set_row(rw++,"@23gIVA A DEBITO DA NON VERSARE@75g%r",iva); 
       }                                      
     }
   }
@@ -1115,7 +1114,7 @@ void TLiquidazione_app::set_grand(_DescrItem& d)
     set_print_zero(FALSE);
   }
   
-  if (!_is_visliq) set_auto_ff(TRUE);
+  if (!_is_visliq && !_isregis) set_auto_ff(TRUE);
   else set_auto_ff(FALSE);
 }
 
diff --git a/cg/cg4400.h b/cg/cg4400.h
index ba93d11bd..aae3f37cc 100755
--- a/cg/cg4400.h
+++ b/cg/cg4400.h
@@ -13,11 +13,7 @@
 #include <sheet.h>
 #include <config.h> 
 #include <prefix.h>
-<<<<<<< cg4400.h
-#include "conto.h"
-=======
 #include "conto.h"   // CI VOGLIONO LE VIRGOLETTE! CAPITELA!
->>>>>>> 1.23
 #include <nditte.h>
 #include <anagr.h>
 #include <comuni.h>