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

Correzione errore MI1089, MI1072. Corretta anche la stampa degli importi

Browse Source 
in lire se la relativa colonna non e' abilitata.


git-svn-id: svn://10.65.10.50/trunk@2871 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
angelo 1996-05-20 14:27:45 +00:00
parent 4ef0a18aa3
commit 21d801c5ff
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sc/sc2100.cpp
View File

@ -604,17 +604,11 @@ void TEC_array::add_row(const TRiga_partite& row)
}
TImporto diffcam(row.importo(FALSE, 0x4));
if (!diffcam.is_zero())
if (!diffcam.is_zero() && !in_valuta)
{
TEC_row& rec = new_row(row, data_pag, TImporto('D', ZERO), 3);
rec.descrizione(form().describe(PEC_DIFFCAM));
if (in_valuta)
{
diffcam.normalize(sezione);
rec.importo_lire(diffcam.valore());
}
else
rec.importo(diffcam);
rec.importo(diffcam);
}
TImporto ritenute(row.importo(FALSE, 0x8));
@ -968,6 +962,8 @@ void TEC_form::print_total(int riga, const THash_object& o)
TForm_item& bimplire = body.find_field(PEC_IMPLIRE);
implire.set_x(bimplire.x());
esposto.width() = bimplire.width();
if (bimplire.shown()) implire.show();
else implire.hide();
}
modify_picture(implire,old_pictures,FALSE);
implire.set(t.importo_lire().string());
@ -1359,8 +1355,8 @@ int TStampaEC_application::print_ec()
{
TPartita game(partite.curr());
if (game.chiusa())
{
// if (game.chiusa())
// {
const TDate& dir = f.data_inizio_rischio();
const TDate& dlo = f.data_limite_operazione();
const TImporto saldo = game.calcola_saldo_al(f.in_valuta(), dlo, dir);
@ -1375,7 +1371,7 @@ int TStampaEC_application::print_ec()
if (riga.is_fattura())
{
const TDate dd(riga.get(PART_DATADOC));
if (dd > dir)
if (dd >= data_chiuse)
break;
}
}
@ -1383,7 +1379,7 @@ int TStampaEC_application::print_ec()
if (r == 0)
continue;
}
}
// }
if (one_printed)
{