Aggiunti totale_netto

git-svn-id: svn://10.65.10.50/trunk@3704 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1996-10-03 17:30:43 +00:00
parent 38b5f688f8
commit e0801e00d5
2 changed files with 17 additions and 1 deletions

View File

@ -2012,6 +2012,21 @@ real TDocumento::totale_doc() const
{
const TString16 field(tipo().totale_doc());
if (field.not_empty())
return get_real(field);
else
{
real r = imponibile() + imposta();
r += spese_incasso(r, in_valuta() ? 3 : 0);
r += bolli(r, in_valuta() ? 3 : 0);
return r;
}
}
real TDocumento::totale_netto() const
{
const TString16 field(tipo().totale_netto());
if (field.not_empty())
return get_real(field);
else

View File

@ -191,6 +191,7 @@ public:
const TString& imponibile() const { return _imponibile;}
const TString& imposta() const { return _imposta;}
const TString& totale_doc() const { return _totale;}
const TString& totale_netto() const { return TString("_") << _totale;}
const TString& basesconto() const { return _basesconto;}
const TString& spese() const { return _spese;}
@ -293,7 +294,6 @@ public:
real prezzo(bool scontato, bool lordo, int ndec) const ;
real importo(bool scontato, bool lordo, int ndec, bool iva_calc = FALSE) const ;
// real iva(int ndec) const {return ::iva(importo(TRUE, FALSE, ndec, TRUE), iva(), ndec);}
real iva(int ndec) const {return ::iva(imponibile(), iva(), ndec);}
real imponibile() const;
real imposta() const;
@ -383,6 +383,7 @@ public:
real imponibile() const;
real imposta() const;
real totale_doc() const;
real totale_netto() const;
real basesconto() const;
real spese() const;