From de583099ef3b769a9fdb14cd68991f78528e2df5 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 20 May 2011 13:43:48 +0000 Subject: [PATCH] Patch level : 10.1002 Files correlati : cg2.exe Ricompilazione Demo : [ ] Commento : Preservato il campo importo anitcipato sullescdenze, veniva azzerato. git-svn-id: svn://10.65.10.50/branches/R_10_00@22142 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg2104.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/cg/cg2104.cpp b/cg/cg2104.cpp index 531080ae4..7381697b1 100755 --- a/cg/cg2104.cpp +++ b/cg/cg2104.cpp @@ -1017,8 +1017,22 @@ void TPrimanota_application::write_scadenze(const TMask& m) partita.put(PART_IMPOSTA, m.get(F_IMPOSTE)); TSheet_field& ps = m.sfield(FS_RATESHEET); - - partita.elimina_rata(-1); // Elimina tutte le rate eventuali + const int new_rate = ps.items(); + const int nrate = partita.rate(); + TArray ant; + + for (int i = 0; i < new_rate; i++) + { + real * r = new real; + + ant.add(r); + if (i < nrate) + *r = partita.rata(i + 1).get_real(SCAD_IMPORTOANT); + } + for (int i = new_rate; i < nrate; i++) + ((real &)ant[new_rate - 1]) += partita.rata(i + 1).get_real(SCAD_IMPORTOANT); + + partita.elimina_rata(-1); // Elimina tutte le rate eventuali for (i = 0; i < ps.items(); i++) { TToken_string& row = ps.row(i); @@ -1040,6 +1054,7 @@ void TPrimanota_application::write_scadenze(const TMask& m) scadenza.put(SCAD_CODCAB, row.get()); //10 = Vs CAB scadenza.put(SCAD_DESCR, row.get()); //11 = Note scadenza.put(SCAD_BLOCCATA, row.get()); //12 = Non pagabile + scadenza.put(SCAD_IMPORTOANT, ((real &)ant[i])); } }