From adfdae01eda1ebc7dfa7e760405d742ef8fb46dd Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 25 Jul 2008 15:11:59 +0000
Subject: [PATCH] Patch level         : 10.0 Files correlati     : ve0 ve2
 vearea.men Ricompilazione Demo : [ ] Commento            :

0000848
   Anagrafica articoli

0000872
   Segnalazione errore in apertura programma


git-svn-id: svn://10.65.10.50/trunk@16947 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ve/ve0100b.uml |   3 +-
 ve/ve2400.h    |  18 ++---
 ve/ve2400.uml  | 209 +++++++++++++++++++++++++++----------------------
 ve/vearea.men  |   3 +
 4 files changed, 128 insertions(+), 105 deletions(-)

diff --git a/ve/ve0100b.uml b/ve/ve0100b.uml
index 9874c81de..0e2d886c4 100755
--- a/ve/ve0100b.uml
+++ b/ve/ve0100b.uml
@@ -4,7 +4,8 @@ TOOLBAR "" 0 0 0 2
 
 BUTTON DLG_OK 10 2
 BEGIN
-	PROMPT -14 -1 ""
+	PROMPT -14 -1 "Elabora"
+	PICTURE BMP_ELABORA
 END
 
 BUTTON DLG_INFO 10 2
diff --git a/ve/ve2400.h b/ve/ve2400.h
index 36b4fc078..1174bbf41 100755
--- a/ve/ve2400.h
+++ b/ve/ve2400.h
@@ -1,13 +1,13 @@
-#define F_CODART         101
-#define F_DESCR          102
-#define F_COPY           100
-#define F_ADVANCED       108
+#define F_CODART         111
+#define F_DESCR          112
+#define F_COPY           119
+#define F_ADVANCED       118
 
-#define F_GRMERC         103
-#define F_GRMERCD1       106
-#define H_GRMERCD1       105
-#define F_GRMERCB        104
-#define F_GRMERCD2       107
+#define F_GRMERC         113
+#define F_GRMERCD1       116
+#define H_GRMERCD1       115
+#define F_GRMERCB        114
+#define F_GRMERCD2       117
 
 #define F_UMA            121
 #define F_FCA            122
diff --git a/ve/ve2400.uml b/ve/ve2400.uml
index 8a2e3cda6..18d52eee3 100755
--- a/ve/ve2400.uml
+++ b/ve/ve2400.uml
@@ -1,12 +1,10 @@
 #include "ve2400.h"
 
 TOOLBAR "Toolbar" 0 0 0 2
-
 #include <relapbar.h>
-
 ENDPAGE
 
-PAGE "Codici" 0 0 0 0 
+PAGE "Codici" 0 2 0 0 
 
 GROUPBOX DLG_NULL 78 4
 BEGIN
@@ -155,9 +153,7 @@ END
 
 ENDPAGE
 
-
-
-PAGE "Classi" 0 0 70 20
+PAGE "Classi" 0 2 0 0
 
 GROUPBOX DLG_NULL 78 3
 BEGIN
@@ -303,90 +299,6 @@ BEGIN
 	GROUP G_VD
 END
 
