diff --git a/cg/cg5500.cpp b/cg/cg5500.cpp index 95b3c1cc1..5ff9ba789 100755 --- a/cg/cg5500.cpp +++ b/cg/cg5500.cpp @@ -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); diff --git a/cg/pagament.cpp b/cg/pagament.cpp index 0f7f9c33d..f8189fbc6 100755 --- a/cg/pagament.cpp +++ b/cg/pagament.cpp @@ -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);