diff --git a/ba/ba4200.cpp b/ba/ba4200.cpp index 6c6a3af0b..74849c73f 100755 --- a/ba/ba4200.cpp +++ b/ba/ba4200.cpp @@ -291,10 +291,8 @@ bool gest_uff_imp(TMask_field& f, KEY key) msk.set(F_UFFIVA, s) ; msk.field(F_UFFIVA).on_key(K_TAB); msk.set(F_UFFREG, comuni.get("UFFREG")); msk.field(F_UFFREG).on_key(K_TAB); if (msk.get(F_UFFCONC).empty() || msk.is_running()) - { msk.set(F_UFFCONC, comuni.get("UFFCONC")); - msk.field(F_UFFCONC).on_key(K_TAB); - } + msk.set(F_UFFCONC_P, comuni.get("UFFCONC")); msk.field(F_UFFCONC_P).on_key(K_TAB); msk.set(F_UFFSERV, comuni.get("UFFCSERV")); msk.field(F_UFFSERV).on_key(K_TAB); msk.set(F_CODCONTR_EP, comuni.get("UFFESPROV").mid(1, 2)); diff --git a/ba/ba4200.h b/ba/ba4200.h index 43cff6921..4c39cf870 100755 --- a/ba/ba4200.h +++ b/ba/ba4200.h @@ -379,5 +379,7 @@ #define F_DVARDF 408 #define F_STATORES 409 #define F_LOCCORR 410 +#define F_UFFCONC_P 411 +#define F_CONFIS 412 #endif // __BA4200_H diff --git a/ba/ba4200b.uml b/ba/ba4200b.uml index acee61646..a8b0bd463 100755 --- a/ba/ba4200b.uml +++ b/ba/ba4200b.uml @@ -177,6 +177,7 @@ OUTPUT FLD_ANAG_RAGSOC2 RAGSOC[31,0] HELP "Codice fiscale della persona fisica" CHECKTYPE REQUIRED VALIDATE XTCF_FUNC FLD_AF1_STATOPAIV LST_AF1_SESSO FLD_AF1_DATANASC FLD_AF1_COMNASC +MESSAGE COPY,F_CONFIS END STRING F_COFIEST 20 @@ -759,7 +760,7 @@ ITEM "4|Variato da meno di 60gg" HELP "Soggetto a a casi particolari di residenza fiscale" END -GROUPBOX DLG_NULL 76 4 +GROUPBOX DLG_NULL 76 5 BEGIN PROMPT 0 13 "Dati conto fiscale" END @@ -810,6 +811,19 @@ CHECKTYPE NORMAL VALIDATE REQIF_FUNC 1 F_CODABI END +NUMBER F_UFFCONC 3 +BEGIN +PROMPT 2 16 "Conto fiscale " +FLAGS "Z" +FIELD LF_ANAG->UFFCONC +END + +STRING F_CONFIS 16 +BEGIN + PROMPT 24 16 "" + FLAGS "UD" +END + ENDPAGE PAGE "Anagrafica persone fisiche" -1 -1 77 20 @@ -1062,16 +1076,15 @@ PROMPT 24 10 "" FLAGS "D" END -NUMBER F_UFFCONC 3 +NUMBER F_UFFCONC_P 3 BEGIN PROMPT 1 11 "Concessioni " -FLAGS "Z" +FLAGS "DZ" USE %UCC -FIELD LF_ANAG->UFFCONC -INPUT CODTAB F_UFFCONC +INPUT CODTAB F_UFFCONC_P DISPLAY "Codice" CODTAB DISPLAY "Denominazione@50" S0 -OUTPUT F_UFFCONC CODTAB +OUTPUT F_UFFCONC_P CODTAB OUTPUT F_DENUFFCONC S0 CHECKTYPE NORMAL END diff --git a/ba/ba4200c.uml b/ba/ba4200c.uml index 36d5e1eb6..bbe44249f 100755 --- a/ba/ba4200c.uml +++ b/ba/ba4200c.uml @@ -120,6 +120,7 @@ BEGIN DISPLAY "Codice" CODANAGR COPY OUTPUT FLD_CODANAGR CHECKTYPE REQUIRED + MESSAGE COPY,F_CONFIS KEY 3 END @@ -560,7 +561,7 @@ STRING FLD_AG2_TLEXRF 30 BEGIN PROMPT 35 14 "Numero " FIELD LF_ANAG->TLEXRFX - HELP "Numero del telex della perosna giuridica" + HELP "Numero del telex della persona giuridica" END ENDPAGE @@ -877,7 +878,7 @@ BEGIN HELP "Estremi dell'estratto dell'atto costituzionale" END -GROUPBOX DLG_NULL 76 4 +GROUPBOX DLG_NULL 76 5 BEGIN PROMPT 0 13 "Dati conto fiscale" END @@ -927,6 +928,19 @@ BEGIN VALIDATE REQIF_FUNC 1 F_CODABI END +NUMBER F_UFFCONC 3 +BEGIN + PROMPT 2 16 "Conto fiscale " + FLAGS "Z" + FIELD LF_ANAG->UFFCONC +END + +STRING F_CONFIS 12 +BEGIN + PROMPT 24 16 "" + FLAGS "UD" +END + ENDPAGE PAGE "Anagrafica persone giuridiche" -1 -1 77 20 @@ -1204,16 +1218,15 @@ BEGIN FLAGS "D" END -NUMBER F_UFFCONC 3 +NUMBER F_UFFCONC_P 3 BEGIN PROMPT 1 11 "Concessioni " - FLAGS "Z" - FIELD LF_ANAG->UFFCONC + FLAGS "ZD" USE %UCC - INPUT CODTAB F_UFFCONC + INPUT CODTAB F_UFFCONC_P DISPLAY "Codice" CODTAB DISPLAY "Denominazione@50" S0 - OUTPUT F_UFFCONC CODTAB + OUTPUT F_UFFCONC_P CODTAB OUTPUT F_DENUFFCONC S0 CHECKTYPE NORMAL END