From ef6ca0352beb8bd47b6e131bb9ecbc58782e4b1a Mon Sep 17 00:00:00 2001 From: rajitgill Date: Fri, 23 Jan 2009 17:03:44 +0000 Subject: [PATCH] Patch level :10.0 Files correlati :lv0400.msk,lv0.exe Ricompilazione Demo : [ ] Commento : Modifiche concordate con Tassan il 22-01-2009 git-svn-id: svn://10.65.10.50/trunk@18098 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/f169.dir | 2 +- lv/f169.trr | 11 +- lv/lv0400.cpp | 131 +++++++++++++------ lv/lv0400.h | 65 +++++----- lv/lv0400a.uml | 343 ++++++++++++++++++++++++++----------------------- 5 files changed, 310 insertions(+), 242 deletions(-) diff --git a/lv/f169.dir b/lv/f169.dir index 1d739811a..2fdaee9e8 100755 --- a/lv/f169.dir +++ b/lv/f169.dir @@ -1,3 +1,3 @@ 169 0 -$lvrcondv|0|0|250|0|Righe del contratto||| +$lvrcondv|0|0|220|0|Righe del contratto||| diff --git a/lv/f169.trr b/lv/f169.trr index 8c52a7f23..80d113b0c 100755 --- a/lv/f169.trr +++ b/lv/f169.trr @@ -1,5 +1,5 @@ 169 -30 +27 CODCF|3|6|0|Codice cliente CODCONT|3|6|0|Codice contratto CODART|1|20|0|Codice articolo @@ -7,12 +7,10 @@ PREZZO|4|18|3|Prezzo in vigore PREZRIN|4|18|3|Prezzo di rinnovo QTACONG|4|15|5|Quantità conguaglio SCONTPERC|4|6|2|Percentuale di sconto -DOTIN|4|15|5|Dotazione iniziale -DOTTMP|4|15|5|Dotazione temporanea +INDTTMP|5|8|0|Inizio Dotazione temporanea +FIDTTMP|5|8|0|Fine Dotazione temporanea PRZDTTMP|4|18|3|Prezzo Dotazione temporanea -INDTTMP|5|8|0|Inizio Dotazione temporanea -FIDTTMP|5|8|0|Fine Dotazione temporanea -UM|1|2|0|Unità di misura +UM|1|3|0|Unità di misura PREZDAN|4|18|3|Prezzo danneggiati TIPOFORF|2|1|0|Tipo forfait RITAUDTTMP|8|1|0|Ritiro automatico dotazione temporanea @@ -24,7 +22,6 @@ IMPFISART|4|18|3|Importo fisso per articolo FATTKG|8|1|0|Fatturazione in Kg ARTBLOC|2|1|0|Articolo bloccato CALCCONS|2|1|0|Calcolo consegnato -TIPONOL|2|1|0|Tipo noleggio MINCIC|4|4|2|Minimo ciclaggio PREZNOL|4|18|3|Prezzo nolo FLGQTA|8|1|0|Flag quantita per tipo forfait=valore fisso diff --git a/lv/lv0400.cpp b/lv/lv0400.cpp index 968cf3e99..3d261d3c7 100755 --- a/lv/lv0400.cpp +++ b/lv/lv0400.cpp @@ -1,20 +1,58 @@ #include +#include #include #include #include #include "lv0400.h" #include "lvlib.h" + #include "../cg/cglib01.h" #include "../mg/anamag.h" #include "../mg/mglib.h" +long lv_new_contract(long cliente, int indsped) +{ + TConfig ini(CONFIG_DITTA, "lv"); + const bool unicont=ini.get_bool("UniCont"); + + long codcont=0; + if (unicont) + { + TISAM_recordset recset ("USE LVCONDV"); + for (bool ok=recset.move_first(); ok; ok=recset.move_next()) + { + const long codice=recset.get("CODCONT").as_int(); + if (codice>codcont) + codcont=codice; + } + } + else + { + TString query; + query<<"USE LVCONDV \n" + <<"FROM CODCF=#CLIENTE\n" + <<"TO CODCF=#CLIENTE\n"; + TISAM_recordset recset (query); + recset.set_var("#CLIENTE",cliente); + if (recset.move_last()) + codcont=recset.get("CODCONT").as_int(); + + } + codcont++; + return codcont; +} + class TContratti_msk: public TAutomask { + long _post_contr; + protected: bool on_art_select(); virtual bool on_field_event(TOperable_field& o,TField_event e,long jolly); + virtual void on_idle(); + public: TContratti_msk(); }; @@ -70,17 +108,33 @@ bool TContratti_msk::on_art_select() return true; } +void TContratti_msk::on_idle() +{ + if (_post_contr > 0) + { + set(F_CODCONT, _post_contr); + _post_contr = 0; + efield(F_CODCONT).set_focus(); + } + TAutomask::on_idle(); +} -bool TContratti_msk:: on_field_event(TOperable_field& o,TField_event e,long jolly) +bool TContratti_msk::on_field_event(TOperable_field& o,TField_event e,long jolly) { switch(o.dlg()) { case F_CODCF: - if (e == fe_close) - { - if (query_mode() && o.get().blank()) - return error_box("Codice Cliente Obbligatorio"); + if (query_mode()) + { + if (e == fe_modify && !o.empty() && efield(F_CODCONT).empty()) + { + const long codcf = atol(o.get()); + const int indsped = get_int(F_INDSPED); + const TDate oggi(TODAY); + _post_contr = lv_find_contract(codcf, indsped, oggi); + } } + break; case DLG_PLANNING: if (e==fe_button && edit_mode()) { @@ -130,6 +184,27 @@ bool TContratti_msk:: on_field_event(TOperable_field& o,TField_event e,long joll } } break; + case DLG_NEWREC: + if (e == fe_button) + { + if (edit_mode()) + { + send_key(K_ESC, 0); + return false; + } + if (query_mode()) + { + const long codcf = get_long(F_CODCF); + if (codcf > 0) + { + const int indsped = get_int(F_INDSPED); + const long codcont = lv_new_contract(codcf, indsped); + if (codcont > 0) + set(F_CODCONT, codcont); + } + } + } + break; default: if (e==fe_modify && o.dlg()>500 && o.dlg() != F_CAUSLAVDESCRIG) { @@ -147,7 +222,7 @@ bool TContratti_msk:: on_field_event(TOperable_field& o,TField_event e,long joll return true; } -TContratti_msk::TContratti_msk():TAutomask("lv0400a") +TContratti_msk::TContratti_msk():TAutomask("lv0400a"), _post_contr(0) { } @@ -155,7 +230,6 @@ class TContratti_app: public TRelation_application { TContratti_msk* _msk; TRelation* _rel; - bool _unicont; private: void save_rows(const TMask& m); @@ -207,8 +281,6 @@ bool TContratti_app:: user_destroy() void TContratti_app:: on_config_change() { - TConfig ini(CONFIG_DITTA); - _unicont=ini.get_bool("UniCont"); } bool TContratti_app:: get_next_key(TToken_string& key) @@ -219,30 +291,7 @@ bool TContratti_app:: get_next_key(TToken_string& key) key.add(cliente); key.add(F_CODCONT); - long codcont=0; - if (_unicont) - { - TISAM_recordset recset ("USE LVCONDV"); - for (bool ok=recset.move_first(); ok; ok=recset.move_next()) - { - const long codice=recset.get("CODCONT").as_int(); - if (codice>codcont) - codcont=codice; - } - } - else - { - TString query; - query<<"USE LVCONDV \n" - <<"FROM CODCF=#CLIENTE\n" - <<"TO CODCF=#CLIENTE\n"; - TISAM_recordset recset (query); - recset.set_var("#CLIENTE",cliente); - if (recset.move_last()) - codcont=recset.get("CODCONT").as_int(); - - } - codcont++; + long codcont= lv_new_contract(cliente, _msk->get_int(F_INDSPED)); key.add(codcont); return true; @@ -338,17 +387,19 @@ void TContratti_app::save_rows(const TMask& m) void TContratti_app::init_query_mode(TMask& m) { - if (m.field(F_CODCF).enabled()) - m.field(F_RAGSOC).enable(); - else - m.field(F_RAGSOC).disable(); + m.field(F_RAGSOC).enable(m.field(F_CODCF).enabled()); + } void TContratti_app::init_insert_mode(TMask& m) { - TSheet_field& ss=m.sfield(F_RIGHE); -// ss.insert(); - + const long codcf = m.get_long(F_CODCF); + const long indsp = m.get_int(F_INDSPED); + const TDate oggi(TODAY); + const long old_contr = lv_find_contract(codcf, indsp, oggi); + const long cur_contr = m.get_long(F_CODCONT); + if (old_contr > 0 && old_contr < cur_contr) + m.set(F_PROPOSTA, "X"); } int TContratti_app::write(const TMask& m) diff --git a/lv/lv0400.h b/lv/lv0400.h index e1bc8d6e4..1f11ed53a 100755 --- a/lv/lv0400.h +++ b/lv/lv0400.h @@ -38,35 +38,33 @@ #define F_RITAUDTTMP 236 #define DLG_PLANNING 237 #define F_INDSPED 238 -#define F_INDIR 239 -#define F_PROPOSTA 240 -#define F_PREC 241 -#define F_PPCOLLO 242 -#define F_TIPOLOGIA 243 -#define F_COLORE 244 -#define F_BARCODE 245 -#define F_CARRELLO 246 +#define F_PROPOSTA 239 +#define F_PPCONF 240 +#define F_TIPOLOGIA 241 +#define F_COLORE 242 +#define F_BARCODE 243 + // Campi del dettalio sotto lo spreadsheet -#define F_CAUSLAVDESCRIG 513 -#define F_PRZDTTMP 514 -#define F_INDTTEMP 515 -#define F_FIDTTEMP 516 -#define F_IMPFISART 517 -#define F_PREZDAN 518 -#define F_VALCONV 519 -#define F_ARTBLOC 520 -#define F_CALCCONS 521 -#define F_TIPOFORF 522 -#define F_NOLCIC 523 -#define F_VCARTCLI 524 -#define F_MINCIC 525 -#define F_FORFPERCL 526 -#define F_CAUSLAVRIG 527 -#define F_RITAUDTTMPRIG 528 -#define F_FATTKG 529 -#define F_ARROT 530 +#define F_CAUSLAVDESCRIG 512 +#define F_PRZDTTMP 513 +#define F_INDTTEMP 514 +#define F_FIDTTEMP 515 +#define F_IMPFISART 516 +#define F_PREZDAN 517 +#define F_VALCONV 518 +#define F_ARTBLOC 519 +#define F_CALCCONS 520 +#define F_TIPOFORF 521 +#define F_NOLCIC 522 +#define F_VCARTCLI 523 +#define F_MINCIC 524 +#define F_FORFPERCL 525 +#define F_CAUSLAVRIG 526 +#define F_RITAUDTTMPRIG 527 +#define F_FATTKG 528 +#define F_ARROT 529 #define S_CODART 101 #define S_DESCR 102 @@ -94,10 +92,9 @@ #define S_MINCIC 124 #define S_FORFPERCL 125 #define S_CAUSLAV 126 -#define S_TIPONOL 127 -#define S_RITAUDTTMP 128 -#define S_FATTKG 129 -#define S_ARROT 130 +#define S_RITAUDTTMP 127 +#define S_FATTKG 128 +#define S_ARROT 129 #define S_CODCF 301 #define S_RAGSOC 302 @@ -107,6 +104,14 @@ #define T_RAGSOC 402 #define T_CODCONT 403 #define S_PPCONF 404 +#define S_PREC 405 +#define S_QTAMAXXS 406 +#define S_QTAMAXM 407 +#define S_QTAMAXXL 408 +#define S_QTANORMXS 409 +#define S_QTANORMM 410 +#define S_QTANORMXL 411 + diff --git a/lv/lv0400a.uml b/lv/lv0400a.uml index ae2ad9865..3c1c6657a 100755 --- a/lv/lv0400a.uml +++ b/lv/lv0400a.uml @@ -21,14 +21,14 @@ ENDPAGE PAGE "Articoli" 0 2 0 0 -GROUPBOX DLG_NULL 80 5 -BEGIN - PROMPT 1 0 "@b Dati Dettaglio" -END +// GROUPBOX DLG_NULL 80 3 +// BEGIN +// PROMPT 1 0 "@b Dati Dettaglio" +// END NUMBER F_CODCF 6 BEGIN - PROMPT 2 1 "Cliente " + PROMPT 2 1 "Cliente " FIELD CODCF FLAGS "U" KEY 1 @@ -43,10 +43,10 @@ BEGIN ADD RUN cg0 -1 END -STRING F_RAGSOC 50 +STRING F_RAGSOC 50 30 BEGIN - PROMPT 25 1 "" - KEY 2 + PROMPT 19 1 "" + KEY 1 USE LF_CLIFO KEY 2 INPUT TIPOCF "C" INPUT RAGSOC F_RAGSOC @@ -59,7 +59,7 @@ END NUMBER F_CODCONT 6 BEGIN - PROMPT 2 2 "Contratto N. " + PROMPT 53 1 "N." USE LF_LVCONDV JOIN LF_CLIFO INTO TIPOCF="C" CODCF=CODCF INPUT CODCF F_CODCF SELECT @@ -78,25 +78,9 @@ BEGIN CHECKTYPE REQUIRED END -DATE F_DATAIN -BEGIN - PROMPT 25 2 "Inizio " - FIELD DATAIN - FLAGS "A" - CHECKTYPE REQUIRED -END - -DATE F_DATASC -BEGIN - PROMPT 45 2 "Scadenza " - FIELD DATASC - VALIDATE DATE_CMP_FUNC >= F_DATAIN - WARNING "Inserire una data finale maggiore della data di inizio" -END - NUMBER F_INDSPED 3 BEGIN - PROMPT 2 3 "Indirizzo sped. " + PROMPT 65 1 "Ind. sped." USE LF_INDSP KEY 1 INPUT TIPOCF "C" INPUT CODCF F_CODCF SELECT @@ -106,27 +90,20 @@ BEGIN DISPLAY "Indirizzo@30" INDIR DISPLAY "C.A.P." CAP OUTPUT F_INDSPED CODIND - OUTPUT F_INDIR INDIR FIELD CODINDSP CHECKTYPE NORMAL END -STRING F_INDIR 50 39 +SPREADSHEET F_RIGHE -1 10 BEGIN - PROMPT 25 3 "" - FLAGS "D" -END - -SPREADSHEET F_RIGHE -1 7 -BEGIN - PROMPT 0 5 "Righe contratto" + PROMPT 0 2 "Righe contratto" ITEM "Articolo@10F" ITEM "Descrizione@30" ITEM "UM@3" ITEM "Cong.@4" ITEM "Prezzo@8" ITEM "Prezzo\nRinnovo@8" - ITEM "Sconto %@4" + ITEM "Sconto %@5" ITEM "Dot.\nIniz.@5" ITEM "Dot.\nOd.@5" ITEM "Cons.\nmese@6" @@ -146,13 +123,12 @@ BEGIN ITEM "Minimo\nciclaggio@9" ITEM "%Forfait\nCliente@7" ITEM "Causale\ndefault@7" - ITEM "Tipo\nNoleggio@8" ITEM "Ritiro\naut.Dot.Temp.@12" ITEM "Fatturazione\na kg" ITEM "Arrotond." END -LISTBOX F_ARTBLOC 1 26 +LISTBOX F_ARTBLOC 1 25 BEGIN PROMPT 1 13 "Bloccato " ITEM "0|" @@ -163,15 +139,14 @@ END LISTBOX F_CALCCONS 1 28 BEGIN - PROMPT 45 13 "Calcolo " + PROMPT 39 13 "Consegnato" ITEM "0|Uguale al ritirato" ITEM "1|Conguaglio alla confezione" - END -LISTBOX F_TIPOFORF 1 25 +LISTBOX F_TIPOFORF 1 23 BEGIN - PROMPT 1 14 "Forfait " + PROMPT 1 14 "Forfait " ITEM "0|Nessuno" MESSAGE HIDE,1@|DISABLE, F_IMPFISART|DISABLE,3@|DISABLE,F_MINCIC ITEM "1|A valore fisso" @@ -188,7 +163,7 @@ END LISTBOX F_NOLCIC 1 20 BEGIN - PROMPT 45 14 "In base a " + PROMPT 40 14 "In base a " ITEM "I|Dot. iniziale" ITEM "O|Dot. odierna" GROUP 1 @@ -196,29 +171,39 @@ END LISTBOX F_VCARTCLI 1 20 BEGIN - PROMPT 45 14 "Per " + PROMPT 40 14 "Per " ITEM "N|Nessuno" ITEM "C|Cliente" ITEM "A|Articolo" GROUP 1 END -CURRENCY F_PREZDAN 15 +CURRENCY F_IMPFISART 15 BEGIN - PROMPT 1 15 "Danneggiati " - FLAGS "U" - + PROMPT 1 15 "Imp.fisso " END -NUMBER F_FORFPERCL 6 2 +CURRENCY F_VALCONV 15 BEGIN - PROMPT 32 15 "% Cliente " + PROMPT 30 15 "Val.Conven. " + FLAGS "U" GROUP 3 END +NUMBER F_MINCIC 4 2 +BEGIN + PROMPT 60 15 "Min.ciclaggio " +END + +CURRENCY F_PREZDAN 15 +BEGIN + PROMPT 1 16 "Danneggiati " + FLAGS "U" +END + STRING F_CAUSLAVRIG 3 BEGIN - PROMPT 55 15 "Causale di default" + PROMPT 30 16 "Causale di default " USE &CAU INPUT CODTAB F_CAUSLAVRIG DISPLAY "Codice" CODTAB @@ -227,95 +212,70 @@ BEGIN CHECKTYPE NORMAL END +NUMBER F_FORFPERCL 6 2 +BEGIN + PROMPT 60 16 "% Cliente " + GROUP 3 +END + CURRENCY F_PRZDTTMP 15 BEGIN - PROMPT 1 16 "Prezzo dot. tmp. " + PROMPT 1 17 "Prezzo dot.tmp." FLAGS "U" END DATE F_INDTTEMP BEGIN - PROMPT 40 16 "Inizio " + PROMPT 35 17 "Inizio " END DATE F_FIDTTEMP BEGIN - PROMPT 60 16 "Fine " + PROMPT 60 17 "Fine " END -CURRENCY F_IMPFISART 15 -BEGIN - PROMPT 1 17 "Imp.fisso " -END +NUMBER F_PPCONF 15 5 +BEGIN + PROMPT 1 18 "Pezzi per Pacco" + FLAGS "DG" + MESSAGE EMPTY CLEAR,F_ARROT|CLEAR,F_CALCCONS + MESSAGE ENABLE,F_ARROT|ENABLE,F_CALCCONS +END -CURRENCY F_VALCONV 15 +STRING F_BARCODE 20 BEGIN - PROMPT 30 17 "Val.Conven. " - FLAGS "U" - GROUP 3 -END - -NUMBER F_MINCIC 4 2 -BEGIN - PROMPT 60 17 "Min.ciclaggio " -END - -NUMBER F_PPCOLLO 15 5 -BEGIN - PROMPT 1 18 "Pz. per collo " + PROMPT 50 18 "Bar Code " FLAGS "D" -END - -NUMBER F_PREC 2 +END + +STRING F_TIPOLOGIA 20 BEGIN - PROMPT 40 18 "Precedenza " + PROMPT 1 19 "Tipologia " FLAGS "D" -END - -NUMBER F_CARRELLO 6 -BEGIN - PROMPT 60 18 "Carrello " - FLAGS "D" -END +END STRING F_COLORE 20 BEGIN - PROMPT 1 19 "Colore " + PROMPT 50 19 "Colore " FLAGS "D" END -STRING F_TIPOLOGIA 20 -BEGIN - PROMPT 30 19 "Tipologia " - FLAGS "D" -END - -// STRING F_BARCODE 20 -// BEGIN -// PROMPT 19 "Bar Code " -// FLAGS "D" -// END - BOOLEAN F_RITAUDTTMPRIG BEGIN - PROMPT 1 20 "Ritiro automatico dotazione" + PROMPT 1 20 "Ritiro automatico dot. temp. " END BOOLEAN F_FATTKG BEGIN - PROMPT 30 20 "Fatturazione a Kg." - + PROMPT 35 20 "Fatturazione a Kg." END BOOLEAN F_ARROT BEGIN - PROMPT 60 20 "Arrotondamento" + PROMPT 65 20 "Arrotondamento " FLAGS "G" - // MESSAGE FALSE CLEAR, S_CONG - // MESSAGE TRUE ENABLE, S_CONG END - ENDPAGE PAGE "Dati Testata" 0 2 0 0 @@ -417,12 +377,28 @@ END LISTBOX F_PROPOSTA 15 BEGIN - PROMPT 2 12 "Tipo " + PROMPT 2 12 "Tipo " FIELD PROPOSTA ITEM "|Contratto" MESSAGE REQUIRED,F_DATAIN ITEM "X|Proposta" MESSAGE NORMAL,F_DATAIN END +DATE F_DATAIN +BEGIN + PROMPT 30 12 "Inizio " + FIELD DATAIN + FLAGS "A" + CHECKTYPE REQUIRED +END + +DATE F_DATASC +BEGIN + PROMPT 50 12 "Scadenza " + FIELD DATASC + VALIDATE DATE_CMP_FUNC >= F_DATAIN + WARNING "Inserire una data finale maggiore della data di inizio" +END + STRING F_CAUSLAV 3 BEGIN PROMPT 2 13 "Causale di default" @@ -576,10 +552,10 @@ ENDPAGE PAGE "Riga Contratto" -1 -1 80 20 -GROUPBOX DLG_NULL 78 3 -BEGIN - PROMPT 1 0 "@b Contratto" -END +// GROUPBOX DLG_NULL 78 3 +// BEGIN +// PROMPT 1 0 "@b Contratto" +// END NUMBER S_CODCF 6 BEGIN @@ -597,19 +573,19 @@ END NUMBER S_CODCONT 6 BEGIN - PROMPT 55 1 "Contratto N. " + PROMPT 59 1 "Contratto N. " FLAGS "DG" NUM_CALC #-F_CODCONT END -GROUPBOX DLG_NULL 78 5 +GROUPBOX DLG_NULL 78 4 BEGIN - PROMPT 1 3 "@b Articolo" + PROMPT 1 2 "@b Articolo" END STRING S_CODART 20 BEGIN - PROMPT 2 4 "" + PROMPT 2 3 "" FLAGS "U" USE LF_ANAMAG INPUT CODART S_CODART @@ -626,7 +602,7 @@ END STRING S_UM 2 BEGIN - PROMPT 25 4 "U.M." + PROMPT 25 3 "U.M." USE LF_UMART KEY 2 JOIN UMS INTO CODTAB=UM INPUT CODART S_CODART SELECT @@ -640,7 +616,7 @@ END STRING S_DESCR 50 40 BEGIN - PROMPT 35 4 "" + PROMPT 35 3 "" USE LF_ANAMAG KEY 2 INPUT DESCR S_DESCR DISPLAY "Descrizone@50" DESCR @@ -649,9 +625,9 @@ BEGIN CHECKTYPE REQUIRED END -LISTBOX S_ARTBLOC 1 28 +LISTBOX S_ARTBLOC 1 25 BEGIN - PROMPT 2 5 "Bloccato " + PROMPT 2 4 "Bloccato " ITEM "0|" ITEM "1|Articolo in sostituzione" ITEM "2|Cliente in chiusura" @@ -659,24 +635,9 @@ BEGIN FIELD ARTBLOC END -LISTBOX S_TIPONOL 1 10 -BEGIN - PROMPT 51 5 "Tipo Noleggio " - FIELD TIPONOL - FLAGS "D" -END - -NUMBER S_PPCONF 9 -BEGIN - PROMPT 2 6 "Pezzi Pacco" - FLAGS "DG" - MESSAGE EMPTY CLEAR,S_ARROT - MESSAGE ENABLE,S_ARROT -END - BOOLEAN S_ARROT BEGIN - PROMPT 30 6 "Arrotondamento" + PROMPT 40 4 "Arrotondamento" FIELD ARROT FLAGS "G" MESSAGE FALSE CLEAR,S_CONG @@ -685,18 +646,18 @@ END NUMBER S_CONG 9 BEGIN - PROMPT 50 6 "Conguaglio" + PROMPT 58 4 "Conguaglio" FIELD QTACONG END GROUPBOX DLG_NULL 78 7 BEGIN - PROMPT 1 8 "@b Forfait/Prezzi" + PROMPT 1 6 "@b Forfait/Prezzi" END LISTBOX S_TIPOFORF 1 25 BEGIN - PROMPT 2 9 "Tipo " + PROMPT 2 7 "Tipo " ITEM "0|Nessuno" MESSAGE DISABLE,1@|DISABLE, S_IMPFISART|DISABLE,3@|DISABLE,S_MINCIC|ENABLE,2@ ITEM "1|A valore fisso" @@ -714,7 +675,7 @@ END LISTBOX S_NOLCIC 1 20 BEGIN - PROMPT 45 9 "In base a " + PROMPT 45 7 "In base a " ITEM "I|Dot. iniziale" ITEM "O|Dot. odierna" FIELD NOLCIC @@ -723,14 +684,14 @@ END NUMBER S_FORFPERCL 6 2 BEGIN - PROMPT 2 10 "% Cliente " + PROMPT 2 8 "% Cliente " FIELD FORFPERCL GROUP 3 END LISTBOX S_VCARTCLI 1 20 BEGIN - PROMPT 45 10 "Per " + PROMPT 45 8 "Per " ITEM "N|Nessuno" ITEM "C|Cliente" ITEM "A|Articolo" @@ -740,46 +701,46 @@ END CURRENCY S_PREZZOST 15 BEGIN - PROMPT 2 11 "In vigore " + PROMPT 2 9 "In vigore " FIELD PREZZO GROUP 2 END CURRENCY S_PREZZORN 15 BEGIN - PROMPT 30 11 "Di rinnovo " + PROMPT 30 9 "Di rinnovo " FIELD PREZRIN GROUP 2 END NUMBER S_SCONTO 6 2 BEGIN - PROMPT 60 11 "Sconto %" + PROMPT 60 9 "Sconto %" FIELD SCONTPERC END CURRENCY S_PREZDAN 15 BEGIN - PROMPT 2 12 "Danneggiati" + PROMPT 2 10 "Danneggiati" FLAGS "U" FIELD PREZDAN END BOOLEAN S_FATTKG BEGIN - PROMPT 30 12 "Fatturazione a Kg." + PROMPT 30 10 "Fatturazione a Kg." FIELD FATTKG END CURRENCY S_IMPFISART 15 BEGIN - PROMPT 2 13 "Imp.fisso " + PROMPT 2 11 "Imp.fisso " FIELD IMPFISART END CURRENCY S_VALCONV 15 BEGIN - PROMPT 30 13 "Val.Conven." + PROMPT 30 11 "Val.Conven." FLAGS "U" FIELD VALCONV GROUP 3 @@ -787,66 +748,63 @@ END NUMBER S_MINCIC 4 2 BEGIN - PROMPT 58 13 "Min.ciclaggio" + PROMPT 58 11 "Min.ciclaggio" FIELD MINCIC END -GROUPBOX DLG_NULL 78 4 +GROUPBOX DLG_NULL 78 5 BEGIN - PROMPT 1 15 "@b Dotazione" + PROMPT 1 13 "@b Dotazione" END NUMBER S_DOTIN 9 BEGIN - PROMPT 2 16 "Iniziale" - FIELD DOTIN + PROMPT 2 14 "Iniziale" END NUMBER S_DOTOD 9 BEGIN - PROMPT 21 16 "Odierna" - FLAGS "D" + PROMPT 21 14 "Odierna" END NUMBER S_DOTTMP 9 BEGIN - PROMPT 39 16 "Temporanea" - FIELD DOTTMP + PROMPT 39 14 "Temporanea" END CURRENCY S_PRZDTTMP 15 BEGIN - PROMPT 2 17 "Prezzo dotazione temporanea " + PROMPT 2 15 "Prezzo dotazione temporanea " FLAGS "U" FIELD PRZDTTMP END BOOLEAN S_RITAUDTTMP BEGIN - PROMPT 56 17 "Ritiro automatico dotazione" + PROMPT 56 15 "Ritiro automatico dotazione" FIELD RITAUDTTMP END DATE S_INDTTEMP BEGIN - PROMPT 2 18 "Inizio dot.temp. " + PROMPT 2 16 "Inizio dot.temp. " FIELD INDTTMP END DATE S_FIDTTEMP BEGIN - PROMPT 50 18 "Fine dot.temp. " + PROMPT 50 16 "Fine dot.temp. " FIELD FIDTTMP END GROUPBOX DLG_NULL 78 4 BEGIN - PROMPT 1 19 "@b Consegnato" + PROMPT 1 18 "@b Consegnato" END LISTBOX S_CALCCONS 1 34 BEGIN - PROMPT 2 20 "Calcolo" + PROMPT 2 19 "Calcolo" ITEM "0|Conguaglio alla confezione" ITEM "1|Uguale al ritirato" FIELD CALCCONS @@ -854,19 +812,19 @@ END NUMBER S_CONSMESE 9 BEGIN - PROMPT 47 20 "Mese" + PROMPT 47 19 "Mese" FLAGS "D" END NUMBER S_CONSANNO 9 BEGIN - PROMPT 62 20 "Anno" + PROMPT 62 19 "Anno" FLAGS "D" END STRING S_CAUSLAV 3 BEGIN - PROMPT 2 21 "Causale di default" + PROMPT 2 20 "Causale di default" USE &CAU INPUT CODTAB S_CAUSLAV DISPLAY "Codice" CODTAB @@ -879,7 +837,7 @@ END STRING S_CAUSLAVDESC 50 47 BEGIN - PROMPT 28 21 "" + PROMPT 28 20 "" USE CAU KEY 2 INPUT S0 S_CAUSLAVDESC DISPLAY "Descrizione@50" S0 @@ -890,6 +848,63 @@ END ENDPAGE +PAGE "Dati carrello" -1 -1 80 20 + +GROUPBOX DLG_NULL 79 5 +BEGIN + PROMPT 1 0 "" +END + +NUMBER S_PPCONF 15 5 +BEGIN + PROMPT 2 1 "Pezzi per Pacco" + FLAGS "DG" + MESSAGE EMPTY CLEAR,S_ARROT|CLEAR,S_CALCCONS + MESSAGE ENABLE,S_ARROT|ENABLE,S_CALCCONS +END + +NUMBER S_PREC 2 +BEGIN + PROMPT 50 1 "Precedenza " + FLAGS "D" +END + +NUMBER S_QTAMAXXS 6 +BEGIN + PROMPT 2 2 "Qta. max.XS " + FLAGS "D" +END + +NUMBER S_QTAMAXM 6 +BEGIN + PROMPT 30 2 "Qta. max.M " + FLAGS "D" +END + +NUMBER S_QTAMAXXL 6 +BEGIN + PROMPT 55 2 "Qta. max.XL " + FLAGS "D" +END + +NUMBER S_QTANORMXS 6 +BEGIN + PROMPT 2 3 "Qta. norm.XS " + FLAGS "D" +END + +NUMBER S_QTANORMM 6 +BEGIN + PROMPT 30 3 "Qta. norm.M " + FLAGS "D" +END + +NUMBER S_QTANORMXL 6 +BEGIN + PROMPT 55 3 "Qta. norm.XL " + FLAGS "D" +END + ENDMASK