From 66c64a6892017ee1d187b411fbf11bbff2bbbd33 Mon Sep 17 00:00:00 2001 From: luca83 Date: Mon, 25 Oct 2010 13:36:36 +0000 Subject: [PATCH] Patch level : Files correlati : Ricompilazione Demo : [ ] Commento : git-svn-id: svn://10.65.10.50/branches/R_10_00@21064 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv3100.cpp | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/lv/lv3100.cpp b/lv/lv3100.cpp index 9e80f2340..41ef6cc24 100755 --- a/lv/lv3100.cpp +++ b/lv/lv3100.cpp @@ -969,7 +969,7 @@ bool TGestione_bolle_msk::lv_causale_handler(TMask_field& f, KEY k) if (rdoc.get_date("ADATATMP").empty()) { - if (adata.ok() && adata >= datadoc) + if (adata.ok() /*&& adata >= datadoc*/) { rdoc.put("ADATATMP", adata); msk.field(FR_JOLLY4).set(adata); @@ -977,19 +977,22 @@ bool TGestione_bolle_msk::lv_causale_handler(TMask_field& f, KEY k) 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", cont.get_long(LVCONDV_CODCONT)); - if (giri.move_first()) + if(adata < datadoc) { - rdoc.put("ADATATMP", giri.get(LVRCONSPLAN_DTCONS).as_date()); - msk.field(FR_JOLLY4).set(giri.get(LVRCONSPLAN_DTCONS).as_date()); - - if (rcondv.read() == NOERR && !cau.is_reso()) + 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", cont.get_long(LVCONDV_CODCONT)); + if (giri.move_first()) { - rcondv.put(LVRCONDV_FIDTTMP, giri.get(LVRCONSPLAN_DTCONS).as_date()); - rcondv.rewrite(); + rdoc.put("ADATATMP", giri.get(LVRCONSPLAN_DTCONS).as_date()); + msk.field(FR_JOLLY4).set(giri.get(LVRCONSPLAN_DTCONS).as_date()); + + if (rcondv.read() == NOERR && !cau.is_reso()) + { + rcondv.put(LVRCONDV_FIDTTMP, giri.get(LVRCONSPLAN_DTCONS).as_date()); + rcondv.rewrite(); + } } } } @@ -1092,7 +1095,7 @@ bool TGestione_bolle_msk::lv_datatmp_handler(TMask_field& f, KEY k) rdoc.put("DADATATMP", dadata); rdoc.put("ADATATMP", adata); - //recupero i dati di interesse dalla testata per poter trovare il contratto + /*//recupero i dati di interesse dalla testata per poter trovare il contratto const long codcf = dmsk.get_long(F_CODCF); const int indsped = dmsk.get_int(F_CODINDSP); TDate datadoc = dmsk.get_date(F_DATADOC); @@ -1114,7 +1117,7 @@ bool TGestione_bolle_msk::lv_datatmp_handler(TMask_field& f, KEY k) rcondv.rewrite(); } msk.field(FR_JOLLY3).set_focusdirty(false); - msk.field(FR_JOLLY4).set_focusdirty(false); + msk.field(FR_JOLLY4).set_focusdirty(false);*/ } return true; }