From 22acefebe8d7789ef890806f580ad47960c9d877 Mon Sep 17 00:00:00 2001 From: rajitgill Date: Tue, 7 Oct 2008 09:53:36 +0000 Subject: [PATCH] Patch level : Files correlati : Ricompilazione Demo : [ ] Commento : git-svn-id: svn://10.65.10.50/trunk@17362 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/f169.dir | 2 +- lv/f169.trr | 5 +- lv/lv0300.cpp | 86 ++++++- lv/lv0300a.h | 56 +++-- lv/lv0300a.uml | 629 +++++++++++++++++++++++++++++++++++-------------- lv/lv0400.h | 19 +- lv/lv0400a.uml | 197 +++++++++------- lv/lvconf.h | 55 +++-- lv/lvrcondv.h | 1 + 9 files changed, 734 insertions(+), 316 deletions(-) diff --git a/lv/f169.dir b/lv/f169.dir index bf05ed092..9d6f87db8 100755 --- a/lv/f169.dir +++ b/lv/f169.dir @@ -1,3 +1,3 @@ 169 0 -$lvrcondv|0|0|226|0|Righe del contratto||| +$lvrcondv|0|0|232|0|Righe del contratto||| diff --git a/lv/f169.trr b/lv/f169.trr index f5d471b2b..3906906d7 100755 --- a/lv/f169.trr +++ b/lv/f169.trr @@ -1,5 +1,5 @@ 169 -25 +28 CODCF|3|6|0|Codice cliente CODCONT|3|6|0|Codice contratto CODART|1|20|0|Codice articolo @@ -25,5 +25,8 @@ 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 +NOLCIC|1|1|0|Scelta per nolo e ciclaggio, in base a dot. odierna o dot.iniziale +VCARTCLI|1|1|0|Scelta per la % sul val.conv su articolo o cliente 1 CODCF+CODCONT+CODART| diff --git a/lv/lv0300.cpp b/lv/lv0300.cpp index a389b563f..627fc0e72 100755 --- a/lv/lv0300.cpp +++ b/lv/lv0300.cpp @@ -1,14 +1,17 @@ #include +#include +#include #include "lv0300a.h" class TConf_Lavanderie : public TConfig_application { - - public: - +protected: + virtual void load_mask(); + virtual void save_mask(bool tosave) ; virtual bool user_create( ); +public: TConf_Lavanderie() : TConfig_application( CONFIG_DITTA ){ } virtual ~TConf_Lavanderie( ){ } }; @@ -16,14 +19,87 @@ class TConf_Lavanderie : public TConfig_application bool TConf_Lavanderie::user_create( ) { TConfig conf(CONFIG_DITTA ); - conf.set( "EdMask", "lv0300a", "lv" ); return true; } + +void TConf_Lavanderie::load_mask() +{ + TMask* m=get_mask(); + if (m==NULL) + return; + + TConfig_application::load_mask(); + FOR_EACH_MASK_SHEET((*m), i, s) + { + s->destroy(); + TMask& sm=s->sheet_mask(); + + bool found=true; + for (int r=0; found ;r++) + { + FOR_EACH_MASK_FIELD(sm,j,f) + { + const TFieldref* fr=f->field(); + if(fr!=NULL) + { + const TString& value=get_config()->get(fr->name(),NULL,r); + if (value.empty() && f->dlg()==101 ) + { + found=false; + break; + } + s->row(r).add(value,s->cid2index(f->dlg())); + } + } + if (found) + s->check_row(r, 1); + } + s->force_update(); + } +} + +void TConf_Lavanderie::save_mask(bool tosave) +{ + TConfig* cnf = get_config(); + if (!tosave || cnf==NULL) + return; + + TAssoc_array& v = cnf->list_variables("lv"); + + TConfig_application::save_mask(tosave); + + FOR_EACH_ASSOC_STRING(v, h, k, str) + { + const TFixed_string name = k; + if (name.find('(') > 0) + v.remove(name); + } + + TMask& m=*get_mask(); + FOR_EACH_MASK_SHEET(m, i, s) + { + TMask& sm=s->sheet_mask(); + FOR_EACH_SHEET_ROW(*s,j,row) + { + FOR_EACH_MASK_FIELD(sm,k,f) + { + const TFieldref* fr = f->field(); + if (fr!=NULL) + { + const char* value=row->get(s->cid2index(f->dlg())); + cnf->set(fr->name(),value, NULL,true,j); + } + } + + } + + } +} int lv0300(int argc, char* argv[]) { TConf_Lavanderie appc; - appc.run(argc, argv, TR("Parametri gestione Lavanderie industriali")); + appc.run(argc, argv, TR("Parametri Lavanderie industriali")); return 0; } \ No newline at end of file diff --git a/lv/lv0300a.h b/lv/lv0300a.h index 72ec54981..608208cd9 100755 --- a/lv/lv0300a.h +++ b/lv/lv0300a.h @@ -1,26 +1,42 @@ -//campi maschera lv0300a -#define DDT 1 +#define GEN 1 #define RIT 2 -#define PRE 3 -#define ANT 4 +#define ANT 3 +#define CONG 4 +#define DOT 5 -#define F_CODNUM_DDT 101 -#define F_DESNUM_DDT 102 -#define F_TIPODOC_DDT 103 -#define F_DESTIPODOC_DDT 104 +#define F_CODNUM_GEN 201 +#define F_DESNUM_GEN 202 +#define F_TIPODOC_GEN 203 +#define F_DESTIPODOC_GEN 204 +#define F_BUONIRIT 205 +#define F_BUONIANT 206 +#define F_DOCCONG 207 +#define F_DOCDOT 208 +#define F_TIPORIGDOT 209 +#define F_TIPORIGDTMP 210 -#define F_CODNUM_RIT 105 -#define F_DESNUM_RIT 106 -#define F_TIPODOC_RIT 107 -#define F_DESTIPODOC_RIT 108 +#define S_CODNUM_RIT 101 +#define S_TIPODOC_RIT 102 +#define S_DESTIPODOC_RIT 103 +#define S_STATO_RIT 104 +#define S_DESNUM_RIT 105 -#define F_CODNUM_PRE 109 -#define F_DESNUM_PRE 110 -#define F_TIPODOC_PRE 111 -#define F_DESTIPODOC_PRE 112 +#define S_CODNUM_ANT 101 +#define S_TIPODOC_ANT 102 +#define S_DESTIPODOC_ANT 103 +#define S_STATO_ANT 104 +#define S_DESNUM_ANT 105 + +#define S_CODNUM_CONG 101 +#define S_TIPODOC_CONG 102 +#define S_DESTIPODOC_CONG 103 +#define S_STATO_CONG 104 +#define S_DESNUM_CONG 105 + +#define S_CODNUM_DOT 101 +#define S_TIPODOC_DOT 102 +#define S_DESTIPODOC_DOT 103 +#define S_STATO_DOT 104 +#define S_DESNUM_DOT 105 -#define F_CODNUM_ANT 113 -#define F_DESNUM_ANT 114 -#define F_TIPODOC_ANT 115 -#define F_DESTIPODOC_ANT 116 diff --git a/lv/lv0300a.uml b/lv/lv0300a.uml index ac9f0ef17..1d4858aa4 100755 --- a/lv/lv0300a.uml +++ b/lv/lv0300a.uml @@ -28,234 +28,521 @@ PAGE "Parametri" 0 0 0 0 GROUPBOX DLG_NULL 78 4 BEGIN - PROMPT 1 1 "@bDocumenti di trasporto" + PROMPT 1 1 "@bDocumenti da generare" END -STRING F_CODNUM_DDT 4 +STRING F_CODNUM_GEN 4 BEGIN PROMPT 2 2 "Numerazione " - FIELD NUM(DDT) + FIELD NUM_GEN HELP "Codice numerazione" USE %NUM - INPUT CODTAB F_CODNUM_DDT + INPUT CODTAB F_CODNUM_GEN DISPLAY "Codice" CODTAB DISPLAY "Descrizione@50" S0 - OUTPUT F_CODNUM_DDT CODTAB - OUTPUT F_DESNUM_DDT S0 + OUTPUT F_CODNUM_GEN CODTAB + OUTPUT F_DESNUM_GEN S0 CHECKTYPE REQUIRED - FLAG "UPA" + FLAGS "UPA" WARNING "Numerazione assente" END -STRING F_DESNUM_DDT 50 +STRING F_DESNUM_GEN 50 BEGIN PROMPT 24 2 "" - HELP "Descrizione numerazione" + HELP "Descrizione Numerazione" USE %NUM KEY 2 - INPUT S0 F_DESNUM_DDT + INPUT S0 F_DESNUM_GEN DISPLAY "Descrizione@50" S0 DISPLAY "Codice" CODTAB - COPY OUTPUT F_CODNUM_DDT + COPY OUTPUT F_CODNUM_GEN END -STRING F_TIPODOC_DDT 4 +STRING F_TIPODOC_GEN 4 BEGIN PROMPT 2 3 "Tipo " - FIELD TIPODOC(DDT) + FIELD TIPODOC_GEN HELP "Codice tipo documento" USE %TIP - INPUT CODTAB F_TIPODOC_DDT + INPUT CODTAB F_TIPODOC_GEN DISPLAY "Codice" CODTAB DISPLAY "Descrizione@50" S0 - OUTPUT F_TIPODOC_DDT CODTAB - OUTPUT F_DESTIPODOC_DDT S0 + OUTPUT F_TIPODOC_GEN CODTAB + OUTPUT F_DESTIPODOC_GEN S0 CHECKTYPE REQUIRED - FLAG "UP" + FLAGS "UP" END -STRING F_DESTIPODOC_DDT 50 +STRING F_DESTIPODOC_GEN 50 BEGIN PROMPT 24 3 "" HELP "Descrizione tipo documento" USE %TIP KEY 2 - INPUT S0 F_DESTIPODOC_DDT + INPUT S0 F_DESTIPODOC_GEN DISPLAY "Descrizione@50" S0 DISPLAY "Codice" CODTAB - COPY OUTPUT F_TIPODOC_DDT + COPY OUTPUT F_TIPODOC_GEN END -GROUPBOX DLG_NULL 78 4 +ENDPAGE + +PAGE "Buoni" 0 2 0 0 + +SPREADSHEET F_BUONIRIT 0 8 BEGIN - PROMPT 1 5 "@bBuoni Ritiro" + PROMPT 0 1 "Buoni di ritiro" + ITEM "Numerazione" + ITEM "Tipo documento" + ITEM "Desczrizione tipo documento" + ITEM "Stato" + ITEM "Descrizione numerazione" END -STRING F_CODNUM_RIT 4 +SPREADSHEET F_BUONIANT 0 8 BEGIN - PROMPT 2 6 "Numerazione " - FIELD NUM(RIT) - HELP "Codice numerazione" - USE %NUM - INPUT CODTAB F_CODNUM_RIT - DISPLAY "Codice" CODTAB - DISPLAY "Descrizione@50" S0 - OUTPUT F_CODNUM_RIT CODTAB - OUTPUT F_DESNUM_RIT S0 - CHECKTYPE REQUIRED - FLAG "UPA" - WARNING "Numerazione assente" + PROMPT 0 10 "Buoni di anticipo" + ITEM "Numerazione" + ITEM "Tipo documento" + ITEM "Desczrizione tipo documento" + ITEM "Stato" + ITEM "Descrizione numerazione" END -STRING F_DESNUM_RIT 50 +ENDPAGE + +PAGE "Documenti per conguaglio e dotazione" 0 2 0 0 + +SPREADSHEET F_DOCCONG 0 8 BEGIN - PROMPT 24 6 "" - HELP "Descrizione numerazione" - USE %NUM KEY 2 - INPUT S0 F_DESNUM_RIT - DISPLAY "Descrizione@50" S0 - DISPLAY "Codice" CODTAB - COPY OUTPUT F_CODNUM_RIT + PROMPT 0 1 "Documenti per conguaglio" + ITEM "Numerazione" + ITEM "Tipo documento" + ITEM "Desczrizione tipo documento" + ITEM "Stato" + ITEM "Descrizione numerazione" END -STRING F_TIPODOC_RIT 4 +SPREADSHEET F_DOCDOT 0 7 BEGIN - PROMPT 2 7 "Tipo " - FIELD TIPODOC(RIT) - HELP "Codice tipo documento" + PROMPT 0 10 "Documenti per dotazione" + ITEM "Numerazione" + ITEM "Tipo documento" + ITEM "Desczrizione tipo documento" + ITEM "Stato" + ITEM "Descrizione numerazione" +END + +STRING F_TIPORIGDOT 4 +BEGIN + PROMPT 2 18 "Codice " USE %TIP - INPUT CODTAB F_TIPODOC_RIT - DISPLAY "Codice" CODTAB - DISPLAY "Descrizione@50" S0 - OUTPUT F_TIPODOC_RIT CODTAB - OUTPUT F_DESTIPODOC_RIT S0 CHECKTYPE REQUIRED - FLAG "UP" -END - -STRING F_DESTIPODOC_RIT 50 -BEGIN - PROMPT 24 7 "" - HELP "Descrizione tipo documento" - USE %TIP KEY 2 - INPUT S0 F_DESTIPODOC_RIT - DISPLAY "Descrizione@50" S0 - DISPLAY "Codice" CODTAB - COPY OUTPUT F_TIPODOC_RIT -END - -GROUPBOX DLG_NULL 78 4 -BEGIN - PROMPT 1 9 "@bBuoni Prelievo" -END - -STRING F_CODNUM_PRE 4 -BEGIN - PROMPT 2 10 "Numerazione " - FIELD NUM(PRE) - HELP "Codice numerazione" - USE %NUM - INPUT CODTAB F_CODNUM_PRE + INPUT CODTAB F_TIPORIGDOT DISPLAY "Codice" CODTAB DISPLAY "Descrizione@50" S0 - OUTPUT F_CODNUM_PRE CODTAB - OUTPUT F_DESNUM_PRE S0 - CHECKTYPE REQUIRED - FLAG "UPA" - WARNING "Numerazione assente" + OUTPUT F_TIPORIGDOT CODTAB + FIELD TIPORIGDOT + FLAGS "UZ" END -STRING F_DESNUM_PRE 50 +STRING F_TIPORIGDTMP 4 BEGIN - PROMPT 24 10 "" - HELP "Descrizione numerazione" - USE %NUM KEY 2 - INPUT S0 F_DESNUM_PRE - DISPLAY "Descrizione@50" S0 - DISPLAY "Codice" CODTAB - COPY OUTPUT F_CODNUM_PRE -END - -STRING F_TIPODOC_PRE 4 -BEGIN - PROMPT 2 11 "Tipo " - FIELD TIPODOC(PRE) - HELP "Codice tipo documento" + PROMPT 2 19 "Codice " USE %TIP - INPUT CODTAB F_TIPODOC_PRE - DISPLAY "Codice" CODTAB - DISPLAY "Descrizione@50" S0 - OUTPUT F_TIPODOC_PRE CODTAB - OUTPUT F_DESTIPODOC_PRE S0 CHECKTYPE REQUIRED - FLAG "UP" -END - -STRING F_DESTIPODOC_PRE 50 -BEGIN - PROMPT 24 11 "" - HELP "Descrizione tipo documento" - USE %TIP KEY 2 - INPUT S0 F_DESTIPODOC_PRE - DISPLAY "Descrizione@50" S0 - DISPLAY "Codice" CODTAB - COPY OUTPUT F_TIPODOC_PRE -END - -GROUPBOX DLG_NULL 78 4 -BEGIN - PROMPT 1 13 "@bBuoni Anticipo" -END - -STRING F_CODNUM_ANT 4 -BEGIN - PROMPT 2 14 "Numerazione " - FIELD NUM(ANT) - HELP "Codice numerazione" - USE %NUM - INPUT CODTAB F_CODNUM_ANT + INPUT CODTAB F_TIPORIGDTMP DISPLAY "Codice" CODTAB DISPLAY "Descrizione@50" S0 - OUTPUT F_CODNUM_ANT CODTAB - OUTPUT F_DESNUM_ANT S0 - CHECKTYPE REQUIRED - FLAG "UPA" - WARNING "Numerazione assente" -END - -STRING F_DESNUM_ANT 50 -BEGIN - PROMPT 24 14 "" - HELP "Descrizione numerazione" - USE %NUM KEY 2 - INPUT S0 F_DESNUM_ANT - DISPLAY "Descrizione@50" S0 - DISPLAY "Codice" CODTAB - COPY OUTPUT F_CODNUM_ANT -END - -STRING F_TIPODOC_ANT 4 -BEGIN - PROMPT 2 15 "Tipo " - FIELD TIPODOC(ANT) - HELP "Codice tipo documento" - USE %TIP - INPUT CODTAB F_TIPODOC_ANT - DISPLAY "Codice" CODTAB - DISPLAY "Descrizione@50" S0 - OUTPUT F_TIPODOC_ANT CODTAB - OUTPUT F_DESTIPODOC_ANT S0 - CHECKTYPE REQUIRED - FLAG "UP" -END - -STRING F_DESTIPODOC_ANT 50 -BEGIN - PROMPT 24 15 "" - HELP "Descrizione tipo documento" - USE %TIP KEY 2 - INPUT S0 F_DESTIPODOC_ANT - DISPLAY "Descrizione@50" S0 - DISPLAY "Codice" CODTAB - COPY OUTPUT F_TIPODOC_ANT + OUTPUT F_TIPORIGDTMP CODTAB + FIELD TIPORIGDTMP + FLAGS "UZ" +END + +ENDPAGE + +ENDMASK + +PAGE "Buoni di ritiro" -1 -1 80 5 + +STRING S_CODNUM_RIT 4 +BEGIN + PROMPT 1 1 "Numerazione " + FIELD NUM_RIT + HELP "Codice numerazione" + USE %NUM + INPUT CODTAB S_CODNUM_RIT + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT S_CODNUM_RIT CODTAB + OUTPUT S_DESNUM_RIT S0 + CHECKTYPE REQUIRED + FLAGS "UPA" + WARNING "Numerazione assente" +END + +STRING S_DESNUM_RIT 50 +BEGIN + PROMPT 20 1 "" + HELP "Descrizione numerazione" + USE %NUM KEY 2 + INPUT S0 S_DESNUM_RIT + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT S_CODNUM_RIT +END + +STRING S_TIPODOC_RIT 4 +BEGIN + PROMPT 1 2 "Tipo " + FIELD TIPODOC_RIT + HELP "Codice tipo documento" + USE %TIP + INPUT CODTAB S_TIPODOC_RIT + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT S_TIPODOC_RIT CODTAB + OUTPUT S_DESTIPODOC_RIT S0 + CHECKTYPE REQUIRED + FLAGS "UP" +END + +STRING S_DESTIPODOC_RIT 50 +BEGIN + PROMPT 20 2 "" + HELP "Descrizione tipo documento" + USE %TIP KEY 2 + INPUT S0 S_DESTIPODOC_RIT + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT S_TIPODOC_RIT +END + +STRING S_STATO_RIT 1 +BEGIN + PROMPT 1 3 "Stato " + USE %STD + CHECKTYPE REQUIRED + INPUT CODTAB S_STATO_RIT + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT S_STATO_RIT CODTAB + FIELD STATO_RIT + FLAGS "U" +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 "Elimina" + MESSAGE EXIT,K_DEL + PICTURE BMP_DELREC +END + +BUTTON DLG_CANCEL 2 2 +BEGIN + PROMPT 4 1 "" +END + +ENDPAGE + +ENDMASK + +PAGE "Buoni d'anticipo" -1 -1 80 5 + +GROUPBOX DLG_NULL 78 4 +BEGIN + PROMPT 1 9 "@bBuoni di Anticipo" +END + +STRING S_CODNUM_ANT 4 +BEGIN + PROMPT 1 1 "Numerazione " + FIELD NUM_ANT + HELP "Codice numerazione" + USE %NUM + INPUT CODTAB S_CODNUM_ANT + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT S_CODNUM_ANT CODTAB + OUTPUT S_DESNUM_ANT S0 + CHECKTYPE REQUIRED + FLAGS "UPA" + WARNING "Numerazione assente" +END + +STRING S_DESNUM_ANT 50 +BEGIN + PROMPT 20 1 "" + HELP "Descrizione numerazione" + USE %NUM KEY 2 + INPUT S0 S_DESNUM_ANT + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT S_CODNUM_ANT +END + +STRING S_TIPODOC_ANT 4 +BEGIN + PROMPT 1 2 "Tipo " + FIELD TIPODOC_ANT + HELP "Codice tipo documento" + USE %TIP + INPUT CODTAB S_TIPODOC_ANT + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT S_TIPODOC_ANT CODTAB + OUTPUT S_DESTIPODOC_ANT S0 + CHECKTYPE REQUIRED + FLAGS "UP" +END + +STRING S_DESTIPODOC_ANT 50 +BEGIN + PROMPT 20 2 "" + HELP "Descrizione tipo documento" + USE %TIP KEY 2 + INPUT S0 S_DESTIPODOC_ANT + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT S_TIPODOC_ANT +END + +STRING S_STATO_ANT 1 +BEGIN + PROMPT 1 3 "Stato " + USE %STD + CHECKTYPE REQUIRED + INPUT CODTAB S_STATO_ANT + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT S_STATO_ANT CODTAB + FIELD STATO_ANT + FLAGS "U" +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 "Elimina" + MESSAGE EXIT,K_DEL + PICTURE BMP_DELREC +END + +BUTTON DLG_CANCEL 2 2 +BEGIN + PROMPT 4 1 "" +END + +ENDPAGE + +ENDMASK + +PAGE "Documenti conguaglio" -1 -1 80 5 + +GROUPBOX DLG_NULL 78 4 +BEGIN + PROMPT 1 9 "@bDocumenti conguaglio" +END + +STRING S_CODNUM_CONG 4 +BEGIN + PROMPT 1 1 "Numerazione " + FIELD NUM_CONG + HELP "Codice numerazione" + USE %NUM + INPUT CODTAB S_CODNUM_CONG + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT S_CODNUM_CONG CODTAB + OUTPUT S_DESNUM_CONG S0 + CHECKTYPE REQUIRED + FLAGS "UPA" + WARNING "Numerazione assente" +END + +STRING S_DESNUM_CONG 50 +BEGIN + PROMPT 20 1 "" + HELP "Descrizione numerazione" + USE %NUM KEY 2 + INPUT S0 S_DESNUM_CONG + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT S_CODNUM_CONG +END + +STRING S_TIPODOC_CONG 4 +BEGIN + PROMPT 1 2 "Tipo " + FIELD TIPODOC_CONG + HELP "Codice tipo documento" + USE %TIP + INPUT CODTAB S_TIPODOC_CONG + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT S_TIPODOC_CONG CODTAB + OUTPUT S_DESTIPODOC_CONG S0 + CHECKTYPE REQUIRED + FLAGS "UP" +END + +STRING S_DESTIPODOC_CONG 50 +BEGIN + PROMPT 20 2 "" + HELP "Descrizione tipo documento" + USE %TIP KEY 2 + INPUT S0 S_DESTIPODOC_CONG + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT S_TIPODOC_CONG +END + +STRING S_STATO_CONG 1 +BEGIN + PROMPT 1 3 "Stato " + USE %STD + CHECKTYPE REQUIRED + INPUT CODTAB S_STATO_CONG + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT S_STATO_CONG CODTAB + FIELD STATO_CONG + FLAGS "U" +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 "Elimina" + MESSAGE EXIT,K_DEL + PICTURE BMP_DELREC +END + +BUTTON DLG_CANCEL 2 2 +BEGIN + PROMPT 4 1 "" +END + +ENDPAGE + +ENDMASK + +PAGE "Documenti dotazione" -1 -1 80 5 + +GROUPBOX DLG_NULL 78 4 +BEGIN + PROMPT 1 9 "@bDocumenti dotazione" +END + +STRING S_CODNUM_DOT 4 +BEGIN + PROMPT 1 1 "Numerazione " + FIELD NUM_DOT + HELP "Codice numerazione" + USE %NUM + INPUT CODTAB S_CODNUM_DOT + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT S_CODNUM_DOT CODTAB + OUTPUT S_DESNUM_DOT S0 + CHECKTYPE REQUIRED + FLAGS "UPA" + WARNING "Numerazione assente" +END + +STRING S_DESNUM_DOT 50 +BEGIN + PROMPT 20 1 "" + HELP "Descrizione numerazione" + USE %NUM KEY 2 + INPUT S0 S_DESNUM_DOT + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT S_CODNUM_DOT +END + +STRING S_TIPODOC_DOT 4 +BEGIN + PROMPT 1 2 "Tipo " + FIELD TIPODOC_DOT + HELP "Codice tipo documento" + USE %TIP + INPUT CODTAB S_TIPODOC_DOT + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT S_TIPODOC_DOT CODTAB + OUTPUT S_DESTIPODOC_DOT S0 + CHECKTYPE REQUIRED + FLAGS "UP" +END + +STRING S_DESTIPODOC_DOT 50 +BEGIN + PROMPT 20 2 "" + HELP "Descrizione tipo documento" + USE %TIP KEY 2 + INPUT S0 S_DESTIPODOC_DOT + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT S_TIPODOC_DOT +END + +STRING S_STATO_DOT 1 +BEGIN + PROMPT 1 3 "Stato " + USE %STD + CHECKTYPE REQUIRED + INPUT CODTAB S_STATO_DOT + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT S_STATO_DOT CODTAB + FIELD STATO_DOT + FLAGS "U" +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 "Elimina" + MESSAGE EXIT,K_DEL + PICTURE BMP_DELREC +END + +BUTTON DLG_CANCEL 2 2 +BEGIN + PROMPT 4 1 "" END ENDPAGE diff --git a/lv/lv0400.h b/lv/lv0400.h index 37f73a3d8..af06ca3b5 100755 --- a/lv/lv0400.h +++ b/lv/lv0400.h @@ -56,8 +56,6 @@ #define DLG_PLANNING 254 #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 @@ -76,9 +74,14 @@ #define S_ARTBLOC 116 #define S_CALCCONS 117 #define S_TIPOFORF 118 -#define S_FORFPERCL 119 -#define S_CAUSMAG 120 -#define S_TIPONOL 121 -#define S_RITAUDTTMP 122 -#define S_FATTKG 123 -#define S_ARROT 124 \ No newline at end of file +#define S_NOLCIC 119 +#define S_VCARTCLI 120 +#define S_MINCIC 121 +#define S_FORFPERCL 122 +#define S_CAUSMAG 123 +#define S_TIPONOL 124 +#define S_RITAUDTTMP 125 +#define S_FATTKG 126 +#define S_ARROT 127 + + diff --git a/lv/lv0400a.uml b/lv/lv0400a.uml index 3175dd9a5..45c05f28a 100755 --- a/lv/lv0400a.uml +++ b/lv/lv0400a.uml @@ -124,6 +124,9 @@ BEGIN ITEM "Articolo bloccato" ITEM "Calcolo consegnato" ITEM "Tipo Forfait" + ITEM "Tipo nolo/ciclaggio" + ITEM "Tipo % val.conv." + ITEM "Minimo cilaggio" ITEM "%Forfait Cliente" ITEM "Causale default" ITEM "Tipo Noleggio" @@ -249,12 +252,12 @@ ENDPAGE PAGE "Opzioni" 0 2 0 0 -GROUPBOX DLG_NULL 30 6 +GROUPBOX DLG_NULL 78 6 BEGIN PROMPT 1 1 "@bPeriodicità di fatturazione" END -RADIOBUTTON F_PERFAT 1 30 +RADIOBUTTON F_PERFAT 1 23 BEGIN PROMPT 1 1 "@bPeriodicità di fatturazione" ITEM "0|Giornaliero" @@ -264,36 +267,25 @@ BEGIN FIELD PERFAT END - GROUPBOX DLG_NULL 50 6 +DATE F_INPERFAT BEGIN - PROMPT 31 1 "" -END - - DATE F_INPERFAT -BEGIN - PROMPT 32 2 "Inizio primo periodo di fatturazione" + PROMPT 28 2 "Inizio primo periodo di fatturazione" FIELD INPERFAT END DATE F_DTLASTFAT BEGIN - PROMPT 32 3 "Data ultima fattura " + PROMPT 28 3 "Data ultima fattura " FIELD DTLASTFAT END CURRENCY F_IMPMINFAT 15 BEGIN - PROMPT 32 4 "Importo minimo fatturabile " + PROMPT 28 4 "Importo minimo fatturabile " FIELD IMPMINFAT END -BOOLEAN F_FATTSOSP -BEGIN - PROMPT 32 5 "Escluso da fatturazione" - FIELD FATTSOSP -END - -GROUPBOX DLG_NULL 38 9 +GROUPBOX DLG_NULL 38 10 BEGIN PROMPT 1 7 "@bTipo canone" END @@ -326,42 +318,43 @@ BEGIN FIELD TIPOIMB END -RADIOBUTTON F_TIPOSTPRZ 1 40 +RADIOBUTTON F_CONTSPOR 1 40 BEGIN - PROMPT 40 11 "@bTipo di stampa prezzo" - ITEM "0|Prezzo in DDT/Bolla" - ITEM "1|Richiesta stampa in sede bollettaz." - ITEM "2|Prezzo e totale DOC. in DDT" - FIELD TIPOSTPRZ -END + PROMPT 40 11 "@bConta dello sporco" + ITEM "0|Nessuno" + ITEM "1|Sporco" + ITEM "2|Solo pulito" + ITEM "3|Touch-Screen" + FIELD CONTSPOR + END NUMBER F_PERCNOCONT 6 2 BEGIN - PROMPT 1 16 "Percentuale aumento per mancato conteggio " + PROMPT 1 17 "Percentuale aumento per mancato conteggio " FIELD PERCNOCONT END NUMBER F_PERCTOLPES 6 2 BEGIN - PROMPT 1 17 "Percentuale tolleranza peso teorico/effettivo" + PROMPT 1 18 "Percentuale tolleranza peso teorico/effettivo" FIELD PERCTOLPES END NUMBER F_NUMUT 5 BEGIN - PROMPT 60 16 "Num. utente " + PROMPT 60 17 "Num. utente " FIELD NUMUT END NUMBER F_NUMETI 5 BEGIN - PROMPT 60 17 "Num. etichette" + PROMPT 60 18 "Num. etichette" FIELD NUMETI END STRING F_CAUSMAG 4 BEGIN - PROMPT 1 18 "Causale di default" + PROMPT 1 19 "Causale di default" USE CAU INPUT CODTAB F_CAUSMAG DISPLAY "Codice" CODTAB @@ -374,7 +367,7 @@ END STRING F_CAUSMAGDESC 50 BEGIN - PROMPT 27 18 "" + PROMPT 27 19 "" USE CAU KEY 2 INPUT S0 F_CAUSMAGDESC DISPLAY "Descrizione@50" S0 @@ -383,35 +376,19 @@ BEGIN CHECKTYPE NORMAL END -LISTBOX F_DOCCP 23 -BEGIN - PROMPT 1 19 "Documenti di consegna/ritiro " - ITEM "0|" - ITEM "1|Documento di trasporto" - ITEM "2|Buono di Ritiro" - ITEM "3|Buono di Prelievo" - ITEM "4|Buono di Anticipo" - FIELD DOCCP -END - -RADIOBUTTON F_CONTSPOR 1 80 -BEGIN - PROMPT 1 20 "@bConta dello sporco" - ITEM "0|Nessuno" - ITEM "1|Sporco" - ITEM "2|Solo pulito" - ITEM "3|Touch-Screen" - FIELD CONTSPOR - FLAG "Z" -END - ENDPAGE PAGE "Opzioni" 0 2 0 0 -GROUPBOX DLG_NULL 58 16 +GROUPBOX DLG_NULL 58 18 BEGIN - PROMPT 9 2 "" + PROMPT 9 1 "" +END + +BOOLEAN F_FATTSOSP +BEGIN + PROMPT 10 2 "Escluso da fatturazione" + FIELD FATTSOSP END BOOLEAN F_ATTFATNODT @@ -498,6 +475,12 @@ BEGIN FIELD RITAUDTTMP END +BOOLEAN F_TIPOSTPRZ +BEGIN + PROMPT 10 17 "Stampa prezzo in bolla" + FIELD TIPOSTPRZ +END + ENDPAGE ENDMASK @@ -536,46 +519,99 @@ BEGIN CHECKTYPE REQUIRED END +LISTBOX S_TIPOFORF 1 25 +BEGIN + PROMPT 1 3 "Tipo Forfait " + ITEM "0|Nessuno" + MESSAGE HIDE,1@|DISABLE, S_IMPFISART|DISABLE,3@|DISABLE,S_MINCIC|ENABLE,2@ + ITEM "1|A valore fisso" + MESSAGE HIDE,1@|ENABLE,S_IMPFISART|DISABLE,3@|DISABLE,S_MINCIC|DISABLE,2@ + ITEM "2|Nolo" + MESSAGE SHOW,S_NOLCIC|HIDE,S_VCARTCLI|DISABLE,S_IMPFISART|DISABLE,3@|DISABLE,S_MINCIC|ENABLE,2@ + ITEM "3|Ciclaggio" + MESSAGE SHOW,S_NOLCIC|HIDE,S_VCARTCLI|DISABLE,S_IMPFISART|DISABLE,3@|ENABLE,S_MINCIC|ENABLE,2@ + ITEM "4|% sul val. convenz." + MESSAGE HIDE,S_NOLCIC|SHOW,S_VCARTCLI|DISABLE,S_IMPFISART|ENABLE,3@|DISABLE,S_MINCIC|DISABLE,2@ + ITEM "5|Fisso su dot. iniziale" + MESSAGE HIDE,1@|ENABLE,S_IMPFISART|DISABLE,3@|DISABLE,S_MINCIC|DISABLE,2@ + FIELD TIPOFORF +END + +LISTBOX S_NOLCIC 1 20 +BEGIN + PROMPT 46 3 "In base a " + ITEM "I|Dot. iniziale" + ITEM "O|Dot. odierna" + FLAGS "H" + GROUP 1 +END + +LISTBOX S_VCARTCLI 1 20 +BEGIN + PROMPT 46 3 "Per " + ITEM "C|Cliente" + ITEM "A|Articolo" + FLAGS "H" + GROUP 1 +END + CURRENCY S_PREZZOST 15 BEGIN - PROMPT 1 3 "Prezzo in vigore " - FIELD PREZZO + PROMPT 1 4 "Prezzo in vigore " + FIELD PREZZO + GROUP 2 END CURRENCY S_PREZZORN 15 BEGIN - PROMPT 43 3 "Prezzo di rinnovo " + PROMPT 43 4 "Prezzo di rinnovo " FIELD PREZRIN + GROUP 2 END CURRENCY S_IMPFISART 15 BEGIN - PROMPT 1 4 "Importo fisso " + PROMPT 1 5 "Importo fisso " FIELD IMPFISART END NUMBER S_SCONTO 6 2 BEGIN - PROMPT 43 4 "Sconto % " + PROMPT 43 5 "Sconto % " FIELD SCONTPERC END NUMBER S_CONG 9 BEGIN - PROMPT 1 5 "Conguaglio " + PROMPT 1 6 "Conguaglio " FIELD QTACONG END CURRENCY S_VALCONV 15 BEGIN - PROMPT 43 5 "Val. convenzionale" + PROMPT 43 6 "Val. convenzionale" FLAGS "U" FIELD VALCONV + GROUP 3 END +NUMBER S_FORFPERCL 6 2 +BEGIN + PROMPT 1 7 "% Forfait cliente " + FIELD FORFPERCL + GROUP 3 +END + +NUMBER S_MINCIC 4 2 +BEGIN + PROMPT 43 7 "Minimo cilcaggio " + FIELD MINCIC +END + + STRING S_UM 2 BEGIN - PROMPT 1 6 "Unità di misura " + PROMPT 1 8 "Unità di misura " USE LF_UMART KEY 2 JOIN UMS INTO CODTAB=UM INPUT CODART S_CODART SELECT @@ -589,7 +625,7 @@ END STRING S_CAUSMAG 4 BEGIN - PROMPT 43 6 "Causale di default" + PROMPT 43 8 "Causale di default" USE CAU INPUT CODTAB S_CAUSMAG DISPLAY "Codice" CODTAB @@ -601,63 +637,42 @@ END CURRENCY S_PREZDAN 15 BEGIN - PROMPT 1 7 "Prezzo danneggiati " + PROMPT 1 9 "Prezzo danneggiati " FLAGS "U" FIELD PREZDAN END CURRENCY S_PRZDTTMP 15 BEGIN - PROMPT 43 7 "Prezzo dot. temp. " + PROMPT 43 9 "Prezzo dot. temp. " FLAGS "U" FIELD PRZDTTMP END NUMBER S_DOTIN 9 BEGIN - PROMPT 1 8 "Dot. iniziale " + PROMPT 1 10 "Dot. iniziale " FIELD DOTIN END NUMBER S_DOTTMP 9 BEGIN - PROMPT 43 8 "Dot. temporanea " + PROMPT 43 10 "Dot. temporanea " FIELD DOTTMP END DATE S_INDTTMP BEGIN - PROMPT 1 9 "Inizio dot. temporanea " + PROMPT 1 11 "Inizio dot. temporanea " FIELD INDTTMP END DATE S_FIDTTMP BEGIN - PROMPT 43 9 "Fine dot. temp " + PROMPT 43 11 "Fine dot. temp " FIELD FIDTTMP END -NUMBER S_FORFPERCL 6 2 -BEGIN - PROMPT 1 10 "% Forfait cliente " - FIELD FORFPERCL -END - -LISTBOX S_TIPOFORF 1 34 -BEGIN - PROMPT 1 11 "Tipo Forfait " - ITEM "0|Nessuno" - ITEM "1|A valore fisso" - ITEM "2|Nolo in base a dot. iniziale" - ITEM "3|Nolo in base a dot. odierna" - ITEM "4|Ciclaggio in base a dot. odierna" - ITEM "5|Ciclaggio in base a dot. iniziale" - ITEM "6|% sul val. convenz. per articolo" - ITEM "7|% sul val. convenz. per cliente" - ITEM "8|Fisso in base alla dot. iniziale" - FIELD TIPOFORF -END - LISTBOX S_ARTBLOC 1 34 BEGIN PROMPT 1 12 "Articolo bloccato " diff --git a/lv/lvconf.h b/lv/lvconf.h index e32facdc3..ceaa491fb 100755 --- a/lv/lvconf.h +++ b/lv/lvconf.h @@ -1,25 +1,42 @@ -#define DDT 1 +#define GEN 1 #define RIT 2 -#define PRE 3 -#define ANT 4 +#define ANT 3 +#define CONG 4 +#define DOT 5 -#define F_CODNUM_DDT 101 -#define F_DESNUM_DDT 102 -#define F_TIPODOC_DDT 103 -#define F_DESTIPODOC_DDT 104 +#define F_CODNUM_GEN 101 +#define F_DESNUM_GEN 102 +#define F_TIPODOC_GEN 103 +#define F_DESTIPODOC_GEN 104 +#define F_BUONIRIT 105 +#define F_BUONIANT 106 +#define F_DOCCONG 107 +#define F_DOCDOT 108 +#define F_TIPORIGDOT 109 +#define F_TIPORIGDT 110 -#define F_CODNUM_RIT 105 -#define F_DESNUM_RIT 106 -#define F_TIPODOC_RIT 107 -#define F_DESTIPODOC_RIT 108 +#define S_CODNUM_RIT 101 +#define S_TIPODOC_RIT 102 +#define S_DESTIPODOC_RIT 103 +#define S_STATO_RIT 104 +#define S_DESNUM_RIT 105 -#define F_CODNUM_PRE 109 -#define F_DESNUM_PRE 110 -#define F_TIPODOC_PRE 111 -#define F_DESTIPODOC_PRE 112 +#define S_CODNUM_ANT 101 +#define S_TIPODOC_ANT 102 +#define S_DESTIPODOC_ANT 103 +#define S_STATO_RIT 104 +#define S_DESNUM_ANT 105 + +#define S_CODNUM_CONG 101 +#define S_TIPODOC_CONG 102 +#define S_DESTIPODOC_CONG 103 +#define S_STATO_CONG 104 +#define S_DESNUM_CONG 105 + +#define S_CODNUM_DOT 101 +#define S_TIPODOC_DOT 102 +#define S_DESTIPODOC_DOT 103 +#define S_STATO_DOT 104 +#define S_DESNUM_DOT 105 -#define F_CODNUM_ANT 113 -#define F_DESNUM_ANT 114 -#define F_TIPODOC_ANT 115 -#define F_DESTIPODOC_ANT 116 diff --git a/lv/lvrcondv.h b/lv/lvrcondv.h index 7c3f23f96..eb247758f 100755 --- a/lv/lvrcondv.h +++ b/lv/lvrcondv.h @@ -26,5 +26,6 @@ #define LVRCONDV_ARTBLOC "ARTBLOC" #define LVRCONDV_CALCCONS "CALCCONS" #define LVRCONDV_TIPONOL "TIPONOL" +#define LVRCONDV_MINCIC "MINCIC" #endif \ No newline at end of file