Patch level : 12.00 1276

Files correlati     : cg42.exe
Commento            :

Corretta intestazione registri riepilogativi
IL ricalco saldi permette di fare piu' registri uno dopo l'altro
This commit is contained in:
Alessandro Bonazzi 2023-08-02 19:40:41 +02:00
parent 1e3d4f2ace
commit f8c76d915e
2 changed files with 10 additions and 13 deletions

View File

@ -42,20 +42,12 @@ class CG4100_App : public TSkeleton_application
TMask* _msk; TMask* _msk;
public: public:
bool set_parms();
virtual void main_loop(); virtual void main_loop();
void sort_all(); void sort_all();
bool sort_sal(); bool sort_sal();
}; };
bool CG4100_App::set_parms()
{
_msk->run();
_year = _msk->get_int(FLD_CG41_YEAR);
return _msk->last_key() == K_ENTER;
}
void CG4100_App::main_loop() void CG4100_App::main_loop()
{ {
if (fexist("__sal__.sav")) if (fexist("__sal__.sav"))
@ -63,15 +55,17 @@ void CG4100_App::main_loop()
_msk = new TMask("cg4100b"); _msk = new TMask("cg4100b");
sort_sal(); while (_msk->run() == K_ENTER)
{
_year = _msk->get_int(FLD_CG41_YEAR);
sort_sal();
}
delete _msk; delete _msk;
} }
bool CG4100_App::sort_sal() bool CG4100_App::sort_sal()
{ {
if (!set_parms())
return FALSE;
TSystemisamfile saldi(LF_SALDI); saldi.open(_excllock); TSystemisamfile saldi(LF_SALDI); saldi.open(_excllock);
TLocalisamfile mov(LF_MOV); TLocalisamfile mov(LF_MOV);

View File

@ -2337,6 +2337,8 @@ bool TStampa_registri_app::preprocess_print(int file, int counter)
get_dati_ditta(); get_dati_ditta();
set_print_zero(); set_print_zero();
} }
else
get_dati_ditta();
return true; return true;
} }
@ -2968,7 +2970,8 @@ int TStampa_registri_app::stampa_intestazione()
int r = 1; int r = 1;
TString riga(_stampa_width); TString riga(_stampa_width);
// get_dati_ditta(); if (_ragsoc.blank())
get_dati_ditta();
riga.format(FR("Ditta %ld %s %s %s %s %s"), get_firm(), riga.format(FR("Ditta %ld %s %s %s %s %s"), get_firm(),
(const char*)_ragsoc, (const char*)_viafis, (const char*)_ragsoc, (const char*)_viafis,
(const char*)_cap, (const char*)_comunefis, (const char*)_cap, (const char*)_comunefis,