From 499dcf1a71fdd27ed81697d99f660c9c17f6dd33 Mon Sep 17 00:00:00 2001 From: luca83 Date: Tue, 6 Oct 2009 16:45:40 +0000 Subject: [PATCH] Patch level : 10.0 patch 45? Files correlati : lv0300a.msk Ricompilazione Demo : [ ] Commento : Aggiunti i file da importare da contapezzi Corrette le segnalazioni mail di Paolo git-svn-id: svn://10.65.10.50/trunk@19385 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv0300a.h | 40 ++++++------ lv/lv0300a.uml | 166 ++++++++++++++++++++++++++++++++++--------------- 2 files changed, 139 insertions(+), 67 deletions(-) diff --git a/lv/lv0300a.h b/lv/lv0300a.h index a7d5e5ee7..d0f6283ea 100755 --- a/lv/lv0300a.h +++ b/lv/lv0300a.h @@ -48,25 +48,28 @@ #define F_CODMAGC 231 #define F_DESMAGC 232 -#define F_PATH_CON 233 -#define F_PATH_MAN 234 -#define F_PATH_LAVA 235 - -#define F_UNICONT 236 -#define F_QTAMODI 237 -#define F_AUTGIRI 238 -#define F_ORDGIRI 239 -#define F_DATAFISSA 240 -#define F_AGGCONG 241 -#define F_PERARR 242 -#define F_RIFOR 243 -#define F_ARTCANFIS 244 -#define F_GESTSACA 245 -#define F_ALMANAC 246 -#define F_USEINDSP 247 -#define F_CODARTFIX 248 +#define F_UNICONT 233 +#define F_QTAMODI 234 +#define F_AUTGIRI 235 +#define F_ORDGIRI 236 +#define F_DATAFISSA 237 +#define F_AGGCONG 238 +#define F_PERARR 239 +#define F_RIFOR 240 +#define F_ARTCANFIS 241 +#define F_GESTSACA 242 +#define F_ALMANAC 243 +#define F_USEINDSP 244 +#define F_CODARTFIX 245 +#define F_DESARTFIX 246 +#define F_CODARTCAFIX 247 +#define F_DESARTCAFIX 248 #define F_TIPOPR 249 -#define F_CODARTCAFIX 250 + +#define F_PATH_CON 250 +#define F_SHEET_NAME 251 +#define F_PATH_MAN 252 +#define F_PATH_LAVA 253 #define S_CODNUM_RIT 101 #define S_TIPODOC_RIT 102 @@ -98,4 +101,5 @@ #define S_STATO_DOT 104 #define S_DESNUM_DOT 105 +#define S_NAME 101 diff --git a/lv/lv0300a.uml b/lv/lv0300a.uml index ebfad5f89..dc5648b6d 100755 --- a/lv/lv0300a.uml +++ b/lv/lv0300a.uml @@ -519,70 +519,41 @@ END TEXT -1 BEGIN - PROMPT 0 5 "@bPercorsi file" -END - -STRING F_PATH_CON 256 50 -BEGIN - PROMPT 1 6 "Cartella contapezzi " - DSELECT - CHECKTYPE NORMAL - FIELD PathContapezzi -END - -STRING F_PATH_MAN 256 50 -BEGIN - PROMPT 1 7 "Cartella mangano " - DSELECT - CHECKTYPE NORMAL - FIELD PathMangano -END - -STRING F_PATH_LAVA 256 50 -BEGIN - PROMPT 1 8 "Cartella lavacontinua " - DSELECT - CHECKTYPE NORMAL - FIELD PathLavacontinua -END - -TEXT -1 -BEGIN - PROMPT 0 10 "@bOpzioni contratti" + PROMPT 0 5 "@bOpzioni contratti" END BOOLEAN F_UNICONT BEGIN - PROMPT 1 11 "Numera contr. per ditta" + PROMPT 1 6 "Numera contr. per ditta" FIELD UniCont END BOOLEAN F_QTAMODI BEGIN - PROMPT 28 11 "Dot. modificabili" + PROMPT 28 6 "Dot. modificabili" FIELD Qtamodi END BOOLEAN F_USEINDSP BEGIN - PROMPT 50 11 "Utilizza ind. sped. su contratto" + PROMPT 50 6 "Utilizza ind. sped. su contratto" FIELD Useindsp END TEXT -1 BEGIN - PROMPT 0 13 "@bOpzioni Giri" + PROMPT 0 8 "@bOpzioni Giri" END BOOLEAN F_AUTGIRI BEGIN - PROMPT 1 14 "Generazione automatica giri" + PROMPT 1 9 "Generazione automatica giri" FIELD Autgiri END LISTBOX F_ORDGIRI 1 22 BEGIN - PROMPT 35 14 "Ordina giri per " + PROMPT 35 9 "Ordina giri per " ITEM "0|Ordine di generazione" ITEM "1|Ordine di fermata" ITEM "2|Orario di passaggio" @@ -591,30 +562,30 @@ END TEXT -1 BEGIN - PROMPT 0 16 "@bOpzioni Documenti" + PROMPT 0 11 "@bOpzioni Documenti" END BOOLEAN F_DATAFISSA BEGIN - PROMPT 1 17 "Data documenti fissa" + PROMPT 1 12 "Data documenti fissa" FIELD Datafissa END BOOLEAN F_AGGCONG BEGIN - PROMPT 35 17 "Aggiorna conguaglio su modifiche manuali" + PROMPT 28 12 "Aggiorna conguaglio su modifiche manuali" FIELD Aggcong END NUMBER F_PERARR 3 BEGIN - PROMPT 1 18 "Percentuale per il calcolo dell'arrotondamento " + PROMPT 1 13 "Percentuale per il calcolo dell'arrotondamento " FIELD Perarr END STRING F_CODARTFIX 8 BEGIN - PROMPT 1 19 "Cod. art. per canone fisso " + PROMPT 1 14 "Art. per canone fisso " FIELD Codartfix KEY 1 FLAG "UG" @@ -623,19 +594,18 @@ BEGIN DISPLAY "Codice@20" CODART DISPLAY "Descrizione@50" DESCR OUTPUT F_CODARTFIX CODART + OUTPUT F_DESARTFIX DECSR END -LISTBOX F_TIPOPR 1 19 +STRING F_DESARTFIX 50 28 BEGIN - PROMPT 43 19 "Tipo prezzo" - ITEM "0|Prezzo da contratto" - ITEM "1|Prezzo da bolla" - FIELD Tipopr + PROMPT 40 14 "" + FLAGS "D" END STRING F_CODARTCAFIX 8 BEGIN - PROMPT 1 20 "Cod. art. per raggruppamento " + PROMPT 1 15 "Art. per raggruppamento " FIELD Codartcafix KEY 1 FLAG "UG" @@ -644,22 +614,74 @@ BEGIN DISPLAY "Codice@20" CODART DISPLAY "Descrizione@50" DESCR OUTPUT F_CODARTCAFIX CODART + OUTPUT F_DESARTCAFIX DESCR END +STRING F_DESARTCAFIX 50 28 +BEGIN + PROMPT 40 15 "" + FLAGS "D" +END + +LISTBOX F_TIPOPR 1 19 +BEGIN + PROMPT 1 16 "Tipo prezzo" + ITEM "0|Prezzo da contratto" + ITEM "1|Prezzo da bolla" + FIELD Tipopr +END TEXT -1 BEGIN - PROMPT 0 22 "@bOpzioni articoli" + PROMPT 0 18 "@bOpzioni articoli" END BOOLEAN F_GESTSACA BEGIN - PROMPT 1 23 "Gestione sacchi/carrello" + PROMPT 1 19 "Gestione sacchi/carrello" FIELD Gestsaca END ENDPAGE +PAGE "File da elaborare" 0 0 0 0 + +TEXT -1 +BEGIN + PROMPT 0 0 "@bPercorsi file" +END + +STRING F_PATH_CON 256 50 +BEGIN + PROMPT 1 1 "Cartella contapezzi " + DSELECT + CHECKTYPE NORMAL + FIELD PathContapezzi +END + +SPREADSHEET F_SHEET_NAME 78 10 +BEGIN + PROMPT 1 2 "Nomi" + ITEM "Nome file" +END + +STRING F_PATH_MAN 256 50 +BEGIN + PROMPT 1 14 "Cartella mangano " + DSELECT + CHECKTYPE NORMAL + FIELD PathMangano +END + +STRING F_PATH_LAVA 256 50 +BEGIN + PROMPT 1 15 "Cartella lavacontinua " + DSELECT + CHECKTYPE NORMAL + FIELD PathLavacontinua +END + +ENDPAGE PAGE "Calendario" 0 2 0 0 @@ -1151,3 +1173,49 @@ END ENDPAGE ENDMASK + +PAGE "Nomi file" -1 -1 80 3 + +GROUPBOX DLG_NULL 78 3 +BEGIN + PROMPT 1 1 "@bNome file" +END + +STRING S_NAME 255 66 +BEGIN + PROMPT 3 2 "File " + FSELECT "*.dat" + CHECKTYPE NORMAL + FIELD FileName +END + +ENDPAGE + +TOOLBAR "" 0 0 0 2 + +BUTTON DLG_OK 2 2 +BEGIN + PROMPT 1 1 "" +END + +BUTTON DLG_DELREC 2 2 +BEGIN + PROMPT 2 1 "" + PICTURE TOOL_DELREC +END + +BUTTON DLG_USER 2 2 +BEGIN + PROMPT 3 1 "Cerca" + MESSAGE K_F9, S_NAME + PICTURE TOOL_FINDREC +END + +BUTTON DLG_CANCEL 2 2 +BEGIN + PROMPT 4 1 "" +END + +ENDPAGE + +ENDMASK \ No newline at end of file