From 45be538953973c18abd2e15047779c255b11e06a Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Fri, 19 Mar 2021 02:23:11 +0100 Subject: [PATCH] Patch level : 12.0 1042 Files correlati : ba4.exe ba6.exe Commento : Aggiunta Tabella Uffici doganali (%UDD) Aggiunto ufficio doganale ai comuni e alle ditte --- src/ba/ba4100a.h | 8 ++-- src/ba/ba4100a.uml | 46 +++++++++++++++++---- src/ba/ba4300.h | 5 ++- src/ba/ba4300a.uml | 27 ++++++++---- src/ba/ba6200.cpp | 13 ++++-- src/ba/bamenu.men | 6 ++- src/ba/bastudd.rep | 61 +++++++++++++++++++++++++++ src/ba/bastudd.uml | 36 ++++++++++++++++ src/ba/batbudd.h | 9 ++++ src/ba/batbudd.uml | 101 +++++++++++++++++++++++++++++++++++++++++++++ src/ba/f13.dir | 2 +- src/ba/f13.trr | 3 +- src/ba/f9.dir | 2 +- src/ba/f9.trr | 3 +- 14 files changed, 291 insertions(+), 31 deletions(-) create mode 100644 src/ba/bastudd.rep create mode 100644 src/ba/bastudd.uml create mode 100644 src/ba/batbudd.h create mode 100644 src/ba/batbudd.uml diff --git a/src/ba/ba4100a.h b/src/ba/ba4100a.h index e390d1ec3..5aa952815 100755 --- a/src/ba/ba4100a.h +++ b/src/ba/ba4100a.h @@ -62,10 +62,12 @@ #define F_DESUUE9 157 #define F_CODUUE10 158 #define F_DESUUE10 159 +#define FLD_CM2_UFFDOG 160 +#define FLD_CM2_DUFFDOG 161 -#define FLD_CM3_STATO 160 -#define FLD_CM3_COM 161 -#define FLD_CM3_DENCOM 162 +#define FLD_CM3_STATO 170 +#define FLD_CM3_COM 171 +#define FLD_CM3_DENCOM 172 #define FLD_CM3_DENSTA 163 #define N_STATO "STATO" diff --git a/src/ba/ba4100a.uml b/src/ba/ba4100a.uml index 1d3afb154..5046de564 100755 --- a/src/ba/ba4100a.uml +++ b/src/ba/ba4100a.uml @@ -298,7 +298,7 @@ BEGIN GROUP 23 END -GROUPBOX DLG_NULL 75 5 +GROUPBOX DLG_NULL 75 6 BEGIN PROMPT 1 4 "Uffici Vari" END @@ -379,16 +379,44 @@ BEGIN DISPLAY "Denominazione@50" S0 DISPLAY "Codice" CODTAB COPY OUTPUT FLD_CM2_UFFCSERV + +END + +NUMBER FLD_CM2_UFFDOG 6 +BEGIN + PROMPT 2 8 "Dogana " + FIELD LF_COMUNI->UFFDOG + FLAGS "RZ" + USE %UDD + INPUT CODTAB FLD_CM2_UFFDOG + DISPLAY "Codice" CODTAB + DISPLAY "Denominazione@50" S0 + OUTPUT FLD_CM2_UFFDOG CODTAB + OUTPUT FLD_CM2_DUFFDOG S0 + HELP "Codice del centro servizi competente" + CHECKTYPE NORMAL + WARNING "Ufficio assente" + FLAGS "RZ" +END + +STRING FLD_CM2_DUFFDOG 50 +BEGIN + PROMPT 23 8 "" + USE %UDD KEY 2 + INPUT S0 FLD_CM2_DUFFDOG + DISPLAY "Denominazione@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT FLD_CM2_UFFDOG END GROUPBOX DLG_NULL 23 4 BEGIN - PROMPT 1 9 "Esattorie" + PROMPT 1 10 "Esattorie" END NUMBER FLD_CM2_UFFESPROV 3 BEGIN - PROMPT 2 10 "Provinciale " + PROMPT 2 11 "Provinciale " FIELD LF_COMUNI->UFFESPROV FLAGS "RZ" HELP "Codice esattoria provinciale competente" @@ -396,7 +424,7 @@ END NUMBER FLD_CM2_UFFESCOM 3 BEGIN - PROMPT 2 11 "Comunale " + PROMPT 2 12 "Comunale " FIELD LF_COMUNI->UFFESCOM FLAGS "RZ" HELP "Codice esattoria comunale competente" @@ -405,7 +433,7 @@ END LIST FLD_CM2_TERRMON 18 BEGIN - PROMPT 34 11 "Territorio montano " + PROMPT 34 12 "Territorio montano " HELP "Codice identificativo di comune residente in territorio montano" FIELD LF_COMUNI->TERRMON ITEMS " |Non montano" @@ -415,7 +443,7 @@ END STRING FLD_CM2_COMAGG 4 BEGIN - PROMPT 2 13 "Comune aggr. " + PROMPT 2 14 "Comune aggr. " HELP "Codice comune a cui e' stato accorpato il presente comune" FIELD LF_COMUNI->COMAGG FLAGS "U" @@ -431,7 +459,7 @@ END STRING FLD_CM2_DENCOMAGG 50 BEGIN - PROMPT 23 13 "" + PROMPT 23 14 "" HELP "Denominazione comune a cui e' stato accorpato il presente comune" USE LF_COMUNI KEY 2 SELECT STATO="" INPUT DENCOM FLD_CM2_DENCOMAGG @@ -442,7 +470,7 @@ END NUMBER F_CODREG 2 BEGIN - PROMPT 2 15 "Cod.regione " + PROMPT 2 16 "Cod.regione " FIELD LF_COMUNI->CODREG FLAGS "RZ" USE %RGI @@ -457,7 +485,7 @@ END STRING F_DESREG 50 BEGIN - PROMPT 23 15 "" + PROMPT 23 16 "" USE %RGI KEY 2 INPUT S0 F_DESREG DISPLAY "Denominazione@50" S0 diff --git a/src/ba/ba4300.h b/src/ba/ba4300.h index 490fb9d84..8d890f6e1 100755 --- a/src/ba/ba4300.h +++ b/src/ba/ba4300.h @@ -140,9 +140,10 @@ #define FLD_IN_CODSOGDEL 200 #define FLD_IN_DESSOGDEL 201 #define CHK_IN_NONOBBSTAT 202 +#define FLD_IN_UFFDOG 203 -#define F_INTCAF 203 -#define F_DICHP 204 +#define F_INTCAF 303 +#define F_DICHP 304 #endif // __BA4300_H diff --git a/src/ba/ba4300a.uml b/src/ba/ba4300a.uml index f31b36abf..a6775a0b4 100755 --- a/src/ba/ba4300a.uml +++ b/src/ba/ba4300a.uml @@ -118,6 +118,7 @@ BEGIN FIELD LF_NDITTE->CODANAGR FLAGS "R" USE LF_ANAG KEY 1 + JOIN LF_COMUNI INTO COM=COMRES INPUT TIPOA FLD_GD1_TIPOA INPUT CODANAGR FLD_GD1_CODANAGR DISPLAY "Tipo" TIPOA @@ -126,6 +127,7 @@ BEGIN OUTPUT FLD_GD1_CODANAGR CODANAGR OUTPUT FLD_GD1_TIPOA TIPOA OUTPUT FLD_GD1_CODANAGR_ANAGR_RAGSOC RAGSOC + OUTPUT FLD_IN_UFFDOG LF_COMUNI->UFFDOG HELP "Codice della anagrafica di riferimento" CHECKTYPE REQUIRED WARNING "Anagrafica assente" @@ -890,7 +892,7 @@ BEGIN GROUP 2 END -GROUPBOX DLG_NULL 76 7 +GROUPBOX DLG_NULL 76 8 BEGIN PROMPT 1 4 "@bSoggetto Obbligato INTRA" FLAGS "R" @@ -929,20 +931,31 @@ END BOOLEAN CHK_IN_NONOBBSTAT BEGIN PROMPT 2 9 "Non obbligato a compilare: valore stat., modalità consegna e trasporto" - - FIELD NONOBBSTAT END +NUMBER FLD_IN_UFFDOG 6 +BEGIN + PROMPT 2 10 "Ufficio Doganale " + USE %UDD + INPUT CODTAB FLD_IN_UFFDOG + DISPLAY "Ufficio" CODTAB + DISPLAY "Denominazione@50" S0 + OUTPUT FLD_IN_UFFDOG CODTAB + FIELD UFFDOG + FLAGS "RZ" + CHECKTYPE NORMAL +END + GROUPBOX DLG_NULL 76 4 BEGIN - PROMPT 1 11 "@bSoggetto Delegato INTRA" + PROMPT 1 13 "@bSoggetto Delegato INTRA" FLAGS "R" END LIST LST_IN_TIPOSOGDEL 1 10 BEGIN - PROMPT 2 12 "Tipo persona " + PROMPT 2 14 "Tipo persona " ITEM "F|Fisica" ITEM "G|Giuridica" FIELD TIPOSOGDEL @@ -950,7 +963,7 @@ END NUMBER FLD_IN_CODSOGDEL 6 BEGIN - PROMPT 35 12 "Codice " + PROMPT 35 14 "Codice " USE LF_ANAG INPUT TIPOA LST_IN_TIPOSOGDEL SELECT INPUT CODANAGR FLD_IN_CODSOGDEL @@ -966,7 +979,7 @@ END STRING FLD_IN_DESSOGDEL 50 BEGIN - PROMPT 2 13 "Denominazione " + PROMPT 2 15 "Denominazione " USE LF_ANAG KEY 2 INPUT TIPOA LST_IN_TIPOSOGDEL SELECT INPUT RAGSOC FLD_IN_DESSOGDEL diff --git a/src/ba/ba6200.cpp b/src/ba/ba6200.cpp index 3c426375b..0263e3fc0 100755 --- a/src/ba/ba6200.cpp +++ b/src/ba/ba6200.cpp @@ -17,6 +17,7 @@ class BA6200_application : public TPrintapp TString _codistat, _uffreg; int _uffiidd1, _uffiidd2, _uffiidd3, _uffiva1, _uffiva2, _uffiva3; int _uffconc, _uffcserv, _uffesprov, _uffescom, _terrmon; + long _uffdog; TDate _data_stampa; protected: @@ -64,7 +65,8 @@ bool BA6200_application::preprocess_page(int file, int counter) _uffconc = current_cursor()->curr(LF_COMUNI).get_int(COM_UFFCONC); _uffcserv = current_cursor()->curr(LF_COMUNI).get_int(COM_UFFCSERV); _uffesprov = current_cursor()->curr(LF_COMUNI).get_int(COM_UFFESPROV); - _uffescom = current_cursor()->curr(LF_COMUNI).get_int(COM_UFFESCOM); + _uffescom = current_cursor()->curr(LF_COMUNI).get_int(COM_UFFESCOM); + _uffdog = current_cursor()->curr(LF_COMUNI).get_long(COM_UFFDOG); _terrmon = current_cursor()->curr(LF_COMUNI).get_int(COM_TERRMON); setta_righe_descr(_descr_comune); @@ -109,8 +111,11 @@ bool BA6200_application::preprocess_page(int file, int counter) if (_uffescom != 0) set_row (1,"@114g%03d", _uffescom); + + if (_uffdog != 0L) + set_row(1, "@119g%06ld", _uffdog); - return TRUE; + return true; } else return FALSE; @@ -226,10 +231,10 @@ void BA6200_application::crea_intestazione() sep.fill('-'); set_header (3, (const char *) sep); - set_header(5, FR("@0gCodice@7gDenominazione@33gProv.@40gCap@45gCd.Istat@54gMont.@60gUff.@67gII.DD.@80gI.V.A.@92gRegi.@98gConc.@104gServ.@110gEsatt.")); + set_header(5, FR("@0gCodice@7gDenominazione@33gProv.@40gCap@45gCd.Istat@54gMont.@60gUff.@67gII.DD.@80gI.V.A.@92gRegi.@98gConc.@104gServ.@110gEsatt.@119gUff.dog.")); set_header (6, FR("@0g------@7g-------------------------@33g-----@39g-----")); set_header (6, FR("@45g--------@54g-----@65g-----------")); - set_header (6, FR("@78g------------@92g-----@98g-----@104g-----@110g-------")); + set_header (6, FR("@78g------------@92g-----@98g-----@104g-----@110g-------@119g------")); } bool BA6200_application::user_create() diff --git a/src/ba/bamenu.men b/src/ba/bamenu.men index a7a7f26ad..b2f2b53e8 100755 --- a/src/ba/bamenu.men +++ b/src/ba/bamenu.men @@ -78,7 +78,8 @@ Item_04 = "Uffici imposte dirette", "ba3 -0 %uid", "" Item_05 = "Uffici IVA", "ba3 -0 %uiv", "" Item_06 = "Uffici registro", "ba3 -0 %ure", "" Item_07 = "Centri servizio", "ba3 -0 %ucs", "" -Item_08 = "Codici tributo", "ba3 -0 %trb", "" +Item_08 = "Uffici doganali", "ba3 -0 %udd", "" +Item_09 = "Codici tributo", "ba3 -0 %trb", "" [MENU_012] Caption = "Stampa tabelle ministeriali" @@ -91,7 +92,8 @@ Item_03 = "Uffici imposte dirette", "ba3 -1 %uid", "" Item_04 = "Uffici IVA", "ba3 -1 %uiv", "" Item_05 = "Uffici registro", "ba3 -1 %ure", "" Item_06 = "Centri servizio", "ba3 -1 %ucs", "" -Item_07 = "Codici tributo", "ba3 -1 %trb", "" +Item_07 = "Uffici doganali", "ba3 -1 %udd", "" +Item_08 = "Codici tributo", "ba3 -1 %trb", "" [MENU_014] Caption = "Query e Report" diff --git a/src/ba/bastudd.rep b/src/ba/bastudd.rep new file mode 100644 index 000000000..74dc02547 --- /dev/null +++ b/src/ba/bastudd.rep @@ -0,0 +1,61 @@ + + + + +