From 87022b42edecce8d02fa5d8bbdad07077cff77a1 Mon Sep 17 00:00:00 2001
From: augusto <augusto@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 24 Sep 1997 13:10:57 +0000
Subject: [PATCH] ve2400.* : corretta l'abilitazione delle pagine di magazzino
 ve2400.cpp: corretto il calcolo formula consistenza campi di giacenza

git-svn-id: svn://10.65.10.50/trunk@5257 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ve/ve2400.cpp | 62 +++++++++++++++++++++++++--------------------------
 ve/ve2400.h   |  2 ++
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/ve/ve2400.cpp b/ve/ve2400.cpp
index acd2edc00..ceb448592 100755
--- a/ve/ve2400.cpp
+++ b/ve/ve2400.cpp
@@ -70,9 +70,6 @@ TMask_anamag::TMask_anamag(TRelation * rel,bool mg_autorized) : TMask("ve2400")
   // imposta il valore dell'anno per le giacenze
   last_annogiac=-1;
   last_annosto=-1;
-  // maschera
-  set_handler(F_ANNO, handle_anno);
-  set_handler(F_STOANNO, handle_stoanno);
   // sheet unità di misura
   set_handler(F_SHEETUM, handle_sheet_um);
   TSheet_field &f= (TSheet_field &)field(F_SHEETUM);
@@ -85,18 +82,6 @@ TMask_anamag::TMask_anamag(TRelation * rel,bool mg_autorized) : TMask("ve2400")
   set_handler(F_SHEETDESLIN, handle_sheet_deslin);
   // sheet codici corrispondenti
   set_handler(F_SHEETCOD, handle_sheet_cod);
-  // sheet giacenze
-  set_handler(F_SHEETGIAC, handle_sheetgiac);
-  ((TSheet_field &)field(F_SHEETGIAC)).set_notify(notify_sheet_giac);
-  ((TSheet_field &)field(F_SHEETGIAC)).set_userget(sheetgiac_get);
-  ((TSheet_field &)field(F_SHEETGIAC)).set_userput(sheetgiac_put);
-  // sheet storico
-  set_handler(F_SHEETSTOMAG, handle_sheetstomag);
-  ((TSheet_field &)field(F_SHEETSTOMAG)).set_notify(notify_sheet_sto);
-  ((TSheet_field &)field(F_SHEETSTOMAG)).set_userget(sheetsto_get);
-  ((TSheet_field &)field(F_SHEETSTOMAG)).set_userput(sheetsto_put);
-  
-  
 
   // ***************************************************
   // ABILITAZIONI PARAMETRICHE
@@ -104,8 +89,21 @@ TMask_anamag::TMask_anamag(TRelation * rel,bool mg_autorized) : TMask("ve2400")
   // Abilita la pagina delle giacenze 
   if (mg_autorized && magazzini().gestmag())
   {
-    enable_page(3,TRUE);
-    enable_page(4,TRUE);
+    // sheet giacenze
+    set_handler(F_ANNO, handle_anno);
+    set_handler(F_SHEETGIAC, handle_sheetgiac);
+    sfield(F_SHEETGIAC).set_notify(notify_sheet_giac);
+    sfield(F_SHEETGIAC).set_userget(sheetgiac_get);
+    sfield(F_SHEETGIAC).set_userput(sheetgiac_put);
+    // sheet storico
+    set_handler(F_SHEETSTOMAG, handle_sheetstomag);
+    sfield(F_SHEETSTOMAG).set_notify(notify_sheet_sto);
+    sfield(F_SHEETSTOMAG).set_userget(sheetsto_get);
+    sfield(F_SHEETSTOMAG).set_userput(sheetsto_put);
+    set_handler(F_STOANNO, handle_stoanno);
+  
+    enable_page(PAGE_GIACENZE,TRUE);
+    enable_page(PAGE_STORICO,TRUE);
     // setta i campi della maschera per la pagina giacenze
     TSheet_field &fld_stomag= (TSheet_field &)field(F_SHEETSTOMAG); 
     TSheet_field &fld_giac= (TSheet_field &)field(F_SHEETGIAC); 
@@ -135,8 +133,8 @@ TMask_anamag::TMask_anamag(TRelation * rel,bool mg_autorized) : TMask("ve2400")
     fld_stomag.enable_column(fld_stomag.cid2index(F_STOCODMAG),magazzini().gestmultimag());
 
   } else {
-    enable_page(4,FALSE);
-    enable_page(3,FALSE);
+    enable_page(PAGE_GIACENZE,FALSE);
+    enable_page(PAGE_STORICO,FALSE);
   }
   // abilita la visualizzazione dei campi distinti per i livelli articolo 
   if (FALSE)
