From cb25cd552c49d6f460d59a7a3ebd32d64dfb1cc3 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 27 Jan 2011 14:50:46 +0000
Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=20910?=
 =?UTF-8?q?=20Files=20correlati=20=20=20=20=20:=20sc1.exe=20Ricompilazione?=
 =?UTF-8?q?=20Demo=20:=20[=20]=20Commento=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20:=200001618:=20002458=20-=20pharmatex=20-=20generazione=20ab?=
 =?UTF-8?q?buoni=20Descrizione=09richiedono=20una=20generazione=20automati?=
 =?UTF-8?q?ca=20di=20abbuoni=20sul=20saldaconto,=20con=20massimale=20di=20?=
 =?UTF-8?q?abbuono=20da=20generare.=20Dovr=C3=A0=20essere=20generata=20anc?=
 =?UTF-8?q?he=20la=20registrazione=20contabile.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.65.10.50/branches/R_10_00@21529 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cglib01.cpp  |  3 ++-
 cg/cgsaldac.cpp | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/cg/cglib01.cpp b/cg/cglib01.cpp
index 9e9ce583a..fb06701ec 100755
--- a/cg/cglib01.cpp
+++ b/cg/cglib01.cpp
@@ -1000,7 +1000,8 @@ const TString& TBill::descrizione() const
 {                    
   TBill& myself = (TBill&)*this;
   // Se il conto e' valido (c'e' almeno il gruppo) cerca la sua descrizione su file
-  if ((_descrizione == NULL || _descrizione->blank()) && gruppo() != 0)
+  if ((_descrizione == NULL || _descrizione->blank()) && 
+       (gruppo() != 0 || (tipo() > ' ' && codclifo()>0)))
   {
     if (!myself.find()) 
       myself.set_description(TR("Sconosciuto"));
diff --git a/cg/cgsaldac.cpp b/cg/cgsaldac.cpp
index 08eabb975..5ca32383c 100755
--- a/cg/cgsaldac.cpp
+++ b/cg/cgsaldac.cpp
@@ -160,21 +160,21 @@ void TValuta::get(const TRectype& rec)
 
 void TValuta::put(TRectype& rec) const
 {
-  if (in_lire())            
+  if (in_valuta())            
   {  
-    rec.zero("CODVAL");
-    rec.zero("DATACAM");
-    rec.zero("CAMBIO");
-    if (rec.exist("CONTROEURO"))
-      rec.zero("CONTROEURO");
-  }
-  else
-  {
     rec.put("CODVAL",  _cod);
     rec.put("DATACAM", _dat);
     rec.put("CAMBIO",  _cam);
     if (rec.exist("CONTROEURO"))
       rec.put("CONTROEURO", _et == _exchange_contro ? "X" : "");
+  }
+  else
+  {
+    rec.zero("CODVAL");
+    rec.zero("DATACAM");
+    rec.zero("CAMBIO");
+    if (rec.exist("CONTROEURO"))
+      rec.zero("CONTROEURO");
   }  
 }
 
@@ -1066,7 +1066,7 @@ TPartita::TPartita(const TRectype& r)
         : _part(LF_PARTITE, PART_NRIGA), _unassigned(LF_PAGSCA, PAGSCA_NRIGP), _align(' ')
 {
   TBill clifo; clifo.get(r);
-  if (clifo.gruppo() == 0)
+  if (clifo.gruppo() == 0 && r.num() == LF_PARTITE)
     clifo.set(r.get_int(PART_GRUPPOCL), r.get_int(PART_CONTOCL), clifo.sottoconto(), clifo.tipo());
   const int anno = r.get_int(PART_ANNO);
   const TString8 num(r.get(PART_NUMPART));