diff --git a/ve/verig.h b/ve/verig.h index 061067641..0385d0141 100755 --- a/ve/verig.h +++ b/ve/verig.h @@ -16,7 +16,8 @@ #define FR_CODPRSV 105 #define FR_CODPRSQ 105 #define FR_CODPRSP 105 -#define FR_CODDIP 105 +#define FR_CODRSS 105 +#define FR_CODATR 105 #define FR_LIV1 106 #define FR_LIV2 107 #define FR_LIV3 108 @@ -32,7 +33,8 @@ #define FR_DESCRPRSV 110 #define FR_DESCRPRSQ 110 #define FR_DESCRPRSP 110 -#define FR_COGNDIP 110 +#define FR_DESCRRSS 110 +#define FR_DESCRATR 110 // UMQTA UMQTASP UMQTAPR alternativi definirne uno solo #define FR_UMQTA 111 #define FR_UMQTASP 111 @@ -101,5 +103,4 @@ #define FR_DESCMS 260 #define FR_DESFAS 261 #define FR_CODGOL 262 -#define FR_NOMEDIP 263 #endif diff --git a/ve/vetbatr.h b/ve/vetbatr.h index 25ae6fb7b..5a41ab304 100755 --- a/ve/vetbatr.h +++ b/ve/vetbatr.h @@ -9,6 +9,16 @@ #define ATR_SOTTOA 112 #define ATR_DESCRCONTOA 113 +#define ATR_CODIVA 114 +#define ATR_DESIVA 115 +#define ATR_CODVAL 116 +#define ATR_DESVAL 117 +#define ATR_CAMPI 118 +#define ATR_PREZZO 119 +#define ATR_QTA 120 +#define ATR_UM 121 +#define ATR_PRESTAZ 122 + #define ATR_CDC_V1 201 #define ATR_CDC_V2 202 #define ATR_CDC_V3 203 diff --git a/ve/vetbatr.uml b/ve/vetbatr.uml index f68db66ae..7f9a90e0f 100755 --- a/ve/vetbatr.uml +++ b/ve/vetbatr.uml @@ -64,27 +64,123 @@ BEGIN COPY OUTPUT ATR_TIPORIGA END +STRING ATR_CODIVA 4 +BEGIN + PROMPT 2 5 "Codice IVA " + FIELD S3[1,4] + FLAGS "U" + USE %IVA + INPUT CODTAB ATR_CODIVA + DISPLAY "Codice " CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT ATR_CODIVA CODTAB + OUTPUT ATR_DESIVA S0 + CHECKTYPE NORMAL +END + +STRING ATR_DESIVA 50 +BEGIN + PROMPT 24 5 "" + USE %IVA KEY 2 + INPUT S0 ATR_DESIVA + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice " CODTAB + COPY OUTPUT ATR_CODIVA + CHECKTYPE NORMAL +END + +STRING ATR_CODVAL 4 +BEGIN + PROMPT 2 6 "Codice valuta " + FIELD S4 + FLAGS "U" + USE %VAL + INPUT CODTAB ATR_CODVAL + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT ATR_CODVAL CODTAB + OUTPUT ATR_DESVAL S0 + CHECKTYPE NORMAL +END + +STRING ATR_DESVAL 50 +BEGIN + PROMPT 24 6 "" + USE %VAL KEY 2 + INPUT S0 ATR_DESVAL + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT ATR_CODVAL + CHECKTYPE NORMAL +END + +LISTBOX ATR_CAMPI 15 +BEGIN + PROMPT 2 8 "Campo default " + FIELD S6 + ITEM "Q|Qta prezzo " + FLAGS "H" +END + +CURRENCY ATR_PREZZO 15 +BEGIN + PROMPT 2 8 "Prezzo " + FIELD R0 + FLAGS "U" +END + +NUMBER ATR_QTA 13 5 +BEGIN + PROMPT 38 8 "Quantita' " + FIELD R1 +END + +STRING ATR_UM 2 +BEGIN + PROMPT 67 8 "U.M. " + FIELD S7 + FLAGS "U" + USE %UMS + INPUT CODTAB ATR_UM + DISPLAY "U.M." CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT ATR_UM CODTAB + CHECKTYPE NORMAL +END + +STRING ATR_PRESTAZ 8 +BEGIN + PROMPT 2 9 "Prestazione per fatturazione " + USE PRS + INPUT CODTAB ATR_PRESTAZ + DISPLAY "Codice@8" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT ATR_PRESTAZ CODTAB + CHECKTYPE NORMAL + FIELD S5 +END + DATE ATR_DISMISS BEGIN - PROMPT 2 6 "Data dismissione " + PROMPT 2 11 "Data dismissione " FIELD D0 END NUMBER ATR_GRUPPOA 3 BEGIN - PROMPT 2 10 "Conto acquisti " + PROMPT 2 12 "Conto acquisti " FIELD I3 END NUMBER ATR_CONTOA 3 BEGIN - PROMPT 22 10 "" + PROMPT 22 12 "" FIELD I4 END NUMBER ATR_SOTTOA 6 BEGIN - PROMPT 28 10 "" + PROMPT 28 12 "" FIELD I5 USE LF_PCON SELECT SOTTOCONTO!="" INPUT GRUPPO ATR_GRUPPOA @@ -105,7 +201,7 @@ END STRING ATR_DESCRCONTOA 50 35 BEGIN - PROMPT 39 10 "" + PROMPT 39 12 "" FLAG "U" USE LF_PCON KEY 2 SELECT SOTTOCONTO!="" INPUT DESCR ATR_DESCRCONTOA