From c05dfd5cb2b933d46bb824797cf16908db47b73e Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 15 Dec 2006 09:26:08 +0000
Subject: [PATCH] Patch level         :4.0 567 Files correlati     :
 Ricompilazione Demo : [ ] Commento            :corretti errori di riporto

git-svn-id: svn://10.65.10.50/trunk@14641 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ve/velib03.cpp | 13 +++++------
 ve/velib06.cpp | 60 ++++++++++++++++++++++++--------------------------
 2 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/ve/velib03.cpp b/ve/velib03.cpp
index 3ef554d41..47cf05b3d 100755
--- a/ve/velib03.cpp
+++ b/ve/velib03.cpp
@@ -2,6 +2,11 @@
 #include <modaut.h>
 #include <utility.h>
 
+#include "../cg/cg2103.h"
+#include "../db/dblib.h"
+#include "../pr/prlib.h"
+#include "../sv/svlib01.h"
+
 #include "veini.h"
 #include "velib.h"
 #include "sconti.h"             
@@ -10,14 +15,6 @@
 
 #include <clifo.h>
 #include <cfven.h>
-#include "../cg/cg2103.h"
-#include "../cg/cglib01.h"
-#include "../mg/mglib.h"
-#include "../mg/anamag.h"
-#include "../mg/movmag.h"
-#include "../pr/prlib.h"
-#include "../sv/svlib01.h"
-#include "../db/dblib.h"
 
 // calcola il prezzo per le spese
 void sppr_calc(const TRectype & rec, const TString & valuta_doc, const real & cambio, real & prezzo, exchange_type controeuro)
diff --git a/ve/velib06.cpp b/ve/velib06.cpp
index 345ce1196..6d97352b6 100755
--- a/ve/velib06.cpp
+++ b/ve/velib06.cpp
@@ -1199,9 +1199,7 @@ void TDocumento_mask::update_giacenza()
 
 	if (causmag.full() && c.scarica_alternativi())
 	{
-		const TRectype art = cache().get(LF_ANAMAG, codart);
-		const TString & alt = art.get(ANAMAG_CODARTALT);
-
+		const TString& alt = cache().get(LF_ANAMAG, codart, ANAMAG_CODARTALT);
 		if (alt.full())
 			codart = alt;
 	}
@@ -1209,38 +1207,38 @@ void TDocumento_mask::update_giacenza()
 	real giac, disp;
 	if (codart.full())
 	{
-      TString16 codmag = row.get(sf.cid2index(FR_CODMAG));
-      if (codmag.full())
+    TString8 codmag = row.get(sf.cid2index(FR_CODMAG));
+    if (codmag.full())
+    {
+      const TString4 coddep = row.get(sf.cid2index(FR_CODDEP));    
+      if (coddep.full())
+        codmag << coddep;
+    }
+    else
+    { // Cerca di determinare il magazzino di default, se manca sulla riga
+      if (causmag.full())
       {
-        const TString4 coddep = row.get(sf.cid2index(FR_CODDEP));    
-        if (coddep.full())
-          codmag << coddep;
-      }
-      else
-      { // Cerca di determinare il magazzino di default, se manca sulla riga
-        if (causmag.full())
-        {
-          const TCausale_magazzino c(causmag);
+        const TCausale_magazzino c(causmag);
 
-          if (c.has_default_mag())
-          {
-            codmag = c.default_mag();
-            if (c.has_default_dep())
-              codmag << c.default_dep();  
-          }
+        if (c.has_default_mag())
+        {
+          codmag = c.default_mag();
+          if (c.has_default_dep())
+            codmag << c.default_dep();  
         }
       }
-	
-      TString16 livello;
-    
-      for (int i = 0; i < 4; i++)
-      {
-        const char* liv = row.get(sf.cid2index(FR_LIV1+i));
-        if (*liv > ' ')
-          livello << liv;
-        else
-          break;  
-      }
+    }
+
+    TString16 livello;
+  
+    for (int i = 0; i < 4; i++)
+    {
+      const char* liv = row.get(sf.cid2index(FR_LIV1+i));
+      if (*liv > ' ')
+        livello << liv;
+      else
+        break;  
+    }
     
 		const TString8 annoes = get(F_ANNO);
 		TArticolo_giacenza art(codart);