root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0 patch ???

Browse Source 
Files correlati     : lv3
Ricompilazione Demo : [ ]
Commento            :
Data di fine dotazione temporanea: mai modificabile se la riga del documento è una riga di reso


git-svn-id: svn://10.65.10.50/branches/R_10_00@20945 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca83 2010-10-04 15:03:34 +00:00
parent 1cb6a01820
commit 312e8d958b
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lv/lv3100.cpp
View File

@ -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()); rdoc.put("ADATATMP", giri.get(LVRCONSPLAN_DTCONS).as_date());
msk.field(FR_JOLLY4).set(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.put(LVRCONDV_FIDTTMP, giri.get(LVRCONSPLAN_DTCONS).as_date());
rcondv.rewrite(); rcondv.rewrite();
@ -1077,6 +1077,7 @@ bool TGestione_bolle_msk::lv_datatmp_handler(TMask_field& f, KEY k)
const TString& codart = msk.get(FR_CODART); const TString& codart = msk.get(FR_CODART);
const TDate& dadata = msk.get_date(FR_JOLLY3); 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(); 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); const TLaundry_contract cont(codcf, indsped, datadoc);
TLocalisamfile rcondv(LF_LVRCONDV); 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_CODCF,codcf);
rcondv.put(LVRCONDV_CODCONT,cont.get_int(LVCONDV_CODCONT)); rcondv.put(LVRCONDV_CODCONT,cont.get_int(LVCONDV_CODCONT));
rcondv.put(LVRCONDV_CODART,msk.get(FR_CODART)); 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_INDTTMP, dadata);
rcondv.put(LVRCONDV_FIDTTMP, adata); 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); TSheet_field& sheet = mask.sfield(F_SHEET);
const long codcf = mask.get_long(F_CODCF); const long codcf = mask.get_long(F_CODCF);
const int indsped = mask.get_int(F_CODINDSP); const int indsped = mask.get_int(F_CODINDSP);
TDate datadoc = mask.get_date(F_DATADOC); TDate datadoc = mask.get_date(F_DATADOC);
const TLaundry_contract cont(codcf, indsped, 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; bool to_write = false;
const TCausale_lavanderie cau(rdoc.get(RDOC_CODAGG1));
rcondv.put(LVRCONDV_CODCF,codcf); rcondv.put(LVRCONDV_CODCF,codcf);
rcondv.put(LVRCONDV_CODCONT, codcont); rcondv.put(LVRCONDV_CODCONT, codcont);
rcondv.put(LVRCONDV_CODART, rdoc.get(RDOC_CODART)); 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_contr = rcondv.get_date(LVRCONDV_FIDTTMP);
const TDate a_data_bolla = rdoc.get_date("ADATATMP"); 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); rcondv.put(LVRCONDV_FIDTTMP, a_data_bolla);
to_write = true; to_write = true;

9
lv/lv3300.cpp
View File

@ -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()); rdoc.put("ADATATMP", giri.get(LVRCONSPLAN_DTCONS).as_date());
msk.field(FR_JOLLY4).set(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.put(LVRCONDV_FIDTTMP, giri.get(LVRCONSPLAN_DTCONS).as_date());
rcondv.rewrite(); rcondv.rewrite();
@ -1244,6 +1244,9 @@ void TGestione_buoni_app::date_dotmp( const TMask& m)
rcondv.put(LVRCONDV_CODCF,codcf); rcondv.put(LVRCONDV_CODCF,codcf);
rcondv.put(LVRCONDV_CODCONT, codcont); rcondv.put(LVRCONDV_CODCONT, codcont);
rcondv.put(LVRCONDV_CODART, rdoc.get(RDOC_CODART)); rcondv.put(LVRCONDV_CODART, rdoc.get(RDOC_CODART));
const TCausale_lavanderie cau(rdoc.get(RDOC_CODAGG1));
if (rcondv.read() == NOERR) if (rcondv.read() == NOERR)
{ {
const TDate da_data_contr = rcondv.get_date(LVRCONDV_INDTTMP); 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_contr = rcondv.get_date(LVRCONDV_FIDTTMP);
const TDate a_data_bolla = rdoc.get_date("ADATATMP"); 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); rcondv.put(LVRCONDV_FIDTTMP, a_data_bolla);
to_write = true; to_write = true;
} }
if (to_write) if (to_write && cau.is_reso())
rcondv.rewrite(); rcondv.rewrite();
} }
} }