From 62a2f97986fbe5353480f1f1e1b1d13647999c49 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 22 Mar 2010 13:41:59 +0000 Subject: [PATCH] Patch level : 10.0 682 Files correlati : Ricompilazione Demo : [ ] Commento : MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug 0001490: Manca la possibilità di gestire due Conti correnti per lo stesso ABI - CAB Manca la possibilità di gestire due Conti correnti per lo stesso ABI - CAB. Aggiunto un progrssvo per banca di presentazione nei documenti nella tabella e nella gestione effetti. git-svn-id: svn://10.65.10.50/trunk@20256 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cgtbbnp.h | 2 + cg/cgtbbnp.uml | 100 +++++++++++++++++++++++++++---------------------- 2 files changed, 57 insertions(+), 45 deletions(-) diff --git a/cg/cgtbbnp.h b/cg/cgtbbnp.h index ba9c4d82a..1e01b3cee 100755 --- a/cg/cgtbbnp.h +++ b/cg/cgtbbnp.h @@ -47,5 +47,7 @@ #define F_IBAN_PAG 151 #define F_IBAN_INC 152 +#define F_PROG 153 + #endif//__CGTBBNP_H diff --git a/cg/cgtbbnp.uml b/cg/cgtbbnp.uml index e43bf482f..ff87878d3 100755 --- a/cg/cgtbbnp.uml +++ b/cg/cgtbbnp.uml @@ -6,7 +6,7 @@ ENDPAGE PAGE "Banche di Presentazione" 0 2 0 0 -GROUPBOX DLG_NULL 78 4 +GROUPBOX DLG_NULL 78 5 BEGIN PROMPT 1 0 "" END @@ -53,13 +53,20 @@ BEGIN FLAGS "Z" FIELD CODTAB[1,5] KEY 1 - USE BNP KEY 1 SELECT CODTAB ?= "??????????" - JOIN %BAN ALIAS 100 INTO CODTAB==CODTAB + USE BNP + JOIN %BAN ALIAS 100 INTO CODTAB==CODTAB[1,10] INPUT CODTAB[1,5] F_ABI + INPUT CODTAB[6,10] F_CAB + INPUT CODTAB[11,12] F_PROG DISPLAY "ABI@5" CODTAB[1,5] DISPLAY "CAB@5" CODTAB[6,10] + DISPLAY "Progr." CODTAB[11,12] + DISPLAY "IBAN@25" S3 DISPLAY "Denominazione@50" 100@->S0 OUTPUT F_ABI CODTAB[1,5] + OUTPUT F_CAB CODTAB[6,10] + OUTPUT F_PROG CODTAB[11,12] + OUTPUT F_DENOM 100@->S0 MESSAGE COPY,F_CODICEABI MESSAGE CHECK,F_CODICEABI MESSAGE COPY,F_BBAN_ABI @@ -72,16 +79,7 @@ BEGIN FLAGS "Z" FIELD CODTAB[6,10] KEY 1 - USE BNP KEY 1 SELECT CODTAB ?= "??????????" - JOIN %BAN ALIAS 100 INTO CODTAB=CODTAB - INPUT CODTAB[1,5] F_ABI - INPUT CODTAB[6,10] F_CAB - DISPLAY "ABI@5" CODTAB[1,5] - DISPLAY "CAB@5" CODTAB[6,10] - DISPLAY "Denominazione@50" 100@->S0 - OUTPUT F_CAB CODTAB[6,10] - OUTPUT F_ABI CODTAB[1,5] - OUTPUT F_DENOM 100@->S0 + COPY ALL F_ABI MESSAGE COPY,F_CODICECAB MESSAGE CHECK,F_CODICEABI MESSAGE COPY,F_BBAN_CAB @@ -100,9 +98,21 @@ BEGIN FLAG "D" END +NUMBER F_PROG 2 +BEGIN + PROMPT 2 3 "Progressivo " + FLAGS "Z" + FIELD CODTAB[11,12] + KEY 1 + COPY ALL F_ABI + MESSAGE CHECK,F_CODICEABI + MESSAGE COPY,F_BBAN_CAB + CHECKTYPE SEARCH +END + GROUPBOX DLG_NULL 78 3 BEGIN - PROMPT 1 4 "@bConto Corrente" + PROMPT 1 5 "@bConto Corrente" END STRING F_IBAN 34 @@ -114,80 +124,80 @@ END STRING F_IBAN_STATO 2 BEGIN - PROMPT 2 5 "Codice IBAN " + PROMPT 2 6 "Codice IBAN " FLAGS "U" VALIDATE CHECK_IBAN_FUNC F_IBAN F_IBAN_STATO F_IBAN_CHECK F_BBAN F_BBAN_CIN F_BBAN_ABI F_BBAN_CAB F_BBAN_CONTO END NUMBER F_IBAN_CHECK 2 BEGIN - PROMPT 19 5 "" + PROMPT 19 6 "" FLAGS "UZ" VALIDATE CHECK_IBAN_FUNC F_IBAN F_IBAN_STATO F_IBAN_CHECK F_BBAN F_BBAN_CIN F_BBAN_ABI F_BBAN_CAB F_BBAN_CONTO END STRINGA F_BBAN 30 BEGIN - PROMPT 30 5 "BBAN " + PROMPT 30 6 "BBAN " FLAGS "UH" END STRINGA F_BBAN_CIN 1 BEGIN - PROMPT 30 5 "BBAN " + PROMPT 30 6 "BBAN " FLAGS "U" VALIDATE CHECK_BBAN_FUNC F_BBAN F_BBAN_CIN F_BBAN_ABI F_BBAN_CAB F_BBAN_CONTO END NUMBER F_BBAN_ABI 5 BEGIN - PROMPT 38 5 "" + PROMPT 38 6 "" FLAGS "DGZ" NUM_CALC #F_ABI END NUMBER F_BBAN_CAB 5 BEGIN - PROMPT 45 5 "" + PROMPT 45 6 "" FLAGS "DGZ" NUM_CALC #F_CAB END STRING F_BBAN_CONTO 12 BEGIN - PROMPT 52 5 "" + PROMPT 52 6 "" FLAGS "UZ" VALIDATE CHECK_BBAN_FUNC F_BBAN F_BBAN_CIN F_BBAN_ABI F_BBAN_CAB F_BBAN_CONTO END GROUPBOX DLG_NULL 78 5 BEGIN - PROMPT 1 7 "@bPortafoglio Effetti all'incasso" + PROMPT 1 8 "@bPortafoglio Effetti all'incasso" END STRING F_CC_INC 20 BEGIN - PROMPT 2 8 "C/C " + PROMPT 2 9 "C/C " FIELD S0 END NUMBER F_GRUPPO_INC 3 BEGIN - PROMPT 2 9 "Conto attivi " + PROMPT 2 10 "Conto attivi " FIELD I0 CHECKTYPE NORMAL END NUMBER F_CONTO_INC 3 BEGIN - PROMPT 21 9 "" + PROMPT 21 10 "" FIELD I1 CHECKTYPE NORMAL END NUMBER F_SOTTOC_INC 6 BEGIN - PROMPT 28 9 "" + PROMPT 28 10 "" FIELD I2 USE LF_PCON KEY 1 SELECT SOTTOCONTO!="" INPUT GRUPPO F_GRUPPO_INC @@ -206,7 +216,7 @@ END STRING F_DESCR_INC 50 38 BEGIN - PROMPT 38 9 "" + PROMPT 38 10 "" USE LF_PCON KEY 2 INPUT DESCR F_DESCR_INC DISPLAY "Descrizione@50" DESCR @@ -219,21 +229,21 @@ END NUMBER F_GRUPPO_INCP 3 BEGIN - PROMPT 2 10 "Conto addebito " + PROMPT 2 11 "Conto addebito " FIELD I9 CHECKTYPE NORMAL END NUMBER F_CONTO_INCP 3 BEGIN - PROMPT 21 10 "" + PROMPT 21 11 "" FIELD I10 CHECKTYPE NORMAL END NUMBER F_SOTTOC_INCP 6 BEGIN - PROMPT 28 10 "" + PROMPT 28 11 "" FIELD I11 USE LF_PCON KEY 1 SELECT SOTTOCONTO!="" INPUT GRUPPO F_GRUPPO_INCP @@ -252,7 +262,7 @@ END STRING F_DESCR_INCP 50 38 BEGIN - PROMPT 38 10 "" + PROMPT 38 11 "" USE LF_PCON KEY 2 INPUT DESCR F_DESCR_INCP DISPLAY "Descrizione@50" DESCR @@ -265,39 +275,39 @@ END GROUPBOX DLG_NULL 78 4 BEGIN - PROMPT 1 12 "@bPortafoglio Effetti salvo buon fine" + PROMPT 1 13 "@bPortafoglio Effetti salvo buon fine" END STRING F_CC_SBF 20 BEGIN - PROMPT 2 13 "C/C " + PROMPT 2 14 "C/C " FIELD S1 END NUMBER F_FIDO_SBF 20 2 BEGIN - PROMPT 38 13 "Fido " + PROMPT 38 14 "Fido " FIELD R1 PICTURE "###.###.###.###,@@" END NUMBER F_GRUPPO_SBF 3 BEGIN - PROMPT 2 14 "Contropartita " + PROMPT 2 15 "Contropartita " FIELD I3 CHECKTYPE NORMAL END NUMBER F_CONTO_SBF 3 BEGIN - PROMPT 21 14 "" + PROMPT 21 15 "" FIELD I4 CHECKTYPE NORMAL END NUMBER F_SOTTOC_SBF 6 BEGIN - PROMPT 28 14 "" + PROMPT 28 15 "" FIELD I5 USE LF_PCON KEY 1 SELECT SOTTOCONTO!="" INPUT GRUPPO F_GRUPPO_SBF @@ -316,7 +326,7 @@ END STRING F_DESCR_SBF 50 38 BEGIN - PROMPT 38 14 "" + PROMPT 38 15 "" USE LF_PCON KEY 2 INPUT DESCR F_DESCR_SBF DISPLAY "Descrizione@50" DESCR @@ -329,39 +339,39 @@ END GROUPBOX DLG_NULL 78 4 BEGIN - PROMPT 1 16 "@bPortafoglio Effetti allo sconto" + PROMPT 1 17 "@bPortafoglio Effetti allo sconto" END STRING F_CC_SCN 20 BEGIN - PROMPT 2 17 "C/C " + PROMPT 2 18 "C/C " FIELD S2 END NUMBER F_FIDO_SCN 20 2 BEGIN - PROMPT 38 17 "Fido " + PROMPT 38 18 "Fido " FIELD R2 PICTURE "###.###.###.###,@@" END NUMBER F_GRUPPO_SCN 3 BEGIN - PROMPT 2 18 "Contropartita " + PROMPT 2 19 "Contropartita " FIELD I6 CHECKTYPE NORMAL END NUMBER F_CONTO_SCN 3 BEGIN - PROMPT 20 18 "" + PROMPT 20 19 "" FIELD I7 CHECKTYPE NORMAL END NUMBER F_SOTTOC_SCN 6 BEGIN - PROMPT 28 18 "" + PROMPT 28 19 "" FIELD I8 USE LF_PCON KEY 1 SELECT SOTTOCONTO!="" INPUT GRUPPO F_GRUPPO_SCN @@ -380,7 +390,7 @@ END STRING F_DESCR_SCN 50 38 BEGIN - PROMPT 38 18 "" + PROMPT 38 19 "" USE LF_PCON KEY 2 INPUT DESCR F_DESCR_SCN DISPLAY "Descrizione@50" DESCR