From baa7727c09147414e13c24aca80d294ee1165508 Mon Sep 17 00:00:00 2001 From: luca83 Date: Mon, 9 Feb 2009 16:39:34 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:10.0?= =?UTF-8?q?=20patch=20232=20Files=20correlati=20=20=20=20=20:lv3=20Ricompi?= =?UTF-8?q?lazione=20Demo=20:=20[=20]=20Commento=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20:=20Evita=20di=20settare=20le=20date=20di=20inizio?= =?UTF-8?q?=20e=20fine=20dotazione=20temporanea=20se=20queste=20sono=20vuo?= =?UTF-8?q?te=20sul=20contratto,=20evitando=20cos=C3=AC=20le=20segnalazion?= =?UTF-8?q?i=20di=20errore=20per=20data=20nulla?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/trunk@18227 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv3100.cpp | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/lv/lv3100.cpp b/lv/lv3100.cpp index 4ae3e0213..c9ceab041 100755 --- a/lv/lv3100.cpp +++ b/lv/lv3100.cpp @@ -411,14 +411,7 @@ bool TGestione_bolle_msk::lv_bolla_handler(TMask_field& f, KEY k) //instanzio una cache sulle anagrafice di magazzino const TRectype& anamag = cache().get(LF_ANAMAG,codart); - - //instanzio in TRecordset sui giri - TISAM_recordset giri("USE LVRCONSPLAN KEY 3\nSELECT DTCONS>#DATADOC\nFROM CODCF=#CODCF CODCONT=#CODCONT\nTO CODCF=#CODCF CODCONT=#CODCONT"); - giri.set_var("#DATADOC", datadoc); - giri.set_var("#CODCF", codcf); - giri.set_var("#CODCONT", codcont); - giri.move_first(); - + rdoc.put(RDOC_CODART,codart); rdoc.put(RDOC_CODARTMAG,codart); rdoc.put(RDOC_CHECKED,'X'); @@ -428,11 +421,24 @@ bool TGestione_bolle_msk::lv_bolla_handler(TMask_field& f, KEY k) rdoc.put(RDOC_CODIVA,anamag.get(ANAMAG_CODIVA)); //setto le date di inizio e fine della dotazione temporanea - rdoc.put("DADATATMP", rcont.get(LVRCONDV_INDTTMP).as_date()); - if (rcont.get(LVRCONDV_FIDTTMP).as_date() < datadoc) - rdoc.put("ADATATMP", rcont.get(LVRCONDV_FIDTTMP).as_date()); - else - rdoc.put("ADATATMP", giri.get(LVRCONSPLAN_DTCONS).as_date()); + TDate dadata = rcont.get(LVRCONDV_INDTTMP).as_date(); + TDate adata = rcont.get(LVRCONDV_FIDTTMP).as_date(); + if (dadata.ok() && adata.ok()) + { + rdoc.put("DADATATMP", dadata); + if (adata < datadoc) + rdoc.put("ADATATMP", adata); + else + { + //instanzio in TRecordset sui giri + TISAM_recordset giri("USE LVRCONSPLAN KEY 3\nSELECT DTCONS>#DATADOC\nFROM CODCF=#CODCF CODCONT=#CODCONT\nTO CODCF=#CODCF CODCONT=#CODCONT"); + giri.set_var("#DATADOC", datadoc); + giri.set_var("#CODCF", codcf); + giri.set_var("#CODCONT", codcont); + giri.move_first(); + rdoc.put("ADATATMP", giri.get(LVRCONSPLAN_DTCONS).as_date()); + } + } //elaborazione per il prezzo: o lo prendo dalle righe contratto, o dall'anagrafica magazzino const TString& sconto = rcont.get(LVRCONDV_SCONTPERC).as_string();