diff --git a/cg/cg5500.cpp b/cg/cg5500.cpp index 39ddc5c93..ee727b66e 100755 --- a/cg/cg5500.cpp +++ b/cg/cg5500.cpp @@ -141,7 +141,10 @@ void Visliq_app::build_ditte_sheet() const char vers = d->get_char(2); bool selectable = vers == '?'; const long pos = _ditte->add(d); - if (selectable) _ditte->disable_row(pos); + if (selectable) + _ditte->disable_row(pos); + else + _ditte->enable_row(pos); } } @@ -769,7 +772,7 @@ bool Visliq_app::vis_one(int m) } if (k == K_SAVE) { - if (l_mod) { write_liq(); recalc_next_liq(m, _liq_sheet, _vers_sheet); } + { write_liq(); recalc_next_liq(m, _liq_sheet, _vers_sheet); } if (d_mod) { write_del(); } l_mod = d_mod = FALSE; recorded = TRUE; @@ -1027,6 +1030,7 @@ void Visliq_app::recalc_next_liq(int start_month, TSheet_field* sl, TSheet_field if (sl != NULL) { TToken_string& t = sl->row(row); + t.add(itoname(i),0); int sr0 = (_lim->get_real("R0")).sign(); int sr5 = (_lim->get_real("R5")).sign(); @@ -1040,6 +1044,7 @@ void Visliq_app::recalc_next_liq(int start_month, TSheet_field* sl, TSheet_field t.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),5); + for (int kk = 3; kk < 6 ; kk++) sl->enable_cell(i-1, kk); sl->force_update(row); } } @@ -1113,7 +1118,7 @@ void Visliq_app::read_general(TMask& m) TSheet_field& sv = (TSheet_field&)m.field(F_VISLIQ2); m.field(F_CREDPREC).set(_lia->get_real("R0").string()); - + // set sheet for (int i = 1; i <= 12; i++) {