diff --git a/cg/cg4400.cpp b/cg/cg4400.cpp index b789b2499..5ca7a78ec 100755 --- a/cg/cg4400.cpp +++ b/cg/cg4400.cpp @@ -632,6 +632,8 @@ void CG4400_application::build_nomiditte(TProgind* pnd) //TApplication::set_firm(dt.get_long("CODDITTA")); if (!look_lia(dt.get_long("CODDITTA"))) good = FALSE; } + else continue; + _n_ditte++; TToken_string* d = new TToken_string(64); d->add(dt.get("CODDITTA")); diff --git a/cg/cg5500.cpp b/cg/cg5500.cpp index 06fb4d197..82bf911aa 100755 --- a/cg/cg5500.cpp +++ b/cg/cg5500.cpp @@ -170,7 +170,8 @@ void Visliq_app::build_nomiditte() if (lia.read() != NOERR) good = FALSE; else fr = lia.get("S7"); } - + else continue; + TToken_string* d = new TToken_string(64); // add record @@ -332,11 +333,11 @@ bool Visliq_app::sel_mese_sh1 (TMask_field& f, KEY k) TMask& sm = sh.sheet_mask(); - sm.field(103).set(tt.get(2)); - sm.field(104).set(tt.get(3)); - sm.field(105).set(tt.get(4)); - sm.field(106).set(tt.get(5)); - sm.field(107).set(tt.get(6)); + sm.field(102).set(tt.get(2)); + sm.field(103).set(tt.get(3)); + sm.field(104).set(tt.get(4)); + sm.field(105).set(tt.get(5)); + sm.field(106).set(tt.get(6)); return TRUE; } @@ -438,8 +439,8 @@ bool Visliq_app::vis_all() // qui occorre modificare le deleghe sv.set_notify(vers_action); - sh.sheet_mask().set_handler(101,sel_mese_sh1); - sv.sheet_mask().set_handler(101,sel_mese_sh2); + sh.sheet_mask().set_handler(100,sel_mese_sh1); + sv.sheet_mask().set_handler(100,sel_mese_sh2); // fill the mask in read_general(m); @@ -915,11 +916,11 @@ void Visliq_app::recalc_next_liq(int start_month, TSheet_field* sl, TSheet_field int sr0 = (_lim->get_real("R0")).sign(); int sr5 = (_lim->get_real("R5")).sign(); - t.add(abs(_lim->get_real("R0")).string(),2); - t.add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"), 3); - t.add((_lim->get_real("R1")).string(),4); - t.add(abs(_lim->get_real("R5")).string(),5); - t.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),6); + t.add(abs(_lim->get_real("R0")).string(),1); + t.add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"), 2); + t.add((_lim->get_real("R1")).string(),3); + t.add(abs(_lim->get_real("R5")).string(),4); + t.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),5); sl->force_update(row); } @@ -994,7 +995,6 @@ void Visliq_app::read_general(TMask& m) if (sh.items() < i) tt = new TToken_string(80); else tt = &(sh.row(i-1)); - tt->add(""); // questo e' il bottone tt->add(itoname(i)); tt->add(abs(_lim->get_real("R0")).string()); @@ -1053,7 +1053,6 @@ void Visliq_app::read_general(TMask& m) if (i == 12) nomemese << " acconto"; if (i == 13) nomemese << " saldo"; - tt->add(""); // questo e' il bottone tt->add(nomemese); // mese tt->add(date[i-1].string()); // data vers. tt->add(banche[i-1].get(0)); // azienda @@ -1112,22 +1111,22 @@ void Visliq_app::write_general(TMask& m) TToken_string& tt_vn = sv.row(row); // traduci contenuto righe in real pila - real orett(tt_lo.get(5)); - real nrett(tt_ln.get(5)); - real orimb(tt_lo.get(4)); - real nrimb(tt_ln.get(4)); - real overs(tt_vo.get(6)); - real nvers(tt_vn.get(6)); - TDate odate(tt_vn.get(2)); - TDate ndate(tt_vn.get(2)); - TString odbcr(tt_lo.get(6)); - TString ndbcr(tt_ln.get(6)); - TString oabi (tt_vo.get(3)); - TString nabi (tt_vn.get(3)); - TString ocab (tt_vo.get(4)); - TString ncab (tt_vn.get(4)); - TString ocon (tt_vo.get(5)); - TString ncon (tt_vn.get(5)); + real orett(tt_lo.get(4)); + real nrett(tt_ln.get(4)); + real orimb(tt_lo.get(3)); + real nrimb(tt_ln.get(3)); + real overs(tt_vo.get(5)); + real nvers(tt_vn.get(5)); + TDate odate(tt_vn.get(1)); + TDate ndate(tt_vn.get(1)); + TString odbcr(tt_lo.get(5)); + TString ndbcr(tt_ln.get(5)); + TString oabi (tt_vo.get(2)); + TString nabi (tt_vn.get(2)); + TString ocab (tt_vo.get(3)); + TString ncab (tt_vn.get(3)); + TString ocon (tt_vo.get(4)); + TString ncon (tt_vn.get(4)); if (odbcr == "C") orett = -orett; if (ndbcr == "C") nrett = -nrett; @@ -1135,16 +1134,16 @@ void Visliq_app::write_general(TMask& m) // acconto (si considerera' solo a dicembre) TToken_string& vo = (TToken_string&)_vers_rows[_freqviva == "M" ? 11 : 3]; TToken_string& vn = sv.row(_freqviva == "M" ? 11 : 3); - real oacct (vo.get(6)); - real nacct (vn.get(6)); - TDate aodate(vn.get(2)); - TDate andate(vn.get(2)); - TString aoabi (vo.get(3)); - TString anabi (vn.get(3)); - TString aocab (vo.get(4)); - TString ancab (vn.get(4)); - TString aocon (vo.get(5)); - TString ancon (vn.get(5)); + real oacct (vo.get(5)); + real nacct (vn.get(5)); + TDate aodate(vn.get(1)); + TDate andate(vn.get(1)); + TString aoabi (vo.get(2)); + TString anabi (vn.get(2)); + TString aocab (vo.get(3)); + TString ancab (vn.get(3)); + TString aocon (vo.get(4)); + TString ancon (vn.get(4)); if (!look_lim(i)) // blocca riporto crediti e debiti @@ -1322,11 +1321,11 @@ void Visliq_app::write_general(TMask& m) int sr0 = (_lim->get_real("R0")).sign(); int sr5 = (_lim->get_real("R5")).sign(); - tt_ln.add(abs(_lim->get_real("R0")).string(),2); - tt_ln.add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"), 3); - tt_ln.add((_lim->get_real("R1")).string(),4); - tt_ln.add(abs(_lim->get_real("R5")).string(),5); - tt_ln.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),6); + tt_ln.add(abs(_lim->get_real("R0")).string(),1); + tt_ln.add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"), 2); + tt_ln.add((_lim->get_real("R1")).string(),3); + tt_ln.add(abs(_lim->get_real("R5")).string(),4); + tt_ln.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),5); sh.force_update(row); diff --git a/cg/cg5600.cpp b/cg/cg5600.cpp index 875ccbbbd..274e94c67 100755 --- a/cg/cg5600.cpp +++ b/cg/cg5600.cpp @@ -104,7 +104,8 @@ void TRipristino_liq::build_nomiditte() if (lia.read() != NOERR) good = FALSE; else fr = lia.get("S7"); } - + else continue; + TToken_string* d = new TToken_string(64); // add record