Pagament: corretta erronea riassegnazione a rate uguali

cg5500: disabilitata riga relativa all'acconto a dicembre


git-svn-id: svn://10.65.10.50/trunk@2002 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1995-10-25 08:34:38 +00:00
parent e3b0e42b5c
commit 8caa5e9dac
2 changed files with 16 additions and 12 deletions

View File

@ -409,7 +409,7 @@ bool Visliq_app::sel_mese_sh2 (TMask_field& f, KEY k)
month *= 3;
// click su acconto
if (month > 12) month = 12;
if (month > 12) return TRUE;
bool ok = FALSE;
if (m.dirty())
@ -429,7 +429,7 @@ bool Visliq_app::sel_mese_sh2 (TMask_field& f, KEY k)
TMask& sv = sh.sheet_mask();
app().set_vers_rows(sh);
if (app().look_del(month, sel == (sh.items() - 1) ? 7 : 1))
if (app().look_del(month, /* sel == (sh.items() - 1) ? 7 : */ 1))
{
sv.field(102).set(app().del()->get("D0"));
sv.field(103).set(app().del()->get("S7"));
@ -1194,7 +1194,9 @@ void Visliq_app::read_general(TMask& m)
tt->add(banche[i-1].get(2),4); // concessionaria
tt->add(versamenti[i-1].string(),5);// versamenti
sv.row(-1) = *tt;
sv.row(-1) = *tt;
if (i == 12)
sv.enable_cell(sv.items() - 1, -1, FALSE);
}
sh.enable_column(0, FALSE);

View File

@ -1023,15 +1023,17 @@ word TPagamento::recalc_rate(int row, bool is_perc_modified,
else // i != row modified
{
if (rdiff == 2) continue;
if (i > 0 && !((perc_rata(i-1) == perc_rata(i))))
{
if (rdiff == 2) rdiff = 1;
_rdiff = FALSE;
}
if (is_perc_modified)
rsum += perc_rata(i);
else
rsum += tpay_rata(i);
if (i > 0 && !((perc_rata(i-1) == perc_rata(i))))
{
if (rdiff == 2)
rdiff = 1;
_rdiff = TRUE;
}
if (is_perc_modified)
rsum += perc_rata(i);
else
rsum += tpay_rata(i);
lastdate = data_rata(i);
oldtype = tipo_rata(i);