diff --git a/ba/ba0.cpp b/ba/ba0.cpp index 02c135110..6d5677bc2 100755 --- a/ba/ba0.cpp +++ b/ba/ba0.cpp @@ -13,7 +13,6 @@ #include #endif - #if XVT_OS == XVT_OS_WIN extern "C" { @@ -54,8 +53,10 @@ void TPicture_mask::set_picture(short id) { _id = id; #if XVT_OS == XVT_OS_WIN - if (_picture) picture_free(_picture); - _picture = xvt_picture_load(id, id == BA0_PICTURE); + if (_picture) + picture_free(_picture); // xvt_pict_destroy(_picture); + + _picture = xvt_picture_load(id, FALSE); #endif } } @@ -65,7 +66,7 @@ void TPicture_mask::reset() #if XVT_OS == XVT_OS_WIN if (_picture) { - picture_free(_picture); + picture_free(_picture); // xvt_pict_destroy(_picture); _picture = 0L; _id = 0; } @@ -166,14 +167,18 @@ bool TMenu_application::build_firm_data(long codditta, bool flagcom) return FALSE; set_autoload_new_files(yesno_box("Si desidera precaricare gli archivi standard")); s = s.path(); + + if (!fexist(s)) + { #if XVT_OS == XVT_OS_SCOUNIX - if (mkdir(s, 0777) == -1) + if (mkdir(s, 0777) == -1) #else - if (mkdir(s) == -1) + if (mkdir(s) == -1) #endif - return error_box("Impossibile creare il direttorio della ditta %ld (%s)", - codditta, (const char*) ndir); - + return error_box("Impossibile creare il direttorio della ditta %ld (%s)", + codditta, (const char*)s); + } + s << ndir; if (!fcopy(&ndir[1], s)) return error_box("Impossibile copiare il file %s della ditta %ld", @@ -290,7 +295,7 @@ void TMenu_application::load_menu() } _menu.add(ts); - const TString16 action = ts->get(2); + const TString80 action(ts->get(2)); const int last = _menu.items() - 1; if (atoi(action) > 0) diff --git a/ba/ba0.h b/ba/ba0.h index 6a94303ed..b909f0c24 100755 --- a/ba/ba0.h +++ b/ba/ba0.h @@ -1,8 +1,6 @@ -#ifndef __BA0_H -#define __BA0_H - -#define BA0_PICTURE 883 - -#endif - - +#ifndef __BA0_H +#define __BA0_H + +#define BA0_PICTURE 883 + +#endif diff --git a/ba/ba1400.cpp b/ba/ba1400.cpp index 0bbb1cbf3..67d3da3da 100755 --- a/ba/ba1400.cpp +++ b/ba/ba1400.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include "ba1.h" diff --git a/ba/ba1500.cpp b/ba/ba1500.cpp index c935424b4..e6c0c2453 100755 --- a/ba/ba1500.cpp +++ b/ba/ba1500.cpp @@ -1,8 +1,10 @@ #include #include #include +#include #include #include + #include #include "ba1.h" diff --git a/ba/ba4300.cpp b/ba/ba4300.cpp index b5bf4ad3f..ab1ebf943 100755 --- a/ba/ba4300.cpp +++ b/ba/ba4300.cpp @@ -79,12 +79,21 @@ public: bool ba4300_handler(TMask& m, KEY k) -{ +{ + TDitte_application& app = (TDitte_application&)main_app(); + + if (k == (K_SHIFT+K_F12) && m.mode() == MODE_MOD && app.user() == "PRASSI") + { + m.enable(FLD_GD1_TIPOA); + m.enable(FLD_GD1_CODANAGR); + m.enable(FLD_GD1_CODANAGR_ANAGR_RAGSOC); + return TRUE; + } + if (k != K_F5 && k != K_F6 && k != K_F7 && k != K_F8) return TRUE; if (m.mode() == MODE_MOD || m.mode() == MODE_INS) { - TDitte_application& app = (TDitte_application&)main_app(); if (m.mode() == MODE_INS) { if (!m.check_fields()) return FALSE; diff --git a/ba/bacnv.cpp b/ba/bacnv.cpp index c5c9ee43c..a19120665 100755 --- a/ba/bacnv.cpp +++ b/ba/bacnv.cpp @@ -171,7 +171,7 @@ void TConversione_archivi::contropartita_rmov() void TConversione_archivi::liala(const char* table) { - TString16 tab(table); + TString16 tab(table); TTable lia(tab); tab.insert("%", 0); diff --git a/ba/batbreg.uml b/ba/batbreg.uml index d4f8c334a..23fa754db 100755 --- a/ba/batbreg.uml +++ b/ba/batbreg.uml @@ -214,7 +214,6 @@ BEGIN FIELD S6 HELP "Codice del libro unico a cui fa riferimento" FLAGS "UZ" - VALIDATE NOT_EMPTY_CHECK_FIELD GROUP 2 3 4 USE %LBU INPUT CODTAB[1,4] F_ANNO @@ -226,6 +225,7 @@ BEGIN OUTPUT F_CODLBU CODTAB[5,7] WARNING "Libro unico assente" CHECKTYPE NORMAL + VALIDATE NOT_EMPTY_CHECK_FIELD END ENDPAGE diff --git a/ba/batbvid.uml b/ba/batbvid.uml index 3575f2bd9..c10c1c910 100755 --- a/ba/batbvid.uml +++ b/ba/batbvid.uml @@ -11,18 +11,13 @@ PAGE "Tabella Vidimazioni" -1 -1 78 18 STRING F_CODICE 3 BEGIN PROMPT 4 1 "Codice vidimazione " - USE VID - FIELD VID->CODTAB + FIELD CODTAB + USE %VID INPUT CODTAB F_CODICE DISPLAY "Codice" CODTAB DISPLAY "Intestatario@50" S0 OUTPUT F_CODICE CODTAB OUTPUT F_INTESTA S0 - OUTPUT F_DATAVID D0 - OUTPUT F_UFFVID S1 - OUTPUT F_NUMFOGLI I0 - OUTPUT F_PAGDA I1 - OUTPUT F_PAGA I2 CHECKTYPE REQUIRED KEY 1 END @@ -32,15 +27,20 @@ BEGIN PROMPT 4 3 "Intestatario " HELP "Inserire l'intestatario del codice di vidimazione" WARNING "E' necessario specificare l'intestatario" - FIELD VID->S0 + FIELD S0 + USE %VID KEY 2 + INPUT S0 F_INTESTA + DISPLAY "Intestatario@50" S0 + DISPLAY "Codice" CODTAB + COPY OUTPUT F_CODICE CHECKTYPE REQUIRED + KEY 2 END DATE F_DATAVID BEGIN PROMPT 4 5 "Data vidimazione " - FIELD VID->D0 - FLAGS "A" + FIELD D0 WARNING "E' necessario specificare la data di vidimazione" CHECKTYPE REQUIRED END @@ -49,7 +49,7 @@ STRING F_UFFVID 50 BEGIN PROMPT 4 7 "Ufficio vidimazione " WARNING "E' necessario specificare il nome dell'ufficio" - FIELD VID->S1 + FIELD S1 CHECKTYPE REQUIRED END @@ -57,7 +57,7 @@ NUMBER F_NUMFOGLI 5 BEGIN PROMPT 4 9 "Numero fogli libro " WARNING "E' necessario specificare il numero dei fogli" - FIELD VID->I0 + FIELD I0 FLAGS "R" CHECKTYPE REQUIRED END @@ -66,7 +66,7 @@ NUMBER F_PAGDA 5 BEGIN PROMPT 4 11 "Dalla pagina " WARNING "E' necessario specificare un numero di pagina iniziale" - FIELD VID->I1 + FIELD I1 FLAGS "R" CHECKTYPE REQUIRED END @@ -74,7 +74,7 @@ END NUMBER F_PAGA 5 BEGIN PROMPT 30 11 "Alla pagina " - FIELD VID->I2 + FIELD I2 FLAGS "R" CHECKTYPE REQUIRED WARNING "Specificare un numero di pagina superiore a quella iniziale"