Modifica alle maschere Listino/contratti/offerte

git-svn-id: svn://10.65.10.50/trunk@1963 c028cbd2-c16b-5b4b-a496-9718f37d4682
1995-10-16 16:31:39 +00:00 · 1995-10-16 16:31:39 +00:00 · d9c3b8b96e
commit d9c3b8b96e
parent 58045a3d3d
9 changed files with 1067 additions and 909 deletions
--- a/ve/ve2100.uml
+++ b/ve/ve2100.uml
@ -1,10 +1,10 @@
 #include "ve2100.h"

-PAGE "Tabelle sconti " -1 -1 40 10
+PAGE "Archivio sconti " -1 -1 40 10

 RADIOBUTTON F_TIPOSC 36
 BEGIN
-  PROMPT 1 2 "Tipo di tabella "
+  PROMPT 1 2 "Tipo di archivio "
  ITEM "R|Sconti di riga"
  ITEM "D|Sconti documento"
  ITEM "I|Sconti indondizionati"
@ -24,3 +24,4 @@ END
 ENDPAGE

 ENDMASK
+
--- a/ve/ve2100d.h
+++ b/ve/ve2100d.h
@ -1,3 +1,5 @@
 #define F_D_TIPO   111
 #define F_D_CODCAT 112
 #define F_D_SCONTO 113
+#define F_D_DESCR  114
+
--- a/ve/ve2100d.uml
+++ b/ve/ve2100d.uml
@ -17,7 +17,7 @@ END

 STRING F_D_CODCAT 2
 BEGIN
-  PROMPT 2 2  "Codice sconto documento "
+  PROMPT 2 2  "Cod. sconto doc. "
  FIELD LF_SCONTI->CODCAT
  FLAG "UR"
  KEY 1
@ -25,24 +25,34 @@ BEGIN
  INPUT TIPO F_D_TIPO SELECT
  INPUT CODCAT F_D_CODCAT
  DISPLAY "Codice" CODCAT
-  DISPLAY "Sconto@50" SCONTO
+  DISPLAY "Descrizione" DESCR
+  DISPLAY "Sconto@25" SCONTO
  OUTPUT F_D_CODCAT CODCAT
  OUTPUT F_D_SCONTO SCONTO
+  OUTPUT F_D_DESCR DESCR
  CHECKTYPE REQUIRED
 END

-GROUPBOX DLG_NULL 70 5
+STRING F_D_DESCR 50
+BEGIN
+  PROMPT 2 4  "Descrizione      "
+  FIELD LF_SCONTI->DESCR
+  FLAG "D"
+END
+
+GROUPBOX DLG_NULL 75 7
 BEGIN
  PROMPT 0 0 ""
-//FLAG "R"
+  FLAG "R"
 END

 STRING F_D_SCONTO 25
 BEGIN
-  PROMPT 19 6 "Sconto "
+  PROMPT 2 8  "Sconto           "
  FIELD LF_SCONTI->SCONTO
 END

 ENDPAGE

 ENDMASK
+
--- a/ve/ve2100r.h
+++ b/ve/ve2100r.h
@ -3,5 +3,7 @@
 #define F_R_CODCAT  123
 #define F_R_CODART  124
 #define F_R_UM      125
-#define F_R_UMDESC  126
+#define F_R_DESART  126
 #define F_R_SCONTO  127
+#define F_R_DESCAT  128
+
--- a/ve/ve2100r.uml
+++ b/ve/ve2100r.uml
@ -25,7 +25,6 @@ BEGIN
  OUTPUT F_R_CODART CODART
  OUTPUT F_R_UM UM
  OUTPUT F_R_SCONTO SCONTO
-  OUTPUT F_R_UMDESC %UMS->S0
 END

 LISTA F_R_TIPO 1
@ -38,7 +37,7 @@ END

 STRING F_R_CODCAT 2
 BEGIN
-  PROMPT 2 2 "Categoria vendita "
+  PROMPT 2 2 "Cat. vendita  "
  FIELD LF_SCONTI->CODCAT
  FLAG "U"
  KEY 1
@ -47,12 +46,19 @@ BEGIN
  DISPLAY "Codice" CODTAB
  DISPLAY "Descrizione@50" S0
  OUTPUT F_R_CODCAT CODTAB
