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

Corretto errore per rettifica

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@2010 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
nik 1995-10-25 15:17:46 +00:00
parent ecd1ec2de1
commit 2eecc558fd
1 changed files with 561 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
cg/cg4900.cpp
View File

@ -431,10 +431,18 @@ bool LiqAcc_app::video_vis()
m.field(F_CREPRE).set(cre_pre.string()); m.field(F_CREPRE).set(cre_pre.string());
m.field(F_ULTDET).set(ult_det.string()); m.field(F_ULTDET).set(ult_det.string());
risven = iva_ven + non_fat + non_ann + iva_ret + iva_rim; //risven = iva_ven + non_fat + non_ann + iva_ret + iva_rim;
risven = iva_ven + non_fat + non_ann + iva_rim;
if (iva_ret.sign() > 0)
risven += iva_ret;
m.field(F_RISVEN).set(risven.string()); m.field(F_RISVEN).set(risven.string());
risacq = iva_acq + acq_intr + cre_pre + ult_det + abs(iva_ret); //risacq = iva_acq + acq_intr + cre_pre + ult_det + abs(iva_ret);
risacq = iva_acq + acq_intr + cre_pre + ult_det;
if (iva_ret.sign() < 0)
risacq += abs(iva_ret);
m.field(F_RISACQ).set(risacq.string()); m.field(F_RISACQ).set(risacq.string());
diff = risacq - risven; diff = risacq - risven;
@ -445,56 +453,56 @@ bool LiqAcc_app::video_vis()
if (liqdiff) //se no e' gestito da maschera if (liqdiff) //se no e' gestito da maschera
m.field(F_IVADEB).set(abs(diff).string()); m.field(F_IVADEB).set(abs(diff).string());
} }
else if (diff.sign() > 0) else if (diff.sign() > 0)
{ {
m.hide(F_IVADEB); m.hide(F_IVADEB);
m.show(F_IVACRE); m.show(F_IVACRE);
if (liqdiff) if (liqdiff)
m.field(F_IVACRE).set(diff.string()); m.field(F_IVACRE).set(diff.string());
} }
else else
{ {
m.hide(F_IVADEB); m.hide(F_IVADEB);
m.hide(F_IVACRE); m.hide(F_IVACRE);
} }
if (acconto.sign() < 0) if (acconto.sign() < 0)
{ {
m.show(F_CREEVI); m.show(F_CREEVI);
m.field(F_CREEVI).set(abs(acconto).string()); m.field(F_CREEVI).set(abs(acconto).string());
m.hide(F_ACCVER); m.hide(F_ACCVER);
m.hide(F_ACCNVER); m.hide(F_ACCNVER);
} }
else if (acconto.sign() > 0 && acconto > ACCONTO_MIN_DA_VERSARE) else if (acconto.sign() > 0 && acconto > ACCONTO_MIN_DA_VERSARE)
{ {
m.hide(F_CREEVI); m.hide(F_CREEVI);
m.hide(F_ACCNVER); m.hide(F_ACCNVER);
m.show(F_ACCVER); m.show(F_ACCVER);
m.field(F_ACCVER).set(acconto.string()); m.field(F_ACCVER).set(acconto.string());
} }
else if (acconto.sign() > 0 && acconto <= ACCONTO_MIN_DA_VERSARE) else if (acconto.sign() > 0 && acconto <= ACCONTO_MIN_DA_VERSARE)
{ {
m.hide(F_CREEVI); m.hide(F_CREEVI);
m.show(F_ACCNVER); m.show(F_ACCNVER);
m.hide(F_ACCVER); m.hide(F_ACCVER);
m.field(F_ACCNVER).set(acconto.string()); m.field(F_ACCNVER).set(acconto.string());
} }
else //==0 else //==0
{ {
m.hide(F_CREEVI); m.hide(F_CREEVI);
m.hide(F_ACCNVER); m.hide(F_ACCNVER);
m.hide(F_ACCVER); m.hide(F_ACCVER);
} }
if (!liqdiff) if (!liqdiff)
{ {
m.set_handler(F_NONFAT, msk_risul); m.set_handler(F_NONFAT, msk_risul);
m.set_handler(F_NONANN, msk_risul); m.set_handler(F_NONANN, msk_risul);
} }
m.set_handler(msk_hide); m.set_handler(msk_hide);
for (bool stop = FALSE; !stop;) for (bool stop = FALSE; !stop;)
{ {
KEY k = m.run(); KEY k = m.run();
switch(k) switch(k)
@ -541,8 +549,8 @@ bool LiqAcc_app::video_vis()
} }
break; break;
} }
} }
return TRUE; return TRUE;
} }
int cg4900(int argc, char* argv[]) int cg4900(int argc, char* argv[])