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

Patch level : 10.0 462

Browse Source 
Files correlati     : sc2.exe
Ricompilazione Demo : [ ]
Commento

Allargato a 12 il numero di colonne degli importi nella stampa previsione incassi/pagamenti


git-svn-id: svn://10.65.10.50/trunk@19407 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2009-10-08 11:23:12 +00:00
parent 312ae4b486
commit b74a0d5fb3
2 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
sc/sc2600.cpp
View File

@ -765,10 +765,10 @@ void TProspettoScadenze::print_totali_rows(int nriga, bool what)
if (v._s[i] != ZERO) if (v._s[i] != ZERO)
{ {
print_real(value, v._s[i]); print_real(value, v._s[i]);
rw << format("@%dg%11s", pos, (const char*) value); rw << format("@%dg%12s", pos, (const char*) value);
tot += v._s[i]; tot += v._s[i];
} }
pos += 11; pos += 12;
} }
} }
else else
@ -776,10 +776,10 @@ void TProspettoScadenze::print_totali_rows(int nriga, bool what)
if (v._s[0] != ZERO) if (v._s[0] != ZERO)
{ {
print_real(value, v._s[0]); print_real(value, v._s[0]);
rw << format("@%dg%11s", pos, (const char*) value); rw << format("@%dg%12s", pos, (const char*) value);
tot += v._s[0]; tot += v._s[0];
} }
pos += 11; pos += 12;
} }
if (_nsinfasce) if (_nsinfasce)
@ -789,10 +789,10 @@ void TProspettoScadenze::print_totali_rows(int nriga, bool what)
if (v._ns[i] != ZERO) if (v._ns[i] != ZERO)
{ {
print_real(value, v._ns[i]); print_real(value, v._ns[i]);
rw << format("@%dg%11s", pos, (const char*) value); rw << format("@%dg%12s", pos, (const char*) value);
tot += v._ns[i]; tot += v._ns[i];
} }
pos += 11; pos += 12;
} }
} }
else else
@ -800,36 +800,36 @@ void TProspettoScadenze::print_totali_rows(int nriga, bool what)
if (v._ns[0] != ZERO) if (v._ns[0] != ZERO)
{ {
print_real(value, v._ns[0]); print_real(value, v._ns[0]);
rw << format("@%dg%11s", pos, (const char*) value); rw << format("@%dg%12s", pos, (const char*) value);
tot += v._ns[0]; tot += v._ns[0];
} }
pos += 11; pos += 12;
} }
if (tot != ZERO) if (tot != ZERO)
{ {
print_real(value, tot); print_real(value, tot);
rw << format("@%dg%11s", pos, (const char*) value); rw << format("@%dg%12s", pos, (const char*) value);
} }
pos += 11; pos += 12;
if (v._es != ZERO) if (v._es != ZERO)
{ {
print_real(value, v._es); print_real(value, v._es);
rw << format("@%dg%11s", pos, (const char*) value); rw << format("@%dg%12s", pos, (const char*) value);
} }
pos += 11; pos += 12;
if (v._sl != ZERO) if (v._sl != ZERO)
{ {
print_real(value, v._sl); print_real(value, v._sl);
rw << format("@%dg%11s", pos, (const char*) value); rw << format("@%dg%12s", pos, (const char*) value);
} }
pos += 11; pos += 12;
const real diff = v._sl - (tot - v._es); const real diff = v._sl - (tot - v._es);
if (diff != ZERO) if (diff != ZERO)
{ {
print_real(value, diff); print_real(value, diff);
rw << format("@%dg%11s", pos, (const char*) value); rw << format("@%dg%12s", pos, (const char*) value);
} }
if (rw.not_empty()) if (rw.not_empty())
@ -988,18 +988,18 @@ void TProspettoScadenze::print_header()
if (_sinfasce) if (_sinfasce)
{ {
rw << format("@%dg >%3d gg", pos, _limiti[_sfasce] * 30); rw << format("@%dg >%3d gg", pos, _limiti[_sfasce] * 30);
pos += 11; pos += 12;
for (int i = _sfasce; i > 0; i--) for (int i = _sfasce; i > 0; i--)
{ {
rw << format("@%dg <= %3d gg", pos, _limiti[i] * 30); rw << format("@%dg <= %3d gg", pos, _limiti[i] * 30);
pos += 11; pos += 12;
} }
set_header(soh, format("@%dg%s", 40+((pos-40)/2), "SCADUTO")); set_header(soh, format("@%dg%s", 40+((pos-40)/2), "SCADUTO"));
} }
else else
{ {
set_header(soh, format("@%dg%11s", pos, "SCADUTO")); set_header(soh, format("@%dg%12s", pos, "SCADUTO"));
pos += 11; pos += 12;
} }
const int pos_ascad = pos; const int pos_ascad = pos;
@ -1008,24 +1008,24 @@ void TProspettoScadenze::print_header()
for (int i = 1; i <= _nsfasce; i++) for (int i = 1; i <= _nsfasce; i++)
{ {
rw << format("@%dg <= %3d gg", pos, _limiti[i] * 30); rw << format("@%dg <= %3d gg", pos, _limiti[i] * 30);
pos = pos + 11; pos = pos + 12;
} }
rw << format("@%dg >%3d gg", pos, _limiti[_nsfasce] * 30); rw << format("@%dg >%3d gg", pos, _limiti[_nsfasce] * 30);
pos = pos + 11; pos = pos + 12;
set_header(soh, format("@%dg%s", pos_ascad+((pos-pos_ascad)/2)-5, "A SCADERE")); set_header(soh, format("@%dg%s", pos_ascad+((pos-pos_ascad)/2)-5, "A SCADERE"));
} }
else else
{ {
set_header(soh, format("@%dg%11s", pos, "A SCADERE")); set_header(soh, format("@%dg%12s", pos, "A SCADERE"));
pos += 11; pos += 12;
} }
set_header(soh, format("@%dg%11s", pos, "TOTALE")); set_header(soh, format("@%dg%12s", pos, "TOTALE"));
pos += 11; pos += 12;
set_header(soh, format("@%dg%11s", pos, "ESPOSTO")); set_header(soh, format("@%dg%12s", pos, "ESPOSTO"));
pos += 11; pos += 12;
set_header(soh, format("@%dg%11s", pos, "SALDO")); set_header(soh, format("@%dg%12s", pos, "SALDO"));
pos += 11; pos += 12;
set_header(soh, format("@%dg%11s", pos, " DIFFERENZA")); set_header(soh, format("@%dg%12s", pos, " DIFFERENZA"));
set_header(++soh,(const char *)rw); set_header(++soh,(const char *)rw);
break; break;
} }
@ -1042,16 +1042,16 @@ void TProspettoScadenze::preprocess_footer()
int TProspettoScadenze::calc_last_column() int TProspettoScadenze::calc_last_column()
// Setta le righe dell'intestazione // Setta le righe dell'intestazione
{ {
int pos = 110; int pos = 112;
if (_sinfasce) if (_sinfasce)
pos += _sfasce * 11; pos += _sfasce * 12;
else else
pos += 11; pos += 12;
if (_nsinfasce) if (_nsinfasce)
pos = pos + _nsfasce * 11; pos = pos + _nsfasce * 12;
else else
pos += 11; pos += 12;
return pos; return pos;
} }

6
sc/sc2600a.uml
View File

@ -218,5 +218,11 @@ BEGIN
WARNING "E' possibile selezionare massimo 9 fasce in totale" WARNING "E' possibile selezionare massimo 9 fasce in totale"
END END
STRING DLG_PROFILE 50
BEGIN
PROMPT 2 -2 "Profilo "
PSELECT
END
ENDPAGE ENDPAGE
ENDMASK ENDMASK