From f1b3583676d6a8510aed1ea7677feef83672f24d Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 10 Nov 2003 15:03:38 +0000
Subject: [PATCH] Patch level         : 2.0 638 Files correlati     : cg0.exe
 cg0200a.msk f20.dir f20.trr Ricompilazione Demo : [ ] Commento            :

Prima implementazione della gestione del codice IBAN in generazione effetti


git-svn-id: svn://10.65.10.50/trunk@11582 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg0200.cpp  |   2 +
 cg/cg0200.h    |  12 +++-
 cg/cg0200a.uml | 154 +++++++++++++++++++++++++++++++++----------------
 cg/cg4200a.uml |   2 -
 cg/f20.dir     |   2 +-
 cg/f20.trr     |   3 +-
 6 files changed, 121 insertions(+), 54 deletions(-)

diff --git a/cg/cg0200.cpp b/cg/cg0200.cpp
index 37217c131..241253ed1 100755
--- a/cg/cg0200.cpp
+++ b/cg/cg0200.cpp
@@ -451,6 +451,8 @@ void TClifo_application::init_insert_mode(TMask& m)
 void TClifo_application::init_modify_mode(TMask& m)
 {
   m.enable_page(4, _gesven);
+  if (_gesven)
+    m.efield(F_IBAN_STATO).validate(K_TAB); // Decodifica IBAN
 }
 
 void TClifo_application::set_pnae(TMask& m, TToken_string& nonacc, TToken_string& nonscd)
diff --git a/cg/cg0200.h b/cg/cg0200.h
index 28f2e7a31..697586a6f 100755
--- a/cg/cg0200.h
+++ b/cg/cg0200.h
@@ -42,7 +42,17 @@
 #define F_DESPAG     331
 #define F_RAGSOC1    132
 #define F_CODABI     133
-#define F_CODBAN     134
+#define F_CODCAB     134
+
+#define F_IBAN       350
+#define F_IBAN_STATO 351
+#define F_IBAN_CHECK 352
+#define F_BBAN       353
+#define F_BBAN_CIN   354
+#define F_BBAN_ABI   355
+#define F_BBAN_CAB   356
+#define F_BBAN_CONTO 357
+
 #define F_DESBAN     140
 #define F_CODVAL     136
 #define F_DESVAL     336
diff --git a/cg/cg0200a.uml b/cg/cg0200a.uml
index 57d83674c..3ecd1598e 100755
--- a/cg/cg0200a.uml
+++ b/cg/cg0200a.uml
@@ -68,7 +68,7 @@ END
 
 STRING F_RAGSOC 30
 BEGIN
-  PROMPT 23 1 "Cognome / Rag. Soc.  "
+  PROMPT 25 1 "Cognome/Rag. Soc.  "
   FIELD RAGSOC[1,30]
   KEY 2
   USE LF_CLIFO KEY 2
@@ -88,7 +88,7 @@ END
 
 STRING F_RAGSOCA 20
 BEGIN
-  PROMPT 23 2 "Nome / Seconda parte Rag. Soc. "
+  PROMPT 25 2 "Nome/Seconda parte Rag. Soc. "
   FIELD RAGSOC[31,50]
   KEY 2
   HELP "Seconda parte della ragione sociale o nome"
@@ -380,14 +380,14 @@ END
 
 STRING DLG_NULL 30
 BEGIN
-  PROMPT 23 1 "Cognome / Rag. Soc.  "
+  PROMPT 25 1 "Cognome/Rag. Soc.  "
   FLAGS "D"
   GROUP 3
 END
 
 STRING DLG_NULL 20
 BEGIN
-  PROMPT 23 2 "Nome / Seconda parte Rag. Soc. "
+  PROMPT 25 2 "Nome/Seconda parte Rag. Soc. "
   FLAGS "D"
   GROUP 6
 END
@@ -606,21 +606,21 @@ END
 
 STRING DLG_NULL 30
 BEGIN