@@ -565,8 +563,8 @@ void TMask_anamag::update_totali_storico(TString & codmag)
   // ...sum...
   for (; i< s.items() && *s.cell(i,s.cid2index(F_STOTIPORIGA))!=SIMBOLO_TOTALI ; i++) 
   {
-    tot1+=s.cell(i,s.cid2index(F_STOQUANT));
-    tot2+=s.cell(i,s.cid2index(F_STOVAL));
+    tot1+=real(s.cell(i,s.cid2index(F_STOQUANT)));
+    tot2+=real(s.cell(i,s.cid2index(F_STOVAL)));
   }
   //... display
   if (i< s.items())
@@ -636,17 +634,17 @@ bool TMask_anamag::notify_sheet_giac(TSheet_field &f, int i, KEY k)
     case (K_ENTER): // fine modifica
     {
       real ck(f.cell(i,f.cid2index(F_RIM)));
-      ck+=f.cell(i,f.cid2index(F_ACQ));
-      ck+=f.cell(i,f.cid2index(F_ENTR));
-      ck-=f.cell(i,f.cid2index(F_VEN));
-      ck-=f.cell(i,f.cid2index(F_USC));
-      ck-=f.cell(i,f.cid2index(F_ACL));
-      ck+=f.cell(i,f.cid2index(F_INCL));
-      ck-=f.cell(i,f.cid2index(F_INPRODF));
-      ck+=f.cell(i,f.cid2index(F_INPRODC));
-      ck-=f.cell(i,f.cid2index(F_SCARTI));
-    
-      ck-=f.cell(i,f.cid2index(F_GIAC));
+      ck+=real(f.cell(i,f.cid2index(F_ACQ)));
+      ck+=real(f.cell(i,f.cid2index(F_ENTR)));
+      ck-=real(f.cell(i,f.cid2index(F_VEN)));
+      ck-=real(f.cell(i,f.cid2index(F_USC)));
+      ck-=real(f.cell(i,f.cid2index(F_ACL)));
+      ck+=real(f.cell(i,f.cid2index(F_INCL)));
+      ck-=real(f.cell(i,f.cid2index(F_INPRODF)));
+      ck+=real(f.cell(i,f.cid2index(F_INPRODC)));
+      ck-=real(f.cell(i,f.cid2index(F_SCARTI)));
+      ck-=real(f.cell(i,f.cid2index(F_GIAC)));
+
       if (!ck.is_zero())          
       {
         f.error_box("La giacenza deve essere pari a RIM+(ACQ+ENTR)-(VEN+USC)-(ACL-INCL)-(PRODF-PRODC) - SCARTI)");
diff --git a/ve/ve2400.h b/ve/ve2400.h
index 9359d2e34..2a6733e4f 100755
--- a/ve/ve2400.h
+++ b/ve/ve2400.h
@@ -151,4 +151,6 @@
 #define F_STOVAL    105
 #define F_STOCODART 120
 
+#define PAGE_GIACENZE 4
+#define PAGE_STORICO 5
 #define SIMBOLO_TOTALI '>'