From 5ebd8006b245c61e50da9134359bfd4490012ef2 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Mon, 2 May 2022 13:59:48 +0200 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2012.?= =?UTF-8?q?0=201138=20Files=20correlati=20=20=20=20=20:=20cg4=20Commento:?= =?UTF-8?q?=20Corretta=20imputazione=20quadro=20VT=20ora=20viene=20usato?= =?UTF-8?q?=20il=20comune=20dell'unit=C3=A0=20locale=20corretto=20calcolo?= =?UTF-8?q?=20imponibile=20nel=20caso=20di=20fatture=20pagate=20nel=20peri?= =?UTF-8?q?odo=20in=20acluni=20casi=20aggiungieva=20l'imonibile=202=20volt?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ci/ci1300.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ci/ci1300.cpp b/src/ci/ci1300.cpp index 933d17e80..1724a8c60 100755 --- a/src/ci/ci1300.cpp +++ b/src/ci/ci1300.cpp @@ -281,6 +281,9 @@ void TRil_ore_ris_mask::elabora_risorsa(const TString& curr_risorsa, const int c const real tot_ore_uso_risorsa_nel_periodo = tot_ore * giorni_lavorativi / giorni_lavorativi_rilore; const TString8 tpora = rilore_recset.get_string(RILORE_TPORA); const TString8 tpassenza = cache().get("&ORE", tpora, "S2"); + + if (tpassenza == "OA") + int i = 1; //crea la chiave per l'assoc_array TToken_string key; @@ -373,7 +376,7 @@ void TRil_ore_ris_mask::elabora_risorsa(const TString& curr_risorsa, const int c if (tpassenza.full()) { - TString8 tp = tpass.objptr(i) == NULL ? EMPTY_STRING : tpass.row(i); + TString8 tp = tpass.objptr(i) == nullptr ? EMPTY_STRING : tpass.row(i); if (tp.blank()) tpass.add(tpassenza, i); @@ -400,8 +403,8 @@ void TRil_ore_ris_mask::elabora_risorsa(const TString& curr_risorsa, const int c TString8 fld = "H0."; fld << 200 + d; TString val = rep.field(fld)->get().as_string(); - // if (val.blank()) - // { + if (val.blank()) + { if (tpass.objptr(d) != nullptr) { const TString8 tp = tpass.row(d); @@ -411,7 +414,7 @@ void TRil_ore_ris_mask::elabora_risorsa(const TString& curr_risorsa, const int c else rep.field(fld)->set(""); } - // } + } } //prende il recordset in opera dal report per fargli le set_var