From a0c8fa656da6ee34f052773f921139ba6464acdd Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 6 Aug 2010 10:00:03 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            :

git-svn-id: svn://10.65.10.50/branches/R_10_00@20772 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ps/ps1001300.cpp | 2 +-
 setup/dninst.txt | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ps/ps1001300.cpp b/ps/ps1001300.cpp
index da6ef9c92..b712e38b6 100755
--- a/ps/ps1001300.cpp
+++ b/ps/ps1001300.cpp
@@ -1369,7 +1369,7 @@ void TVariazione_budget_mask::calcola_impegnato(const TString& cms, const bool i
             {
               //è inutile fare un sacco di conti su una riga senza valore!
               const real valore = rigadoc.importo(true, true, AUTO_DECIMALS);
-              if ((rigadoc.is_merce() || rigadoc.is_prestazione()) && valore.is_zero())
+              if (valore.is_zero())
                 continue;
 
               TString16 rigadoc_conto, rigadoc_fase;
diff --git a/setup/dninst.txt b/setup/dninst.txt
index 74643bc8e..18d899f0e 100755
--- a/setup/dninst.txt
+++ b/setup/dninst.txt
@@ -576,6 +576,7 @@ ps0713 -2=31-12-2010
 ps0713 -3=31-12-2010
 ps0713 -4=31-12-2010
 ps0713 -5=31-12-2010
+ps0713 -6=31-12-2010
 cacnv -0=31-12-2010
 [7701]
 [7702]
@@ -738,7 +739,6 @@ Owner=Rettifica Lasagni
 [8118]
 OEM=0
 Owner=Consorzio FIT
-*=10-09-2010
 [8120]
 [8121]
 [8122]
@@ -847,6 +847,7 @@ ps0713 -2=31-12-2010
 ps0713 -3=31-12-2010
 ps0713 -4=31-12-2010
 ps0713 -5=31-12-2010
+ps0713 -6=31-12-2010
 cacnv -0=31-12-2010
 [8352]
 OEM=0
@@ -1227,6 +1228,7 @@ ps0713 -2=31-12-2010
 ps0713 -3=31-12-2010
 ps0713 -4=31-12-2010
 ps0713 -5=31-12-2010
+ps0713 -6=31-12-2010
 cacnv -0=31-12-2010
 [8862]
 OEM=3