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

Patch level : 10.0 nopatch

Browse Source 
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
This commit is contained in:
alex 2009-04-05 21:07:45 +00:00
parent 11de434c46
commit 3a739643c9
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lv/lv2500.cpp
View File

@ -122,12 +122,18 @@ void TFatturazione_lavanderie::post_process_output(TLista_documenti& doc_out)
const TString4 tipodot = rcont.get(LVRCONDV_NOLCIC); const TString4 tipodot = rcont.get(LVRCONDV_NOLCIC);
const TString4 artcli = rcont.get(LVRCONDV_VCARTCLI); const TString4 artcli = rcont.get(LVRCONDV_VCARTCLI);
real dot; real dot;
const int annoes = _data_elab.year();
TArticolo_lavanderie artlav(codart, 'C', clifo, indsped); TArticolo_lavanderie artlav(codart, 'C', clifo, indsped);
if (tipodot=="I") const int index = artlav.find_clifomag(annoes);
dot=artlav.get_real("DOTIN");
else if (index >=0)
dot=artlav.get_real("DOTOD"); {
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); 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"); TRiga_documento& nolorow=doc.insert_row(++i, "01");
doc.copy_data(nolorow,rout); doc.copy_data(nolorow,rout);
nolorow.put(RDOC_DESCR,"Nolo per"); 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)); nolorow.put(RDOC_PREZZO, rcont.get_real(LVRCONDV_PREZNOL));
} }
break; break;
@ -165,7 +171,7 @@ void TFatturazione_lavanderie::post_process_output(TLista_documenti& doc_out)
TRiga_documento& congrow=doc.insert_row(++i, "01"); TRiga_documento& congrow=doc.insert_row(++i, "01");
doc.copy_data(congrow,rout); doc.copy_data(congrow,rout);
congrow.put(RDOC_DESCR,"Pareggio minimo fatturabile"); 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)); congrow.put(RDOC_PREZZO, rcont.get_real(LVRCONDV_PREZZO));
} }
else 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 char tipo=doc_out[r].get_char("LVTYPE");
const TString& cod=doc_out[r].get(RDOC_CODARTMAG); 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; break;
} }
if (r<=0) if (r<=0)
@ -438,6 +449,7 @@ void TFatturazione_lav_app::main_loop()
} }
TToken_string key; TToken_string key;
key.add('C'); key.add('C');
key.add(clifo); key.add(clifo);
const TRectype& clienti=cache().get(LF_CFVEN,key); const TRectype& clienti=cache().get(LF_CFVEN,key);