root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Aggiornata liquidazione per tipo attivita' in righe movimento

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@58 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1994-08-24 12:14:09 +00:00
parent f168a2ad7e
commit 635e73f1b4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cg/cg4301.cpp
View File

@ -262,7 +262,6 @@ void CG4300_App::recalc_att(int month, const char* codatt)
TDate date(_mov_r->get("DATAREG")); TDate date(_mov_r->get("DATAREG"));
TString reg = _mov_r->get("REG"); TString reg = _mov_r->get("REG");
bool isreg = look_reg(_mov_r->get("REG")); bool isreg = look_reg(_mov_r->get("REG"));
int tipoatt = /* TBC: si' o no? _mov_r->get_int("TIPOATT"); */ 1;
/* /*
* check register present, rmoviva present and date OK * check register present, rmoviva present and date OK
@ -271,8 +270,7 @@ void CG4300_App::recalc_att(int month, const char* codatt)
if (!is_date_ok(date, month) || if (!is_date_ok(date, month) ||
!isreg || !isreg ||
_reg_r->get("S8") != trueatt || _reg_r->get("S8") != trueatt ||
!_cur->is_first_match(LF_RMOVIVA) || !_cur->is_first_match(LF_RMOVIVA))
tipoatt != tipatt)
continue; continue;
/* /*
@ -305,7 +303,10 @@ void CG4300_App::recalc_att(int month, const char* codatt)
real imponibile = _rmoviva->get_real("IMPONIBILE"); real imponibile = _rmoviva->get_real("IMPONIBILE");
real imposta = _rmoviva->get_real("IMPOSTA"); real imposta = _rmoviva->get_real("IMPOSTA");
bool intra = _rmoviva->get_bool("INTRA"); bool intra = _rmoviva->get_bool("INTRA");
int tipoatt = _rmoviva->get_int("TIPOATT");
if ( tipoatt != tipatt ) continue;
// ***************************************** // *****************************************
// casi particolari // casi particolari
// ***************************************** // *****************************************