Correzioni chiamata a TDate::string() e cazzatelle liquidazione

git-svn-id: svn://10.65.10.50/trunk@1329 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1995-05-09 09:10:39 +00:00
parent 82a3aea7c8
commit 3c11b4be8d
4 changed files with 20 additions and 8 deletions

View File

@ -2462,7 +2462,7 @@ void CG1500_application::set_page(int file, int counter)
} }
else //stampa bilancio di verifica else //stampa bilancio di verifica
{ {
TString udata = _ultima_data.string(2,'/'); TString udata = _ultima_data.string(brief,'/');
char app; char app;
int r = 1; int r = 1;

View File

@ -263,7 +263,19 @@ bool TLiquidazione_app::user_create()
//fine modifica //fine modifica
if (_isprint && _descr_arr.items() > 0) if (_isprint && _descr_arr.items() > 0)
print(); print();
// se ci sono altri mesi dopo l'ultimo calcolato, invalida il
// flag 'calcolato' del primo, per causare il ricalcolo dei
// successivi (evitando problemi per credito precedente)
for (int m = _month+1; m <= 13; m++)
if (look_lim(m))
{
_lim->put("B0","");
_lim->rewrite();
break;
}
TApplication::set_firm(__firm); TApplication::set_firm(__firm);
end_wait(); end_wait();
} }
@ -414,7 +426,7 @@ long TLiquidazione_app::select_firm_range(long from, long to, wht freq)
TToken_string& d = _ditte->row(i); TToken_string& d = _ditte->row(i);
const char vers = d.get_char(3); const char vers = d.get_char(3);
if (vers == '?' || (freq == mnt && vers == 'T') || (freq == quarter && vers == 'M')) if (vers == '?' || (freq == mnt && vers == 'T') || (freq == trimestre && vers == 'M'))
continue; continue;
const long cod = d.get_long(1); const long cod = d.get_long(1);
@ -611,7 +623,7 @@ void TLiquidazione_app::build_ditte_sheet(wht what)
const char vers = d->get_char(2); const char vers = d->get_char(2);
bool selectable = vers == '?'; bool selectable = vers == '?';
if ((what == mnt && vers == 'T') || (what == quarter && vers == 'M')) if ((what == mnt && vers == 'T') || (what == trimestre && vers == 'M'))
continue; continue;
d->insert(" |", 0); d->insert(" |", 0);
@ -654,7 +666,7 @@ bool TLiquidazione_app::set_liquidazione()
// handlers have set everything // handlers have set everything
_month = _what == quarter ? m.get_int(CG43_LST_TRIM) : _month = _what == trimestre ? m.get_int(CG43_LST_TRIM) :
m.get_int(CG43_LST_MESE); m.get_int(CG43_LST_MESE);
_year = m.get(CG43_FLD_ANNO); _year = m.get(CG43_FLD_ANNO);

View File

@ -60,7 +60,7 @@ class TProgind;
enum tiporeg { vendita = 1, acquisto = 2 }; enum tiporeg { vendita = 1, acquisto = 2 };
enum recalc { needed = 1, one = 2, ever = 3, never = 4 }; enum recalc { needed = 1, one = 2, ever = 3, never = 4 };
enum wht { all = 1, mnt = 2, quarter = 3}; enum wht { all = 1, mnt = 2, trimestre = 3};
enum tbc { precedente = 1, incorso = 2}; enum tbc { precedente = 1, incorso = 2};
// flags per gli items di stampa // flags per gli items di stampa

View File

@ -2001,7 +2001,7 @@ bool CG4400_application::preprocess_page(int file, int counter)
_tipodoc = mov.get(MOV_TIPODOC); _tipodoc = mov.get(MOV_TIPODOC);
_descr_doc = descr_doc(); _descr_doc = descr_doc();
TString app = datadoc.string(2, '/'); TString app = datadoc.string(brief, '/');
if (stampa_totali_finali()) if (stampa_totali_finali())
_doc_array.add_riga(_tipodoc,_descr_doc,totdoc); _doc_array.add_riga(_tipodoc,_descr_doc,totdoc);
@ -2009,7 +2009,7 @@ bool CG4400_application::preprocess_page(int file, int counter)
//setto le righe di stampa //setto le righe di stampa
_r = 1; _r = 1;
if (!_stampa_data_reg) if (!_stampa_data_reg)
set_row(_r, "%s", (const char*) _datareg.string(2, '/')); set_row(_r, "%s", (const char*) _datareg.string(brief, '/'));
set_row(_r, "@9g%5ld", protiva); set_row(_r, "@9g%5ld", protiva);
if (datadoc.ok()) if (datadoc.ok())
set_row(_r, "@15g%s", (const char*) app); set_row(_r, "@15g%s", (const char*) app);