-  PROMPT 23 1 "Cognome / Rag. Soc.  "
+  PROMPT 25 1 "Cognome/Rag. Soc.  "
   FLAGS "D"
   GROUP 3
 END
 
 STRING DLG_NULL 20
 BEGIN
-  PROMPT 23 2 "Nome / Seconda parte Rag. Soc. "
+  PROMPT 25 2 "Nome/Seconda parte Rag. Soc. "
   FLAGS "D"
   GROUP 6
 END
 
 NUMBER F_CODABI 5
 BEGIN
-  PROMPT 2 4 "Banca appoggio ABI  "
+  PROMPT 2 4 "Banca d'appoggio "
   FIELD CODABI
   FLAGS "Z"
   USE %BAN SELECT CODTAB ?= "?????"
@@ -630,47 +630,103 @@ BEGIN
   OUTPUT F_CODABI CODTAB[1,5]
   HELP "Codice ABI banca del C/F"
   CHECKTYPE NORMAL
+  MESSAGE COPY,F_BBAN_ABI
 END
 
-NUMBER F_CODBAN 5
+NUMBER F_CODCAB 5
 BEGIN
-  PROMPT 63 4 "CAB "
+  PROMPT 28 4 ""
   FIELD CODCAB
   FLAGS "Z"
   USE %BAN SELECT CODTAB ?= "??????????"
   INPUT CODTAB[1,5] F_CODABI
-  INPUT CODTAB[6,10] F_CODBAN
+  INPUT CODTAB[6,10] F_CODCAB
   DISPLAY "Codice ABI" CODTAB[1,5]
   DISPLAY "Codice CAB" CODTAB[6,10]
   DISPLAY "Denominazione@50" S0
   OUTPUT F_CODABI CODTAB[1,5]
-  OUTPUT F_CODBAN CODTAB[6,10]
+  OUTPUT F_CODCAB CODTAB[6,10]
   OUTPUT F_DESBAN S0
   HELP "Codice CAB banca del C/F"
   CHECKTYPE NORMAL
+  MESSAGE COPY,F_BBAN_CAB
 END
 
-STRING F_DESBAN 50
+STRING F_DESBAN 50 37
 BEGIN
-  PROMPT 2 5 "Denominazione       "
+  PROMPT 37 4 ""
   USE %BAN KEY 2 SELECT CODTAB ?= "??????????"
   INPUT S0 F_DESBAN
   DISPLAY "Denominazione@50" S0
   DISPLAY "Codice ABI" CODTAB[1,5]
   DISPLAY "Codice CAB" CODTAB[6,10]
-  COPY OUTPUT F_CODBAN
+  COPY OUTPUT F_CODCAB
 END
 
 STRING F_NUMCC 20
 BEGIN
-  PROMPT 2 6 "Conto corrente      "
+  PROMPT 2 5 "Conto corrente   "
   FIELD NUMCC
   FLAGS "U"
 END
 
+STRING F_IBAN 34
+BEGIN
+  PROMPT 2 6 ""
+  FLAGS "H"
+  FIELD IBAN
+END
+
+STRING F_IBAN_STATO 2
+BEGIN
+  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 24 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 33 6 "BBAN "
+  FLAGS "UH"
+END
+
+STRINGA F_BBAN_CIN 1
+BEGIN
+  PROMPT 33 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 41 6 ""
+  FLAGS "DGZ"
+END
+
+NUMBER F_BBAN_CAB 5
+BEGIN
+  PROMPT 48 6 ""
+  FLAGS "DGZ"
+END
+
+STRING F_BBAN_CONTO 12
+BEGIN
+  PROMPT 55 6 ""
+  FLAGS "UZ"
+  VALIDATE CHECK_BBAN_FUNC F_BBAN F_BBAN_CIN F_BBAN_ABI F_BBAN_CAB F_BBAN_CONTO
+END
+
+
 STRING F_CODVAL 3
 BEGIN
-  PROMPT 2 7 "Valuta      "
+  PROMPT 2 8 "Valuta       "
   FLAGS "UZ"
   FIELD CODVAL
   USE %VAL
