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

Ultime caciottelle; annullata modifica per velocita' di Guido, non perche'

Browse Source 
fosse sbagliata, ma perche' cosi' elide un altro errore (non capito) sulla
gestione shheet nel pagamento alla modifica di ULC


git-svn-id: svn://10.65.10.50/trunk@2112 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1995-11-08 15:43:11 +00:00
parent 3b3df5b725
commit 65f300c267
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cg/cg21rata.uml
View File

@ -49,6 +49,7 @@ BEGIN
ITEM "9|Bonifici"
OUTPUT 105
OUTPUT 107
MESSAGE DIRTY,106|K_TAB,106
END
STRING 106 1

23
cg/pagament.cpp
View File

@ -577,9 +577,9 @@ const char* TPagamento::desc_tpr() const
case 1: o = "Tutte le imposte su 1a"; break;
case 2: o = "Tutte le spese su 1a"; break;
case 3: o = "Imposte + spese su 1a"; break;
case 4: o = "Spese + merce su 1a"; break;
case 5: o = "Merce + imposte su 1a"; break;
case 6: o = "Tutta la merce su 1a"; break;
case 4: o = "Solo imposte"; break;
case 5: o = "Solo spese"; break;
case 6: o = "Imposte + spese"; break;
default: o = ""; break;
}
return o;
@ -1081,7 +1081,7 @@ word TPagamento::recalc_rate(int row, bool is_perc_modified,
{
if (rdiff == 2)
rdiff = 1;
_rdiff = FALSE;
_rdiff = TRUE;
}
if (is_perc_modified)
rsum += perc_rata(i);
@ -1384,24 +1384,17 @@ void TPagamento::set_sheet(TSheet_field& sf, int sscad)
ts.add(paid ? "X" : "", 11); // 11 - Pagaya
}
// destroy remaining but avoid screen update by now
TString_array& arr = sf.rows_array();
for (int d = arr.items()-1; d >= i; d--)
arr.destroy(d);
// destroy remaining and don't avoid screen update forever and ever
for (int d = sf.items()-1; d >= i; d--)
sf.destroy(d);
sf.enable_column(2, in_valuta);
}
else
if (_rate.items() > 0) // not inited: set edit sheet
<<<<<<< pagament.cpp
{
if (sf.items() > 0) sf.destroy();
=======
{
TString_array& arr = sf.rows_array();
arr.destroy(); // Avoid screen update by now
sf.destroy();
>>>>>>> 1.44
for (int i = 0, scr = 0; i < n_rate(); i++)
{
TToken_string& s = sf.row(-1);