From 94cf5a09ecaff1de775729064082fdfbadd887b2 Mon Sep 17 00:00:00 2001 From: pirro Date: Thu, 28 Nov 1996 15:33:09 +0000 Subject: [PATCH] Modifiche varie prima del rilascio della Beta. Modificate maschere di tabelle + verig.uml + ve0300a.src git-svn-id: svn://10.65.10.50/trunk@3940 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ve/batbcaa.uml | 4 ++-- ve/batbcra.uml | 4 ++-- ve/batbprs.uml | 12 ++++++------ ve/batbrfa.uml | 4 ++-- ve/batbspp.uml | 12 ++++++------ ve/ve0300a.src | 2 +- ve/ve6200a.uml | 4 ++-- ve/verig.uml | 4 ++++ 8 files changed, 25 insertions(+), 21 deletions(-) diff --git a/ve/batbcaa.uml b/ve/batbcaa.uml index 0e93f4652..7ec253628 100755 --- a/ve/batbcaa.uml +++ b/ve/batbcaa.uml @@ -71,8 +71,8 @@ BEGIN FIELD I2 USE LF_PCON SELECT (SOTTOCONTO!="") && (500@->INDBIL=="3") JOIN LF_PCON ALIAS 500 INTO GRUPPO==GRUPPO CONTO==CONTO - INPUT GRUPPO F_CODCON SELECT - INPUT CONTO F_CODCON1 SELECT + INPUT GRUPPO F_CODCON + INPUT CONTO F_CODCON1 INPUT SOTTOCONTO F_CODCON2 DISPLAY "Gruppo " GRUPPO DISPLAY "Conto " CONTO diff --git a/ve/batbcra.uml b/ve/batbcra.uml index 09e960d39..1f62a7df6 100755 --- a/ve/batbcra.uml +++ b/ve/batbcra.uml @@ -71,8 +71,8 @@ BEGIN FIELD I2 USE LF_PCON SELECT (SOTTOCONTO!="") && (500@->INDBIL=="4") JOIN LF_PCON ALIAS 500 INTO GRUPPO==GRUPPO CONTO==CONTO - INPUT GRUPPO F_CODCON SELECT - INPUT CONTO F_CODCON1 SELECT + INPUT GRUPPO F_CODCON + INPUT CONTO F_CODCON1 INPUT SOTTOCONTO F_CODCON2 DISPLAY "Gruppo " GRUPPO DISPLAY "Conto " CONTO diff --git a/ve/batbprs.uml b/ve/batbprs.uml index 2d5a70ecb..47cf3f5ba 100755 --- a/ve/batbprs.uml +++ b/ve/batbprs.uml @@ -140,7 +140,7 @@ NUMBER F_CONTOV 3 BEGIN PROMPT 22 14 "" FIELD I1 - USE LF_PCON SELECT INDBIL=="4" + USE LF_PCON SELECT (CONTO!="") && (SOTTOCONTO=="") && ((INDBIL=="4") || (INDBIL=="1") || (INDBIL=="2")) INPUT GRUPPO F_GRUPPOV INPUT CONTO F_CONTOV DISPLAY "Gruppo" GRUPPO @@ -157,7 +157,7 @@ NUMBER F_SOTTOV 6 BEGIN PROMPT 30 14 "" FIELD I2 - USE LF_PCON SELECT (SOTTOCONTO!="") && (500@->INDBIL=="4") + USE LF_PCON SELECT (SOTTOCONTO!="") && ((500@->INDBIL=="4") || (500@->INDBIL=="1") || (500@->INDBIL=="2")) JOIN LF_PCON ALIAS 500 INTO GRUPPO==GRUPPO CONTO==CONTO INPUT GRUPPO F_GRUPPOV SELECT INPUT CONTO F_CONTOV SELECT @@ -179,7 +179,7 @@ STRING F_DESCRCONTOV 50 BEGIN PROMPT 17 15 "" FLAG "U" - USE LF_PCON KEY 2 SELECT (SOTTOCONTO!="") && (500@->INDBIL=="4") + USE LF_PCON KEY 2 SELECT (SOTTOCONTO!="") && ((500@->INDBIL=="4") || (500@->INDBIL=="1") || (500@->INDBIL=="2")) JOIN LF_PCON ALIAS 500 INTO GRUPPO==GRUPPO CONTO==CONTO INPUT DESCR F_DESCRCONTOV DISPLAY "Descrizione@50" DESCR @@ -203,7 +203,7 @@ NUMBER F_CONTOA 3 BEGIN PROMPT 22 16 "" FIELD I4 - USE LF_PCON SELECT INDBIL=="3" + USE LF_PCON SELECT (CONTO!="") && (SOTTOCONTO=="") && ((INDBIL=="3") || (INDBIL=="1") || (INDBIL=="2")) INPUT GRUPPO F_GRUPPOA INPUT CONTO F_CONTOA DISPLAY "Gruppo" GRUPPO @@ -220,7 +220,7 @@ NUMBER F_SOTTOA 6 BEGIN PROMPT 30 16 "" FIELD I5 - USE LF_PCON SELECT (SOTTOCONTO!="") && (500@->INDBIL=="3") + USE LF_PCON SELECT (SOTTOCONTO!="") && ((500@->INDBIL=="3") || (500@->INDBIL=="1") || (500@->INDBIL=="2")) JOIN LF_PCON ALIAS 500 INTO GRUPPO==GRUPPO CONTO==CONTO INPUT GRUPPO F_GRUPPOA SELECT INPUT CONTO F_CONTOA SELECT @@ -242,7 +242,7 @@ STRING F_DESCRCONTOA 50 BEGIN PROMPT 17 17 "" FLAG "U" - USE LF_PCON KEY 2 SELECT (SOTTOCONTO!="") && (500@->INDBIL=="3") + USE LF_PCON KEY 2 SELECT (SOTTOCONTO!="") && ((500@->INDBIL=="3") || (500@->INDBIL=="1") || (500@->INDBIL=="2")) JOIN LF_PCON ALIAS 500 INTO GRUPPO==GRUPPO CONTO==CONTO INPUT DESCR F_DESCRCONTOA DISPLAY "Descrizione@50" DESCR diff --git a/ve/batbrfa.uml b/ve/batbrfa.uml index 0cf4f82bc..009972127 100755 --- a/ve/batbrfa.uml +++ b/ve/batbrfa.uml @@ -166,8 +166,8 @@ BEGIN FIELD I5 USE LF_PCON SELECT (SOTTOCONTO!="") && (500@->INDBIL=="4") JOIN LF_PCON ALIAS 500 INTO GRUPPO==GRUPPO CONTO==CONTO - INPUT GRUPPO F_GRUPPOV SELECT - INPUT CONTO F_CONTOV SELECT + INPUT GRUPPO F_GRUPPOV + INPUT CONTO F_CONTOV INPUT SOTTOCONTO F_SOTTOCV DISPLAY "Gruppo" GRUPPO DISPLAY "Conto" CONTO diff --git a/ve/batbspp.uml b/ve/batbspp.uml index aa359de97..a76a57a15 100755 --- a/ve/batbspp.uml +++ b/ve/batbspp.uml @@ -180,7 +180,7 @@ NUMBER F_CONTOV 3 BEGIN PROMPT 22 15 "" FIELD I1 - USE LF_PCON SELECT INDBIL=="4" + USE LF_PCON SELECT (CONTO!="") && (SOTTOCONTO=="") && ((INDBIL=="4") || (INDBIL=="1") || (INDBIL=="2")) INPUT GRUPPO F_GRUPPOV INPUT CONTO F_CONTOV DISPLAY "Gruppo" GRUPPO @@ -197,7 +197,7 @@ NUMBER F_SOTTOV 6 BEGIN PROMPT 30 15 "" FIELD I2 - USE LF_PCON SELECT (SOTTOCONTO!="") && (500@->INDBIL=="4") + USE LF_PCON SELECT (SOTTOCONTO!="") && ((500@->INDBIL=="4") || (500@->INDBIL=="1") || (500@->INDBIL=="2")) JOIN LF_PCON ALIAS 500 INTO GRUPPO==GRUPPO CONTO==CONTO INPUT GRUPPO F_GRUPPOV INPUT CONTO F_CONTOV @@ -219,7 +219,7 @@ STRING F_DESCRCONTOV 50 BEGIN PROMPT 17 16 "" FLAG "U" - USE LF_PCON KEY 2 SELECT (SOTTOCONTO!="") && (500@->INDBIL=="4") + USE LF_PCON KEY 2 SELECT (SOTTOCONTO!="") && ((500@->INDBIL=="4") || (500@->INDBIL=="1") || (500@->INDBIL=="2")) JOIN LF_PCON ALIAS 500 INTO GRUPPO==GRUPPO CONTO==CONTO INPUT DESCR F_DESCRCONTOV DISPLAY "Descrizione@50" DESCR @@ -243,7 +243,7 @@ NUMBER F_CONTOA 3 BEGIN PROMPT 22 17 "" FIELD I4 - USE LF_PCON SELECT INDBIL=="3" + USE LF_PCON SELECT (CONTO!="") && (SOTTOCONTO=="") && ((INDBIL=="3") || (INDBIL=="1") || (INDBIL=="2")) INPUT GRUPPO F_GRUPPOA INPUT CONTO F_CONTOA DISPLAY "Gruppo" GRUPPO @@ -260,7 +260,7 @@ NUMBER F_SOTTOA 6 BEGIN PROMPT 30 17 "" FIELD I5 - USE LF_PCON SELECT (SOTTOCONTO!="") && (500@->INDBIL=="3") + USE LF_PCON SELECT (SOTTOCONTO!="") && ((500@->INDBIL=="3") || (500@->INDBIL=="1") || (500@->INDBIL=="2")) JOIN LF_PCON ALIAS 500 INTO GRUPPO==GRUPPO CONTO==CONTO INPUT GRUPPO F_GRUPPOA INPUT CONTO F_CONTOA @@ -282,7 +282,7 @@ STRING F_DESCRCONTOA 50 BEGIN PROMPT 17 18 "" FLAG "U" - USE LF_PCON KEY 2 SELECT (SOTTOCONTO!="") && (500@->INDBIL=="3") + USE LF_PCON KEY 2 SELECT (SOTTOCONTO!="") && ((500@->INDBIL=="3") || (500@->INDBIL=="1") || (500@->INDBIL=="2")) JOIN LF_PCON ALIAS 500 INTO GRUPPO==GRUPPO CONTO==CONTO INPUT DESCR F_DESCRCONTOA DISPLAY "Descrizione@50" DESCR diff --git a/ve/ve0300a.src b/ve/ve0300a.src index f734c1a79..6b8e7a8fb 100755 --- a/ve/ve0300a.src +++ b/ve/ve0300a.src @@ -1408,7 +1408,7 @@ PROMPT="Importi netti " GROUP=2400 X=2 Y=0 -FIELDNAME=SPESEINC +FIELDNAME=PERCSPINC MSKID=151 TYPE=T_NUMERO PROMPT="% spese incasso " diff --git a/ve/ve6200a.uml b/ve/ve6200a.uml index 6f3f296f5..7a499f30e 100755 --- a/ve/ve6200a.uml +++ b/ve/ve6200a.uml @@ -11,7 +11,7 @@ STRING F_CODICE_ELAB 8 BEGIN PROMPT 2 1 "Codice " FLAG "U" - USE %ELD + USE %ELD SELECT S3 == "FB" INPUT CODTAB F_CODICE_ELAB DISPLAY "Codice@8" CODTAB DISPLAY "Descrizione@50" S0 @@ -25,7 +25,7 @@ END STRING F_DESCR_ELAB 50 BEGIN PROMPT 2 2 "Descrizione " - USE %ELD KEY 2 + USE %ELD KEY 2 SELECT S3 == "FB" INPUT S0 F_DESCR_ELAB DISPLAY "Descrizione@50" S0 DISPLAY "Codice@8" CODTAB diff --git a/ve/verig.uml b/ve/verig.uml index 25604e24c..29f0e191d 100755 --- a/ve/verig.uml +++ b/ve/verig.uml @@ -193,6 +193,7 @@ ENDIF OUTPUT FR_CODIVA S3 MESSAGE DIRTY,FR_CODIVA|K_TAB,FR_CODIVA|DISABLE,FR_QTA FIELD CODART + FLAGS "U" IFDEF(CH_CODSPV) CHECKTYPE CH_CODSPV ELSEIF @@ -221,6 +222,7 @@ ENDIF OUTPUT FR_CODIVA S3 MESSAGE DIRTY,FR_CODIVA|K_TAB,FR_CODIVA FIELD CODART + FLAGS "U" IFDEF(CH_CODSPQ) CHECKTYPE CH_CODSPQ ELSEIF @@ -246,6 +248,7 @@ ENDIF OUTPUT FR_PERCSP R2 OUTPUT FR_CODIVA S3 FIELD CODART + FLAGS "U" MESSAGE DIRTY,FR_CODIVA|K_TAB,FR_CODIVA IFDEF(CH_CODSPP) CHECKTYPE CH_CODSPP @@ -275,6 +278,7 @@ ENDIF OUTPUT FR_CODIVA S3 MESSAGE DIRTY,FR_CODIVA|K_TAB,FR_CODIVA FIELD CODART + FLAGS "U" IFDEF(CH_CODPRS) CHECKTYPE CH_CODPRS ELSEIF