Aggiustata scadenza prima rata con mese commerciale

git-svn-id: svn://10.65.10.50/trunk@2564 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1996-02-06 10:54:37 +00:00
parent 8779085e37
commit f1c39abee2

View File

@ -505,9 +505,7 @@ void TPagamento::set_cambio(const real& cambio, bool recalc_lit)
void TPagamento::next_scad(TDate& d, int scad, bool mcomm, int rata) void TPagamento::next_scad(TDate& d, int scad, bool mcomm, int rata)
{ {
if (rata == 0 || !mcomm) if (mcomm && rata > 0)
d += scad;
if (mcomm)
{ {
int nm = scad / 30; int nm = scad / 30;
int ny = nm / 12; int ny = nm / 12;
@ -535,6 +533,7 @@ void TPagamento::next_scad(TDate& d, int scad, bool mcomm, int rata)
if (!last && dy < d.day()) if (!last && dy < d.day())
d.set_day(dy); d.set_day(dy);
} }
else d += scad;
} }
void TPagamento::set_default_type(int type, bool change_existing) void TPagamento::set_default_type(int type, bool change_existing)