diff --git a/lv/lv0300a.h b/lv/lv0300a.h index da3d8e4cd..2030c0ef7 100755 --- a/lv/lv0300a.h +++ b/lv/lv0300a.h @@ -40,52 +40,50 @@ #define F_CAUSLAV 225 #define F_CAUSLAVDESC 226 -#define F_CAUSLAVSC 227 -#define F_CAUSLAVSCDESC 228 -#define F_CAULVRITDT 229 -#define F_CAULVRITDTDE 230 -#define F_CAUCARMAG 231 -#define F_CAUCARMAGDE 232 -#define F_CAUSCARMAG 233 -#define F_CAUSCARMAGDE 234 +#define F_CAULVRITDT 227 +#define F_CAULVRITDTDE 228 +#define F_CAUCARMAG 229 +#define F_CAUCARMAGDE 230 +#define F_CAUSCARMAG 231 +#define F_CAUSCARMAGDE 232 -#define F_CODMAG 235 -#define F_DESMAG 236 -#define F_CODMAGN 237 -#define F_DESMAGN 238 -#define F_CODMAGC 239 -#define F_DESMAGC 240 -#define F_CODMAGP 241 -#define F_DESMAGP 242 -#define F_CODMAGCL 243 -#define F_DESMAGCL 244 +#define F_CODMAG 233 +#define F_DESMAG 234 +#define F_CODMAGN 235 +#define F_DESMAGN 236 +#define F_CODMAGC 237 +#define F_DESMAGC 238 +#define F_CODMAGP 239 +#define F_DESMAGP 240 +#define F_CODMAGCL 241 +#define F_DESMAGCL 242 -#define F_UNICONT 245 -#define F_QTAMODI 246 -#define F_AUTGIRI 247 -#define F_ORDGIRI 248 -#define F_DATAFISSA 249 -#define F_AGGCONG 250 -#define F_PERARR 251 -#define F_RIFOR 252 -#define F_ARTCANFIS 253 -#define F_GESTSACA 254 -#define F_ALMANAC 255 -#define F_USEINDSP 256 -#define F_CODARTFIX 257 -#define F_DESARTFIX 258 -#define F_CODARTCAFIX 259 -#define F_DESARTCAFIX 260 -#define F_TIPOPR 261 -#define F_UMPESO 262 -#define F_DATABCON 263 +#define F_UNICONT 243 +#define F_QTAMODI 244 +#define F_AUTGIRI 245 +#define F_ORDGIRI 246 +#define F_DATAFISSA 247 +#define F_AGGCONG 248 +#define F_PERARR 249 +#define F_RIFOR 250 +#define F_ARTCANFIS 251 +#define F_GESTSACA 252 +#define F_ALMANAC 253 +#define F_USEINDSP 254 +#define F_CODARTFIX 255 +#define F_DESARTFIX 256 +#define F_CODARTCAFIX 257 +#define F_DESARTCAFIX 258 +#define F_TIPOPR 259 +#define F_UMPESO 260 +#define F_DATABCON 261 -#define F_PATH_CON 264 -#define F_SHEET_NAME 265 -#define F_PATH_MAN 266 -#define F_PATH_LAVA 267 -#define F_PATH_PUL 268 -#define F_FILE_PUL 269 +#define F_PATH_CON 262 +#define F_SHEET_NAME 263 +#define F_PATH_MAN 264 +#define F_PATH_LAVA 265 +#define F_PATH_PUL 266 +#define F_FILE_PUL 267 #define F_BACKUP 300 diff --git a/lv/lv0300a.uml b/lv/lv0300a.uml index 8ff388b4f..ed7bd1f87 100755 --- a/lv/lv0300a.uml +++ b/lv/lv0300a.uml @@ -356,33 +356,9 @@ BEGIN CHECKTYPE REQUIRED END -STRING F_CAUSLAVSC 3 -BEGIN - PROMPT 2 20 "Cau. Rit/Con s.c." - USE &CAU - INPUT CODTAB F_CAUSLAVSC - DISPLAY "Codice" CODTAB - DISPLAY "Descrizione@50" S0 - OUTPUT F_CAUSLAVSC CODTAB - OUTPUT F_CAUSLAVSCDESC S0 - FIELD CAUSLAVSC - CHECKTYPE REQUIRED -END - -STRING F_CAUSLAVSCDESC 48 -BEGIN - PROMPT 26 20 "" - USE &CAU KEY 2 - INPUT S0 F_CAUSLAVSCDESC - DISPLAY "Descrizione@50" S0 - DISPLAY "Codice" CODTAB - COPY OUTPUT F_CAUSLAVSC - CHECKTYPE REQUIRED -END - STRING F_CAULVRITDT 3 BEGIN - PROMPT 2 21 "Cau. Rit. dt. tmp" + PROMPT 2 20 "Cau. Rit. dt. tmp" USE &CAU INPUT CODTAB F_CAULVRITDT DISPLAY "Codice" CODTAB @@ -395,7 +371,7 @@ END STRING F_CAULVRITDTDE 48 BEGIN - PROMPT 26 21 "" + PROMPT 26 20 "" USE &CAU KEY 2 INPUT S0 F_CAUSLAVDESC DISPLAY "Descrizione@50" S0 @@ -406,7 +382,7 @@ END STRING F_CAUCARMAG 5 BEGIN - PROMPT 2 22 "Cau. Car. Mag. " + PROMPT 2 21 "Cau. Car. Mag. " USE %CAU KEY 1 INPUT CODTAB F_CAUCARMAG DISPLAY "Codice" CODTAB @@ -419,7 +395,7 @@ END STRING F_CAUCARMAGDE 50 46 BEGIN - PROMPT 28 22 "" + PROMPT 28 21 "" USE %CAU KEY 2 INPUT S0 F_CAUCARMAGDE DISPLAY "Descrizione@50" S0 @@ -430,7 +406,7 @@ END STRING F_CAUSCARMAG 5 BEGIN - PROMPT 2 23 "Cau. Scar. Mag. " + PROMPT 2 22 "Cau. Scar. Mag. " USE %CAU KEY 1 INPUT CODTAB F_CAUSCARMAG DISPLAY "Codice" CODTAB @@ -443,7 +419,7 @@ END STRING F_CAUSCARMAGDE 50 46 BEGIN - PROMPT 28 23 "" + PROMPT 28 22 "" USE %CAU KEY 2 INPUT S0 F_CAUSCARMAGDE DISPLAY "Descrizione@50" S0 diff --git a/lv/lvlib.h b/lv/lvlib.h index f4178c707..f0a360ac6 100755 --- a/lv/lvlib.h +++ b/lv/lvlib.h @@ -169,6 +169,7 @@ public: //metodi che restituiscono i dati di interesse sulla causale di lavanderia const TString& codice() const {return get("CODTAB");} const TString& descr() const {return get("S0");} + const TString& caucol() const {return get("S4");} const bool is_ritiro() const {return get_bool("B0");} const bool is_consegna() const {return get_bool("B1");} const bool is_reso() const {return get_bool("B2");} diff --git a/lv/lvtbcau.h b/lv/lvtbcau.h index 880ef9478..c724af1ce 100755 --- a/lv/lvtbcau.h +++ b/lv/lvtbcau.h @@ -2,25 +2,26 @@ #define F_COD_CAUSALE 101 #define F_DES_CAUSALE 102 #define F_DES_BREVE 103 -#define F_RITIRATO 104 -#define F_CAUSALE_RITIRO 105 -#define F_DES_CAUSALE_RITIRO 106 -#define F_SGNDOTIN_R 107 -#define F_SGNDOTOD_R 108 -#define F_SGNDOTTM_R 109 -#define F_SGNCONYR_R 110 -#define F_SGNCONMN_R 111 -#define F_CONSEGNATO 112 -#define F_CAUSALE_CONSEGNA 113 -#define F_DES_CAUSALE_CONSEGNA 114 -#define F_SGNDOTIN_C 115 -#define F_SGNDOTOD_C 116 -#define F_SGNDOTTM_C 117 -#define F_SGNCONYR_C 118 -#define F_SGNCONMN_C 119 -#define F_CAUSALE_RESO 120 -#define F_CAUSALE_ROTTO 121 -#define F_MOV_CONGUAGLIO 122 +#define F_COD_CAUSCOLL 104 +#define F_RITIRATO 105 +#define F_CAUSALE_RITIRO 106 +#define F_DES_CAUSALE_RITIRO 107 +#define F_SGNDOTIN_R 108 +#define F_SGNDOTOD_R 109 +#define F_SGNDOTTM_R 110 +#define F_SGNCONYR_R 111 +#define F_SGNCONMN_R 112 +#define F_CONSEGNATO 113 +#define F_CAUSALE_CONSEGNA 114 +#define F_DES_CAUSALE_CONSEGNA 115 +#define F_SGNDOTIN_C 116 +#define F_SGNDOTOD_C 117 +#define F_SGNDOTTM_C 118 +#define F_SGNCONYR_C 119 +#define F_SGNCONMN_C 120 +#define F_CAUSALE_RESO 121 +#define F_CAUSALE_ROTTO 122 +#define F_MOV_CONGUAGLIO 123 //#define F_STAMPA_BOLLA 117 //#define F_CALC_IMPORTO 118 //#define F_CONTR_DOTAZIONE 119 \ No newline at end of file diff --git a/lv/lvtbcau.uml b/lv/lvtbcau.uml index 353f7ace6..8585702d9 100755 --- a/lv/lvtbcau.uml +++ b/lv/lvtbcau.uml @@ -21,6 +21,7 @@ BEGIN DISPLAY "Codice@8" CODTAB DISPLAY "Descrizione@50" S0 DISPLAY "Descr. breve@10" S3 + DISPLAY "Caus. alt.@10" S4 DISPLAY "Ritiro@C" B0 DISPLAY "Consegna@C" B1 DISPLAY "Reso@C" B2 @@ -28,7 +29,8 @@ BEGIN OUTPUT F_DES_CAUSALE S0 OUTPUT F_DES_BREVE S3 OUTPUT F_CAUSALE_RITIRO S1 - OUTPUT F_CAUSALE_CONSEGNA S2 + OUTPUT F_CAUSALE_CONSEGNA S2 + OUTPUT F_COD_CAUSCOLL S4 FIELD CODTAB KEY 1 CHECKTYPE REQUIRED @@ -41,8 +43,9 @@ BEGIN USE &CAU KEY 2 INPUT S0 F_DES_CAUSALE DISPLAY "Descrizione@50" S0 - DISPLAY "Descr. breve@10" S3 + DISPLAY "Descr. breve@10" S3 DISPLAY "Codice@8" CODTAB + DISPLAY "Caus. alt.@10" S4 DISPLAY "Ritiro@C" B0 DISPLAY "Consegna@C" B1 DISPLAY "Reso@C" B2 @@ -61,6 +64,25 @@ BEGIN KEY 2 END +STRING F_COD_CAUSCOLL 3 +BEGIN + PROMPT 35 3 "Causale alternativa " + FLAGS "U" + HELP "Inserire la causale altrenativa." + USE &CAU + INPUT CODTAB F_COD_CAUSCOLL + DISPLAY "Codice@8" CODTAB + DISPLAY "Descrizione@50" S0 + DISPLAY "Descr. breve@10" S3 + DISPLAY "Caus. alt.@10" S4 + DISPLAY "Ritiro@C" B0 + DISPLAY "Consegna@C" B1 + DISPLAY "Reso@C" B2 + OUTPUT F_COD_CAUSCOLL CODTAB + CHECKTYPE NORMAL + FIELD S4 +END + GROUPBOX DLG_NULL 80 5 BEGIN PROMPT 1 5 "@b Ritiro" @@ -263,8 +285,7 @@ END BOOLEAN F_MOV_CONGUAGLIO BEGIN FIELD B4 - PROMPT 45 16 "Non movimentare conguaglio" - + PROMPT 45 16 "Non movimentare conguaglio" END ENDPAGE