root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 1044

Browse Source 
Files correlati     : cg0.exe cg0200a.msk cgtbbnp.msk
Commento        :

Agiunto supporto per IBAN esteri all'anagrafica clienti e alle banche di presentazione
This commit is contained in:
Alessandro Bonazzi 2021-03-22 14:28:59 +01:00
parent fb3716dac6
commit c88d8a8c1c
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/cg/cg0200.cpp
View File

@ -819,6 +819,7 @@ void TClifo_application::add_bank(TSheet_field& ns_sh, const TRectype& rec)
TString8 abi, cab; TString8 abi, cab;
TString80 numcc, iban; TString80 numcc, iban;
TString8 progr; TString8 progr;
const bool pres = ns_sh.sheet_mask().efield(F_PROGPR).active();
switch (rec.num()) switch (rec.num())
{ {
@ -831,7 +832,7 @@ void TClifo_application::add_bank(TSheet_field& ns_sh, const TRectype& rec)
case LF_CFVEN: case LF_CFVEN:
abi = rec.get(CFV_CODABIPR); abi = rec.get(CFV_CODABIPR);
cab = rec.get(CFV_CODCABPR); cab = rec.get(CFV_CODCABPR);
if (ns_sh.sheet_mask().efield(F_PROGPR).active()) if (pres)
progr = "01"; // verificare progr = "01"; // verificare
break; break;
case LF_CFBAN: case LF_CFBAN:
@ -840,7 +841,7 @@ void TClifo_application::add_bank(TSheet_field& ns_sh, const TRectype& rec)
numcc = rec.get(CFBAN_NUMCC); numcc = rec.get(CFBAN_NUMCC);
iban = rec.get(CFBAN_IBAN); iban = rec.get(CFBAN_IBAN);
// Copia il progressivo solo nello sheet delle banche di presentazione // Copia il progressivo solo nello sheet delle banche di presentazione
if (ns_sh.sheet_mask().efield(F_PROGPR).active()) if (pres)
{ {
progr = rec.get(CFBAN_PROGPR); progr = rec.get(CFBAN_PROGPR);
@ -865,7 +866,8 @@ void TClifo_application::add_bank(TSheet_field& ns_sh, const TRectype& rec)
if (iso == "IT") if (iso == "IT")
ns_sh.set_row_cell(F_BBAN_CONTO, numcc, nrow); ns_sh.set_row_cell(F_BBAN_CONTO, numcc, nrow);
else else
ns_sh.set_row_cell(F_BBAN, numcc, nrow); if (!pres)
ns_sh.set_row_cell(F_BBAN, numcc, nrow);
ns_sh.set_row_cell(F_IBAN, iban, nrow); ns_sh.set_row_cell(F_IBAN, iban, nrow);
if (ns_sh.sheet_mask().efield(F_PROGPR).active()) if (ns_sh.sheet_mask().efield(F_PROGPR).active())
ns_sh.set_row_cell(F_PROGPR, progr, nrow); ns_sh.set_row_cell(F_PROGPR, progr, nrow);
@ -877,8 +879,7 @@ void TClifo_application::add_bank(TSheet_field& ns_sh, const TRectype& rec)
ns_sh.set_row_cell(F_DESBAN, cache().get("%BAN", key,"S0"), nrow); ns_sh.set_row_cell(F_DESBAN, cache().get("%BAN", key,"S0"), nrow);
} }
enable_iban_fields(ns_sh.sheet_row_mask(nrow), F_BBAN, F_BBAN_CIN, F_BBAN_ABI, enable_iban_fields(ns_sh.sheet_row_mask(nrow), F_BBAN, F_BBAN_CIN, F_BBAN_ABI,
F_BBAN_CAB, F_BBAN_CONTO, F_DESBAN, iso == "IT", F_BBAN_CAB, F_BBAN_CONTO, F_DESBAN, iso == "IT", pres, nrow);
ns_sh.sheet_mask().efield(F_PROGPR).active(), nrow);
} }
} }
@ -1555,12 +1556,18 @@ bool TClifo_application::user_create() // initvar e arrmask
_msk->set_handler(F_PADESTIN, coddest_handler); _msk->set_handler(F_PADESTIN, coddest_handler);
TSheet_field& ind = _msk->sfield(F_SHEET_G_VEN); TSheet_field& ind = _msk->sfield(F_SHEET_G_VEN);
ind.set_notify(indsp_notify); ind.set_notify(indsp_notify);
ind.sheet_mask().set_handler(F_COMI, comi_handler); ind.sheet_mask().set_handler(F_COMI, comi_handler);
ind.sheet_mask().set_handler(F_PADESTINI, coddest_handler); ind.sheet_mask().set_handler(F_PADESTINI, coddest_handler);
TSheet_field& pnae = _msk->sfield(F_NONACCEFF); TSheet_field& pnae = _msk->sfield(F_NONACCEFF);
pnae.set_notify(effetti_notify);
pnae.set_notify(effetti_notify);
/*TSheet_field & vs_sh = _msk->sfield(F_BANP);
vs_sh.show_column(F_BBAN, false);*/
_savenew = !ini_get_bool(CONFIG_STUDIO, "cg", "Cg02SN"); _savenew = !ini_get_bool(CONFIG_STUDIO, "cg", "Cg02SN");

11
src/cg/cg0200a.uml
View File

@ -858,7 +858,7 @@ BEGIN
ITEM "IBAN\nABI@5" ITEM "IBAN\nABI@5"
ITEM "IBAN\nCAB@5" ITEM "IBAN\nCAB@5"
ITEM "IBAN\nConto@12" ITEM "IBAN\nConto@12"
ITEM "BBAN@15" ITEM "@1"
ITEM "Progressivo" ITEM "Progressivo"
ITEM "Descrizione@50" ITEM "Descrizione@50"
ITEM "IBAN@27" ITEM "IBAN@27"
@ -2521,7 +2521,7 @@ PAGE "Banche di presentazione" -1 -1 80 8
STRING F_IBAN_STATO 2 STRING F_IBAN_STATO 2
BEGIN BEGIN
PROMPT 2 2 "Codice IBAN " PROMPT 2 2 "Codice IBAN "
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 F_DESBAN 1 VALIDATE CHECK_IBAN_FUNC F_IBAN F_IBAN_STATO F_IBAN_CHECK -1 F_BBAN_CIN F_BBAN_ABI F_BBAN_CAB F_BBAN_CONTO F_DESBAN 1
FLAGS "UDG" FLAGS "UDG"
END END
@ -2555,11 +2555,6 @@ BEGIN
OUTPUT F_PROGPR CODTAB[11,12] OUTPUT F_PROGPR CODTAB[11,12]
OUTPUT F_DESBAN 100@->S0 OUTPUT F_DESBAN 100@->S0
OUTPUT F_IBAN S3 OUTPUT F_IBAN S3
OUTPUT F_IBAN_STATO S3[1,2]
OUTPUT F_IBAN_CHECK S3[3,4]
OUTPUT F_BBAN_CIN S3[5,5]
OUTPUT F_BBAN_CONTO S3[16,27]
OUTPUT F_BBAN S6
HELP "Codice ABI banca del C/F" HELP "Codice ABI banca del C/F"
CHECKTYPE SEARCH CHECKTYPE SEARCH
FLAGS "ZG" FLAGS "ZG"
@ -2583,7 +2578,7 @@ END
STRING F_BBAN 30 STRING F_BBAN 30
BEGIN BEGIN
PROMPT 59 2 "" PROMPT 59 2 ""
FLAGS "UGD" FLAGS "UHGD"
END END
NUMBER F_PROGPR 2 NUMBER F_PROGPR 2