root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'R12.00' of http://10.65.20.33/sirio/CAMPO/campo into R12.00

Browse Source
This commit is contained in:
Alessandro Bonazzi 2021-12-13 12:46:25 +01:00
commit 2cd18cbacd
4 changed files with 19 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/fp/fp0700.cpp
View File

@ -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);

6
src/fp/fplib.h
View File

@ -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();

65
src/fp/fplib01.cpp
View File

@ -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<const char*>(_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<const char*>(_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, ',')
{

9
src/fp/fpmenu.men
View File

@ -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", ""
Item_03 = "Gestione file doc. cartacei", "f90 -2", ""
[FPMENU_005]
Caption = "Regolarizzazione Contabile"
Picture = <cg01>
Module = fp
Flags = ""
Item_01 = "Invio Regolarizzazioni", "fp -6", ""