@@ -684,7 +740,7 @@ END
 
 STRING F_DESVAL 50
 BEGIN
-  PROMPT 22 7 ""
+  PROMPT 22 8 ""
   USE %VAL KEY 2
   INPUT S0 F_DESVAL
   DISPLAY "Descrizione@50" S0
@@ -695,7 +751,7 @@ END
 
 STRING F_CODVALINTRA 3
 BEGIN
-  PROMPT 2 8 "Valuta INTRA"
+  PROMPT 2 9 "Valuta INTRA "
   FLAGS "UZ"
   FIELD VALINTRA
   COPY USE F_CODVAL
@@ -709,7 +765,7 @@ END
 
 STRING F_DESVALINTRA 50
 BEGIN
-  PROMPT 22 8 ""
+  PROMPT 22 9 ""
   COPY USE F_DESVAL
   INPUT S0 F_DESVALINTRA
   COPY DISPLAY F_DESVAL
@@ -720,7 +776,7 @@ END
 
 STRING F_CODLIN 1
 BEGIN
-  PROMPT 2 9 "Lingua        "
+  PROMPT 2 10 "Lingua         "
   FIELD CODLIN
   USE %LNG
   FLAGS "U"
@@ -735,7 +791,7 @@ END
 
 STRING F_DESLIN 50
 BEGIN
-  PROMPT 22 9 ""
+  PROMPT 22 10 ""
   USE %LNG KEY 2
   INPUT S0 F_DESLIN
   DISPLAY "Descrizione@50" S0
@@ -746,7 +802,7 @@ END
 
 STRING F_CODPAG 4
 BEGIN
-  PROMPT 2 10 "Pagamento  "
+  PROMPT 2 11 "Pagamento   "
   FIELD CODPAG
   FLAGS "U#"
   USE %CPG
@@ -762,7 +818,7 @@ END
 
 STRING F_DESPAG 50
 BEGIN
-  PROMPT 22 10 ""
+  PROMPT 22 11 ""
   USE %CPG KEY 2
   INPUT S0 F_DESPAG
   DISPLAY "Descrizione@50" S0
@@ -774,7 +830,7 @@ END
 
 CURRENCY F_FIDO 15
 BEGIN
-  PROMPT 2 11 "Fido                "
+  PROMPT 2 12 "Fido                "
   FIELD FIDO
   DRIVENBY F_CODVAL
   HELP "Importo massimo fido del cliente/fornitore"
@@ -782,18 +838,18 @@ END
 
 GROUPBOX DLG_NULL 76 3
 BEGIN
-  PROMPT 1 12 "@bConto cliente/fornitore"
+  PROMPT 1 13 "@bConto cliente/fornitore"
 END
 
 NUMBER F_GRUPPO 3
 BEGIN
-  PROMPT 2 13 "Grp."
+  PROMPT 2 14 "Grp."
   FIELD GRUPPO
 END
 
 NUMBER F_CONTO 3
 BEGIN
