From 04b497c9555de7a45ad5ead63d2c450acc921844 Mon Sep 17 00:00:00 2001 From: smen Date: Mon, 13 Dec 2021 12:44:26 +0100 Subject: [PATCH] Patch level : nopatch Files correlati : Commento : Punto di menu nuovo modulo FP --- src/fp/fp0700.cpp | 8 ++++-- src/fp/fplib.h | 6 ++--- src/fp/fplib01.cpp | 65 ++-------------------------------------------- src/fp/fpmenu.men | 9 ++++++- 4 files changed, 19 insertions(+), 69 deletions(-) diff --git a/src/fp/fp0700.cpp b/src/fp/fp0700.cpp index aa53af1b8..9ef8fd1a5 100644 --- a/src/fp/fp0700.cpp +++ b/src/fp/fp0700.cpp @@ -166,7 +166,11 @@ void TPAR_mask::fill() const TDate data_inizio = get_date_start_new_fatt(); // Disabilito la colonna del codice ufficio - regs.enable_column(cid2index(S_UFFICIO), false); + //regs.enable_column(cid2index(S_UFFICIO), false); + regs.reset(); + + // Disabilito la colonna riferimento Amministrazione + regs.enable_column(cid2index(S_RIFAMM), false); regs.reset(); for (bool okc = rec.move_first(); okc; okc = rec.move_next()) @@ -215,7 +219,7 @@ void TPAR_mask::fill() fat_no_cod++; } regs.set_row_cell(S_UFFICIO, rif, r); - regs.set_row_cell(S_RIFAMM, cli.vendite().get(CFV_PARIFAMM), r); + //regs.set_row_cell(S_RIFAMM, cli.vendite().get(CFV_PARIFAMM), r); regs.set_row_cell(S_COFI, cli.get(CLI_COFI), r); bool split = cli.get_bool("20." CLI_SPLITPAY); diff --git a/src/fp/fplib.h b/src/fp/fplib.h index e3034c6dd..27f1880ce 100644 --- a/src/fp/fplib.h +++ b/src/fp/fplib.h @@ -83,9 +83,9 @@ public: TString& insert_string(); -// TString& update_string(); -// TString& filter_string(); -// bool update(); + TString& update_string(); + TString& filter_string(); + bool update(); bool insert(); TString& remove_string(bool id_riga = false); bool remove(); diff --git a/src/fp/fplib01.cpp b/src/fp/fplib01.cpp index 5e1d5ed52..20f9db1b3 100644 --- a/src/fp/fplib01.cpp +++ b/src/fp/fplib01.cpp @@ -466,7 +466,8 @@ bool TPaf_record::remove() return ok; } // Carica un record in base ai campi chiave -/*bool TPaf_record::search() + +bool TPaf_record::search() { CHECKS(_fields.items() > 0, "Can't search with empty key on table ", static_cast(_table)); @@ -589,70 +590,8 @@ bool TPaf_record::update() { return fp_db().sq_set_exec(update_string(), false); } -*/ -bool TPaf_record::search() -{ - CHECKS(_fields.items() > 0, "Can't search with empty key on table ", static_cast(_table)); - TString256 query; - query << "SELECT TOP 1 * FROM " << _table << " WHERE "; - FOR_EACH_TOKEN(_key, fld) - { - const TVariant& var = get(fld); - if (!var.is_null()) - query << fld << '=' << var2str(fld, var) << " AND "; - } - query.rtrim(5); - query << " ORDER BY "; - FOR_EACH_TOKEN(_key, fld) - { - const TVariant& var = get(fld); - if (!var.is_null()) - query << fld << ", "; - } - query.rtrim(2) << " DESC;"; - // return xvt_sql_execute(_db, query, paf_search_record, this) == 1; - // TODO: Valutare - return fp_db().sq_set_exec(query); -} -// Carica un record in base ad un massimo di 3 campi chiave -bool TPaf_record::search(const char* k1, const char* k2, const char* k3) -{ - _fields.destroy(); - set(_key.get(0), k1); - set(_key.get(1), k2); - if (k3 && *k3) - set(_key.get(2), k3); - return search(); -} - -TString & TPaf_record::insert_string() -{ - CHECKS(_fields.items() >= _key.items(), "Can't insert empty record on table ", _table); - static TString query, values; - query.cut(0); values.cut(0); - query << "INSERT INTO " << _table << "\n("; - FOR_EACH_ASSOC_OBJECT(_fields, obj, fld, itm) - { - const TVariant& var = get(fld); - if (!var.is_null()) - { - query << fld << ','; - values << var2str(fld, var) << ','; - } - } - query.rtrim(1); - values.rtrim(1); - query << ")\nVALUES (" << values << ");"; - return query; -} - -// Aggiunge un record al db -bool TPaf_record::insert() -{ - return fp_db().sq_set_exec(insert_string(), false); -} // Crea un record della tabella data ed imposta i nomi dei campi chiave TPaf_record::TPaf_record(const char* table) : _table(table), _key(15, ',') { diff --git a/src/fp/fpmenu.men b/src/fp/fpmenu.men index 862b5b31c..b3f631b51 100644 --- a/src/fp/fpmenu.men +++ b/src/fp/fpmenu.men @@ -33,4 +33,11 @@ Module = f9 Flags = "" Item_01 = "Estrazioni", "f90 -0", "" Item_02 = "Categorie documentali", "f90 -1", "" -Item_03 = "Gestione file doc. cartacei", "f90 -2", "" \ No newline at end of file +Item_03 = "Gestione file doc. cartacei", "f90 -2", "" + +[FPMENU_005] +Caption = "Regolarizzazione Contabile" +Picture = +Module = fp +Flags = "" +Item_01 = "Invio Regolarizzazioni", "fp -6", ""