From 5b331782583da22a7115cfde60d7ceadbeed60f1 Mon Sep 17 00:00:00 2001
From: luca83 <luca83@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 2 Dec 2009 11:52:12 +0000
Subject: [PATCH] Patch level         : 10.0 patch 539 Files correlati     :
 lv2 lv3 Ricompilazione Demo : [ ] Commento            : Corretta la gestione
 dell'indirizzo di spedizione

git-svn-id: svn://10.65.10.50/trunk@19707 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 lv/lv2600.cpp | 16 +++++++++++-----
 lv/lv2900.cpp | 15 ++++++++++-----
 lv/lv3200.cpp |  6 +++++-
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/lv/lv2600.cpp b/lv/lv2600.cpp
index 0e73ebcdf..72ad7767f 100755
--- a/lv/lv2600.cpp
+++ b/lv/lv2600.cpp
@@ -8,6 +8,7 @@
 #include "lvlib.h"
 #include "../ve/velib.h"
 
+#include "cfven.h"
 #include "lvcondv.h"
 #include "lvrcondv.h"
 #include "lvrconsplan.h"
@@ -342,7 +343,11 @@ TObject* TAcquisizione_cache::key2obj(const char* key)
       doc = new TDocumento(rset.cursor()->curr());    
   else 
   {
-    TLaundry_contract cont(codcf, 0, datadoc);
+    TToken_string key;
+    key.add('C');
+    key.add(codcf);
+    const int codindsp = atoi(cache().get(LF_CFVEN, key, CFV_CODINDSP));
+    TLaundry_contract cont(codcf, codindsp, datadoc);
     const TString8 codcont = cont.get(LVCONDV_CODCONT);
     
     TString query1 = "USE LVRCONSPLAN KEY 3\n";
@@ -355,9 +360,6 @@ TObject* TAcquisizione_cache::key2obj(const char* key)
     const TDate dataprco = consegne.get(LVRCONSPLAN_DTCONS).as_date();
 
     //recupero il codpag
-    TToken_string key;
-    key.add('C');
-    key.add(codcf);
     const TString4 codpag = cache().get(LF_CLIFO, key, CLI_CODPAG);
      
     //reupero la cuasale di magazzino di testata
@@ -727,7 +729,11 @@ void TAcquisizione_lavanderie_app::genera_documenti(TLog_report& rep, TAssoc_arr
     const long qtacon = qc->get_pezzi();
     const long qtarotti = qc->get_rotti();
 
-    TLaundry_contract cont(codcf, 0, datadoc);
+    TToken_string key;
+    key.add('C');
+    key.add(codcf);
+    const int codindsp = atoi(cache().get(LF_CFVEN, key, CFV_CODINDSP));
+    TLaundry_contract cont(codcf, codindsp, datadoc);
     const TString8 codcont = cont.get(LVCONDV_CODCONT);
     
     TDate oggi(TODAY);
diff --git a/lv/lv2900.cpp b/lv/lv2900.cpp
index de2d5b131..1ad80f090 100755
--- a/lv/lv2900.cpp
+++ b/lv/lv2900.cpp
@@ -76,7 +76,11 @@ TObject* TBuoni_cache::key2obj(const char* key)
       doc = new TDocumento(rset.cursor()->curr());    
   else 
   {
-    TLaundry_contract cont(codcf, 0, datadoc);
+    TToken_string key;
+    key.add('C');
+    key.add(codcf);
+    const int codindsp = atoi(cache().get(LF_CFVEN, key, CFV_CODINDSP));
+    TLaundry_contract cont(codcf, codindsp, datadoc);
     const TString8 codcont = cont.get(LVCONDV_CODCONT);
     
     TString query1 = "USE LVRCONSPLAN KEY 3\n";
@@ -91,9 +95,6 @@ TObject* TBuoni_cache::key2obj(const char* key)
     const long codaut = consegne.get(LVRCONSPLAN_CODAUT).as_int();
 
     //recupero il codpag
-    TToken_string key;
-    key.add('C');
-    key.add(codcf);
     const TRectype& clifo = cache().get(LF_CLIFO, key);
     const TString4 codpag = clifo.get(CLI_CODPAG);
     const long codabi = clifo.get_long(CLI_CODABI);
@@ -454,7 +455,11 @@ bool TConta_pulito_msk::genera_documenti(const TFilename& file, TAssoc_array& do
     const real quantita = rp.quantita();
 
     //instanzio un contratto e la corrispondente riga contratto per l'articolo che sto analizzando
-    TLaundry_contract cont(codcf, 0, datadoc);
+    TToken_string key;
+    key.add('C');
+    key.add(codcf);
+    const int codindsp = atoi(cache().get(LF_CFVEN, key, CFV_CODINDSP));
+    TLaundry_contract cont(codcf, codindsp, datadoc);
     const TRectype rcont = cont.row(codart);
 
     bool dtmp = false;
diff --git a/lv/lv3200.cpp b/lv/lv3200.cpp
index db593a77d..43da59e93 100755
--- a/lv/lv3200.cpp
+++ b/lv/lv3200.cpp
@@ -148,7 +148,11 @@ void TEvasione_msk::setta_campi_cliente()
 
   if (codcf > 0)
   {
-    TLaundry_contract cont(codcf, 0, data);
+    TToken_string key;
+    key.add('C');
+    key.add(codcf);
+    const int codindsp = atoi(cache().get(LF_CFVEN, key, CFV_CODINDSP));
+    TLaundry_contract cont(codcf, codindsp, data);
 
     //se trovo un contratto, allora scrivo il codice contratto e cerco itinerario e data di prevista consegna
     //se no avviso che non c'è neanche un contratto valido e svuoto i campi interassati