Corrette alcune posizioni a video e tolti i VALIDATE AUTOEXIT

git-svn-id: svn://10.65.10.50/trunk@3106 c028cbd2-c16b-5b4b-a496-9718f37d4682

ve/batbgmc.uml

@@ -6,7 +6,7 @@ ENDPAGE
 
 PAGE "Tabella gruppi merceologici " 11 60 14
 
-GROUPBOX DLG_NULL 75 7
+GROUPBOX DLG_NULL 78 7
 BEGIN
  PROMPT 1 0 ""
  FLAGS "R"
@@ -25,7 +25,7 @@ BEGIN
   OUTPUT F_CODGRU CODTAB[1,3]
   OUTPUT H_DESGRU S0
   MESSAGE COPY,H_CODGRU
-
+  CHECKTYPE REQUIRED
 END
 
 STRING F_CODSGR 2
@@ -45,12 +45,14 @@ BEGIN
   OUTPUT F_DESSGR S0
   MESSAGE SHOW,F_DESGRU|HIDE,H_DESGRU|SHOW,F_DESSGR
   MESSAGE EMPTY HIDE,F_DESGRU|SHOW,H_DESGRU|HIDE,F_DESSGR
-  VALIDATE AUTOEXIT_FUNC 2 F_CODGRU F_CODSGR
+  //VALIDATE AUTOEXIT_FUNC 2 F_CODGRU F_CODSGR
   GROUP GR_SEARCH
 END
 
 STRING H_CODGRU 3
 BEGIN
+  PROMPT 2 2 "Codice gruppo      "
+  FLAG "U"
   FLAGS "H"
   COPY USE F_CODGRU
   INPUT CODTAB F_CODGRU
@@ -67,7 +69,7 @@ END
 
 STRING F_DESSGR 50
 BEGIN
-  PROMPT 2 8 "Descrizione sottogruppo "
+  PROMPT 2 5 "Descrizione sottogruppo "
   FIELD S0
   USE GMC KEY 2
   KEY 2
@@ -120,3 +122,4 @@ ENDPAGE
 
 
 ENDMASK
+

ve/batbrfa.uml

@@ -16,7 +16,7 @@ STRING FLD_TABRFA_CODTAB 5
 BEGIN
         PROMPT 2 2 "Codice      "
         FIELD CODTAB
-        USE RFA
+        USE %RFA
         CHECKTYPE REQUIRED
         INPUT CODTAB FLD_TABRFA_CODTAB
         DISPLAY "Codice" CODTAB
@@ -31,7 +31,7 @@ STRING FLD_TABRFA_S0 50
 BEGIN
         PROMPT 2 4 "Descrizione "
         FIELD S0
-        USE RFA KEY 2
+        USE %RFA KEY 2
         CHECKTYPE REQUIRED
         WARNING "Manca la descrizione"
         INPUT S0 FLD_TABRFA_S0
@@ -51,7 +51,7 @@ STRING FLD_TABRFA_S8 1
 BEGIN
         PROMPT 2 10 "Classe fiscale   "
         FIELD S8
-        USE ASF
+        USE %ASF
         INPUT CODTAB FLD_TABRFA_S8
         DISPLAY "Cl. Fisc." CODTAB
         DISPLAY "Descrizione@30" S0

ve/batbspp.uml

@@ -18,7 +18,7 @@ BEGIN
   FIELD SPP->CODTAB
   KEY 1
   USE SPP
-  FLAG "U"
+  FLAGS "U"
   INPUT CODTAB  F_CODICE
   DISPLAY "Codice "         CODTAB
   DISPLAY "Descrizione@50 " S0
@@ -46,7 +46,7 @@ END
 STRING F_CODASSFIS 4
 BEGIN
   PROMPT 2 7  "Codice IVA    "
-  FIELD SPP->S1[1,4]
+  FIELD SPP->S3
   USE %IVA
   INPUT CODTAB  F_CODASSFIS
   DISPLAY "Codice " CODTAB
