Patch level :2.2 102

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :eliminati alcuni errori di compilazione


git-svn-id: svn://10.65.10.50/trunk@13110 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2005-05-17 16:11:51 +00:00
parent 225e79220c
commit e9f146aaa4
5 changed files with 24 additions and 24 deletions

View File

@ -59,9 +59,9 @@ bool TSaldo_cdc::data_limite_commessa(int bilancio, int g, int c, long s,
const TDate& data_sup, int indbil, int stp_prov)
{
TString filter;
filter << '(' << RMV_CODCMS << "==\"" << commessa << "\")";
filter << '(' << "CODCMS" << "==\"" << commessa << "\")";
if (fase.not_empty())
filter << "&&(" << RMV_FASCMS << "==\"" << fase << "\")";
filter << "&&(" << "FASCMS" << "==\"" << fase << "\")";
return data_limite_bilancio(bilancio, g, c, s, data_inf, data_sup, indbil, stp_prov, filter);
}
@ -1766,9 +1766,9 @@ bool TStampa_bilanci::calcola(int g, int c, long s)
TString filter;
if (_cdc.not_empty())
{
filter << '(' << RMV_CODCMS << "=='" << _cdc << "')";
filter << '(' << "CODCMS" << "=='" << _cdc << "')";
if (_fsc.not_empty())
filter << "&&(" << RMV_FASCMS << "=='" << _fsc << "')";
filter << "&&(" << "FASCMS" << "=='" << _fsc << "')";
}
TCursor cur(&rel, filter, 2, &rmov, &rmov);

View File

@ -488,10 +488,10 @@ bool cdc_filter(const TRelation* rel)
{
if (rmov.get_long(RMV_NUMREG) != numreg)
break;
if (rmov.get(RMV_CODCMS) == cdc)
if (rmov.get("CODCMS") == cdc)
{
if (fsc.not_empty())
ok = (rmov.get(RMV_FASCMS) == fsc);
ok = (rmov.get("FASCMS") == fsc);
else
ok = TRUE;
if (ok)
@ -816,11 +816,11 @@ void TListaMov_application::set_page(int file, int count)
const TRectype& rec = current_cursor()->curr(LF_RMOV);
if (_cdc.not_empty())
{
if (rec.get(RMV_CODCMS) == _cdc)
if (rec.get("CODCMS") == _cdc)
{
if (_fsc.not_empty())
{
if (rec.get(RMV_FASCMS) == _fsc)
if (rec.get("FASCMS") == _fsc)
{
if (!_cdc_only)
set_row(_nr,"@0g@b"); // Grassettiamo le righe interessate
@ -854,13 +854,13 @@ void TListaMov_application::set_page(int file, int count)
set_row(_nr,"@110g@n",FLD(LF_RMOV,RMV_IMPORTO));
if (_print_cdc)
{
TString80 cms = rec.get(RMV_CODCMS);
TString80 cms = rec.get("CODCMS");
if (cms.not_empty())
{
TString riga_commessa(132);
riga_commessa << "@0g@b" << cms;
riga_commessa << "@21g" << cache().get("CMS", cms, "S0");
cms = rec.get(RMV_FASCMS);
cms = rec.get("FASCMS");
if (cms.not_empty())
{
riga_commessa << "@72g" << cms;

View File

@ -622,9 +622,9 @@ bool TMastrini_application::almeno_un_record()
TString filter;
if (_cdc.not_empty())
{
filter << '(' << RMV_CODCMS << "=='" << _cdc << "')";
filter << '(' << "CODCMS" << "=='" << _cdc << "')";
if (_fsc.not_empty())
filter << "&&(" << RMV_FASCMS << "=='" << _fsc << "')";
filter << "&&(" << "FASCMS" << "=='" << _fsc << "')";
}
rmov.zero();
rmov.put(RMV_GRUPPO, _gruppo);
@ -1497,9 +1497,9 @@ bool TMastrini_application::preprocess_page(int file, int counter)
case LF_RMOV:
{
TLocalisamfile& rmov = current_cursor()->file(LF_RMOV);
if (_cdc.not_empty() && rmov.get(RMV_CODCMS) != _cdc)
if (_cdc.not_empty() && rmov.get("CODCMS") != _cdc)
return FALSE;
if (_fsc.not_empty() && rmov.get(RMV_FASCMS) != _fsc)
if (_fsc.not_empty() && rmov.get("FASCMS") != _fsc)
return FALSE;
//Il flag _gia_stampata_intestazione serve nella stampa in continuo, xche'
@ -1952,13 +1952,13 @@ bool TMastrini_application::preprocess_page(int file, int counter)
if (_print_cdc)
{
const TString& cms = rmov.get(RMV_CODCMS);
const TString& cms = rmov.get("CODCMS");
if (cms.not_empty())
{
TString riga_commessa;
riga_commessa << "@0g@b" << cms;
riga_commessa << "@21g" << cache().get("CMS", cms, "S0");
const TString& fas = rmov.get(RMV_FASCMS);
const TString& fas = rmov.get("FASCMS");
if (fas.not_empty())
{
riga_commessa << "@72g" << fas;
@ -3122,9 +3122,9 @@ void TMastrini_application::calcola_progressivi_al(const TDate& data_fin)
TString filter;
if (_cdc.not_empty())
{
filter << RMV_CODCMS << "==\"" << _cdc << "\"";
filter << "CODCMS" << "==\"" << _cdc << "\"";
if (_fsc.not_empty())
filter << "&&(" << RMV_FASCMS << "==\"" << _fsc << "\")";
filter << "&&(" << "FASCMS" << "==\"" << _fsc << "\")";
}
rmov.zero();
rmov.put(RMV_GRUPPO, _gruppo);

View File

@ -54,7 +54,7 @@ protected:
// @cmember Ritorna un puntatore all'oggetto che precede l'oggetto corrente
virtual TObject* pred_item( );
// @cmember Ritorna il numero di oggetti nel contenitore
virtual long objects( );
virtual long objects( ) const;
protected:
TList_object* detach_lstobj(long index);
@ -329,7 +329,7 @@ protected:
// @cmember Ritorna un puntatore all'oggetto che precede l'oggetto corrente
virtual TObject* pred_item( ) { return _data.pred_item(); }
// @cmember Ritorna il numero di oggetti nel contenitore
virtual long objects( ) { return _data.objects(); }
virtual long objects( ) const { return _data.objects(); }
public:
long items() const { return _data.items(); }

View File

@ -964,8 +964,8 @@ void TInv_cont::invio_righe_contabili()
TString4 rowtype = _trmov->get(RMV_ROWTYPE);
record.overwrite(rowtype,158);
record.overwrite(_trmov->get(RMV_CODCMS),159);
record.overwrite(_trmov->get(RMV_FASCMS),179);
record.overwrite(_trmov->get("CODCMS"),159);
record.overwrite(_trmov->get("FASCMS"),179);
_tras_file.write_control_rec(record,size);
_numrec_pn++;
@ -1097,8 +1097,8 @@ void TInv_cont::invio_righe_IVA()
str.format("%03d", rigaiva);
record.overwrite(str,113);
record.overwrite(_triva->get(RMI_CODCMS),118);
record.overwrite(_triva->get(RMI_FASCMS),138);
record.overwrite(_triva->get("CODCMS"),118);
record.overwrite(_triva->get("FASCMS"),138);
_tmov->setkey(1);
_tmov->put(MOV_NUMREG, nreg);