diff --git a/lv/lv0300.cpp b/lv/lv0300.cpp index 0e7643fc1..a389b563f 100755 --- a/lv/lv0300.cpp +++ b/lv/lv0300.cpp @@ -26,4 +26,4 @@ int lv0300(int argc, char* argv[]) TConf_Lavanderie appc; appc.run(argc, argv, TR("Parametri gestione Lavanderie industriali")); return 0; -} +} \ No newline at end of file diff --git a/lv/lv0400.h b/lv/lv0400.h index da26da46f..37f73a3d8 100755 --- a/lv/lv0400.h +++ b/lv/lv0400.h @@ -1,9 +1,11 @@ +//Definizione campi per maschera lv0400a - Inserimento e gestione contratti +//Testata contratto #define F_CODCF 201 #define F_RAGSOC 202 #define F_CODCONT 203 #define F_DATAIN 204 #define F_DATASC 205 -#define F_RIGHE 206 +#define F_RIGHE 206 //sheet righe contratto #define F_GRMERC 207 #define F_COLORE 208 #define F_LIVELLO 209 @@ -55,6 +57,7 @@ #define F_INDSPED 255 #define F_INDIR 256 #define F_DOCCP 257 +//Sheet #define S_CODART 101 #define S_DESCR 102 #define S_UM 103 diff --git a/lv/lv0400a.uml b/lv/lv0400a.uml index 480d5ca0b..4a64af489 100755 --- a/lv/lv0400a.uml +++ b/lv/lv0400a.uml @@ -506,12 +506,12 @@ PAGE "" -1 -1 80 20 GROUPBOX DLG_NULL 78 3 BEGIN - PROMPT 1 1 "@bArt" + PROMPT 1 0 "@bArticolo" END STRING S_CODART 20 BEGIN - PROMPT 1 2 "" + PROMPT 2 1 "" FLAGS "U" USE LF_ANAMAG INPUT CODART S_CODART @@ -527,7 +527,7 @@ END STRING S_DESCR 50 BEGIN - PROMPT 26 2 "" + PROMPT 25 1 "" USE LF_ANAMAG KEY 2 INPUT DESCR S_DESCR DISPLAY "Descrizone@50" DESCR @@ -538,44 +538,44 @@ END CURRENCY S_PREZZOST 15 BEGIN - PROMPT 1 4 "Prezzo in vigore " + PROMPT 1 3 "Prezzo in vigore " FIELD PREZZO END CURRENCY S_PREZZORN 15 BEGIN - PROMPT 43 4 "Prezzo di rinnovo " + PROMPT 43 3 "Prezzo di rinnovo " FIELD PREZRIN END CURRENCY S_IMPFISART 15 BEGIN - PROMPT 1 5 "Importo fisso " + PROMPT 1 4 "Importo fisso " FIELD IMPFISART END NUMBER S_SCONTO 6 2 BEGIN - PROMPT 43 5 "Sconto % " + PROMPT 43 4 "Sconto % " FIELD SCONTPERC END NUMBER S_CONG 9 BEGIN - PROMPT 1 6 "Conguaglio " + PROMPT 1 5 "Conguaglio " FIELD QTACONG END CURRENCY S_VALCONV 15 BEGIN - PROMPT 43 6 "Val. convenzionale" + PROMPT 43 5 "Val. convenzionale" FLAGS "U" FIELD VALCONV END STRING S_UM 2 BEGIN - PROMPT 1 7 "Unità di misura " + PROMPT 1 6 "Unità di misura " USE LF_UMART KEY 2 JOIN UMS INTO CODTAB=UM INPUT CODART S_CODART SELECT @@ -589,7 +589,7 @@ END STRING S_CAUSMAG 4 BEGIN - PROMPT 43 7 "Causale di default" + PROMPT 43 6 "Causale di default" USE CAU INPUT CODTAB S_CAUSMAG DISPLAY "Codice" CODTAB @@ -601,51 +601,51 @@ END CURRENCY S_PREZDAN 15 BEGIN - PROMPT 1 8 "Prezzo danneggiati " + PROMPT 1 7 "Prezzo danneggiati " FLAGS "U" FIELD PREZDAN END CURRENCY S_PRZDTTMP 15 BEGIN - PROMPT 43 8 "Prezzo dot. temp. " + PROMPT 43 7 "Prezzo dot. temp. " FLAGS "U" FIELD PRZDTTMP END NUMBER S_DOTIN 9 BEGIN - PROMPT 1 9 "Dot. iniziale " + PROMPT 1 8 "Dot. iniziale " FIELD DOTIN END NUMBER S_DOTTMP 9 BEGIN - PROMPT 43 9 "Dot. temporanea " + PROMPT 43 8 "Dot. temporanea " FIELD DOTTMP END DATE S_INDTTMP BEGIN - PROMPT 1 10 "Inizio dot. temporanea " + PROMPT 1 9 "Inizio dot. temporanea " FIELD INDTTMP END DATE S_FIDTTMP BEGIN - PROMPT 43 10 "Fine dot. temp " + PROMPT 43 9 "Fine dot. temp " FIELD FIDTTMP END NUMBER S_FORFPERCL 6 2 BEGIN - PROMPT 1 11 "% Forfait cliente " + PROMPT 1 10 "% Forfait cliente " FIELD FORFPERCL END LISTBOX S_TIPOFORF 1 34 BEGIN - PROMPT 1 12 "Tipo Forfait " + PROMPT 1 11 "Tipo Forfait " ITEM "0|Nessuno" ITEM "1|A valore fisso" ITEM "2|Nolo in base a dot. iniziale" @@ -660,7 +660,7 @@ END LISTBOX S_ARTBLOC 1 34 BEGIN - PROMPT 1 13 "Articolo bloccato " + PROMPT 1 12 "Articolo bloccato " ITEM "0|Nessuna" ITEM "1|Articolo in sostituzione" ITEM "2|Cliente in chiusura" @@ -670,7 +670,7 @@ END LISTBOX S_CALCCONS 1 34 BEGIN - PROMPT 1 14 "Calcolo del consegnato " + PROMPT 1 13 "Calcolo del consegnato " ITEM "0|Conguaglio alla confezione" ITEM "1|Uguale al ritirato" FIELD CALCCONS @@ -678,42 +678,48 @@ END LISTBOX S_TIPONOL 1 34 BEGIN - PROMPT 1 15 "Tipo Noleggio " + PROMPT 1 14 "Tipo Noleggio " FIELD TIPONOL FLAGS "D" END BOOLEAN S_RITAUDTTMP BEGIN - PROMPT 1 16 "Ritiro automatico dotazione temporanea" + PROMPT 1 15 "Ritiro automatico dotazione temporanea" FIELD RITAUDTTMP END BOOLEAN S_FATTKG BEGIN - PROMPT 1 17 "Fatturazione a Kg." + PROMPT 1 16 "Fatturazione a Kg." FIELD FATTKG END BOOLEAN S_ARROT BEGIN - PROMPT 1 18 "Arrotondamento" + PROMPT 1 17 "Arrotondamento" FIELD ARROT END -BUTTON DLG_OK 10 2 +ENDPAGE + +TOOLBAR "" 0 0 0 2 + +BUTTON DLG_OK 2 2 BEGIN - PROMPT -13 -1 "" + PROMPT 1 1 "" END -BUTTON DLG_DELREC 10 2 +BUTTON DLG_DELREC 2 2 BEGIN - PROMPT -23 -1 "" + PROMPT 2 1 "Elimina" + MESSAGE EXIT,K_DEL + PICTURE BMP_DELREC END -BUTTON DLG_CANCEL 10 2 +BUTTON DLG_CANCEL 2 2 BEGIN - PROMPT -33 -1 "" + PROMPT 4 1 "" END ENDPAGE diff --git a/lv/lvcondv.h b/lv/lvcondv.h index f5bdc3d0a..a2cb648ba 100755 --- a/lv/lvcondv.h +++ b/lv/lvcondv.h @@ -6,6 +6,7 @@ #define LVCONDV_CODCF "CODCF" #define LVCONDV_DATAIN "DATAIN" #define LVCONDV_DATASC "DATASC" +#define LVCONDV_CODINDSP "CODINDSP" #define LVCONDV_DTSTAGIN "DTSTAGIN" #define LVCONDV_DTSTAGSC "DTSTAGSC" #define LVCONDV_FATTSOSP "FATTSOSP" @@ -13,9 +14,9 @@ #define LVCONDV_TIPOLIS "TIPOLIS" #define LVCONDV_STPRZBOL "STPRZBOL" #define LVCONDV_CONTSPOR "CONTSPOR" -#define LVCONDV_TIPODOC "TIPODOC" +#define LVCONDV_DOCCP "DOCCP" #define LVCONDV_PERFATT "PERFATT" -#define LVCONDV_INPRPER "INPRPER" +#define LVCONDV_INPERFAT "INPERFAT" #define LVCONDV_FATTPARZ "FATTPARZ" #define LVCONDV_DOTTMPPRZD "DOTTMPPRZD" #define LVCONDV_FORFNOCONS "FORFNOCONS" diff --git a/lv/lvtbtsp.uml b/lv/lvtbtsp.uml index 445daff9f..246b227fe 100755 --- a/lv/lvtbtsp.uml +++ b/lv/lvtbtsp.uml @@ -53,6 +53,7 @@ END LIST F_MODPASS 10 BEGIN PROMPT 25 5 "Modalità di passaggio " + ITEM "|" ITEM "E|Entrambi" ITEM "C|Consegna" ITEM "R|Ritiro"