diff --git a/ba/ba4300.cpp b/ba/ba4300.cpp index a42abcc6f..8e3dad523 100755 --- a/ba/ba4300.cpp +++ b/ba/ba4300.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include "ba4.h" #include "ba4300.h" @@ -58,6 +59,7 @@ class TDitte_application : public TRelation_application TLocalisamfile* _attiv; TLocalisamfile* _tabcom; TString16 _oldattprev; + bool _cespiti; protected: bool user_create() ; @@ -160,7 +162,7 @@ bool ba4300_handler(TMask& m, KEY k) } -TDitte_application::TDitte_application() +TDitte_application::TDitte_application() : _cespiti(FALSE) {} bool TDitte_application::fax_handler(TMask_field& f, KEY k) @@ -198,6 +200,7 @@ bool TDitte_application::user_create() // initvar e arrmask _unloc = new TLocalisamfile(LF_UNLOC); _attiv = new TLocalisamfile(LF_ATTIV); _tabcom = new TLocalisamfile(LF_TABCOM); + _cespiti = has_module(CEAUT); set_search_field(FLD_GD1_CODDITTA); if (argc() > 2) { @@ -370,6 +373,7 @@ void TDitte_application::init_insert_mode(TMask& m) m.disable(DLG_ULC); m.disable(DLG_SOC); m.disable(DLG_REG); + m.disable(DLG_REG1); _oldattprev = ""; } @@ -403,6 +407,7 @@ void TDitte_application::init_modify_mode(TMask& m) m.enable(DLG_ATT); m.enable(DLG_ULC); m.enable(DLG_SOC); + m.enable(DLG_REG1, _cespiti); enable_reg(m); _oldattprev = m.get(FLD_GD1_CODATTPREV); } diff --git a/ba/ba4300.h b/ba/ba4300.h index c93c0283e..23e827d6f 100755 --- a/ba/ba4300.h +++ b/ba/ba4300.h @@ -125,5 +125,6 @@ #define DLG_REG 188 #define F_ISCRCAF 189 #define FLD_GD1_RAGSOCH 190 +#define DLG_REG1 191 #endif // __BA4300_H diff --git a/ba/ba4300a.uml b/ba/ba4300a.uml index 7942dad0b..b3b21ead7 100755 --- a/ba/ba4300a.uml +++ b/ba/ba4300a.uml @@ -1,6 +1,6 @@ #include "ba4300.h" -TOOLBAR "" 0 18 0 4 +TOOLBAR "" 0 18 0 4 BUTTON DLG_ATT 10 2 BEGIN @@ -15,7 +15,7 @@ BEGIN END BUTTON DLG_SOC 10 2 -BEGIN +BEGIN PROMPT -36 -3 "~Soci" MESSAGE K_F7 END @@ -28,7 +28,7 @@ END BUTTON DLG_REG1 10 2 BEGIN - PROMPT -56 -3 "Ces~piti" + PROMPT -56 -3 "Reg.Ces~p." MESSAGE K_F3 END @@ -76,7 +76,7 @@ BEGIN FIELD LF_NDITTE->CODDITTA FLAGS "RG" USE LF_NDITTE KEY 3 - INPUT TIPOA FLD_GD1_TIPOA SELECT + INPUT TIPOA FLD_GD1_TIPOA SELECT INPUT CODANAGR FLD_GD1_CODANAGR SELECT INPUT CODDITTA FLD_GD1_CODDITTAH COPY DISPLAY FLD_GD1_CODDITTA @@ -108,7 +108,7 @@ BEGIN FIELD LF_NDITTE->RAGSOC KEY 2 USE LF_NDITTE KEY 2 SELECT (TIPOA==#FLD_GD1_TIPOA) && (CODANAGR==#FLD_GD1_CODANAGR) - INPUT RAGSOC FLD_GD1_RAGSOCH + INPUT RAGSOC FLD_GD1_RAGSOCH COPY DISPLAY FLD_GD1_RAGSOC COPY OUTPUT FLD_GD1_RAGSOC HELP "Ragione sociale della ditta" @@ -116,7 +116,7 @@ BEGIN CHECKTYPE REQUIRED MESSAGE COPY,2@|COPY,FLD_GD1_RAGSOC FLAGS "HG" -END +END GROUPBOX DLG_NULL 76 4 BEGIN @@ -233,7 +233,7 @@ BEGIN PROMPT 34 14 "Numero " FIELD LF_NDITTE->FAX HELP "Numero telefonico del fax della ditta" -END +END ENDPAGE @@ -613,7 +613,7 @@ STRING FLD_GD3_FIRMAT_ANAGR_RAGSOC 50 BEGIN PROMPT 17 5 "" HELP "Nome del firmatario degli atti" - USE LF_ANAG KEY 2 + USE LF_ANAG KEY 2 INPUT TIPOA "F" INPUT RAGSOC FLD_GD3_FIRMAT_ANAGR_RAGSOC DISPLAY "Nome@50" RAGSOC