From 89b8f8b7d9dea2176538e0fda1cf5817deec607e Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 4 Dec 2009 09:04:41 +0000 Subject: [PATCH] Patch level : 10.0 patch 540 Files correlati : lv3 lvlib Ricompilazione Demo : [ ] Commento : Correzioni per evitare problemi con gli indirizzi di spedizione git-svn-id: svn://10.65.10.50/trunk@19725 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv3100.cpp | 2 +- lv/lv3300.cpp | 2 +- lv/lvlib.cpp | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lv/lv3100.cpp b/lv/lv3100.cpp index 41a691a4e..39256dc17 100755 --- a/lv/lv3100.cpp +++ b/lv/lv3100.cpp @@ -363,7 +363,7 @@ bool TGestione_bolle_msk::lv_bolla_handler(TMask_field& f, KEY k) } TGestione_bolle_msk& dmsk = (TGestione_bolle_msk&)f.mask(); - if (ok && k == K_TAB && ((dmsk.insert_mode() && f.to_check(k, true)) || f.focusdirty())) + if (ok && k == K_TAB && ((dmsk.insert_mode() && f.to_check(k, true)) || f.focusdirty()) && dmsk.mode() != MODE_MOD) { f.set_focusdirty(false); diff --git a/lv/lv3300.cpp b/lv/lv3300.cpp index ebe915018..a36dfdb53 100755 --- a/lv/lv3300.cpp +++ b/lv/lv3300.cpp @@ -358,7 +358,7 @@ bool TGestione_buoni_msk::set_righe_buono_handler(TMask_field& f, KEY k) TGestione_buoni_msk& dmsk = (TGestione_buoni_msk&)f.mask(); - if (ok && k == K_TAB && ((dmsk.insert_mode() && f.to_check(k, true)) || f.focusdirty())) + if (ok && k == K_TAB && ((dmsk.insert_mode() && f.to_check(k, true)) || f.focusdirty()) && dmsk.mode() != MODE_MOD) { f.set_focusdirty(false); diff --git a/lv/lvlib.cpp b/lv/lvlib.cpp index 69f1a268a..ef3732717 100755 --- a/lv/lvlib.cpp +++ b/lv/lvlib.cpp @@ -1372,6 +1372,19 @@ long TGiac_per_cli::giac_in_mag(const TString& codart, bool odierna) const //leggo il record corrispondente if (magcli.read() == NOERR) return magcli.get_long( odierna ? CLIFOGIAC_DOTOD : CLIFOGIAC_DOTTM); + else + { + magcli.put(CLIFOGIAC_ANNOES, _year); + magcli.put(CLIFOGIAC_TIPOCF, 'C'); + magcli.put(CLIFOGIAC_CODCF, _clifo); + magcli.put(CLIFOGIAC_INDSPED, 0); + magcli.put(CLIFOGIAC_CODART, codart); + magcli.put(CLIFOGIAC_NRIGA, 1); + + //leggo il record corrispondente + if (magcli.read() == NOERR) + return magcli.get_long( odierna ? CLIFOGIAC_DOTOD : CLIFOGIAC_DOTTM); + } return 0; }