From 49df928972cd239be0b34ead83d60e025b7dd11e Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 6 May 2011 09:59:17 +0000 Subject: [PATCH] Patch level : 10.990 Files correlati : ve2.exe Ricompilazione Demo : [ ] Commento : Bug 0001851: Anagrafica di Magazzino Aggiungere i campi e una tabella per il collegamento a Magic (E-Commerce) Sono quattro campi gerarchici che identificano la categoria e relativa tabella ( Rif. PRASSI Napoli) Il programma di anagrafica di magazzino deve funzionare esattamente come prima visto che son campi che si attivano con una configurazione nel ditta.ini paragrafo ve (Magic=X) git-svn-id: svn://10.65.10.50/branches/R_10_00@22084 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ve/ve2400.cpp | 18 ++++++++++- ve/ve2400.h | 5 +++ ve/ve2400.uml | 65 +++++++++++++++++++++++++++++++++++++++ ve/vetbctm.h | 7 +++++ ve/vetbctm.uml | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 176 insertions(+), 1 deletion(-) create mode 100755 ve/vetbctm.h create mode 100755 ve/vetbctm.uml diff --git a/ve/ve2400.cpp b/ve/ve2400.cpp index 61ef0f371..b9d58c545 100755 --- a/ve/ve2400.cpp +++ b/ve/ve2400.cpp @@ -453,7 +453,7 @@ void TMask_anamag::create_user_fields() } //if(c.get_bool... } //for(int i... - if (user_fields == 0) + if (user_fields == 0 && !ini_get_bool(CONFIG_DITTA, "ve", "Magic")) _disabled_user_page = PAGE_USER; } @@ -524,6 +524,20 @@ TMask_anamag::TMask_anamag(TRelation * rel) : TMask("ve2400") field(F_CODIVA).check_type(c.get_bool("IVA_OBBL", "ve") && app().has_module(VEAUT, CHK_DONGLE) ? CHECK_REQUIRED : CHECK_NORMAL); + if (c.get_bool("Magic", "ve")) + { + show(F_ECMAGIC1); + show(F_ECMAGIC2); + show(F_ECMAGIC3); + show(F_ECMAGIC4); + show(F_ECMAGIC_DESCR); + enable(F_ECMAGIC1); + enable(F_ECMAGIC2); + enable(F_ECMAGIC3); + enable(F_ECMAGIC4); + enable(F_ECMAGIC_DESCR); + } + first_focus(F_CODART); } } @@ -1837,6 +1851,8 @@ bool TAnagrafica_magazzino::user_create() // crea l'oggetto per i parametri di livello giacenza // apre la maschera e dispone gli sheet _rel= new TRelation(LF_ANAMAG); + if (ini_get_bool(CONFIG_DITTA, "ve", "Magic")) + _rel->add("&ATM","CODTAB==" ANAMAG_CODART); _msk= new TMask_anamag(_rel); diff --git a/ve/ve2400.h b/ve/ve2400.h index 60301bfce..5bc2e3e78 100755 --- a/ve/ve2400.h +++ b/ve/ve2400.h @@ -176,6 +176,11 @@ #define F_SCAPLA 325 #define F_SCALEG 326 #define F_SCAVET 327 +#define F_ECMAGIC1 328 +#define F_ECMAGIC2 329 +#define F_ECMAGIC3 330 +#define F_ECMAGIC4 331 +#define F_ECMAGIC_DESCR 332 #define F_USER1 371 #define F_USER2 372 diff --git a/ve/ve2400.uml b/ve/ve2400.uml index 26f6f3492..54c56f238 100755 --- a/ve/ve2400.uml +++ b/ve/ve2400.uml @@ -1525,6 +1525,71 @@ BEGIN GROUP G_DESART END +STRING F_ECMAGIC1 5 +BEGIN + PROMPT 2 4 "Categoria Magic 1 " + USE &CTM + INPUT CODTAB[1,5] F_ECMAGIC1 + INPUT CODTAB[6,10] F_ECMAGIC2 + INPUT CODTAB[11,15] F_ECMAGIC3 + INPUT CODTAB[16,20] F_ECMAGIC4 + DISPLAY "Categoria 1" CODTAB[1,5] + DISPLAY "Categoria 2" CODTAB[6,10] + DISPLAY "Categoria 3" CODTAB[11,15] + DISPLAY "Categoria 4" CODTAB[16,20] + DISPLAY "Descrizione@50" S0 + OUTPUT F_ECMAGIC1 CODTAB[1,5] + OUTPUT F_ECMAGIC2 CODTAB[6,10] + OUTPUT F_ECMAGIC3 CODTAB[11,15] + OUTPUT F_ECMAGIC4 CODTAB[16,20] + OUTPUT F_ECMAGIC_DESCR S0 + CHECKTYPE NORMAL + FIELD USER1 + FLAGS "UHDZ" +END + +STRING F_ECMAGIC2 5 +BEGIN + PROMPT 29 4 "2 " + COPY ALL F_ECMAGIC1 + CHECKTYPE NORMAL + FIELD USER2 + FLAGS "UHDZ" + END + +STRING F_ECMAGIC3 5 +BEGIN + PROMPT 40 4 "3 " + COPY ALL F_ECMAGIC1 + CHECKTYPE NORMAL + FIELD USER3 + FLAGS "UHDZ" +END + +STRING F_ECMAGIC4 5 +BEGIN + PROMPT 51 4 "4 " + COPY ALL F_ECMAGIC1 + CHECKTYPE NORMAL + FIELD USER4 + FLAGS "UHDZ" +END + +STRING F_ECMAGIC_DESCR 50 +BEGIN + PROMPT 2 6 "Descrizione " + USE &CTM KEY 2 + INPUT S0 F_ECMAGIC_DESCR + DISPLAY "Descrizione@50" S0 + DISPLAY "Categoria 1" CODTAB[1,5] + DISPLAY "Categoria 2" CODTAB[6,10] + DISPLAY "Categoria 3" CODTAB[11,15] + DISPLAY "Categoria 4" CODTAB[16,20] + COPY OUTPUT F_ECMAGIC1 + CHECKTYPE NORMAL + FLAGS "UHDZ" +END + ENDPAGE ENDMASK diff --git a/ve/vetbctm.h b/ve/vetbctm.h new file mode 100755 index 000000000..0e8752dee --- /dev/null +++ b/ve/vetbctm.h @@ -0,0 +1,7 @@ +//campi maschera ectbctm +#define F_CATEGORIA1 201 +#define F_CATEGORIA2 202 +#define F_CATEGORIA3 203 +#define F_CATEGORIA4 204 +#define F_CATEGORIA_DESCR 205 + diff --git a/ve/vetbctm.uml b/ve/vetbctm.uml new file mode 100755 index 000000000..d0fae2d5b --- /dev/null +++ b/ve/vetbctm.uml @@ -0,0 +1,82 @@ +#include "vetbctm.h" + +PAGE "Tabella Categorie Magic" -1 -1 78 6 + +STRING F_CATEGORIA1 5 +BEGIN + PROMPT 1 1 "Categoria " + FLAGS "UZ" + USE &CTM + INPUT CODTAB[1,5] F_CATEGORIA1 + INPUT CODTAB[6,10] F_CATEGORIA2 + INPUT CODTAB[11,15] F_CATEGORIA3 + INPUT CODTAB[16,20] F_CATEGORIA4 + DISPLAY "Categoria 1" CODTAB[1,5] + DISPLAY "Categoria 2" CODTAB[6,10] + DISPLAY "Categoria 3" CODTAB[11,15] + DISPLAY "Categoria 4" CODTAB[16,20] + DISPLAY "Descrizione@50" S0 + OUTPUT F_CATEGORIA1 CODTAB[1,5] + OUTPUT F_CATEGORIA2 CODTAB[6,10] + OUTPUT F_CATEGORIA3 CODTAB[11,15] + OUTPUT F_CATEGORIA4 CODTAB[16,20] + CHECKTYPE REQUIRED + FIELD CODTAB[1,5] + KEY 1 +END + +STRING F_CATEGORIA2 5 +BEGIN + PROMPT 22 1 "" + FLAGS "UZ" + COPY ALL F_CATEGORIA1 + CHECKTYPE NORMAL + VALIDATE REQIF_FUNC 1 F_CATEGORIA3 + FIELD CODTAB[6,10] + KEY 1 +END + +STRING F_CATEGORIA3 5 +BEGIN + PROMPT 31 1 "" + FLAGS "UZ" + COPY ALL F_CATEGORIA1 + CHECKTYPE NORMAL + VALIDATE REQIF_FUNC 1 F_CATEGORIA4 + FIELD CODTAB[11,15] + KEY 1 +END + +STRING F_CATEGORIA4 5 +BEGIN + PROMPT 40 1 "" + FLAGS "UZ" + COPY ALL F_CATEGORIA1 + CHECKTYPE NORMAL + FIELD CODTAB[16,20] + KEY 1 +END + +STRING F_CATEGORIA_DESCR 50 +BEGIN + PROMPT 1 3 "" + USE &GMC KEY 2 + INPUT S0 F_CATEGORIA_DESCR + DISPLAY "Descrizione@50" S0 + DISPLAY "Categoria 1" CODTAB[1,5] + DISPLAY "Categoria 2" CODTAB[6,10] + DISPLAY "Categoria 3" CODTAB[11,15] + DISPLAY "Categoria 4" CODTAB[16,20] + COPY OUTPUT F_CATEGORIA1 + CHECKTYPE NORMAL + KEY 2 + FIELD S0 +END + +ENDPAGE + +TOOLBAR "" 0 0 0 2 +#include "relapbar.h" +ENDPAGE + +ENDMASK \ No newline at end of file