From bd67ed713e53f91323bc473fd20e6ee2aa66ee92 Mon Sep 17 00:00:00 2001 From: luca83 Date: Tue, 23 Jun 2009 09:48:07 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2010.?= =?UTF-8?q?0=20patch=20356=20Files=20correlati=20=20=20=20=20:=20lv3=20Ric?= =?UTF-8?q?ompilazione=20Demo=20:=20[=20]=20Commento=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20:=200001390:=20Data=20Dotazione=20temporanea=20D?= =?UTF-8?q?escrizione=20=20Inserendo=20una=20dotazione=20temporanea=20dire?= =?UTF-8?q?ttamente=20sul=20contratto,=20da=20data=201-gennaio=20a=2020=20?= =?UTF-8?q?giugno.=20Andando=20in=20bolla=20oggi=2022=20giugno=20mi=20segn?= =?UTF-8?q?ala=20che=20=C3=A8=20scaduta=20ma=20la=20data=20di=20inizio=20?= =?UTF-8?q?=C3=A8=20il=20"22-giugno"=20anziche=20il=20"1-gennaio"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/trunk@19071 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv3100.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lv/lv3100.cpp b/lv/lv3100.cpp index 688c7fd15..26741cf78 100755 --- a/lv/lv3100.cpp +++ b/lv/lv3100.cpp @@ -897,15 +897,13 @@ bool TGestione_bolle_msk::lv_causale_handler(TMask_field& f, KEY k) //disabilito i campi di dotazione temporanea se la causale non prevede la loro movimentazione if (sgn_rit == 0 && sgn_con == 0) { - //msk.field(FR_JOLLY2).disable(); msk.field(FR_JOLLY3).disable(); msk.field(FR_JOLLY4).disable(); } else { - //msk.field(FR_JOLLY2).enable(); - msk.field(FR_JOLLY3).enable(); - msk.field(FR_JOLLY4).enable(); + msk.field(FR_JOLLY3).enable(); + msk.field(FR_JOLLY4).enable(); fdotmp = true; } @@ -921,11 +919,15 @@ bool TGestione_bolle_msk::lv_causale_handler(TMask_field& f, KEY k) if (!dadata.ok() && rcondv.read() == NOERR) { rcondv.put(LVRCONDV_INDTTMP, datadoc); - rcondv.rewrite(); + rcondv.rewrite(); + rdoc.put("DADATATMP", datadoc); + msk.field(FR_JOLLY3).set(datadoc); + } + else + { + rdoc.put("DADATATMP", dadata); + msk.field(FR_JOLLY3).set(dadata); } - - rdoc.put("DADATATMP", datadoc); - msk.field(FR_JOLLY3).set(datadoc); } if (rdoc.get_date("ADATATMP").empty())