From ff5d02694e5c1e05db928e5abc7a7f793e15d216 Mon Sep 17 00:00:00 2001 From: mtollari Date: Mon, 19 Jun 2017 12:50:14 +0000 Subject: [PATCH] Patch level : 12.0 410 Files correlati : ba Commento : Serie di aggiornamenti in preparazione al modulo TF: - La tabella Stati CEE adesso comprende anche gli Extra CEE - Aggiunta Natura nei codici IVA anche per il modulo TF - Aggiunta gestione in anagrafica dei Rappresentanti Fiscali o Stabili Organizzazioni git-svn-id: svn://10.65.10.50/branches/R_10_00@23873 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- src/ba/ba4300.cpp | 33 ++++++++ src/ba/ba4300.h | 189 +++++++++++++++++++++++---------------------- src/ba/ba4300a.uml | 43 +++++++++++ src/ba/batbiva.h | 4 +- src/ba/batbiva.uml | 7 +- src/ba/batbsce.h | 1 + src/ba/batbsce.uml | 12 ++- 7 files changed, 188 insertions(+), 101 deletions(-) diff --git a/src/ba/ba4300.cpp b/src/ba/ba4300.cpp index 890d54ed2..a068c993f 100755 --- a/src/ba/ba4300.cpp +++ b/src/ba/ba4300.cpp @@ -61,6 +61,8 @@ protected: void set_att_prev(const TMask& m); static bool email_handler(TMask_field& f, KEY k); + // Handler RF/SO + static bool rfso_handler(TMask_field& f, KEY k); public: TDitte_application(); @@ -172,6 +174,36 @@ bool TDitte_application::email_handler(TMask_field& f, KEY k) return TRUE; } +bool TDitte_application::rfso_handler(TMask_field& f, KEY key) +{ + if(f.get() == "G") + { + f.mask().show(F_COD_RFSO_G); + f.mask().enable(F_COD_RFSO_G); + f.mask().set(F_COD_RFSO_F, ""); + f.mask().hide(F_COD_RFSO_F); + f.mask().disable(F_COD_RFSO_F); + } + else if(f.get() == "F") + { + f.mask().show(F_COD_RFSO_F); + f.mask().enable(F_COD_RFSO_F); + f.mask().set(F_COD_RFSO_G, ""); + f.mask().hide(F_COD_RFSO_G); + f.mask().disable(F_COD_RFSO_G); + } + else + { + f.mask().set(F_COD_RFSO_F, ""); + f.mask().set(F_COD_RFSO_G, ""); + f.mask().hide(F_COD_RFSO_F); + f.mask().hide(F_COD_RFSO_G); + f.mask().disable(F_COD_RFSO_F); + f.mask().disable(F_COD_RFSO_G); + } + return true; +} + bool TDitte_application::user_create() // initvar e arrmask { open_files(LF_NDITTE, LF_ANAG, LF_UNLOC, LF_ATTIV, LF_TABCOM, 0); @@ -180,6 +212,7 @@ bool TDitte_application::user_create() // initvar e arrmask _msk = new TMask("ba4300a") ; _msk->set_handler(ba4300_handler); _msk->set_handler(DLG_EMAIL, email_handler); + _msk->set_handler(LST_TIPO_RFSO, rfso_handler); set_search_field(FLD_GD1_CODDITTA); diff --git a/src/ba/ba4300.h b/src/ba/ba4300.h index 9dda5ff67..0ae6aa981 100755 --- a/src/ba/ba4300.h +++ b/src/ba/ba4300.h @@ -44,101 +44,104 @@ #define FN_CARRAPP "CARRAPP" /* FLD_GD3_CARRAPP */ #define FN_DECCARINT "DECCARINT" /* FLD_GD3_DECCARINT */ -#define RDB_GD1_FREQVIVA 102 -#define FLD_GD3_FIRMAT 107 -#define FLD_GD3_FIRMAT_ANAGR_RAGSOC 108 -#define CHK_GD3_ESILOR 109 -#define CHK_GD3_REGSTATSP 110 -#define CHK_GD3_AZCONIUG 111 -#define CHK_GD3_CONDFAM 112 -#define CHK_GD3_DEDART13 113 -#define CHK_GD3_RICSUP20 114 -#define FLD_GD3_RAPPR 115 -#define FLD_GD3_RAPPR_ANAGR_RAGSOC 116 -#define FLD_GD3_CARRAPP 117 -#define FLD_GD3_CARRAPP_TABCARICHE_DESCR 118 -#define FLD_GD3_DECCARINT 119 -#define FLD_GD2_CODSTAT1_TABSTT_S0 121 -#define FLD_GD2_CODSTAT2_TABSTT_S0 122 -#define FLD_GD2_CODSTAT3_TABSTT_S0 123 -#define LST_GD2_STATOSOC 124 -#define DLG_DENEST 125 -#define FLD_GD1_TIPOA 126 -#define FLD_GD1_CODANAGR 127 -#define FLD_GD1_CODDITTAH 627 -#define FLD_GD2_MESIREDD 128 -#define FLD_DE_DENEST1 129 -#define FLD_DE_DENEST2 130 -#define FLD_DE_DENEST3 131 -#define FLD_GD2_RAPPR 132 -#define FLD_GD2_RAPPR_ANAGR_RAGSOC 133 -#define FLD_GD2_CARRAPP 134 -#define FLD_GD2_CARRAPP_TABCARICHE_DESCR 135 -#define FLD_GD2_DECCARINT 136 -#define RDB_GD2_FREQVIVA_M 137 -#define RDB_GD2_FREQVIVA_T 138 -#define FLD_GD1_CODATTPREV 139 -#define FLD_GD1_CODATTPREV_TABATT_DESCR 140 -#define FLD_GD2_NAPP 141 -#define FLD_GD2_NULC 142 -#define FLD_GD2_DINIZIOATT 143 -#define FLD_GD2_NENASARCO 144 -#define FLD_GD2_CODSTAT1 145 -#define FLD_GD2_CODSTAT2 146 -#define FLD_GD2_CODSTAT3 147 -#define FLD_GD2_CABBAN 148 -#define FLD_GD2_CABBAN_TABBANCHE_DESCR 149 -#define FLD_GD2_ABIBAN 150 -#define FLD_GD2_ABIBAN_TABBANCHE_DESCR 151 -#define LST_GD2_DATLAV 154 -#define BUT_DENEST 155 -#define FLD_GD1_CODANAGR_ANAGR_RAGSOC 157 -#define FLD_GD1_RAGSOC 159 -#define FLD_GD1_CODDITTA 160 -#define FLD_GD1_PERRIF 161 -#define FLD_GD1_PTEL 162 -#define FLD_GD1_TEL 163 -#define FLD_GD1_PFAX 164 -#define FLD_GD1_FAX 165 -#define FLD_GD1_FIRMAT 166 -#define FLD_GD1_FIRMAT_ANAGR_RAGSOC 167 -#define CHK_GD1_ARTIG 168 -#define FLD_GD1_DATAISCRAA 169 -#define FLD_GD1_NISCRAA 170 -#define FLD_GD1_COMAA 171 -#define FLD_GD1_CAPAA 172 -#define FLD_GD1_COMAA_COMUNI_DESCR 173 -#define CHK_GD1_CONTORD 174 -#define CHK_GD1_ESILOR 175 -#define CHK_GD1_REGMAG 176 -#define CHK_GD1_REGSTATSP 177 -#define CHK_GD1_IMPRFAM 178 -#define CHK_GD1_AZCONIUG 179 -#define CHK_GD1_CONDFAM 180 -#define CHK_GD1_FLIVA11Q 181 -#define CHK_GD1_DEDART13 182 -#define CHK_GD1_RICSUP20 183 -#define BUT_PAGSUC 184 -#define DLG_ATT 185 -#define DLG_ULC 186 -#define DLG_SOC 187 -#define DLG_REG 188 -#define F_ISCRCAF 189 -#define FLD_GD1_RAGSOCH 190 -#define FLD_GD1_MAIL 191 -#define FLD_GD1_VALUTA 192 +#define RDB_GD1_FREQVIVA 102 +#define FLD_GD3_FIRMAT 107 +#define FLD_GD3_FIRMAT_ANAGR_RAGSOC 108 +#define CHK_GD3_ESILOR 109 +#define CHK_GD3_REGSTATSP 110 +#define CHK_GD3_AZCONIUG 111 +#define CHK_GD3_CONDFAM 112 +#define CHK_GD3_DEDART13 113 +#define CHK_GD3_RICSUP20 114 +#define FLD_GD3_RAPPR 115 +#define FLD_GD3_RAPPR_ANAGR_RAGSOC 116 +#define FLD_GD3_CARRAPP 117 +#define FLD_GD3_CARRAPP_TABCARICHE_DESCR 118 +#define FLD_GD3_DECCARINT 119 +#define FLD_GD2_CODSTAT1_TABSTT_S0 121 +#define FLD_GD2_CODSTAT2_TABSTT_S0 122 +#define FLD_GD2_CODSTAT3_TABSTT_S0 123 +#define LST_GD2_STATOSOC 124 +#define DLG_DENEST 125 +#define FLD_GD1_TIPOA 126 +#define FLD_GD1_CODANAGR 127 +#define FLD_GD1_CODDITTAH 627 +#define FLD_GD2_MESIREDD 128 +#define FLD_DE_DENEST1 129 +#define FLD_DE_DENEST2 130 +#define FLD_DE_DENEST3 131 +#define LST_TIPO_RFSO 500 // Aggiunti 2017 +#define F_COD_RFSO_G 501 // Aggiunti 2017 +#define F_COD_RFSO_F 502 // Aggiunti 2017 +#define FLD_GD2_RAPPR 132 +#define FLD_GD2_RAPPR_ANAGR_RAGSOC 133 +#define FLD_GD2_CARRAPP 134 +#define FLD_GD2_CARRAPP_TABCARICHE_DESCR 135 +#define FLD_GD2_DECCARINT 136 +#define RDB_GD2_FREQVIVA_M 137 +#define RDB_GD2_FREQVIVA_T 138 +#define FLD_GD1_CODATTPREV 139 +#define FLD_GD1_CODATTPREV_TABATT_DESCR 140 +#define FLD_GD2_NAPP 141 +#define FLD_GD2_NULC 142 +#define FLD_GD2_DINIZIOATT 143 +#define FLD_GD2_NENASARCO 144 +#define FLD_GD2_CODSTAT1 145 +#define FLD_GD2_CODSTAT2 146 +#define FLD_GD2_CODSTAT3 147 +#define FLD_GD2_CABBAN 148 +#define FLD_GD2_CABBAN_TABBANCHE_DESCR 149 +#define FLD_GD2_ABIBAN 150 +#define FLD_GD2_ABIBAN_TABBANCHE_DESCR 151 +#define LST_GD2_DATLAV 154 +#define BUT_DENEST 155 +#define FLD_GD1_CODANAGR_ANAGR_RAGSOC 157 +#define FLD_GD1_RAGSOC 159 +#define FLD_GD1_CODDITTA 160 +#define FLD_GD1_PERRIF 161 +#define FLD_GD1_PTEL 162 +#define FLD_GD1_TEL 163 +#define FLD_GD1_PFAX 164 +#define FLD_GD1_FAX 165 +#define FLD_GD1_FIRMAT 166 +#define FLD_GD1_FIRMAT_ANAGR_RAGSOC 167 +#define CHK_GD1_ARTIG 168 +#define FLD_GD1_DATAISCRAA 169 +#define FLD_GD1_NISCRAA 170 +#define FLD_GD1_COMAA 171 +#define FLD_GD1_CAPAA 172 +#define FLD_GD1_COMAA_COMUNI_DESCR 173 +#define CHK_GD1_CONTORD 174 +#define CHK_GD1_ESILOR 175 +#define CHK_GD1_REGMAG 176 +#define CHK_GD1_REGSTATSP 177 +#define CHK_GD1_IMPRFAM 178 +#define CHK_GD1_AZCONIUG 179 +#define CHK_GD1_CONDFAM 180 +#define CHK_GD1_FLIVA11Q 181 +#define CHK_GD1_DEDART13 182 +#define CHK_GD1_RICSUP20 183 +#define BUT_PAGSUC 184 +#define DLG_ATT 185 +#define DLG_ULC 186 +#define DLG_SOC 187 +#define DLG_REG 188 +#define F_ISCRCAF 189 +#define FLD_GD1_RAGSOCH 190 +#define FLD_GD1_MAIL 191 +#define FLD_GD1_VALUTA 192 -#define CHK_IN_PRESELEN 195 -#define CHK_IN_CESSIVA 196 -#define LST_IN_FREQCES 197 -#define LST_IN_FREQACQ 198 -#define LST_IN_TIPOSOGDEL 199 -#define FLD_IN_CODSOGDEL 200 -#define FLD_IN_DESSOGDEL 201 -#define CHK_IN_NONOBBSTAT 202 +#define CHK_IN_PRESELEN 195 +#define CHK_IN_CESSIVA 196 +#define LST_IN_FREQCES 197 +#define LST_IN_FREQACQ 198 +#define LST_IN_TIPOSOGDEL 199 +#define FLD_IN_CODSOGDEL 200 +#define FLD_IN_DESSOGDEL 201 +#define CHK_IN_NONOBBSTAT 202 -#define F_INTCAF 203 -#define F_DICHP 204 +#define F_INTCAF 203 +#define F_DICHP 204 #endif // __BA4300_H diff --git a/src/ba/ba4300a.uml b/src/ba/ba4300a.uml index 21b7cb1ea..5897b3772 100755 --- a/src/ba/ba4300a.uml +++ b/src/ba/ba4300a.uml @@ -813,6 +813,49 @@ BEGIN HELP "Denominazione estesa della ditta" END +LIST LST_TIPO_RFSO 10 +BEGIN + HELP "Indicare se è un rappresentante o stabile organizzativo è una persona fisica o giuridica" + PROMPT 3 18 "Tipo RF/SO: " + FIELD CODRFSO[1,1] + ITEM "|" + ITEM "G|Giuridico" + ITEM "F|Fisico" +END + +STRING F_COD_RFSO_G 5 +BEGIN + PROMPT 30 18 "Codice RF/SO:" + FIELD CODRFSO[2,] + USE LF_ANAG SELECT TIPORFSO!="" + INPUT TIPOA "G" + INPUT CODANAGR F_COD_RFSO_G + DISPLAY "Codice" CODANAGR + DISPLAY "Ragione sociale@50" RAGSOC + DISPLAY "Codice Fiscale@16" COFI + OUTPUT F_COD_RFSO_G CODANAGR + MESSAGE COPY,1@ + CHECKTYPE REQUIRED + FLAGS "H" +END + +STRING F_COD_RFSO_F 5 +BEGIN + PROMPT 30 18 "Codice RF/SO:" + FIELD CODRFSO[2,] + USE LF_ANAG SELECT TIPORFSO!="" + INPUT TIPOA "F" + INPUT CODANAGR F_COD_RFSO_F + DISPLAY "Codice" CODANAGR + DISPLAY "Cognome@30" RAGSOC[1,30] + DISPLAY "Nome@20" RAGSOC[31,0] + DISPLAY "Codice Fiscale@16" COFI + OUTPUT F_COD_RFSO_F CODANAGR + MESSAGE COPY,1@ + CHECKTYPE REQUIRED + FLAGS "H" +END + ENDPAGE PAGE "Pag. 5" -1 -1 77 18 diff --git a/src/ba/batbiva.h b/src/ba/batbiva.h index 055186610..4d13f11cd 100755 --- a/src/ba/batbiva.h +++ b/src/ba/batbiva.h @@ -20,7 +20,7 @@ #define FLD_TABIVA_S11 121 #define FLD_TABIVA_I1 122 #define FLD_DETRAZIONE 123 -#define CHK_SERVIZI 124 +#define CHK_SERVIZI 124 #define FLD_DESCR_I1 125 #define FLD_INDET_S4 126 -#define FLD_NATURAPA 127 +#define FLD_NATURA 127 diff --git a/src/ba/batbiva.uml b/src/ba/batbiva.uml index 180c15a60..21cabd741 100755 --- a/src/ba/batbiva.uml +++ b/src/ba/batbiva.uml @@ -305,11 +305,11 @@ BEGIN FIELD B3 END -LIST FLD_NATURAPA 2 40 +LIST FLD_NATURA 2 40 BEGIN -PROMPT 3 19 "Natura per fatture PA" +PROMPT 3 19 "Natura: " FIELD S12 -HELP "Indicare la natura del codice IVA per le fatture PA" +HELP "Indicare la natura del codice IVA per le fatture PA/TF" ITEM "|IVA ordinaria" ITEM "N1|N1 - IVA esclusa ex art 15" ITEM "N2|N2 - IVA non soggetta" @@ -318,7 +318,6 @@ ITEM "N4|N4 - IVA esente" ITEM "N5|N5 - IVA in regime del margine" ITEM "N6|N6 - IVA in reverse charge" ITEM "N7|N7 - IVA assolta in altro stato U3" -MODULE PA END BOOLEAN FLD_SOSPESO_B2 diff --git a/src/ba/batbsce.h b/src/ba/batbsce.h index d10f3c360..d061032c9 100755 --- a/src/ba/batbsce.h +++ b/src/ba/batbsce.h @@ -1,2 +1,3 @@ #define F_CODICE 101 #define F_DESCR 102 +#define F_STATOEU 103 \ No newline at end of file diff --git a/src/ba/batbsce.uml b/src/ba/batbsce.uml index 77fc349af..2220b00d7 100755 --- a/src/ba/batbsce.uml +++ b/src/ba/batbsce.uml @@ -4,11 +4,11 @@ TOOLBAR "topbar" 0 0 0 2 #include ENDPAGE -PAGE "Stati CEE" -1 -1 78 18 +PAGE "Stati ISO" -1 -1 78 18 GROUPBOX DLG_NULL 78 7 BEGIN - PROMPT 1 1 "@bStati CEE" + PROMPT 1 1 "@bStati ISO" END STRING F_CODICE 2 @@ -21,6 +21,7 @@ BEGIN DISPLAY "Descrizione@50" S0 OUTPUT F_CODICE CODTAB OUTPUT F_DESCR S0 + OUTPUT F_STATOEU B0 CHECKTYPE REQUIRED FIELD CODTAB KEY 1 @@ -34,11 +35,18 @@ BEGIN DISPLAY "Descrizione@50" S0 DISPLAY "Codice@8" CODTAB COPY OUTPUT F_CODICE + OUTPUT F_STATOEU B0 CHECKTYPE REQUIRED FIELD S0 KEY 2 END +BOOLEAN F_STATOEU +BEGIN + PROMPT 20 3 "Stato EU" + FIELD B0 +END + ENDPAGE ENDMASK