Corretta visualizzazione saldi

git-svn-id: svn://10.65.10.50/trunk@1295 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1995-04-21 15:41:11 +00:00
parent c791f69dd0
commit 7f2eafbb08
5 changed files with 10 additions and 13 deletions

View File

@ -354,7 +354,7 @@ void TPrimanota_application::write_scadenze(const TMask& m)
const TDate dreg(r.get_date("DATAREG"));
const TString16 reg (r.get("REG"));
const TString80 desc(r.get("DESCR"));
const int protiva = r.get_int("PROTIVA");
const long protiva = r.get_long("PROTIVA");
const TString16 codcaus(r.get("CODCAUS"));
const TString16 codval (r.get("CODVAL"));
const real cambio (r.get("CAMBIO"));

View File

@ -183,6 +183,7 @@ bool TSaldibrowse_application::fai_filtro()
else if (_anno != 0)
from.put(SLD_ANNOES,_anno);
else from.put(SLD_ANNOES,0);
from.put(SLD_GRUPPO,_g);
if (_c != 0)
from.put(SLD_CONTO, _c);
@ -235,7 +236,7 @@ bool TSaldibrowse_application::sottoc_handler(TMask_field& f, KEY key)
pconti.put(PCN_GRUPPO, gruppo) ;
pconti.put(PCN_CONTO, conto);
pconti.put(PCN_SOTTOCONTO, sottoconto);
ok = stop = pconti.read(_isequal, _nolock) == NOERR;
ok = stop = pconti.read() == NOERR;
}
else ok = FALSE;
}
@ -246,7 +247,7 @@ bool TSaldibrowse_application::sottoc_handler(TMask_field& f, KEY key)
clifo.setkey(1);
clifo.put(CLI_TIPOCF,tipo);
clifo.put(CLI_CODCF, sottoconto) ;
ok = stop = clifo.read(_isequal, _nolock) == NOERR;
ok = stop = clifo.read() == NOERR;
if (ok && (gruppo == 0 || conto == 0))
{
m.set(F_GRUPPO, gruppo = clifo.get_int("GRUPPO"));
@ -256,19 +257,17 @@ bool TSaldibrowse_application::sottoc_handler(TMask_field& f, KEY key)
}
}
else
if (gruppo != 0 && conto != 0)
if (gruppo != 0 /* && conto != 0 */)
{
pconti.setkey(1);
pconti.zero();
pconti.put(PCN_GRUPPO, gruppo) ;
pconti.put(PCN_CONTO, conto);
ok = stop= pconti.read(_isequal, _nolock) == NOERR;
ok = stop = pconti.read() == NOERR;
if (ok)
{
m.set(id, pconti.get(PCN_DESCR));
m.disable(id);
}
else m.reset(id);
m.set(F_DESCR_CONTO, pconti.get(PCN_DESCR));
else
m.reset(F_DESCR_CONTO);
}
if (stop) m.stop_run(K_AUTO_ENTER);
if (!ok) error_box("Conto errato o incompleto");

View File

@ -207,7 +207,7 @@ END
SPREADSHEET F_SHEET_SALDI
BEGIN
PROMPT 0 6 ""
ITEM "Es."
ITEM "Es.@4"
ITEM " Saldo iniziale@15"
ITEM ""
ITEM "Progr.Att.: Dare@15"

View File

@ -1,4 +1,3 @@
#include <browfile.h>
#include <prefix.h>
#include <msksheet.h>

View File

@ -5,7 +5,6 @@
// IVA a debito da riportare al mese successivo
#define IVA_DA_RIPORTARE real(50000)
class TSheet_field;
class TViswin;