diff --git a/ca/calib01.h b/ca/calib01.h index 8a02159c7..b042ce8c6 100755 --- a/ca/calib01.h +++ b/ca/calib01.h @@ -19,6 +19,11 @@ class TBill; class TRecordset ; +typedef TString20 TCodice_con; +typedef TString20 TCodice_cdc; +typedef TString20 TCodice_cms; +typedef TString16 TCodice_fas; + /////////////////////////////////////////////////////////// // TConfig_anal /////////////////////////////////////////////////////////// @@ -89,21 +94,21 @@ int ca_create_fields_ext(TMask& m, int page, int x, int y, short first_id, //CA_GET_FIELDS: getta tutti i campi dell'analitica che sono stati generati in base alla configurazione della contabilità analitica void ca_get_fields(TMask& m, - TString& cdc, TString& cms, TString& fase, TString& conto, - const short first_cdc, const short first_cms, const short first_fase, const short first_conto, - const TString80 cdc_fld = NULL, const TString80 cms_fld = NULL, const TString80 fase_fld = NULL, const TString80 conto_fld = NULL); + TString& cdc, TString& cms, TString& fase, TString& conto, + const short first_cdc, const short first_cms, const short first_fase, const short first_conto, + const char* cdc_fld = NULL, const char* cms_fld = NULL, const char* fase_fld = NULL, const char* conto_fld = NULL); //CA_GET_ROW_FIELDS: getta tutti i campi dell'analitica che sono stati generati in base alla configurazione della contabilità analitica su una maschera di riga void ca_get_row_fields(TSheet_field& sheet, const int selected_row, - TString& cdc, TString& cms, TString& fase, TString& conto, - const short first_cdc, const short first_cms, const short first_fase, const short first_conto, - const TString80 cdc_fld = NULL, const TString80 cms_fld = NULL, const TString80 fase_fld = NULL, const TString80 conto_fld = NULL); + TString& cdc, TString& cms, TString& fase, TString& conto, + const short first_cdc, const short first_cms, const short first_fase, const short first_conto, + const char* cdc_fld = NULL, const char* cms_fld = NULL, const char* fase_fld = NULL, const char* conto_fld = NULL); //CA_PUT_ROW_FIELDS: setta tutti i campi dell'analitica che sono stati generati in base alla configurazione della contabilità analitica su una maschera di riga void ca_put_row_fields(TSheet_field& sheet, const int selected_row, - TString& cdc, TString& cms, TString& fase, TString& conto, - const short first_cdc, const short first_cms, const short first_fase, const short first_conto, - const TString80 cdc_fld, const TString80 cms_fld, const TString80 fase_fld, const TString80 conto_fld); + TString& cdc, TString& cms, TString& fase, TString& conto, + const short first_cdc, const short first_cms, const short first_fase, const short first_conto, + const char* cdc_fld, const char* cms_fld, const char* fase_fld, const char* conto_fld); /////////////////////////////////////////////////////////// // TSimple_anal_msk diff --git a/ca/calib02.cpp b/ca/calib02.cpp index 0ccca20de..649a57eab 100755 --- a/ca/calib02.cpp +++ b/ca/calib02.cpp @@ -118,7 +118,7 @@ const TVariant& TPconana_recordset::get(const char* field) const } else { - const TString80 conto = curr.get(PCONANA_CODCONTO); + const TCodice_con conto = curr.get(PCONANA_CODCONTO); const TMultilevel_code_info& info = ca_multilevel_code_info(LF_PCONANA); for (int i = info.levels()-2; i >= 0 && ib <= 0; i--) { @@ -204,7 +204,7 @@ const TVariant& TPconana_recordset::get(const char* field) const bool TPconana_recordset::valid_record(const TRelation& rel) const { - TString80 conto; + TCodice_con conto; const TRectype& curr = rel.curr(); if (curr.num() == LF_PCON) { @@ -557,7 +557,7 @@ TIndbil TAnal_bill::indicatore_bilancio() const TIndbil indbil = ib_null; const TMultilevel_code_info& info = ca_multilevel_code_info(LF_PCONANA); - TString80 conto = _conto; // Codice conto da affettare in sottolivelli + TCodice_con conto = _conto; // Codice conto da affettare in sottolivelli for (int i = info.levels() - 1; i >= 0 && indbil == ib_null; i--) { conto.cut(info.total_len(i)); @@ -1240,7 +1240,7 @@ int TAnal_report_mask::get_row_bill(TSheet_field& sf, int r, TAnal_bill& bill) const TMultilevel_code_info* info = ca_multilevel_code_info_by_index(level); if (info == NULL) break; - TString80 code; + TString20 code; for (int i = 0; i < info->levels(); i++) code << row.get(idx++); switch (info->logic())