From ea0f314380eb83237bcce83379b4cc3241d30354 Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 19 Dec 2009 13:26:17 +0000 Subject: [PATCH] Patch level : 10.0 558 Files correlati : lv3.exe Ricompilazione Demo : [ ] Commento : Caricamento contratti git-svn-id: svn://10.65.10.50/trunk@19817 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv3100.cpp | 16 +++++++++++++--- ve/velib06a.cpp | 4 +++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lv/lv3100.cpp b/lv/lv3100.cpp index 39256dc17..bc07c9872 100755 --- a/lv/lv3100.cpp +++ b/lv/lv3100.cpp @@ -363,7 +363,7 @@ bool TGestione_bolle_msk::lv_bolla_handler(TMask_field& f, KEY k) } TGestione_bolle_msk& dmsk = (TGestione_bolle_msk&)f.mask(); - if (ok && k == K_TAB && ((dmsk.insert_mode() && f.to_check(k, true)) || f.focusdirty()) && dmsk.mode() != MODE_MOD) + if (ok && k == K_TAB && ((dmsk.insert_mode() && f.to_check(k, true)) || f.focusdirty()) && dmsk.mode() != MODE_MOD ) { f.set_focusdirty(false); @@ -487,9 +487,19 @@ bool TGestione_bolle_msk::lv_bolla_handler(TMask_field& f, KEY k) prezzo = anamag.get_real(ANAMAG_COSTSTD); rdoc.put(RDOC_PREZZO, prezzo); } - dmsk.doc2mask(false); + +// dmsk.doc2mask(false); + const int righe = doc.physical_rows(); + sheet.destroy( ); + for (int i = 0; i < righe; i++) + { + TRiga_documento & r = doc[i + 1]; - FOR_EACH_MASK_FIELD(dmsk, i, f) + doc[i+1].autoload(sheet); + sheet.check_row(i, 0x3); + } + + FOR_EACH_MASK_FIELD(dmsk, i, f) { if (f->has_check()) f->check(STARTING_CHECK); diff --git a/ve/velib06a.cpp b/ve/velib06a.cpp index 341b9238a..995154bd7 100755 --- a/ve/velib06a.cpp +++ b/ve/velib06a.cpp @@ -2042,7 +2042,9 @@ bool descr_handler( TMask_field& f, KEY key ) if (s.find('\n') < 0) { TLocalisamfile& anamag = ((TEdit_field&)f).browse()->cursor()->file(); - if (s == anamag.get(ANAMAG_DESCR)) + TString codart = anamag.get(ANAMAG_CODART); + + if (s == anamag.get(ANAMAG_DESCR) && codart != f.mask().get(FR_CODART)) f.mask().set(FR_CODART, anamag.get(ANAMAG_CODART), 3); } }