diff --git a/ba/ba3700.cpp b/ba/ba3700.cpp index 1cda300f3..9aec1e042 100755 --- a/ba/ba3700.cpp +++ b/ba/ba3700.cpp @@ -123,15 +123,16 @@ int BA3700_application::read(TMask& m) _pag->set_sheet(*_cs, ir); if (_pag->n_rate() > 1) _interv_rate = _pag->scad_rata(_pag->n_rate() - 1); - + else _interv_rate = 30; + TArray* arr = new TArray; if (shuttle._rws != NULL) delete shuttle._rws; (*arr) = _cs->rows_array(); shuttle._rws = arr; - // shuttle._msk->field(F_INT_RATE).set(format("%d",_interv_rate)); + shuttle._msk->field(F_INT_RATE).set(format("%d",_interv_rate)); shuttle._msk->field(F_NUM_RATE).set(format("%d",_pag->n_rate())); - shuttle._msk->field(F_RATE_DIFF).set(_pag->rate_differenziate() ? "1" : "2"); + shuttle._msk->set(F_RATE_DIFF, _pag->rate_differenziate() ? "1" : "2", TRUE); return NOERR; } @@ -148,7 +149,7 @@ void BA3700_application::init_insert_mode(TMask& m) shuttle._msk->field(F_INT_RATE).set("30"); shuttle._msk->field(F_INIZIOSCAD).set("F"); shuttle._msk->field(F_NUM_RATE).set("1"); - shuttle._msk->field(F_RATE_DIFF).set("2"); + shuttle._msk->set(F_RATE_DIFF, "2", TRUE); } void BA3700_application::init_query_mode(TMask& m) @@ -407,7 +408,7 @@ bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k) pag->mese_commerciale(), need_recalc); // see if parameters changed - msk->field(F_RATE_DIFF).set(pag->rate_differenziate() ? "1" : "2"); + msk->set(F_RATE_DIFF, pag->rate_differenziate() ? "1" : "2", TRUE); msk->field(F_MESECOMM).set(pag->mese_commerciale() ? "X" : ""); } if (!recalc) @@ -461,7 +462,7 @@ int BA3700_application::rewrite(const TMask& m) const int err = _pag->rewrite(tab_rpg); if (err != NOERR) return err; m.autosave(_rel); - tab_cpg.put("R1", _pag->rate_differenziate() ? "X" : ""); + tab_cpg.put("B1", _pag->rate_differenziate() ? "X" : ""); return _rel->lfile().rewrite(); } @@ -472,7 +473,7 @@ int BA3700_application::write(const TMask& m) const int err = _pag->write(tab_rpg); if (err != NOERR) return err; m.autosave(_rel); - tab_cpg.put("R1", _pag->rate_differenziate() ? "X" : ""); + tab_cpg.put("B1", _pag->rate_differenziate() ? "X" : ""); return _rel->lfile().write(); } diff --git a/ba/ba3700a.uml b/ba/ba3700a.uml index 118018772..489bd9356 100755 --- a/ba/ba3700a.uml +++ b/ba/ba3700a.uml @@ -7,6 +7,13 @@ ENDPAGE PAGE "Tabella condizioni di pagamento" -1 -1 78 15 +BOOLEAN 909 +BEGIN + PROMPT 0 0 "" + FLAGS "GH" + FIELD %CPG->B1 +END + GROUPBOX DLG_NULL 71 4 BEGIN PROMPT 4 0 "" @@ -115,10 +122,10 @@ LIST F_RATE_DIFF 25 BEGIN PROMPT 5 7 "Rate " HELP "Descrizione del meccanismo di generazione rate " - ITEM "1|Differenziate" - ITEM "2|Uguali (obbligate dalla 2a)" - ITEM "3|Uguali dalla prossima modifica" - ITEM "4|Uguali finche' possibile" + ITEM "1|Differenziate" MESSAGE "X",909 + ITEM "2|Uguali (obbligate dalla 2a)" MESSAGE "",909 + ITEM "3|Uguali dalla prossima modifica" MESSAGE "X",909 + ITEM "4|Uguali finche' possibile" MESSAGE "X",909 END STRING F_ULT_CLASS 2