+  OUTPUT F_R_DESCAT S0
  VALIDATE AUTOEXIT_FUNC 2 F_R_CODCAT F_R_CODART
 END

+STRING F_R_DESCAT 50
+BEGIN
+  PROMPT 22 2 ""
+  FLAG "D"
+END
+
 STRING F_R_CODART 20
 BEGIN
-  PROMPT 4 4 "Codice articolo "
+  PROMPT 2 4 "Cod. articolo "
  FIELD LF_SCONTI->CODART
  FLAG "U"
  KEY 1
@ -61,12 +67,13 @@ BEGIN
  DISPLAY "Codice@20" CODART
  DISPLAY "Descrizione@50" DESCR
  OUTPUT F_R_CODART CODART
+  OUTPUT F_R_DESART DESCR
  VALIDATE AUTOEXIT_FUNC 2 F_R_CODCAT F_R_CODART
 END

 STRING F_R_UM 2
 BEGIN
-  PROMPT 15 6 "U.M. "
+  PROMPT 50 4 "U.M. "
  FIELD LF_SCONTI->UM
  FLAG "U"
  KEY 1
@ -77,28 +84,28 @@ BEGIN
  DISPLAY "U.M." UM
  DISPLAY "Desccrizione@50" %UMS->S0
  OUTPUT F_R_UM UM
-  OUTPUT F_R_UMDESC %UMS->S0
  VALIDATE AUTOEXIT_FUNC 2 F_R_CODCAT F_R_CODART
 END

-STRING F_R_UMDESC 50
+STRING F_R_DESART 50
 BEGIN
-  PROMPT 8 8 "Descrizione "
+  PROMPT 2 6 "Descrizione   "
  FLAG "D"
 END

-GROUPBOX DLG_NULL 75 11
+GROUPBOX DLG_NULL 75 10
 BEGIN
  PROMPT 0 0 ""
-//FLAG "R"
+  FLAG "R"
 END

 STRING F_R_SCONTO 25
 BEGIN
-  PROMPT 13 12 "Sconto "
+  PROMPT 2 12 "Sconto        "
  FIELD LF_SCONTI->SCONTO
 END

 ENDPAGE

 ENDMASK
+
--- a/ve/ve2200x.h
+++ b/ve/ve2200x.h
@ -16,20 +16,25 @@
 #define F_SEQRIC_1     124
 #define F_SEQRIC_2     125
 #define F_SEQRIC_3     126
+#define F_SEQRIC_4     127

 // campi riservati ai listini
 #define F_L_CATVEN     131
 #define F_L_COD        132
-#define F_LC_CODSUCC   133 // campo comune anche ai contratti
+#define F_LC_CODSUCC   133
+#define F_L_DESVEN     134
+#define F_LC_DESSUCC   135

 // campi riservati ai contratti
 #define F_C_TIPOCF     141
 #define F_C_CODCF      142
 #define F_C_COD        143
 #define F_C_OBBLIG     144
+#define F_C_DESCF      145

 // campi riservati alle offerte
 #define F_O_COD        151

 // pulsante di lancio dell'edit delle righe
 #define BTN_RIGHE      161
+
--- a/ve/ve2200x.uml
+++ b/ve/ve2200x.uml
@ -19,7 +19,7 @@ END
 // campo riservato ai listini
 STRING F_L_CATVEN 2
 BEGIN
-  PROMPT 26 2 "Cat. vendita "
+  PROMPT 2 2 "Cat. vendita "
  FIELD LF_CONDV->CATVEN
  FLAG "U"
  KEY 1
@ -28,13 +28,21 @@ BEGIN
  DISPLAY "Cat." CODTAB
  DISPLAY "Descrizione@50" S0
  OUTPUT F_L_CATVEN CODTAB
+  OUTPUT F_L_DESVEN S0
  CHECKTYPE REQUIRED
 END

+// campo riservato ai listini
+STRING F_L_DESVEN 50
+BEGIN
+  PROMPT 22 2 ""
+  FLAG "D"
+END
+
 // campo riservato ai contratti
 LIST F_C_TIPOCF 7
 BEGIN