@@ -64,7 +64,7 @@ END
 STRING F_CODDIV 4
 BEGIN
   PROMPT 2 8 "Codice valuta "
-  FIELD SPP->S1[5,7]
+  FIELD SPP->S4
   USE VAL
   INPUT CODTAB  F_CODDIV
   DISPLAY "Codice " CODTAB
@@ -100,13 +100,13 @@ END
 NUMBER F_VALORE 13 2
 BEGIN
   PROMPT 50 10 "Valore      "
-  FIELD SPP->R0
+  FIELD SPP->R1
 END
 
 NUMBER F_PERCENTUALE 5 2
 BEGIN
   PROMPT 50 10 "Percentuale "
-  FIELD SPP->R0
+  FIELD SPP->R2
 END
 
 STRING F_NCAMPOCAL 2
@@ -124,7 +124,7 @@ END
 LISTBOX F_TIPO 8
 BEGIN
   PROMPT 2 14  "Tipo spesa    "
-  FIELD SPP->S1[9]
+  FIELD SPP->S7
   ITEM "S|Spesa "
   ITEM "M|Merce "
 END
@@ -145,10 +145,10 @@ ENDPAGE
 
 PAGE "Tabella spese e prestazioni " 11 60 14
 
-STRING F_CODTABAGG 2
+NUMBER F_CODTABAGG 2
 BEGIN
   PROMPT 2 2 "N. agg. piede     "
-  FIELD SPP->S1[11,12]
+  FIELD SPP->I3
 END
 
 STRING F_CODTABAGG1 50
@@ -157,10 +157,10 @@ BEGIN
   FLAG "D"
 END
 
-STRING F_NCAMPOAUTOM 2
+NUMBER F_NCAMPOAUTOM 2
 BEGIN
   PROMPT 2 4 "N. calcolo spese  "
-  FIELD SPP->S1[14,15]
+  FIELD SPP->I4
 END
 
 STRING F_NCAMPOAUTOM1 50
@@ -172,7 +172,7 @@ END
 STRING F_SEGNO 1
 BEGIN
   PROMPT 2 6 "Segno "
-  FIELD SPP->S1[17]
+  FIELD SPP->S8
 END
 
 NUMBER F_GRUPPO 3
@@ -184,7 +184,7 @@ BEGIN
 NUMBER F_CONTO 3
 BEGIN
   PROMPT 28 8 ""
-  FIELD SPP->S3
+  FIELD SPP->I1
   USE LF_PCON SELECT (INDBIL="3")||(INDBIL="4")
   INPUT GRUPPO      F_GRUPPO
   INPUT CONTO       F_CONTO
@@ -199,7 +199,7 @@ BEGIN
 NUMBER F_SOTTO 6
 BEGIN
   PROMPT 38 8 ""
-  FIELD SPP->S4
+  FIELD SPP->I2
   USE LF_PCON
   INPUT GRUPPO      F_GRUPPO SELECT
   INPUT CONTO       F_CONTO SELECT
@@ -224,7 +224,7 @@ END
 STRING F_CODMOVCOM 3
 BEGIN
   PROMPT 2 12 "Mov. commessa     "
-  FIELD SPP->S1[19,20]
+  FIELD SPP->S9
 END
 
 STRING F_CODMOVCOM1 50

ve/batbspt.uml

@@ -1,5 +1,4 @@
 #include "BATBSPT.H"
-#define LF_ANAGR 47 //ANAGRAFICO ARTICOLI
 
 
 TOOLBAR "" 0 20 60 2
@@ -14,7 +13,7 @@ BEGIN
   FIELD SPT->CODTAB
   KEY 1
   
-  USE LF_ANAGR
+  USE LF_ANAMAG
   FLAG "R"
   FLAG "U"
   INPUT CODART F_CODICE
@@ -31,7 +30,7 @@ BEGIN
   PROMPT 38 3 ""
   KEY 2
   
-  USE LF_ANAGR KEY 2
+  USE LF_ANAMAG KEY 2
   FLAG "R"
   INPUT DESCR F_DESCR
   DISPLAY "Codice " CODART