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

Corretti errori MI2163 e MI2164.

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@3614 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
angelo 1996-09-17 17:33:43 +00:00
parent 7b2da0f8cf
commit d2cc511eee
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cg/cg4304.cpp
View File

@ -194,6 +194,8 @@ void TLiquidazione_app::describe_plafond(int month, const char* codatt)
real t1, t2, t3; real t1, t2, t3;
_DescrItem* d = new _DescrItem(PLAFOND); _DescrItem* d = new _DescrItem(PLAFOND);
if (month == 13)
look_pla(codatt);
for (int jj = 1; jj <= 3; jj++) // three types of plafond for (int jj = 1; jj <= 3; jj++) // three types of plafond
{ {
t1 = 0.0; t2 = 0.0; t3 = 0.0; t1 = 0.0; t2 = 0.0; t3 = 0.0;
@ -203,19 +205,23 @@ void TLiquidazione_app::describe_plafond(int month, const char* codatt)
{ {
t1 += _ppa->get_real("R0"); t1 += _ppa->get_real("R0");
t2 += _ppa->get_real("R1"); t2 += _ppa->get_real("R1");
t3 = _ppa->get_real("R2"); if (month < 13)
t3 = _ppa->get_real("R2");
} }
} }
switch (jj) switch (jj)
{ {
case 1: case 1:
d->_r0 = t1; d->_r1 = t2; d->_r2 = t3; d->_r0 = t1; d->_r1 = t2;
d->_r2 = month < 13 ? t3 : _pla->get_real("R5");
break; break;
case 2: case 2:
d->_r3 = t1; d->_r4 = t2; d->_r5 = t3; d->_r3 = t1; d->_r4 = t2;
d->_r5 = month < 13 ? t3 : _pla->get_real("R6");
break; break;
case 3: case 3:
d->_r6 = t1; d->_r7 = t2; d->_r8 = t3; d->_r6 = t1; d->_r7 = t2;
d->_r8 = month < 13 ? t3 : _pla->get_real("R7");
break; break;
} }
} // for tipo esenzione plafond } // for tipo esenzione plafond
@ -750,8 +756,7 @@ void TLiquidazione_app::describe_pims(int month, const char* codatt)
e3.round(ROUND_MILLELIRE); e3.round(ROUND_MILLELIRE);
ris.round(ROUND_MILLELIRE); ris.round(ROUND_MILLELIRE);
// prorata // prorata
if (!_prorata.is_zero() || !e1.is_zero() || !e2.is_zero() if (!pr.is_zero())
|| !e3.is_zero() || !ris.is_zero() || !co.is_zero())
dd->_f0 |= IS_PRORATA; dd->_f0 |= IS_PRORATA;
dd->_r0 = ris; dd->_r0 = ris;
dd->_r1 = e1; dd->_r1 = e1;