Aggiustato reset della ditta corrente

git-svn-id: svn://10.65.10.50/trunk@538 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1994-11-07 08:12:30 +00:00
parent d3f058f37b
commit e885112992
3 changed files with 5 additions and 7 deletions

View File

@ -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);
}

View File

@ -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

View File

@ -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;