-STRING F_CATCONA 3
-BEGIN
-   PROMPT 1 5 "Categoria conto acquisti "
-   FIELD LF_ANAMAG->CATCONA
-   GROUP G_CATACQ
-   FLAG "UZ"
-   USE CAA
-   INPUT CODTAB F_CATCONA
-   DISPLAY "Codice" CODTAB
-   DISPLAY "Descrizione@50" S0
-   DISPLAY "Gruppo" S1
-   DISPLAY "Conto"  S2
-   DISPLAY "Sottoconto" S3
-   OUTPUT F_CATCONA CODTAB
-   OUTPUT F_CATCONA1 S0
-   CHEKTYPE NORMAL
-END
-
-STRING F_CATCONA1 50 38
-BEGIN
-   PROMPT 35 5 ""
-   GROUP G_CATACQ
-   USE CAA KEY 2
-   INPUT S0 F_CATCONA1
-   DISPLAY "Descrizione@50" S0
-   DISPLAY "Codice" CODTAB
-   DISPLAY "Gruppo" S1
-   DISPLAY "Conto"  S2
-   DISPLAY "Sottoconto" S3
-   COPY OUTPUT F_CATCONA
-END
-
-NUMBER F_GRUPPOA 3
-BEGIN
-   PROMPT 1 6 "Conto d'acquisto "
-   FIELD LF_ANAMAG->GRUPPOA
-   GROUP G_CONACQ
-END
-
-NUMBER F_CONTOA 3
-BEGIN
-    PROMPT 22 6 ""
-    FIELD LF_ANAMAG->CONTOA
-    GROUP G_CONACQ
-END
-
-NUMBER F_SOTTOCA 6
-BEGIN
-   PROMPT 26 6 ""
-   FIELD LF_ANAMAG->SOTTOCA
-   GROUP G_CONACQ
-   USE LF_PCON
-   INPUT GRUPPO F_GRUPPOA
-   INPUT CONTO  F_CONTOA
-   INPUT SOTTOCONTO F_SOTTOCA
-   DISPLAY "Gruppo" GRUPPO
-   DISPLAY "Conto"  CONTO
-   DISPLAY "Sottoconto" SOTTOCONTO
-   DISPLAY "Descrizione@50" DESCR
-   OUTPUT F_GRUPPOA GRUPPO
-   OUTPUT F_CONTOA  CONTO
-   OUTPUT F_SOTTOCA SOTTOCONTO
-   OUTPUT F_DESCRA  DESCR
-   CHECKTYPE NORMAL
-   WARNING "Conto assente"
-   ADD RUN cg0 -0
-END
-
-
-STRING F_DESCRA 50 37
-BEGIN
-   PROMPT 36 6 ""
-   GROUP G_CONACQ
-   USE LF_PCON KEY 2
-   INPUT DESCR F_DESCRA
-   DISPLAY "Descrizione@50" DESCR
-   DISPLAY "Gruppo" GRUPPO
-   DISPLAY "Conto"  CONTO
-   DISPLAY "Sottoconto" SOTTOCONTO
-   COPY OUTPUT F_SOTTOCA
-   WARNING "Conto assente"
-   ADD RUN cg0 -0
-END
-
 STRING F_CATCONV 3
 BEGIN
   PROMPT 1 11 "Categoria conto vendite  "
@@ -565,7 +477,7 @@ END
 
 ENDPAGE
 
-PAGE "Unita'" 0 0 70 20
+PAGE "Unita'" 0 2 0 0
 
 GROUPBOX DLG_NULL 78 3
 BEGIN
@@ -719,12 +631,13 @@ END
 ENDPAGE
 
 
-PAGE "Produz." 0 0 70 20
+PAGE "Produzione" 0 2 0 0
 
 GROUPBOX DLG_NULL 78 3
 BEGIN
   PROMPT 0 0 "@bArticolo"
 END
+
 STRING DLG_NULL 20
 BEGIN
   FLAGS "D"
@@ -996,8 +909,7 @@ END
 
 ENDPAGE
 
-
-PAGE "Giacenze" 0 0 70 20
+PAGE "Giacenze" 0 2 0 0
 
 // Anno relativo alle giacenze
 NUMBER H_ANNO 4
@@ -1112,7 +1024,7 @@ END
 
 ENDPAGE
 
-PAGE "Storico" 0 0 70 20
+PAGE "Storico" 0 2 0 0
 
 GROUPBOX DLG_NULL 78 3
 BEGIN
@@ -1216,6 +1128,112 @@ BEGIN
 END
 
 
