From 017b576792377fa242a9e9a0b31733fdfabdaabe Mon Sep 17 00:00:00 2001
From: luca83 <luca83@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 8 Apr 2010 14:54:10 +0000
Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2010.?=
 =?UTF-8?q?0=20patch=20=3F=3F=3F=20Files=20correlati=20=20=20=20=20:=20lv2?=
 =?UTF-8?q?=20Ricompilazione=20Demo=20:=20[=20]=20Commento=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20:=20Storna=20le=20quantit=C3=A0=20dei=20pa?=
 =?UTF-8?q?cchi=20annullati=20dai=20movimenti=20di=20magazzino?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.65.10.50/trunk@20318 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 lv/lv2900.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lv/lv2900.cpp b/lv/lv2900.cpp
index f780abf1d..7f4e16dca 100755
--- a/lv/lv2900.cpp
+++ b/lv/lv2900.cpp
@@ -776,15 +776,14 @@ void TConta_pulito_msk::prepara_movimenti(const TFilename& file, TAssoc_array& m
   {
     TRiga_pacco rp = selrighe.cursor()->curr();
 
-    //se il pacco risulta annullato, lo elimino
-    if(rp.is_annullato())
-    {
-      rp.remove(pacchi);
-      continue;
-    }
+    real quantita = rp.quantita();
+    
+    //se il pacco risulta annullato, storno la quiantità
+    if(rp.is_annullato())      
+      quantita = -quantita;
     
     //recupero i dati di interesse dalla riga pacchi
-    const real quantita = rp.quantita();
+    
     const TString80 codart = rp.articolo();
     TString8 ansidate;
     ansidate << rp.data().date2ansi();
@@ -804,7 +803,11 @@ void TConta_pulito_msk::prepara_movimenti(const TFilename& file, TAssoc_array& m
        qta += quantita;
     }
     else
-      articoli->add(codart, quantita);    
+      articoli->add(codart, quantita);
+
+    //se il pacco risulta annullato, lo elimino
+    if(rp.is_annullato())    
+      rp.remove(pacchi);
   }
 }