diff --git a/cg/cg1300.cpp b/cg/cg1300.cpp index f29ae03c4..a84d2ea3a 100755 --- a/cg/cg1300.cpp +++ b/cg/cg1300.cpp @@ -111,7 +111,7 @@ void TAgg_attiv::elabora_mov() int cg1300(int argc, char* argv[]) { - switch (*argv[2]) + switch (toupper(*argv[2])) { case 'A': { diff --git a/cg/cg1307.cpp b/cg/cg1307.cpp index 823ffd28d..c46834dd2 100755 --- a/cg/cg1307.cpp +++ b/cg/cg1307.cpp @@ -111,18 +111,16 @@ bool TElimina_zoppi::test_row_file(int lf_rmov, TString_array& arr) TLocalisamfile row(lf_rmov); TString msg; - msg << TR("Controllo righe "); switch (lf_rmov) { - case LF_RMOV : msg << TR("contabili"); break; - case LF_RMOVIVA: msg << TR("iva"); break; - case LF_PARTITE: msg << TR("saldaconto"); break; + case LF_RMOV : msg = TR("Controllo righe contabili"); break; + case LF_RMOVIVA: msg = TR("Controllo righe iva"); break; + case LF_PARTITE: msg = TR("Controllo righe saldaconto"); break; default: CHECKD(0, "Invalid row file %d", lf_rmov); break; } msg << ": 0"; - msg.center_just(50); - TProgind pi(row.items(), msg, TRUE, TRUE, 50); + TProgind pi(row.items(), msg, TRUE, TRUE); TToken_string riga, descr; long reg, last_reg = 0, found = 0; diff --git a/cg/cg3100a.uml b/cg/cg3100a.uml index 0967fb7e6..a77e63b3f 100755 --- a/cg/cg3100a.uml +++ b/cg/cg3100a.uml @@ -185,7 +185,7 @@ STRING F_REGISTROINI 3 BEGIN PROMPT 2 15 "Stampa dal registro iva " USE REG SELECT I0<"3" - //INPUT CODTAB[1,5] F_ANNO SELECT + INPUT CODTAB[1,4] F_ANNO INPUT CODTAB[5,7] F_REGISTROINI DISPLAY "Anno" CODTAB[1,4] DISPLAY "Cod. registro iva" CODTAB[5,7] @@ -201,7 +201,7 @@ STRING F_REGISTROFIN 3 BEGIN PROMPT 40 15 "al reg. iva " COPY USE F_REGISTROINI - //INPUT CODTAB[1,5] F_ANNO SELECT + INPUT CODTAB[1,4] F_ANNO INPUT CODTAB[5,7] F_REGISTROFIN DISPLAY "Anno" CODTAB[1,4] DISPLAY "Cod. registro iva" CODTAB[5,7] diff --git a/cg/cg3600.cpp b/cg/cg3600.cpp index 8377c8e68..3b852144f 100755 --- a/cg/cg3600.cpp +++ b/cg/cg3600.cpp @@ -2919,7 +2919,6 @@ protected: virtual bool create(); virtual bool destroy(); virtual bool menu(MENU_TAG); - virtual void on_firm_change(); public: @@ -2949,11 +2948,6 @@ bool TMastrini_video::destroy() return TRUE; } -void TMastrini_video::on_firm_change() -{ - TEsercizi_contabili::update(); -} - bool TMastrini_video::menu(MENU_TAG mt) { if (mt == BAR_ITEM(1)) diff --git a/cg/cg3600a.uml b/cg/cg3600a.uml index 973c22a25..ff6c7c585 100755 --- a/cg/cg3600a.uml +++ b/cg/cg3600a.uml @@ -1,6 +1,6 @@ #include "cg3600.h" -TOOLBAR "" 0 20 0 0 +TOOLBAR "" 0 -3 0 3 BUTTON DLG_OK 10 2 BEGIN diff --git a/cg/cg3600b.uml b/cg/cg3600b.uml index 504cff482..3b2a274f4 100755 --- a/cg/cg3600b.uml +++ b/cg/cg3600b.uml @@ -1,6 +1,6 @@ #include "cg3600.h" -TOOLBAR "" 0 20 0 0 +TOOLBAR "" 0 -3 0 3 BUTTON DLG_LINK 10 2 BEGIN diff --git a/cg/cg4700a.uml b/cg/cg4700a.uml index 2c291c1d3..143a1ea33 100755 --- a/cg/cg4700a.uml +++ b/cg/cg4700a.uml @@ -1,10 +1,10 @@ #include "cg4700.h" -TOOLBAR "" 0 20 0 2 +TOOLBAR "" 0 -3 0 3 BUTTON DLG_SAVEREC 10 2 BEGIN -PROMPT -14 -1 "~Registra" +PROMPT -14 -11 "~Registra" PICTURE BMP_SAVEREC PICTURE BMP_SAVERECDN MESSAGE EXIT,K_SAVE @@ -12,20 +12,20 @@ END BUTTON DLG_FINDREC 10 2 BEGIN -PROMPT -24 -1 "Ri~cerca" +PROMPT -24 -11 "Ri~cerca" PICTURE BMP_FINDREC MESSAGE EXIT,K_F9 END BUTTON DLG_CANCEL 10 2 BEGIN -PROMPT -34 -1 "" +PROMPT -34 -11 "" MESSAGE EXIT,K_ESC END BUTTON DLG_QUIT 10 2 BEGIN -PROMPT -44 -1 "" +PROMPT -44 -11 "" MESSAGE EXIT,K_QUIT END diff --git a/cg/cg6400.cpp b/cg/cg6400.cpp index 62a314911..36b09c187 100755 --- a/cg/cg6400.cpp +++ b/cg/cg6400.cpp @@ -1,7 +1,5 @@ // Ricezione dati da sistema e da PC -#include - #include #include #include @@ -39,7 +37,8 @@ class TRic_archivi : public TSkeleton_application int _stato_ripartenza,_nultras_tab; bool _sequenza,_disketto; bool _prima_volta,_baipassa; - TString _nomeid,_nomeidp,_marker,_trasf,_trasfer,_pathname,_ragsoc_dittar; + TString _nomeid,_nomeidp,_ragsoc_dittar; + TFilename _marker,_trasf,_trasfer,_pathname; long _dittainv,_dittainvp,_dittaric,_totrectras,_totrectrasp; TDate _datatras,_datatrasp,_dataultras_tab,_dataultras; TString _sigle_file,_nrec_file,_trasfhard; @@ -165,7 +164,7 @@ void TRic_archivi::componi_path(TMask* msk) bool TRic_archivi::leggi_marker() { - if (!fexist(_marker)) + if (!_marker.exist()) { if (_disketto) return error_box(FR("File marker non presente sul dischetto %d: impossibile proseguire"), _numdisk); @@ -236,7 +235,7 @@ bool TRic_archivi::leggi_marker() if (_dittaric != 0) { if (!prefix().exist(_dittaric)) - return error_box(FR("Libreria archivi ditta %s non presente su disco"), (const char*)_dittaric); + return error_box(FR("Libreria archivi ditta %ld non presente su disco"), _dittaric); } else return error_box(TR("Codici NON PRESENTI in tabella ricezione: caricarli e riprovare")); @@ -252,7 +251,7 @@ bool TRic_archivi::leggi_marker_rep() { TString16 tmp; - if (!fexist(_marker)) + if (!_marker.exist()) { if (_disketto) return error_box(FR("File marker non presente sul dischetto %d: impossibile proseguire"), _numdisk); diff --git a/cg/cglib01.cpp b/cg/cglib01.cpp index 86f8be2bb..d98c29ffe 100755 --- a/cg/cglib01.cpp +++ b/cg/cglib01.cpp @@ -64,7 +64,6 @@ void TEsercizi_contabili::check() { if (_firm != prefix().get_codditta()) update(); - CHECK(_esercizi.items() > 0, "Non esistono esercizi contabili!"); } int TEsercizi_contabili::date2index(const TDate& d) const @@ -771,7 +770,8 @@ bool TBill::find() TString16 key; key.format("%c|%ld", _tipo, _sottoconto); const TRectype & clifo = cache().get(LF_CLIFO, key); - if (!clifo.empty()) + ok = !clifo.empty(); + if (ok) { set_description(clifo.get("RAGSOC")); if (_tipo_cr < 0)