From 3a739643c98cfb48ca5d981f876efa11aa33c3f9 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 5 Apr 2009 21:07:45 +0000 Subject: [PATCH] Patch level : 10.0 nopatch Files correlati : Ricompilazione Demo : [ ] Commento : test per nolo e ciclaggio git-svn-id: svn://10.65.10.50/trunk@18664 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv2500.cpp | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/lv/lv2500.cpp b/lv/lv2500.cpp index 84e8245a5..c5602e19f 100755 --- a/lv/lv2500.cpp +++ b/lv/lv2500.cpp @@ -122,12 +122,18 @@ void TFatturazione_lavanderie::post_process_output(TLista_documenti& doc_out) const TString4 tipodot = rcont.get(LVRCONDV_NOLCIC); const TString4 artcli = rcont.get(LVRCONDV_VCARTCLI); real dot; + const int annoes = _data_elab.year(); TArticolo_lavanderie artlav(codart, 'C', clifo, indsped); - if (tipodot=="I") - dot=artlav.get_real("DOTIN"); - else - dot=artlav.get_real("DOTOD"); + const int index = artlav.find_clifomag(annoes); + + if (index >=0) + { + if (tipodot=="I") + dot=artlav.clifomag(annoes)[index].get_real("DOTIN"); + else + dot=artlav.clifomag(annoes)[index].get_real("DOTOD"); + } const int tipoforf = rcont.get_int(LVRCONDV_TIPOFORF); @@ -147,7 +153,7 @@ void TFatturazione_lavanderie::post_process_output(TLista_documenti& doc_out) TRiga_documento& nolorow=doc.insert_row(++i, "01"); doc.copy_data(nolorow,rout); nolorow.put(RDOC_DESCR,"Nolo per"); - rout.put(RDOC_QTA, dot); + nolorow.put(RDOC_QTA, dot); nolorow.put(RDOC_PREZZO, rcont.get_real(LVRCONDV_PREZNOL)); } break; @@ -165,7 +171,7 @@ void TFatturazione_lavanderie::post_process_output(TLista_documenti& doc_out) TRiga_documento& congrow=doc.insert_row(++i, "01"); doc.copy_data(congrow,rout); congrow.put(RDOC_DESCR,"Pareggio minimo fatturabile"); - rout.put(RDOC_QTA, cicl-qta); + congrow.put(RDOC_QTA, cicl-qta); congrow.put(RDOC_PREZZO, rcont.get_real(LVRCONDV_PREZZO)); } else @@ -239,7 +245,12 @@ TRiga_documento& TFatturazione_lavanderie::find_or_create_row(TDocumento& doc_ou { const char tipo=doc_out[r].get_char("LVTYPE"); const TString& cod=doc_out[r].get(RDOC_CODARTMAG); - if (cod==codart && tipo==lavtype) + bool ok = (cod==codart && tipo==lavtype); + +// if (ok) +// ok = doc_out[r].raggruppabile(rin, _campi); + + if (ok) break; } if (r<=0) @@ -438,6 +449,7 @@ void TFatturazione_lav_app::main_loop() } TToken_string key; + key.add('C'); key.add(clifo); const TRectype& clienti=cache().get(LF_CFVEN,key);