+ENDPAGE
+
+PAGE "Analitica" 0 2 0 0
+
+GROUPBOX DLG_NULL 78 3
+BEGIN
+  PROMPT 0 0 "@bArticolo"
+END
+
+STRING DLG_NULL 20
+BEGIN
+  FLAGS "D"
+  PROMPT 2 1 ""
+  GROUP G_CODART
+END
+
+STRING DLG_NULL 50
+BEGIN
+  FLAGS "D"
+  PROMPT 25 1 ""
+  GROUP G_DESART
+END
+
+STRING F_CATCONA 3
+BEGIN
+   PROMPT 1 4 "Categoria conto acquisti "
+   FIELD LF_ANAMAG->CATCONA
+   GROUP G_CATACQ
+   FLAG "UZ"
+   USE CAA
+   INPUT CODTAB F_CATCONA
+   DISPLAY "Codice" CODTAB
+   DISPLAY "Descrizione@50" S0
+   DISPLAY "Gruppo" S1
+   DISPLAY "Conto"  S2
+   DISPLAY "Sottoconto" S3
+   OUTPUT F_CATCONA CODTAB
+   OUTPUT F_CATCONA1 S0
+   CHEKTYPE NORMAL
+END
+
+STRING F_CATCONA1 50 38
+BEGIN
+   PROMPT 35 4 ""
+   GROUP G_CATACQ
+   USE CAA KEY 2
+   INPUT S0 F_CATCONA1
+   DISPLAY "Descrizione@50" S0
+   DISPLAY "Codice" CODTAB
+   DISPLAY "Gruppo" S1
+   DISPLAY "Conto"  S2
+   DISPLAY "Sottoconto" S3
+   COPY OUTPUT F_CATCONA
+END
+
+NUMBER F_GRUPPOA 3
+BEGIN
+   PROMPT 1 6 "Conto d'acquisto "
+   FIELD LF_ANAMAG->GRUPPOA
+   GROUP G_CONACQ
+END
+
+NUMBER F_CONTOA 3
+BEGIN
+    PROMPT 22 6 ""
+    FIELD LF_ANAMAG->CONTOA
+    GROUP G_CONACQ
+END
+
+NUMBER F_SOTTOCA 6
+BEGIN
+   PROMPT 26 6 ""
+   FIELD LF_ANAMAG->SOTTOCA
+   GROUP G_CONACQ
+   USE LF_PCON
+   INPUT GRUPPO F_GRUPPOA
+   INPUT CONTO  F_CONTOA
+   INPUT SOTTOCONTO F_SOTTOCA
+   DISPLAY "Gruppo" GRUPPO
+   DISPLAY "Conto"  CONTO
+   DISPLAY "Sottoconto" SOTTOCONTO
+   DISPLAY "Descrizione@50" DESCR
+   OUTPUT F_GRUPPOA GRUPPO
+   OUTPUT F_CONTOA  CONTO
+   OUTPUT F_SOTTOCA SOTTOCONTO
+   OUTPUT F_DESCRA  DESCR
+   CHECKTYPE NORMAL
+   WARNING "Conto assente"
+   ADD RUN cg0 -0
+END
+
+STRING F_DESCRA 50 37
+BEGIN
+   PROMPT 36 6 ""
+   GROUP G_CONACQ
+   USE LF_PCON KEY 2
+   INPUT DESCR F_DESCRA
+   DISPLAY "Descrizione@50" DESCR
+   DISPLAY "Gruppo" GRUPPO
+   DISPLAY "Conto"  CONTO
+   DISPLAY "Sottoconto" SOTTOCONTO
+   COPY OUTPUT F_SOTTOCA
+   WARNING "Conto assente"
+   ADD RUN cg0 -0
+END
+
 ENDPAGE
 
 PAGE "Utente" 0 0 70 20
@@ -1224,6 +1242,7 @@ GROUPBOX DLG_NULL 78 3
 BEGIN
   PROMPT 0 0 "@bArticolo"
 END
+
 STRING DLG_NULL 20
 BEGIN
   FLAGS "D"
diff --git a/ve/vearea.men b/ve/vearea.men
index 8c54567de..4374e1212 100755
--- a/ve/vearea.men
+++ b/ve/vearea.men
@@ -76,6 +76,7 @@ Item_09 = "Lingue", "ba3 -0 %LNG", ""
 Item_10 = "Divise", "ba3 -0 %VAL", ""
 Item_11 = "Cambi giornalieri", "ba3 -0 CAM", "F"
 Item_12 = "Esercizi", "cg0 -5 esc", "F"
+Item_13 = "Registri", "ba3 -0 REG","F"
 
 [ACQVEN_006]
 Caption = "Tabelle magazzino"
@@ -95,6 +96,8 @@ Item_10 = "Raggruppamenti causali magazzino", "mg0 -0 %RFC", ""
 Item_11 = "Causali magazzino", "mg0 -0 %CAU", ""
 Item_12 = "Gruppi codice articoli", "mg0 -0 GCA", "F"
 Item_13 = "Gruppi codice giacenze", "mg0 -0 GCG", "F"
+Item_14 = "Gruppi cod. art. avanzati", "mg0 -0 GSA", "F"
+Item_15 = "Ubicazioni", "ba3 -0 UBI", "F"
 
 [ACQVEN_007]
 Caption = "Stampa tabelle"