From 9d9e85c6013576753a9ac45072c0b20034d4f954 Mon Sep 17 00:00:00 2001 From: luca Date: Mon, 24 Jan 2011 16:34:18 +0000 Subject: [PATCH] Patch level :10.0 904 Files correlati : Ricompilazione Demo : [ ] Commento : aggiunto il magazzino viaggiante all'agente git-svn-id: svn://10.65.10.50/branches/R_10_00@21506 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- pr/f122.dir | 2 +- pr/f122.trr | 3 ++- pr/pr0500a.h | 4 +++ pr/pr0500a.uml | 69 +++++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 72 insertions(+), 6 deletions(-) diff --git a/pr/f122.dir b/pr/f122.dir index 390661122..e0df8171e 100755 --- a/pr/f122.dir +++ b/pr/f122.dir @@ -1,3 +1,3 @@ 122 0 -$agenti|0|0|151|0|Archivio agenti||| +$agenti|0|0|156|0|Archivio agenti||| diff --git a/pr/f122.trr b/pr/f122.trr index e177313c2..4908d6306 100755 --- a/pr/f122.trr +++ b/pr/f122.trr @@ -1,5 +1,5 @@ 122 -23 +24 CODAGE|1|5|0|Codice agente RAGSOC|1|50|0|Ragione sociale CODFORN|3|6|0|Codice fornitore relativo @@ -23,6 +23,7 @@ CODFISC|1|16|0|Codice Fiscale MATRICOLA|1|8|0|Matricola PLURIMAND|8|1|0|Plurimandatario DATACESS|5|8|0|Data cessazione rapporto +CODMAG|1|5|0|Codice magazzino viaggiante 3 CODAGE| UPPER(RAGSOC)|X diff --git a/pr/pr0500a.h b/pr/pr0500a.h index 5c88ba2c3..fb865c119 100755 --- a/pr/pr0500a.h +++ b/pr/pr0500a.h @@ -32,5 +32,9 @@ #define F_MATRICOLA 130 #define F_PLURIMAND 131 #define F_DATACESS 132 +#define F_CODMAG 135 +#define F_DESMAG 136 +#define F_CODDEP 137 +#define F_DESDEP 138 #define G_CAPOZONA 1 diff --git a/pr/pr0500a.uml b/pr/pr0500a.uml index 8ef848196..ef6682598 100755 --- a/pr/pr0500a.uml +++ b/pr/pr0500a.uml @@ -164,7 +164,7 @@ END NUMBER F_PERCPROVV 5 2 BEGIN - PROMPT 2 15 "% provvigione fissa " + PROMPT 2 15 "% provvigione fissa " FIELD PERCPROVV NUM_EXPR {(#F_PERCPROVV>=0.0)&&(#F_PERCPROVV<100.0)} WARNING "Inserire una percentuale tra 0 e 100" @@ -172,22 +172,83 @@ END STRING F_MATRICOLA 8 BEGIN - PROMPT 2 16 "Numero matricola " + PROMPT 2 16 "Numero matricola " FIELD MATRICOLA END DATE F_DATACESS BEGIN - PROMPT 2 17 "Data cessazione rapporto " + PROMPT 33 16 "Data cessazione rapporto " FIELD DATACESS END BOOLEAN F_PLURIMAND BEGIN - PROMPT 2 18 "Plurimandatario" + PROMPT 2 17 "Plurimandatario" FIELD PLURIMAND END +//magazzino viaggiante collegato all'agente (arsenale,insomma) +GROUPBOX DLG_NULL 76 4 +BEGIN + PROMPT 2 18 "Magazzino viaggiante" +END + +STRING F_CODMAG 3 +BEGIN + PROMPT 3 19 "Magazzino " + FIELD CODMAG[1,3] + USE MAG SELECT CODTAB[4,5]=="" + FLAGS "U" + INPUT CODTAB F_CODMAG + DISPLAY "Codice " CODTAB[1,3] + DISPLAY "Denominazione mag.@50 " S0 + OUTPUT F_CODMAG CODTAB[1,3] + OUTPUT F_DESMAG S0 + CHECKTYPE NORMAL +END + +STRING F_DESMAG 50 +BEGIN + PROMPT 20 19 "" + USE MAG KEY 2 + INPUT S0 F_DESMAG + DISPLAY "Denominazione mag.@50" S0 + DISPLAY "Cod. magazzino" CODTAB[1,3] + DISPLAY "Cod. deposito" CODTAB[4,5] + COPY OUTPUT F_CODMAG + CHECKTYPE NORMAL +END + +STRING F_CODDEP 2 +BEGIN + PROMPT 3 20 "Deposito " + FIELD CODMAG[4,5] + FLAGS "U" + USE MAG + INPUT CODTAB[1,3] F_CODMAG SELECT + INPUT CODTAB[4,5] F_CODDEP + DISPLAY "Cod. magazzino" CODTAB[1,3] + DISPLAY "Cod. deposito" CODTAB[4,5] + DISPLAY "Denominazione dep.@50" S0 + OUTPUT F_CODMAG CODTAB[1,3] + OUTPUT F_CODDEP CODTAB[4,5] + OUTPUT F_DESDEP S0 + CHECKTYPE NORMAL +END + +STRING F_DESDEP 50 +BEGIN + PROMPT 20 20 "" + USE MAG KEY 2 + INPUT S0 F_DESDEP + DISPLAY "Denominazione dep.@50" S0 + DISPLAY "Cod. magazzino" CODTAB[1,3] + DISPLAY "Cod. deposito" CODTAB[4,5] + COPY OUTPUT F_CODDEP + CHECKTYPE NORMAL +END + ENDPAGE PAGE "Ricerche" -1 -1 78 8