From 53701e9b1fe860ce69af3dcb07b5e8966e7f3df9 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 19 Feb 1996 14:05:43 +0000 Subject: [PATCH] Corretta gestione fatture extra-contabili git-svn-id: svn://10.65.10.50/trunk@2612 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- sc/sc0100p.uml | 2 +- sc/sc0101.cpp | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sc/sc0100p.uml b/sc/sc0100p.uml index a49db6059..d66dee1f4 100755 --- a/sc/sc0100p.uml +++ b/sc/sc0100p.uml @@ -278,7 +278,7 @@ END STRING E_CODPAG 4 BEGIN PROMPT 1 11 "Codice Pagamento " - FLAGS "UZ" + FLAGS "U#" USE %CPG INPUT CODTAB E_CODPAG DISPLAY "Codice" CODTAB diff --git a/sc/sc0101.cpp b/sc/sc0101.cpp index ab3faa5a7..637bab767 100755 --- a/sc/sc0101.cpp +++ b/sc/sc0101.cpp @@ -202,7 +202,7 @@ bool TFattura_mask::pag_notify(TSheet_field& ps, int riga, KEY k) pag.add_rata(ZERO, gio_scad, pag.tipo_rata(prev), pag.ulc_rata(prev)); pag.next_scad(data_scad, gio_scad, pag.mese_commerciale(), riga); pag.set_datarata(riga, data_scad); - pag.adjust_fixed_scad(); +// pag.adjust_fixed_scad(); msk.pag2sheet(); } break; @@ -255,11 +255,12 @@ bool TFattura_mask::pag_notify(TSheet_field& ps, int riga, KEY k) } if (m_impl) { - trw.add(newl,7); -// *** TBC la percentuale viene ricalcolata solo se si modifica in valuta -// const real p = pag.recalc_percrata(r, FALSE); -// ps.row(r).add(p.string(), 3); -// ********************************************************************** + trw.add(newl,7); + if (!in_valuta) + { + const real p = pag.recalc_percrata(riga, FALSE); + ps.row(riga).add(p.string(), 3); + } ps.force_update(riga); } if (m_impv) @@ -356,7 +357,7 @@ bool TFattura_mask::pag_handler(TMask_field& f, KEY key) ok = f.yesno_box("Il totale in lire delle rate e' %s mentre\n" "il totale del documento e' %s.\n" "Si desidera registrare ugualmente?", - (const char *)is, (const char *)ts); + (const char*)is, (const char*)ts); } } }