diff --git a/lv/lv3100.cpp b/lv/lv3100.cpp index 2bfeed58d..3f17f6779 100755 --- a/lv/lv3100.cpp +++ b/lv/lv3100.cpp @@ -548,16 +548,27 @@ bool TGestione_bolle_msk::lv_bolla_handler(TMask_field& f, KEY k) } //gestione campi dotazione odierna e dotazione temporanea - TArticolo_lavanderie& artrec = cached_article_laundry(codart, 'C', codcf, indsped); + if(codart.left(1) == "N") + int cazzone = 1; + + TArticolo_lavanderie& artrec = cached_article_laundry(codart, 'C', codcf, indsped); //fisso l'anno esercizio TEsercizi_contabili& esc = esercizi(); const int last_esc = esc.last(); //estraggo il record corrispondente su LF_CLIFOGIAC - const TRecmag_lavanderie& reclav = artrec.find_rec(last_esc); - + const TRecmag_lavanderie& reclav = artrec.find_rec(last_esc); real dotod = reclav.get_real(CLIFOGIAC_DOTOD); real dotmp = reclav.get_real(CLIFOGIAC_DOTTM); + + if(reclav.empty()) + { + TArticolo_lavanderie& artrec1 = cached_article_laundry(codart, 'C', codcf, 0); + const TRecmag_lavanderie& reclav1 = artrec1.find_rec(last_esc); + dotod = reclav1.get_real(CLIFOGIAC_DOTOD); + dotmp = reclav1.get_real(CLIFOGIAC_DOTTM); + } + rdoc.put("DOTOD", dotod); rdoc.put("DOTMP", dotmp); diff --git a/lv/lv3300.cpp b/lv/lv3300.cpp index e5868b23f..4d86aeef1 100755 --- a/lv/lv3300.cpp +++ b/lv/lv3300.cpp @@ -554,9 +554,17 @@ bool TGestione_buoni_msk::set_righe_buono_handler(TMask_field& f, KEY k) //estraggo il record corrispondente su LF_CLIFOGIAC const TRecmag_lavanderie& reclav = artrec.find_rec(last_esc); - real dotod = reclav.get_real(CLIFOGIAC_DOTOD); + real dotod = reclav.get_real(CLIFOGIAC_DOTOD); real dotmp = reclav.get_real(CLIFOGIAC_DOTTM); + if(reclav.empty()) + { + TArticolo_lavanderie& artrec1 = cached_article_laundry(codart, 'C', codcf, 0); + const TRecmag_lavanderie& reclav1 = artrec1.find_rec(last_esc); + dotod = reclav1.get_real(CLIFOGIAC_DOTOD); + dotmp = reclav1.get_real(CLIFOGIAC_DOTTM); + } + rdoc.put("DOTOD", dotod); rdoc.put("DOTMP", dotmp); diff --git a/lv/lvlib.cpp b/lv/lvlib.cpp index 7641a9ad8..d8dae47af 100755 --- a/lv/lvlib.cpp +++ b/lv/lvlib.cpp @@ -1665,6 +1665,14 @@ real TGiac_per_cli::giac_att(TRiga_documento& rdoc, bool odierna) real dotod = reclav.get_real(CLIFOGIAC_DOTOD); real dotmp = reclav.get_real(CLIFOGIAC_DOTTM); + if(reclav.empty()) + { + TArticolo_lavanderie& artrec1 = cached_article_laundry(codart, 'C', doc.get_long(DOC_CODCF), 0); + const TRecmag_lavanderie& reclav1 = artrec1.find_rec(last_esc); + dotod = reclav1.get_real(CLIFOGIAC_DOTOD); + dotmp = reclav1.get_real(CLIFOGIAC_DOTTM); + } + real giac = odierna ? dotod : dotmp; real saldo;