-  PROMPT 2 2 "Tipo     "
+  PROMPT 2 2 "Tipo    "
  FIELD LF_CONDV->TIPOCF
  KEY 1
  ITEM "C|Cliente"
@ -45,7 +53,7 @@ END
 // campo riservato ai contratti
 STRING F_C_CODCF 6
 BEGIN
-  PROMPT 48 2 "Codice "
+  PROMPT 2 3 "Codice  "
  FIELD LF_CONDV->CODCF
  FLAG "U"
  KEY 1
@ -57,9 +65,17 @@ BEGIN
  DISPLAY "Ragione sociale@50" RAGSOC
  OUTPUT F_C_TIPOCF TIPOCF
  OUTPUT F_C_CODCF CODCF
+  OUTPUT F_C_DESCF RAGSOC
  CHECKTYPE REQUIRED
 END

+// campo riservato ai contratti
+STRING F_C_DESCF 50
+BEGIN
+  PROMPT 22 3 ""
+  FLAG "D"
+END
+
 // campo riservato ai listini
 STRING F_L_COD 3
 BEGIN
@ -83,7 +99,7 @@ END
 // campo riservato ai contratti
 NUMBER F_C_COD 3
 BEGIN
-  PROMPT 26 4 "Numero contratto "
+  PROMPT 2 4 "Contratto N. "
  FIELD LF_CONDV->COD
  KEY 1
  USE LF_CONDV
@ -189,7 +205,7 @@ END

 BOOLEAN F_GESTSCO
 BEGIN
-  PROMPT 34 13 "Gestione sconti"
+  PROMPT 34 13 "Gestione sconti/omaggi"
  FIELD LF_CONDV->GESTSCO
 END

@ -206,59 +222,84 @@ BEGIN
  FIELD LF_CONDV->OBBLIG
 END

-LIST F_SEQRIC_1 8
+LIST F_SEQRIC_1 10
 BEGIN
-  PROMPT 2 16 "Sequenza ricerca "
+  PROMPT 2 15 "Sequenza ricerca "
  FIELD LF_CONDV->SEQRIC[1,1]
  ITEM "A|Articoli"
