From 3c365ba6377dcc45c1b167599028846673b90538 Mon Sep 17 00:00:00 2001
From: luca83 <luca83@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 17 Sep 2009 13:29:55 +0000
Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2010.?=
=?UTF-8?q?0=20patch=20441=20Files=20correlati=20=20=20=20=20:=20lv2=20Ric?=
=?UTF-8?q?ompilazione=20Demo=20:=20[=20]=20Commento=20=20=20=20=20=20=20?=
=?UTF-8?q?=20=20=20=20=20:=20Si=20=C3=A8=20fatto=20in=20modo=20che=20dura?=
=?UTF-8?q?nte=20la=20generazione=20automatica=20dei=20buoni=20vengano=20s?=
=?UTF-8?q?vuotate=20le=20date=20di=20inizio=20e=20fine=20dotazione=20temp?=
=?UTF-8?q?oranea=20quando=20dottmp=20=3D=200=20(=C3=A8=20necessario=20far?=
=?UTF-8?q?e=20ulteriori=20test=20sulle=20bolle)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
git-svn-id: svn://10.65.10.50/trunk@19296 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
lv/lv2400.cpp | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/lv/lv2400.cpp b/lv/lv2400.cpp
index f54eab75b..331a48809 100755
--- a/lv/lv2400.cpp
+++ b/lv/lv2400.cpp
@@ -231,12 +231,8 @@ void TGenera_documenti_app::crea_riga(const TString& codart, const char modpas,
//calcolo della quantit� che va sulla bolla
//preparo la chiave per la tabella righe contratti
- TToken_string keyrcont;
- keyrcont.add(codcli);
- keyrcont.add(codcont);
- keyrcont.add(codart);
- //instanzio una cache sulla tabella delle righe contratti
- const TRectype& rcont = cache().get(LF_LVRCONDV,keyrcont);
+ TLaundry_contract cont(codcli, codcont);
+ const TRectype& rcont = cont.row(codart);
//recupero i dati di interesse dalla riga del contratto
bool arrot;
@@ -433,7 +429,7 @@ void TGenera_documenti_app::crea_riga(const TString& codart, const char modpas,
{
if (!tmp)
rdoc.put(RDOC_PREZZO, prezzo);
- else //per adesso per questo ramo non ci passa mai, perch� non sappiamo come gestire le dotazioni temporanee
+ else
rdoc.put(RDOC_PREZZO,rcont.get_real(LVRCONDV_PRZDTTMP));
rdoc.put(RDOC_SCONTO,rcont.get(LVRCONDV_SCONTPERC)); //sconto
}
@@ -458,6 +454,12 @@ void TGenera_documenti_app::crea_riga(const TString& codart, const char modpas,
rep.log(1, str);
}
}
+
+ if (dottmp == 0)
+ {
+ cont.update_row(codart, LVRCONDV_INDTTMP, NULLDATE);
+ cont.update_row(codart, LVRCONDV_FIDTTMP, NULLDATE);
+ }
}
//////////////////////////////////////////////////////////////