From e8851129928e74129d5cae082fa6f62a479ab386 Mon Sep 17 00:00:00 2001
From: villa <villa@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 7 Nov 1994 08:12:30 +0000
Subject: [PATCH] Aggiustato reset della ditta corrente

git-svn-id: svn://10.65.10.50/trunk@538 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg4300.cpp | 7 +++----
 cg/cg4300.h   | 1 +
 cg/cg4301.cpp | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cg/cg4300.cpp b/cg/cg4300.cpp
index ba2697c9c..fedb7a8e9 100755
--- a/cg/cg4300.cpp
+++ b/cg/cg4300.cpp
@@ -96,11 +96,10 @@ void CG4300_App::user_create()
   _del_mese   = new TRecfield(*_del_r,"CODTAB",9,10);
   _del_tipo   = new TRecfield(*_del_r,"CODTAB",11,11);
 
-
-  long firm = TApplication::get_firm();
+  __firm = TApplication::get_firm();
 
   pnd.addstatus(1);
- 
+  
 
   for (_nditte->first(); !_nditte->eof(); _nditte->next())
   {
@@ -120,7 +119,7 @@ void CG4300_App::user_create()
 
   pnd.addstatus(1);
 
-  TApplication::set_firm(firm);
+  TApplication::set_firm(__firm);
   set_real_picture(REAL_PICTURE);
 }
 
diff --git a/cg/cg4300.h b/cg/cg4300.h
index 18d2c3ae6..23e3e7969 100755
--- a/cg/cg4300.h
+++ b/cg/cg4300.h
@@ -187,6 +187,7 @@ class CG4300_App : public TPrintapp
   // totali vari per attivita'
   real       _p8, _p8b, _p9;   // totali plafond
   real       _prorata;         // percentuale indetraibilita' (prorata)
+  long       __firm;           // ditta selezionata all'inizio
   static real CENTO;
   
   // main cursor
diff --git a/cg/cg4301.cpp b/cg/cg4301.cpp
index 8168ff420..47f2c8acb 100755
--- a/cg/cg4301.cpp
+++ b/cg/cg4301.cpp
@@ -14,8 +14,6 @@ bool CG4300_App::recalc_all()
 {
   long l;
   
-  long firm = TApplication::get_firm();
-
   _prind = new TProgind(_selected.ones()*2,
                         "       Calcolo liquidazioni...     \n"
                         "       Preparazione archivi      ",
@@ -70,7 +68,7 @@ bool CG4300_App::recalc_all()
     }
   }
   if (!_prind->iscancelled()) _prind->addstatus(1);
-  TApplication::set_firm(firm);
+  TApplication::set_firm(__firm);
   delete _prind;
 
   return TRUE;