From 0a3e2c483d6499f60666e21fd6d00ada07d780f9 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 21 Aug 1997 09:53:38 +0000
Subject: [PATCH] Corretta formula di default per l'imponibile della riga

git-svn-id: svn://10.65.10.50/trunk@5090 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ve/velib02.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ve/velib02.cpp b/ve/velib02.cpp
index 471f96de2..9b8b64c8f 100755
--- a/ve/velib02.cpp
+++ b/ve/velib02.cpp
@@ -74,7 +74,7 @@ void TTipo_riga_documento::read_formule()
   {
     _imponibile = "IMPONIBILE";
     if (_formule.find(_imponibile) < 0)
-      _formule.add("IMPONIBILE=PREZZO()");
+      _formule.add("IMPONIBILE=IMPORTO(1)");
   }
   if (_imponibile.not_empty() && _formule.find(_imponibile) < 0)
   {
@@ -470,7 +470,7 @@ real TRiga_documento::iva(int ndec) const
     ndec = doc().in_valuta() ? 3 : 0;
               
   ((TRiga_documento *) this)->_iva_calc = TRUE;
-  real zanicchi = ::iva(imponibile(), iva(), ndec);
+  const real zanicchi = is_sconto() ? ZERO : ::iva(imponibile(), iva(), ndec);
   ((TRiga_documento *) this)->_iva_calc = FALSE;
   return zanicchi;
 }