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

Patch level : 12.00 1284

Browse Source 
Files correlati     : f108.dir f108.trr ca3.exe
Commento            :

La stampa mastrini non selezionava piu' per conto
This commit is contained in:
Alessandro Bonazzi 2023-09-27 00:43:12 +02:00
parent e02bfce0d7
commit d3a09f4307
2 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/ca/ca3200.cpp
View File

@ -222,16 +222,6 @@ void TPrint_mastrini_ca_recordset::set_custom_filter(TCursor& cur) const
//filtro sui conti selezionati sulla maschera
TRectype darec(cur.curr()), arec(cur.curr()); //record corrente (rmovana (solo movimentati))
if (_codcms)
{
darec.put(RMOVANA_CODCMS, _codcms);
arec.put(RMOVANA_CODCMS, _codcms);
}
if (_codcosto.full())
{
darec.put(RMOVANA_CODCCOSTO, _codcosto);
arec.put(RMOVANA_CODCCOSTO, _codcosto);
}
if (_daconto.full())
darec.put(RMOVANA_CODCONTO, _daconto);
@ -547,11 +537,8 @@ void TPrint_mastrini_ca_rep::set_filter(const TPrint_mastrini_ca_mask& msk, int
const int tipoconti = msk.get_int(F_TIPOCONTI);
TPrint_mastrini_ca_recordset* recset = NULL;
TConfig & ca = ca_config();
TString query = "USE RMOVANA KEY ";
const char* const query ="USE RMOVANA KEY 2\nJOIN MOVANA INTO NUMREG==NUMREG\nJOIN MOV TO MOVANA INTO NUMREG==NUMREGCG";
query << (ca.get("Level", "ca", 1) ? 6 : 7) << "\nJOIN MOVANA INTO NUMREG==NUMREG\nJOIN MOV TO MOVANA INTO NUMREG==NUMREGCG";
switch (tipoconti)
{
case 1:
@ -671,6 +658,8 @@ void TPrint_mastrini_ca::execute_print(TReport_book & book, TAutomask & mask, TR
TAssoc_array codici_buoni;
TString query;
query << "USE RMOVANA KEY 2\n";
query << "FROM CODCONTO=#DACONTO\n";
query << "TO CODCONTO=#ACONTO";
TISAM_recordset rmovana(query);
TString80 daconto, aconto;
for (int i = 0; _mask->id2pos(F_CDC1_INI+i) > 0; i++)
@ -678,13 +667,8 @@ void TPrint_mastrini_ca::execute_print(TReport_book & book, TAutomask & mask, TR
daconto << _mask->get(F_CDC1_INI+i);
aconto << _mask->get(F_CDC1_FIN+i);
}
// rmovana.set_var("#DACONTO", daconto);
// rmovana.set_var("#ACONTO", aconto);
if (!daconto.blank())
query << "FROM " << CDC_CODCONTO << "=\"" << (const char*) daconto << "\"\n";
if (!daconto.blank())
query << "TO " << CDC_CODCONTO << "=\"" << (const char*)aconto << "\"\n";
rmovana.set_var("#DACONTO", daconto);
rmovana.set_var("#ACONTO", aconto);
const long items = rmovana.items();
if (items > 0)
{
@ -710,14 +694,10 @@ void TPrint_mastrini_ca::execute_print(TReport_book & book, TAutomask & mask, TR
TProgress_monitor pi(set.items(), msg, true);
for (bool sok = set.move_first(); pi.add_status() && sok; sok = set.move_next()) //fighissimo metodo per scandire un file in 1 riga!
{
if (skip_closed && set.get_bool(COMMESSE_CHIUSA))
if (skip_closed && set.get(COMMESSE_CHIUSA).as_bool())
continue;
// row = set.get_string(0u);
if (logic1 == LF_CDC)
row = set.get_string(CDC_CODCOSTO);
else
row = set.get_string(COMMESSE_CODCMS); //prende il valore del primo campo del file (CDC o CMS code)
row = set.get(0u).as_string(); //prende il valore del primo campo del file (CDC o CMS code)
if (!codici_buoni.is_key(row))
continue;

4
src/ca/ca3700.cpp
View File

@ -2780,10 +2780,6 @@ void TPrint_rendiconto_ca::execute_print(TReport_book & book, TAutomask & mask,
}
else //se ha almeno una riga sullo sheet delle cms/cdc...
{
if (!mask.field(F_DATAINI).empty())
dataini = mask.get_date(F_DATAINI);
if (!mask.field(F_DATAFIN).empty())
datafin = mask.get_date(F_DATAFIN);
FOR_EACH_SHEET_ROW(sheet, r, row) //per ogni cdc/cms che appare nello sheet di pag.1 della msk..
{
ca_rep.set_filter(ca_mask, r, recset_key, log); //..chiama il metodone globale che crea e compila il file..