git-svn-id: svn://10.65.10.50/branches/R_10_00@23104 c028cbd2-c16b-5b4b-a496-9718f37d4682

This commit is contained in:
guy 2015-05-29 09:58:57 +00:00
parent ca5bf94f18
commit 0c9e64825a

View File

@ -228,10 +228,10 @@ const TSpesa_prest & TRiga_documento::spesa() const
test_firm();
const TString80 codice(get(RDOC_CODART));
const TCodice_articolo codice = get(RDOC_CODART);
TString80 index; index << tipor << codice;
TSpesa_prest * s = (TSpesa_prest *) _spese.objptr(index);
TSpesa_prest* s = (TSpesa_prest*)_spese.objptr(index);
if (s == NULL)
{
s = new TSpesa_prest(codice, tipor);
@ -503,7 +503,7 @@ real TRiga_documento::importo(bool scontato, bool lordo, int ndec) const
case RIGA_SPESEDOC:
{
const TSpesa_prest & s = spesa();
const bool to_calc = _rit_calc || s.tipo_ritenuta() == '\0';
const bool to_calc = _rit_calc || s.tipo_ritenuta() <= ' ';
if (to_calc)
{
@ -741,7 +741,7 @@ real TRiga_documento::ritenuta(const char tipor, bool lordo, int ndec) const
const TString& TRiga_documento::field_qta() const
{
const TString& rowtype_field = tipo().field_qta();
if (rowtype_field.not_empty())
if (rowtype_field.full())
return rowtype_field;
const TString& doctype_field = doc().tipo().field_qta();
return doctype_field;
@ -750,7 +750,7 @@ const TString& TRiga_documento::field_qta() const
const TString& TRiga_documento::field_qtaevasa() const
{
const TString& rowtype_field = tipo().field_qtaevasa();
if (rowtype_field.not_empty())
if (rowtype_field.full())
return rowtype_field;
const TString& doctype_field = doc().tipo().field_qtaevasa();
return doctype_field;