From e0801e00d5ed1d334569c9ca8158977596d6ea34 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 3 Oct 1996 17:30:43 +0000
Subject: [PATCH] Aggiunti totale_netto

git-svn-id: svn://10.65.10.50/trunk@3704 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ve/velib01.cpp | 15 +++++++++++++++
 ve/velib01.h   |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ve/velib01.cpp b/ve/velib01.cpp
index 10915b059..07c360fbd 100755
--- a/ve/velib01.cpp
+++ b/ve/velib01.cpp
@@ -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
diff --git a/ve/velib01.h b/ve/velib01.h
index e67ff9c02..64a771d4c 100755
--- a/ve/velib01.h
+++ b/ve/velib01.h
@@ -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;