-  PROMPT 11 13 "Cnt."
+  PROMPT 11 14 "Cnt."
   FIELD CONTO
   USE LF_PCON SELECT (CONTO!="")&&(SOTTOCONTO="")&&(TMCF=#F_TIPOCF)
   INPUT GRUPPO F_GRUPPO
@@ -811,7 +867,7 @@ END
 
 STRING F_DESCONTO 50
 BEGIN
-  PROMPT 22 13 ""
+  PROMPT 22 14 ""
   USE LF_PCON KEY 2 SELECT (CONTO!="")&&(SOTTOCONTO="")&&(TMCF=#F_TIPOCF)
   INPUT DESCR F_DESCONTO
   DISPLAY "Descrizione@50" DESCR
@@ -824,18 +880,18 @@ END
 
 GROUPBOX DLG_RIC 76 4
 BEGIN
-  PROMPT 1 15 "@bConto di ricavo"
+  PROMPT 1 16 "@bConto di ricavo"
 END
 
 GROUPBOX DLG_CST 76 4
 BEGIN
-  PROMPT 1 15 "@bConto di costo"
+  PROMPT 1 16 "@bConto di costo"
   FLAGS "H"
 END
 
 NUMBER F_GRUPPORIC 3
 BEGIN
-  PROMPT 2 16 "Gruppo      "
+  PROMPT 2 17 "Gruppo      "
   FIELD GRUPPORIC
   FLAGS "R"
   HELP "Gruppo di contropartita"
@@ -843,7 +899,7 @@ END
 
 NUMBER F_CONTORIC 3
 BEGIN
-  PROMPT 27 16 "Conto "
+  PROMPT 27 17 "Conto "
   FIELD CONTORIC
   FLAGS "R"
   HELP "Conto di contropartita"
@@ -851,7 +907,7 @@ END
 
 NUMBER F_SOTTOCRIC 6
 BEGIN
-  PROMPT 47 16 "Sottoconto "
+  PROMPT 47 17 "Sottoconto "
   FIELD SOTTOCRIC
   FLAGS "R"
   USE LF_PCON SELECT SOTTOCONTO!=""
@@ -873,7 +929,7 @@ END
 
 STRING F_DESCRIC 50
 BEGIN
-  PROMPT 2 17 "Descrizione "
+  PROMPT 2 18 "Descrizione "
   USE LF_PCON KEY 2 SELECT SOTTOCONTO!=""
   INPUT DESCR F_DESCRIC
   DISPLAY "Descrizione@50" DESCR
@@ -912,14 +968,14 @@ END
 
 STRING DLG_NULL 30
 BEGIN
-  PROMPT 23 1 "Cognome / Rag. Soc.  "
+  PROMPT 25 1 "Cognome/Rag. Soc.  "
   FLAGS "D"
   GROUP 3
 END
 
 STRING DLG_NULL 20
 BEGIN
-  PROMPT 23 2 "Nome / Seconda Parte Rag. Soc. "
+  PROMPT 25 2 "Nome/Seconda parte Rag. Soc. "
   FLAGS "D"
   GROUP 6
 END
@@ -942,10 +998,10 @@ BEGIN
   PROMPT 43 4 "CAB    "
   FIELD LF_CFVEN->CODCABPR
   FLAGS "Z"
-  COPY USE F_CODBAN
+  COPY USE F_CODCAB
   INPUT CODTAB[1,5] F_CODABIPR
   INPUT CODTAB[6,10] F_CODBANPR
-  COPY DISPLAY F_CODBAN
+  COPY DISPLAY F_CODCAB
   OUTPUT F_CODABIPR CODTAB[1,5]
   OUTPUT F_CODBANPR CODTAB[6,10]
   OUTPUT F_DESBANPR S0
@@ -1061,14 +1117,14 @@ END
 
 STRING DLG_NULL 30
 BEGIN
-  PROMPT 23 1 "Cognome / Rag. Soc.  "
+  PROMPT 25 1 "Cognome/Rag. Soc.  "
   FLAGS "D"
   GROUP 3
 END
 
 STRING DLG_NULL 20
 BEGIN
-  PROMPT 23 2 "Nome / Seconda parte Rag. Soc. "
+  PROMPT 25 2 "Nome/Seconda parte Rag. Soc. "
   FLAGS "D"
   GROUP 6
 END
@@ -1153,14 +1209,14 @@ END
 
 STRING DLG_NULL 30
 BEGIN
-  PROMPT 23 1 "Cognome / Rag. Soc.  "
+  PROMPT 25 1 "Cognome/Rag. Soc.  "
   FLAGS "D"
   GROUP 3
 END
 
 STRING DLG_NULL 20
 BEGIN
-  PROMPT 23 2 "Nome / seconda parte Rag. Soc. "
+  PROMPT 25 2 "Nome/Seconda parte Rag. Soc. "
   FLAGS "D"
   GROUP 6
 END
@@ -1359,21 +1415,21 @@ END
 
 STRING DLG_NULL 30
 BEGIN
-  PROMPT 23 1 "Cognome / Rag. Soc.  "
+  PROMPT 25 1 "Cognome/Rag. Soc.  "
   FLAGS "D"
   GROUP 3
 END
 
 STRING DLG_NULL 20
 BEGIN
-  PROMPT 23 2 "Nome / Seconda parte Rag. Soc. "
+  PROMPT 25 2 "Nome/Seconda parte Rag. Soc. "
   FLAGS "D"
   GROUP 6
 END
 
 STRING F_CODNOTESP1 3
 BEGIN
-  PROMPT 2 4 "Codici note documento    "
+  PROMPT 2 4 "Codici note documento   "
   FIELD LF_CFVEN->CODNOTESP1
   GROUP 7
   USE %NDO
@@ -1400,9 +1456,9 @@ BEGIN
   CHECKTYPE NORMAL
 END
 
-STRING F_CODSPMEZZO 2
+STRING F_CODSPMEZZO 3
 BEGIN
-  PROMPT 46 4 "Codice modalita'spedizione "
+  PROMPT 43 4 "Codice modalita' spedizione "
   FIELD LF_CFVEN->CODSPMEZZO
   USE %MSP
   INPUT CODTAB F_CODSPMEZZO
@@ -1636,14 +1692,14 @@ END
 
 STRING DLG_NULL 30
 BEGIN
-  PROMPT 23 1 "Cognome / Rag. Soc.  "
+  PROMPT 25 1 "Cognome/Rag. Soc.  "
   FLAGS "D"
   GROUP 3
 END
 
 STRING DLG_NULL 20
 BEGIN
-  PROMPT 23 2 "Nome / Seconda parte Rag. Soc. "
+  PROMPT 25 2 "Nome/Seconda parte Rag. Soc. "
   FLAGS "D"
   GROUP 6
 END
diff --git a/cg/cg4200a.uml b/cg/cg4200a.uml
index dfe8cc9d1..72e580325 100755
--- a/cg/cg4200a.uml
+++ b/cg/cg4200a.uml
@@ -29,7 +29,6 @@ BEGIN
   OUTPUT F_FROMFIRM CODDITTA
   OUTPUT F_DFROMFIRM RAGSOC
   HELP "Codice della ditta da cui prelevare i dati"
-  VALIDATE CHECK_FIRM_FUNC
   WARNING "Ditta assente"
 END
 
@@ -44,7 +43,6 @@ BEGIN
   COPY OUTPUT F_FROMFIRM
   HELP "Ragione sociale della ditta da cui prelevare i dati"
   WARNING "Ditta assente"
-  VALIDATE CHECK_FIRM_FUNC
 END
 
 GROUPBOX DLG_NULL 76 3
diff --git a/cg/f20.dir b/cg/f20.dir
index b88500b4f..00fa0b221 100755
--- a/cg/f20.dir
+++ b/cg/f20.dir
@@ -1,3 +1,3 @@
 20
 0
-$clifo|0|0|639|0|Clienti/Fornitori|NCF||
+$clifo|0|0|673|0|Clienti/Fornitori|NCF||
diff --git a/cg/f20.trr b/cg/f20.trr
index 10d21541b..be7f40341 100755
--- a/cg/f20.trr
+++ b/cg/f20.trr
@@ -1,5 +1,5 @@
 20
-52
+53
 TIPOCF|1|1|0|Tipo ( <C>liente <F>ornitore
 CODCF|3|6|0|Codice
 RAGSOC|1|50|0|Ragione sociale
@@ -40,6 +40,7 @@ CODSTAT|1|7|0|Codice statistico
 CODABI|10|5|0|Codice ABI banca
 CODCAB|10|5|0|Codice CAB banca
 NUMCC|1|20|0|Numero di conto corrente
+IBAN|1|34|0|Codice IBAN
 OCCAS|8|1|0|Cliente / fornitore occasionale
 STATO|2|3|0|Codice stato ???
 CODVAL|1|3|0|Codice valuta