diff --git a/src/cg/cg0200.cpp b/src/cg/cg0200.cpp index 6c9b0e64e..4eb06fd32 100755 --- a/src/cg/cg0200.cpp +++ b/src/cg/cg0200.cpp @@ -819,6 +819,7 @@ void TClifo_application::add_bank(TSheet_field& ns_sh, const TRectype& rec) TString8 abi, cab; TString80 numcc, iban; TString8 progr; + const bool pres = ns_sh.sheet_mask().efield(F_PROGPR).active(); switch (rec.num()) { @@ -831,7 +832,7 @@ void TClifo_application::add_bank(TSheet_field& ns_sh, const TRectype& rec) case LF_CFVEN: abi = rec.get(CFV_CODABIPR); cab = rec.get(CFV_CODCABPR); - if (ns_sh.sheet_mask().efield(F_PROGPR).active()) + if (pres) progr = "01"; // verificare break; case LF_CFBAN: @@ -840,7 +841,7 @@ void TClifo_application::add_bank(TSheet_field& ns_sh, const TRectype& rec) numcc = rec.get(CFBAN_NUMCC); iban = rec.get(CFBAN_IBAN); // 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); @@ -865,7 +866,8 @@ void TClifo_application::add_bank(TSheet_field& ns_sh, const TRectype& rec) if (iso == "IT") ns_sh.set_row_cell(F_BBAN_CONTO, numcc, nrow); 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); if (ns_sh.sheet_mask().efield(F_PROGPR).active()) 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); } 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", - ns_sh.sheet_mask().efield(F_PROGPR).active(), nrow); + F_BBAN_CAB, F_BBAN_CONTO, F_DESBAN, iso == "IT", pres, nrow); } } @@ -1555,12 +1556,18 @@ bool TClifo_application::user_create() // initvar e arrmask _msk->set_handler(F_PADESTIN, coddest_handler); TSheet_field& ind = _msk->sfield(F_SHEET_G_VEN); + ind.set_notify(indsp_notify); ind.sheet_mask().set_handler(F_COMI, comi_handler); ind.sheet_mask().set_handler(F_PADESTINI, coddest_handler); 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"); diff --git a/src/cg/cg0200a.uml b/src/cg/cg0200a.uml index 39d7727e8..3dd66f7cf 100755 --- a/src/cg/cg0200a.uml +++ b/src/cg/cg0200a.uml @@ -858,7 +858,7 @@ BEGIN ITEM "IBAN\nABI@5" ITEM "IBAN\nCAB@5" ITEM "IBAN\nConto@12" - ITEM "BBAN@15" + ITEM "@1" ITEM "Progressivo" ITEM "Descrizione@50" ITEM "IBAN@27" @@ -2521,7 +2521,7 @@ PAGE "Banche di presentazione" -1 -1 80 8 STRING F_IBAN_STATO 2 BEGIN 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" END @@ -2555,11 +2555,6 @@ BEGIN OUTPUT F_PROGPR CODTAB[11,12] OUTPUT F_DESBAN 100@->S0 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" CHECKTYPE SEARCH FLAGS "ZG" @@ -2583,7 +2578,7 @@ END STRING F_BBAN 30 BEGIN PROMPT 59 2 "" - FLAGS "UGD" + FLAGS "UHGD" END NUMBER F_PROGPR 2