diff --git a/ba/ba4200.cpp b/ba/ba4200.cpp index fb0e39144..309e59af4 100755 --- a/ba/ba4200.cpp +++ b/ba/ba4200.cpp @@ -323,6 +323,8 @@ bool gest_uff_imp(TMask_field& f, KEY key) { msk.set(F_IMP_DENCOM, comuni.get("DENCOM")); msk.set(F_IMP_PROVCOM, comuni.get("PROVCOM")); + msk.set(F_UFFUUE, comuni.get("CODUUE1")); + msk.check_field(F_UFFUUE); TString s(comuni.get(N_IMPDIR1)) ; if (s.empty()) s = comuni.get(N_IMPDIR2) ; diff --git a/ba/ba4200.h b/ba/ba4200.h index 9567c33c9..79ddc32ae 100755 --- a/ba/ba4200.h +++ b/ba/ba4200.h @@ -349,6 +349,8 @@ #define DLG_CHGTIP 371 #define DLG_OGGETTI 372 #define F_MAIL 373 +#define F_UFFUUE 374 +#define F_DENUUE 375 #define F_CODCONTR_EP 380 #define F_CODCONTR_EC 381 diff --git a/ba/ba4200b.uml b/ba/ba4200b.uml index fc68aaeef..6ac220172 100755 --- a/ba/ba4200b.uml +++ b/ba/ba4200b.uml @@ -1035,7 +1035,7 @@ FLAGS "D" GROUP 3 END -GROUPBOX DLG_NULL 78 9 +GROUPBOX DLG_NULL 78 10 BEGIN PROMPT 0 5 "Uffici competenti" END @@ -1052,9 +1052,29 @@ PROMPT 62 6 "Prov." FLAGS "D" END +STRING F_UFFUUE 3 +BEGIN + PROMPT 1 7 "Ufficio unico " + FLAGS "ZGD" + USE %UUE + INPUT CODTAB F_UFFUUE + DISPLAY "Ufficio" CODTAB + DISPLAY "Denominazione@50" S0 + OUTPUT F_UFFUUE CODTAB + OUTPUT F_DENUUE S0 + CHECKTYPE NORMAL + WARNING "Ufficio imposte assente" +END + +STRING F_DENUUE 50 48 +BEGIN + PROMPT 23 7 " " + FLAGS "D" +END + STRING F_UFFIIDD 3 BEGIN -PROMPT 1 7 "Imposte Dirette " +PROMPT 1 8 "Imposte Dirette " FIELD LF_ANAG->UFFIIDD FLAGS "Z" USE %UID @@ -1072,7 +1092,7 @@ END STRING F_DENUFFIIDD 50 48 BEGIN -PROMPT 23 7 " " +PROMPT 23 8 " " HELP "Descrizione dell'ufficio delle imposte dirette competente" USE %UID KEY 2 INPUT S0 F_DENUFFIIDD @@ -1084,13 +1104,13 @@ END STRING F_NISCRIIDD 10 BEGIN -PROMPT 1 8 "N.ro iscrizione " +PROMPT 1 9 "N.ro iscrizione " FIELD LF_ANAG->NISCRIIDD END STRING F_UFFIVA 3 BEGIN -PROMPT 1 9 "Ufficio IVA " +PROMPT 1 10 "Ufficio IVA " FIELD LF_ANAG->UFFIVA FLAGS "Z" USE %UIV @@ -1107,13 +1127,13 @@ END STRINF F_DENUFFIVA 50 48 BEGIN -PROMPT 23 9 " " +PROMPT 23 10 " " FLAGS "D" END STRING F_UFFREG 3 BEGIN -PROMPT 1 10 "Registro " +PROMPT 1 11 "Registro " USE %URE INPUT CODTAB F_UFFREG OUTPUT F_UFFREG CODTAB @@ -1124,13 +1144,13 @@ END STRING F_DENUFFREG 50 48 BEGIN -PROMPT 24 10 "" +PROMPT 24 11 "" FLAGS "D" END NUMBER F_UFFCONC_P 3 BEGIN -PROMPT 1 11 "Concessioni " +PROMPT 1 12 "Concessioni " FLAGS "DZ" USE %UCC INPUT CODTAB F_UFFCONC_P @@ -1143,13 +1163,13 @@ END STRING F_DENUFFCONC 50 48 BEGIN -PROMPT 24 11 "" +PROMPT 24 12 "" FLAGS "D" END NUMBER F_UFFSERV 3 BEGIN -PROMPT 1 12 "Centro Servizi " +PROMPT 1 13 "Centro Servizi " FLAGS "DRZG" USE %UCS INPUT CODTAB F_UFFSERV @@ -1160,46 +1180,46 @@ END STRING F_DENUFFSERV 50 48 BEGIN -PROMPT 24 12 "" +PROMPT 24 13 "" FLAGS "D" END GROUPBOX -1 78 4 BEGIN -PROMPT 0 14 "Codice contribuente" +PROMPT 0 15 "Codice contribuente" END STRING F_CODCONTR_EP 2 BEGIN -PROMPT 1 15 "Esattoria Prov." +PROMPT 1 16 "Esattoria Prov." FIELD CODCONTR[1,2] FLAGS "D" END STRING F_CODCONTR_EC 3 BEGIN -PROMPT 23 15 "Esattoria Com." +PROMPT 23 16 "Esattoria Com." FIELD CODCONTR[3,5] FLAGS "D" END STRING F_CODCONTR 8 BEGIN -PROMPT 46 15 "Codice " +PROMPT 46 16 "Codice " FIELD CODCONTR[6,13] HELP "Codice assegnato al contribuente" END STRING F_CODCONTR_CC 2 BEGIN -PROMPT 66 15 "C.c." +PROMPT 66 16 "C.c." FIELD CODCONTR[14,15] HELP "Codice assegnato al contribuente" END STRING F_CC_ESATTORIA 8 BEGIN -PROMPT 1 16 "C/C Esattoria " +PROMPT 1 17 "C/C Esattoria " FLAGS "D" END diff --git a/ba/ba4200c.uml b/ba/ba4200c.uml index 1c67b07bd..794fdc5d5 100755 --- a/ba/ba4200c.uml +++ b/ba/ba4200c.uml @@ -1156,7 +1156,7 @@ BEGIN GROUP 2 END -GROUPBOX DLG_NULL 78 9 +GROUPBOX DLG_NULL 78 10 BEGIN PROMPT 0 5 "Uffici competenti" END @@ -1173,9 +1173,30 @@ BEGIN FLAGS "D" END +STRING F_UFFUUE 3 +BEGIN + PROMPT 1 7 "Ufficio unico " + FLAGS "ZGD" + USE %UUE + INPUT CODTAB F_UFFUUE + DISPLAY "Ufficio" CODTAB + DISPLAY "Denominazione@50" S0 + OUTPUT F_UFFUUE CODTAB + OUTPUT F_DENUUE S0 + CHECKTYPE NORMAL + WARNING "Ufficio imposte assente" +END + +STRING F_DENUUE 50 48 +BEGIN + PROMPT 23 7 " " + USE %UUE KEY 2 + FLAGS "D" +END + STRING F_UFFIIDD 3 BEGIN - PROMPT 1 7 "Imposte Dirette " + PROMPT 1 8 "Imposte Dirette " FIELD LF_ANAG->UFFIIDD FLAGS "Z" USE %UID @@ -1192,7 +1213,7 @@ END STRINF F_DENUFFIIDD 50 48 BEGIN - PROMPT 23 7 " " + PROMPT 23 8 " " HELP "Denominazione ufficio delle imposte dirette competente" USE %UID KEY 2 INPUT S0 F_DENUFFIIDD @@ -1204,13 +1225,13 @@ END STRING F_NISCRIIDD 10 BEGIN - PROMPT 1 8 "N.ro iscrizione " + PROMPT 1 9 "N.ro iscrizione " FIELD LF_ANAG->NISCRIIDD END STRING F_UFFIVA 3 BEGIN - PROMPT 1 9 "Ufficio IVA " + PROMPT 1 10 "Ufficio IVA " FLAGS "Z" FIELD LF_ANAG->UFFIVA USE %UIV @@ -1227,13 +1248,13 @@ END STRINF F_DENUFFIVA 50 48 BEGIN - PROMPT 23 9 " " + PROMPT 23 10 " " FLAGS "D" END STRING F_UFFREG 3 BEGIN - PROMPT 1 10 "Registro " + PROMPT 1 11 "Registro " USE %URE INPUT CODTAB F_UFFREG DISPLAY "Codice" CODTAB @@ -1246,13 +1267,13 @@ END STRING F_DENUFFREG 50 48 BEGIN - PROMPT 24 10 "" + PROMPT 24 11 "" FLAGS "D" END NUMBER F_UFFCONC_P 3 BEGIN - PROMPT 1 11 "Concessioni " + PROMPT 1 12 "Concessioni " FLAGS "ZD" USE %UCC INPUT CODTAB F_UFFCONC_P @@ -1265,13 +1286,13 @@ END STRING F_DENUFFCONC 50 48 BEGIN - PROMPT 24 11 "" + PROMPT 24 12 "" FLAGS "D" END NUMBER F_UFFSERV 3 BEGIN - PROMPT 1 12 "Centro Servizi " + PROMPT 1 13 "Centro Servizi " FLAGS "DRZG" USE %UCS INPUT CODTAB F_UFFSERV @@ -1282,46 +1303,46 @@ END STRING F_DENUFFSERV 50 48 BEGIN - PROMPT 24 12 "" + PROMPT 24 13 "" FLAGS "D" END GROUPBOX -1 78 4 BEGIN - PROMPT 0 14 "Codice contribuente" + PROMPT 0 15 "Codice contribuente" END STRING F_CODCONTR_EP 2 BEGIN - PROMPT 1 15 "Esattoria Prov." + PROMPT 1 16 "Esattoria Prov." FIELD CODCONTR[1,2] FLAGS "D" END STRING F_CODCONTR_EC 3 BEGIN - PROMPT 23 15 "Esattoria Com." + PROMPT 23 16 "Esattoria Com." FIELD CODCONTR[3,5] FLAGS "D" END STRING F_CODCONTR 8 BEGIN - PROMPT 46 15 "Codice " + PROMPT 46 16 "Codice " HELP "Codice contribuente assegnato alla persona giuridica" FIELD CODCONTR[6,13] END STRING F_CODCONTR_CC 2 BEGIN - PROMPT 66 15 "C.c." + PROMPT 66 16 "C.c." FIELD CODCONTR[14,15] HELP "Codice assegnato al contribuente" END STRING F_CC_ESATTORIA 8 BEGIN - PROMPT 1 16 "C/C Esattoria " + PROMPT 1 17 "C/C Esattoria " FLAGS "D" END diff --git a/ba/batbuue.uml b/ba/batbuue.uml index d72071e13..6e7d02cf3 100755 --- a/ba/batbuue.uml +++ b/ba/batbuue.uml @@ -6,7 +6,7 @@ TOOLBAR "" 0 20 0 2 ENDPAGE -PAGE "Uffici concessioni" -1 -1 78 19 +PAGE "Uffici unici entrate" -1 -1 78 19 NUMBER F_CODICE 3 BEGIN