From 33d18d80891cdc0fdc523cdc94006516b7bae922 Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 12 Oct 1994 13:00:01 +0000 Subject: [PATCH] In prima nota non chiede l'incasso immediato se c'e' il saldaconto git-svn-id: svn://10.65.10.50/trunk@354 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg2102.cpp | 18 ++++++++++++------ cg/cg4301.cpp | 4 ++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/cg/cg2102.cpp b/cg/cg2102.cpp index 18028b90d..8fffe1047 100755 --- a/cg/cg2102.cpp +++ b/cg/cg2102.cpp @@ -649,13 +649,19 @@ bool TPrimanota_application::imposta_handler(TMask_field& f, KEY key) } } } else - if (key == K_F8 && f.get().empty()) + if (key == K_F8) { - real imponibile(f.mask().get(101)); - const real& percent = cod2IVA(f.mask()); - const real imposta = scorpora(imponibile, percent); - f.mask().set(101, imponibile.string()); - f.set(imposta.string()); + real imposta(f.get()); + if (imposta.is_zero()) + { + real imponibile(f.mask().get(101)); + const real& percent = cod2IVA(f.mask()); + imposta = scorpora(imponibile, percent); + f.mask().set(101, imponibile.string()); + f.set(imposta.string()); + } + else + f.warning_box("Cancellare l'imposta (tasto F2) prima di effettuare lo scorporo"); } return TRUE; diff --git a/cg/cg4301.cpp b/cg/cg4301.cpp index 451c29e8c..5e085b014 100755 --- a/cg/cg4301.cpp +++ b/cg/cg4301.cpp @@ -17,8 +17,8 @@ bool CG4300_App::recalc_all() long firm = TApplication::get_firm(); _prind = new TProgind(_selected.ones()*2, - " Calcolo liquidazioni... " - "\n Preparazione archivi ", + " Calcolo liquidazioni... \n" + " Preparazione archivi ", TRUE,TRUE,45); for (l = 0l, _nditte->first(); !_nditte->eof(); l++, _nditte->next())