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

Patch level :

Browse Source 
Files correlati     : pd6342
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/branches/R_10_00@21738 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2011-03-03 17:34:51 +00:00
parent d4f93fc8cb
commit 87aed24c13
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ps/pd6342300.cpp
View File

@ -221,6 +221,7 @@ bool TRib_movanal_app::ripartizione(const TAnal_ripartizioni_batch& rrip, const
row->add(rowkey, value = new real);
*value = *value + (sez == 'D' ? -importo : importo);
browkey.rtrim(2);
// Calcolo tutte le percentuali da ripartire
const int righe_ripartizione = rrip.rows();
@ -279,7 +280,7 @@ bool TRib_movanal_app::ripartizione(const TAnal_ripartizioni_batch& rrip, const
nuorec.put(RMOVANA_NUMRIG, rows + 1);
nuorec.put(RMOVANA_IMPORTO, imp); //e la mette nella nuova riga
output_rows.add_row(nuorec);
TToken_string * rowpath = (TToken_string*) output_paths.objptr(r);
TToken_string * rowpath = (TToken_string *) output_paths.objptr(r);
if (rowpath == NULL)
output_paths.add(rowpath = new TToken_string, r);
@ -290,11 +291,27 @@ bool TRib_movanal_app::ripartizione(const TAnal_ripartizioni_batch& rrip, const
output_rows[r].add(RMOVANA_IMPORTO, imp);
}
real* value = (real*)row->objptr(ripkey);
const bool subtract = browkey != ripkey;
real * value = (real *) row->objptr(ripkey);
if (value == NULL)
row->add(ripkey, value = new real);
*value = *value + (sez == 'D' ? imp : -imp);
if ( subtract)
{
row = (TAssoc_array *)_calc.objptr(ripkey);
if (row == NULL)
_calc.add(browkey, row = new TAssoc_array);
real * value = (real *) row->objptr(ripkey);
if (value == NULL)
row->add(ripkey, value = new real);
*value = *value + (sez == 'D' ? -imp : imp);
}
ho_ripartito = true;
} //if(imp!=ZERO)...
} //for(i=1;i<=righe_ripartizione...
@ -370,7 +387,7 @@ bool TRib_movanal_app::elabora_righe(TAnal_mov& anal_mov, TRecord_array& input_r
output_rows.add_row(newrec);
}
} //for(int r=1; r<=nrows...
if (modified && input_rows.rows() != output_rows.rows())
if (modified)
{
ho_cambiato_qualchecosa = true;
input_rows = output_rows;
@ -390,8 +407,6 @@ bool TRib_movanal_app::elabora_movimento(TAnal_mov& anal_mov, const bool esplodi
bool do_rewrite = false;
//Per prima cosa prende le righe del movimento su RMOVANA e le ricompatta..
if(anal_mov.get_long(MOVANA_NUMREG) == 358L)
int i = 1;
if (esplodi)
{
//Imploditore