-  ITEM "G|Gr. Merc"
-  ITEM "R|Rag. Fis"
-  VALIDATE STR_EXPR (#THIS_FIELD!=#F_SEQRIC_2)&&(#THIS_FIELD!=#F_SEQRIC_3)
+  ITEM "G|Gruppo M."
+  ITEM "S|Sottogr.M."
+  ITEM "R|Ragg.fisc."
+  STR_EXPR (#THIS_FIELD!=#F_SEQRIC_2)&&(#THIS_FIELD!=#F_SEQRIC_3)&&(#THIS_FIELD!=#F_SEQRIC_4)
  WARNING "La sequenza di ricerca deve indicare tre tipi diversi di righe"
 END

-LIST F_SEQRIC_2 8
+LIST F_SEQRIC_2 10
 BEGIN
-  PROMPT 32 16 ""
+  PROMPT 34 15 ""
  FIELD LF_CONDV->SEQRIC[2,2]
  ITEM "-|Nessuno"
  ITEM "A|Articoli"
-  ITEM "G|Gr. Merc"
-  ITEM "R|Rag. Fis"
-  VALIDATE STR_EXPR (#THIS_FIELD=="")||((#THIS_FIELD!=#F_SEQRIC_1)&&(#THIS_FIELD!=#F_SEQRIC_3))
+  ITEM "G|Gruppo M."
+  ITEM "S|Sottogr.M."
+  ITEM "R|Ragg.fisc."
+  STR_EXPR (#THIS_FIELD=="")||((#THIS_FIELD!=#F_SEQRIC_1)&&(#THIS_FIELD!=#F_SEQRIC_3)&&(#THIS_FIELD!=#F_SEQRIC_4))
  WARNING "La sequenza di ricerca deve indicare tre tipi diversi di righe"
 END

-LIST F_SEQRIC_3 8
+LIST F_SEQRIC_3 10
 BEGIN
-  PROMPT 45 16 ""
+  PROMPT 49 15 ""
  FIELD LF_CONDV->SEQRIC[3,3]
  ITEM "-|Nessuno"
  ITEM "A|Articoli"
-  ITEM "G|Gr. Merc"
-  ITEM "R|Rag. Fis"
-  VALIDATE STR_EXPR (#THIS_FIELD=="")||((#THIS_FIELD!=#F_SEQRIC_1)&&(#THIS_FIELD!=#F_SEQRIC_2))
+  ITEM "G|Gruppo M."
+  ITEM "S|Sottogr.M."
+  ITEM "R|Ragg.fisc."
+  STR_EXPR (#THIS_FIELD=="")||((#THIS_FIELD!=#F_SEQRIC_1)&&(#THIS_FIELD!=#F_SEQRIC_2)&&(#THIS_FIELD!=#F_SEQRIC_4))
+  WARNING "La sequenza di ricerca deve indicare tre tipi diversi di righe"
+END
+
+LIST F_SEQRIC_4 10
+BEGIN
+  PROMPT 64 15 ""
+  FIELD LF_CONDV->SEQRIC[4,4]
+  ITEM "-|Nessuno"
+  ITEM "A|Articoli"
+  ITEM "G|Gruppo M."
+  ITEM "S|Sottogr.M."
+  ITEM "R|Ragg.fisc."
+  STR_EXPR (#THIS_FIELD=="")||((#THIS_FIELD!=#F_SEQRIC_1)&&(#THIS_FIELD!=#F_SEQRIC_2)&&(#THIS_FIELD!=#F_SEQRIC_3))
  WARNING "La sequenza di ricerca deve indicare tre tipi diversi di righe"
 END

 // campo riservato ai listini
 STRING F_LC_CODSUCC 3
 BEGIN
-  PROMPT 34 16 "Codice listino succ. "
+  PROMPT 2 16 "Listino succ. "
  FIELD LF_CONDV->CODLISSUCC
  FLAG "U"
  USE LF_CONDV
  INPUT TIPO F_TIPO SELECT
  INPUT CATVEN F_L_CATVEN SELECT
-  INPUT TIPOCF F_C_TIPOCF SELECT
-  INPUT CODCF F_C_CODCF SELECT
+//INPUT TIPOCF F_C_TIPOCF SELECT
+//INPUT CODCF F_C_CODCF SELECT
  INPUT COD F_LC_CODSUCC
+  DISPLAY "C.V." CATVEN
  DISPLAY "Codice" COD
  DISPLAY "Descrizione@50" DESCR
  OUTPUT F_LC_CODSUCC COD
+  OUTPUT F_LC_DESSUCC DESCR
  CHECKTYPE NORMAL
 END

+// campo riservato ai listini
+STRING F_LC_DESSUCC 50
+BEGIN
+  PROMPT 24 16 ""
+  FLAG "D"
+END
+
 // bottone di lancio dell'applicazione delle righe
 BUTTON BTN_RIGHE 63 1
 BEGIN
@ -268,4 +309,5 @@ END

 ENDPAGE

-ENDMASK
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
--- a/ve/ve2300x.h
+++ b/ve/ve2300x.h
@ -17,21 +17,31 @@
 #define F_R_CODARTOM    125
 #define F_R_PROMAGGIO   126
 #define F_R_UMOM        127
+#define F_R_CODRIGA_S   128
+#define F_R_DESRIGA_A   161
+#define F_R_DESRIGA_G   162
+#define F_R_DESRIGA_R   163
+#define F_R_DESRIGA_S   163

 // campi riservati ai listini
 #define F_R_L_CATVEN    131
 #define F_R_L_COD       132
 #define F_R_LO_UM       133 // comune anche alle offerte
 #define F_R_L_RICERCA   134
+#define F_R_L_DESVEN    135
+#define F_R_L_DES       136

 // campi riservati ai contratti
 #define F_R_C_TIPOCF    141
 #define F_R_C_CODCF     142
 #define F_R_C_COD       143
 #define F_R_C_RICERCA   144
-#define F_R_CO_CODLOTTO 145 // comune anche alle offerte
+#define F_R_C_DESCF     145
+#define F_R_C_DES       146

 // campi riservati alle offerte
 #define F_R_O_COD       151
 #define F_R_O_RICERCA   152
 #define F_R_O_ARTES     153
+#define F_R_O_DES       154
+
--- a/ve/ve2300x.uml
+++ b/ve/ve2300x.uml
@ -18,7 +18,7 @@ END

 STRING F_R_L_CATVEN 2 // campo riservato ai listini
 BEGIN
-  PROMPT 2 1 "Cat. vendita   "
+  PROMPT 2 2 "Cat. vendita "
  FIELD LF_RCONDV->CATVEN
  FLAG "UP"
  KEY 1
@ -27,12 +27,19 @@ BEGIN
  DISPLAY "Cat." CODTAB
  DISPLAY "Descrizione@50" S0
  OUTPUT F_R_L_CATVEN CODTAB
+  OUTPUT F_R_L_DESVEN S0
  CHECKTYPE REQUIRED
 END

+STRING F_R_L_DESVEN 50 // campo riservato ai listini
+BEGIN
+  PROMPT 23 2 ""
+  FLAG "D"
+END
+
 LIST F_R_C_TIPOCF 7 // campo riservato ai contratti
 BEGIN
-  PROMPT 28 1 "Tipo "
+  PROMPT 2 1 "Tipo C/F  "
  FIELD LF_RCONDV->TIPOCF
  FLAG "P"
  KEY 1
@ -43,7 +50,7 @@ END

 STRING F_R_C_CODCF 6 // campo riservato ai contratti
 BEGIN
-  PROMPT 52 1 "Codice "
+  PROMPT 2 2 "Cod. C/F  "
  FIELD LF_RCONDV->CODCF
  FLAG "UP"
  KEY 1
@ -55,12 +62,19 @@ BEGIN
  DISPLAY "Ragione sociale@50" RAGSOC
  OUTPUT F_R_C_TIPOCF TIPOCF
  OUTPUT F_R_C_CODCF CODCF
+  OUTPUT F_R_C_DESCF RAGSOC
  CHECKTYPE REQUIRED
 END

+STRING F_R_C_DESCF 50 // campo riservato ai contratti
+BEGIN
+  PROMPT 23 2 ""
+  FLAG "D"
+END
+
 STRING F_R_L_COD 3 // campo riservato ai listini
 BEGIN
-  PROMPT 2 3 "Codice listino "
+  PROMPT 2 3 "Listino      "
  FIELD LF_RCONDV->COD
  FLAG "UPG"
  KEY 1
@ -74,12 +88,19 @@ BEGIN
  OUTPUT F_R_TIPO TIPO
  OUTPUT F_R_L_CATVEN CATVEN
  OUTPUT F_R_L_COD COD
+  OUTPUT F_R_L_DES DESCR
  CHECKTYPE REQUIRED
 END

+STRING F_R_L_DES 50 // campo riservato ai contratti
+BEGIN
+  PROMPT 23 3 ""
+  FLAG "D"
+END
+
 NUMBER F_R_C_COD 3 // campo riservato ai contratti
 BEGIN
-  PROMPT 28 3 "Numero contratto "
+  PROMPT 2 3 "Contratto N. "
  FIELD LF_RCONDV->COD
  FLAG "PG"
  KEY 1
@ -96,9 +117,16 @@ BEGIN
  OUTPUT F_R_C_TIPOCF TIPOCF
  OUTPUT F_R_C_CODCF CODCF
  OUTPUT F_R_C_COD COD
+  OUTPUT F_R_C_DES DESCR
  CHECKTYPE REQUIRED
 END

+STRING F_R_C_DES 50 // campo riservato ai listini
+BEGIN
+  PROMPT 23 3 ""
+  FLAG "D"
+END
+
 STRING F_R_O_COD 3 // campo riservato alle offerte
 BEGIN
  PROMPT 2 2 "Codice offerta "
@ -115,20 +143,27 @@ BEGIN
  CHECKTYPE REQUIRED
 END

-LIST F_R_TIPORIGA 8
+STRING F_R_O_DES 50 // campo riservato alle offerte
 BEGIN
-  PROMPT 2 4 "Riga "
+  PROMPT 2 4 "Descr. offerta "
+  FLAG "D"
+END
+
+LIST F_R_TIPORIGA 14
+BEGIN
+  PROMPT 2 4 "Tipo riga    "
  FIELD LF_RCONDV->TIPORIGA
  FLAG "P"
  KEY 1
  ITEM "A|Articolo"
-  ITEM "G|Gr. merc."
-  ITEM "R|Rag. fis."
+  ITEM "G|Gruppo merc."
+  ITEM "S|Sottogr. merc."
+  ITEM "R|Ragg. fiscale"
 END

 STRING F_R_CODRIGA_A 20
 BEGIN
-  PROMPT 28 4 "Codice "
+  PROMPT 37 4 "Codice articolo "
  FIELD LF_RCONDV->CODRIGA
  FLAG "U"
  KEY 1
@ -137,27 +172,63 @@ BEGIN
  DISPLAY "Articolo@20" CODART
  DISPLAY "Descrizione@50" DESCR
  OUTPUT F_R_CODRIGA_A CODART
+  OUTPUT F_R_DESRIGA_A DESCR
  CHECKTYPE REQUIRED
 END

-STRING F_R_CODRIGA_G 20
+STRING F_R_DESRIGA_A 50
 BEGIN
-  PROMPT 28 5 "Codice "
+  PROMPT 2 5 "Descrizione articolo "
+  FLAG "D"
+END
+
+STRING F_R_CODRIGA_G 3
+BEGIN
+  PROMPT 2 5 "Gruppo merc. "
  FIELD LF_RCONDV->CODRIGA
  FLAG "U"
  KEY 1
  USE %GMC
-  INPUT CODTAB F_R_CODRIGA_G
-  DISPLAY "Gr. merc." CODTAB
+  INPUT CODTAB[1,3] F_R_CODRIGA_G
+  DISPLAY "Gr. merc." CODTAB[1,3]
  DISPLAY "Descrizione@50" S0
-  OUTPUT F_R_CODRIGA_G CODTAB
+  OUTPUT F_R_CODRIGA_G CODTAB[1,3]
+  OUTPUT F_R_DESRIGA_G S0
  CHECKTYPE REQUIRED
  MESSAGE COPY,F_R_CODRIGA_A
 END

-STRING F_R_CODRIGA_R 20
+STRING F_R_DESRIGA_G 50
 BEGIN
-  PROMPT 28 6 "Codice "
+  PROMPT 23 5 ""
+  FLAG "D"
+END
+
+STRING F_R_CODRIGA_S 2
+BEGIN
+  PROMPT 2 5 "Sottogr. merc. "
+  FIELD LF_RCONDV->CODRIGA
+  FLAG "U"
+  KEY 1
+  USE %GMC
+  INPUT CODTAB[4,5] F_R_CODRIGA_S
+  DISPLAY "Sottogr. merc." CODTAB[4,5]
+  DISPLAY "Descrizione@50" S0
+  OUTPUT F_R_CODRIGA_S CODTAB[4,5]
+  OUTPUT F_R_DESRIGA_S S0
+  CHECKTYPE REQUIRED
+  MESSAGE COPY,F_R_CODRIGA_A
+END
+
+STRING F_R_DESRIGA_S 50
+BEGIN
+  PROMPT 23 5 ""
+  FLAG "D"
+END
+
+STRING F_R_CODRIGA_R 2
+BEGIN
+  PROMPT 2 5 "Ragg.fiscale "
  FIELD LF_RCONDV->CODRIGA
  FLAG "U"
  KEY 1
@ -166,10 +237,17 @@ BEGIN
  DISPLAY "Ragg. fisc." CODTAB
  DISPLAY "Descrizione@50" S0
  OUTPUT F_R_CODRIGA_R CODTAB
+  OUTPUT F_R_DESRIGA_R S0
  CHECKTYPE REQUIRED
  MESSAGE COPY,F_R_CODRIGA_A
 END

+STRING F_R_DESRIGA_R 50
+BEGIN
+  PROMPT 23 5 ""
+  FLAG "D"
+END
+
 STRING F_R_NSCAGL 1
 BEGIN
  PROMPT 2 7 "N.ro scaglione "
@ -376,3 +454,4 @@ END
 ENDPAGE

 ENDMASK
+