diff --git a/lv/lv3100.cpp b/lv/lv3100.cpp index 643a20195..fde4319ca 100755 --- a/lv/lv3100.cpp +++ b/lv/lv3100.cpp @@ -985,7 +985,7 @@ bool TGestione_bolle_msk::lv_causale_handler(TMask_field& f, KEY k) rdoc.put("ADATATMP", giri.get(LVRCONSPLAN_DTCONS).as_date()); msk.field(FR_JOLLY4).set(giri.get(LVRCONSPLAN_DTCONS).as_date()); - if (rcondv.read() == NOERR) + if (rcondv.read() == NOERR && !cau.is_reso()) { rcondv.put(LVRCONDV_FIDTTMP, giri.get(LVRCONSPLAN_DTCONS).as_date()); rcondv.rewrite(); @@ -1076,7 +1076,8 @@ bool TGestione_bolle_msk::lv_datatmp_handler(TMask_field& f, KEY k) //leggo il codart che ho scritto nella riga corrente dello sheet const TString& codart = msk.get(FR_CODART); const TDate& dadata = msk.get_date(FR_JOLLY3); - const TDate& adata = msk.get_date(FR_JOLLY4); + const TDate& adata = msk.get_date(FR_JOLLY4); + const TCausale_lavanderie cau(msk.get(FR_CODAGG1)); TGestione_bolle_msk& dmsk = (TGestione_bolle_msk&) msk.get_sheet()->mask(); @@ -1094,10 +1095,14 @@ bool TGestione_bolle_msk::lv_datatmp_handler(TMask_field& f, KEY k) const TLaundry_contract cont(codcf, indsped, datadoc); TLocalisamfile rcondv(LF_LVRCONDV); + + const TDate a_data_contr = rcondv.get_date(LVRCONDV_FIDTTMP); + const TDate a_data_bolla = rdoc.get_date("ADATATMP"); + rcondv.put(LVRCONDV_CODCF,codcf); rcondv.put(LVRCONDV_CODCONT,cont.get_int(LVCONDV_CODCONT)); rcondv.put(LVRCONDV_CODART,msk.get(FR_CODART)); - if (rcondv.read() == NOERR) + if (rcondv.read() == NOERR && !cau.is_reso()) { rcondv.put(LVRCONDV_INDTTMP, dadata); rcondv.put(LVRCONDV_FIDTTMP, adata); @@ -1242,6 +1247,7 @@ void TGestione_bolle_app::date_dotmp( const TMask& m) TSheet_field& sheet = mask.sfield(F_SHEET); const long codcf = mask.get_long(F_CODCF); const int indsped = mask.get_int(F_CODINDSP); + TDate datadoc = mask.get_date(F_DATADOC); const TLaundry_contract cont(codcf, indsped, datadoc); @@ -1256,6 +1262,8 @@ void TGestione_bolle_app::date_dotmp( const TMask& m) { bool to_write = false; + const TCausale_lavanderie cau(rdoc.get(RDOC_CODAGG1)); + rcondv.put(LVRCONDV_CODCF,codcf); rcondv.put(LVRCONDV_CODCONT, codcont); rcondv.put(LVRCONDV_CODART, rdoc.get(RDOC_CODART)); @@ -1273,7 +1281,7 @@ void TGestione_bolle_app::date_dotmp( const TMask& m) const TDate a_data_contr = rcondv.get_date(LVRCONDV_FIDTTMP); const TDate a_data_bolla = rdoc.get_date("ADATATMP"); - if(a_data_contr < a_data_bolla) + if(a_data_contr < a_data_bolla && !cau.is_reso()) { rcondv.put(LVRCONDV_FIDTTMP, a_data_bolla); to_write = true; diff --git a/lv/lv3300.cpp b/lv/lv3300.cpp index bf9f36ec5..0f459ba3b 100755 --- a/lv/lv3300.cpp +++ b/lv/lv3300.cpp @@ -1012,7 +1012,7 @@ bool TGestione_buoni_msk::pre_causale_handler(TMask_field& f, KEY k) rdoc.put("ADATATMP", giri.get(LVRCONSPLAN_DTCONS).as_date()); msk.field(FR_JOLLY4).set(giri.get(LVRCONSPLAN_DTCONS).as_date()); - if (rcondv.read() == NOERR) + if (rcondv.read() == NOERR && !cau.is_reso()) { rcondv.put(LVRCONDV_FIDTTMP, giri.get(LVRCONSPLAN_DTCONS).as_date()); rcondv.rewrite(); @@ -1244,6 +1244,9 @@ void TGestione_buoni_app::date_dotmp( const TMask& m) rcondv.put(LVRCONDV_CODCF,codcf); rcondv.put(LVRCONDV_CODCONT, codcont); rcondv.put(LVRCONDV_CODART, rdoc.get(RDOC_CODART)); + + const TCausale_lavanderie cau(rdoc.get(RDOC_CODAGG1)); + if (rcondv.read() == NOERR) { const TDate da_data_contr = rcondv.get_date(LVRCONDV_INDTTMP); @@ -1258,12 +1261,12 @@ void TGestione_buoni_app::date_dotmp( const TMask& m) const TDate a_data_contr = rcondv.get_date(LVRCONDV_FIDTTMP); const TDate a_data_bolla = rdoc.get_date("ADATATMP"); - if(a_data_contr < a_data_bolla) + if(a_data_contr < a_data_bolla && !cau.is_reso()) { rcondv.put(LVRCONDV_FIDTTMP, a_data_bolla); to_write = true; } - if (to_write) + if (to_write && cau.is_reso()) rcondv.rewrite(); } }