Patch level :10.0

Files correlati     :lv2.exe
Ricompilazione Demo : [ ]
Commento            :
Gestito il tipo forfait fisso su dotazione iniziale


git-svn-id: svn://10.65.10.50/trunk@18742 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
rajitgill 2009-04-21 09:05:16 +00:00
parent 73ae87b0b8
commit 606687c224

View File

@ -117,6 +117,7 @@ void TFatturazione_lavanderie::post_process_output(TLista_documenti& doc_out)
const int indsped = doc.get_int(DOC_CODINDSP); const int indsped = doc.get_int(DOC_CODINDSP);
TLaundry_contract contr(clifo,indsped,_data_elab); TLaundry_contract contr(clifo,indsped,_data_elab);
bool valconvcli=false; bool valconvcli=false;
bool fixdotin=false;
for (int i = 1; i <= doc.physical_rows(); i++) for (int i = 1; i <= doc.physical_rows(); i++)
{ {
@ -182,7 +183,7 @@ void TFatturazione_lavanderie::post_process_output(TLista_documenti& doc_out)
nolorow.put(RDOC_PREZZO, rcont.get_real(LVRCONDV_PREZNOL)); nolorow.put(RDOC_PREZZO, rcont.get_real(LVRCONDV_PREZNOL));
} }
break; break;
case 3: case 3: // Tipo forfait = CICLAGGIO
{ {
const real qta=rout.get_real(RDOC_QTA); const real qta=rout.get_real(RDOC_QTA);
const real consumo=qta * rout.get_real(RDOC_PREZZO); const real consumo=qta * rout.get_real(RDOC_PREZZO);
@ -207,10 +208,10 @@ void TFatturazione_lavanderie::post_process_output(TLista_documenti& doc_out)
} }
} }
break; break;
case 4: case 4: // Tipo forfait = & SUL VALORE CONVENZIONALE
{ {
const char tipovalconv = rcont.get_char(LVRCONDV_VCARTCLI); const char tipovalconv = rcont.get_char(LVRCONDV_VCARTCLI);
if (tipovalconv=='A') if (tipovalconv=='A') //
{ {
const real qta=rout.get_real(RDOC_QTA); const real qta=rout.get_real(RDOC_QTA);
const real consumo=qta * rout.get_real(RDOC_PREZZO); const real consumo=qta * rout.get_real(RDOC_PREZZO);
@ -284,9 +285,21 @@ void TFatturazione_lavanderie::post_process_output(TLista_documenti& doc_out)
break; break;
case 5: case 5:
{ {
rout.put(RDOC_PREZZO, rcont.get_real(LVRCONDV_PREZZO)); if (!fixdotin)
{
rout.put(RDOC_QTA, dot); fixdotin=true;
rout.put(RDOC_PREZZO, rcont.get_real(LVRCONDV_IMPFISART));
rout.put(RDOC_QTA, dot);
for (int h = doc.physical_rows(); h>i; h--)
{
TRiga_documento& delrow = doc[h];
const TString80 codart=delrow.get(RDOC_CODART);
const TRectype & rcont=contr.row(codart);
const int forfdotin = rcont.get_int(LVRCONDV_TIPOFORF);
if (forfdotin == 5)
doc.destroy_row(h,true);
}
}
} }
break; break;
default: default: