From 3c2672239a3085fc4fde4f56a43d47b3a183faa9 Mon Sep 17 00:00:00 2001
From: cris <cris@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 30 Mar 2011 13:31:39 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            :

git-svn-id: svn://10.65.10.50/branches/R_10_00@21857 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ha/ha2100.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/ha/ha2100.cpp b/ha/ha2100.cpp
index 0e47db6eb..85ae164d4 100755
--- a/ha/ha2100.cpp
+++ b/ha/ha2100.cpp
@@ -82,7 +82,7 @@ TObject* TCodArtEsselunga_cache::key2obj(const char* key)
 {
   TToken_string code(key);
   TString80 codart; code.get(0, codart);
-	const long codcf = 1000;
+	const TString& codcf = ini_get_string(CONFIG_DITTA, "ha", "Esselunga_CodEsselunga");
 	TISAM_recordset codcorr("USE CODCORR\nSELECT CODCF=#CODCF\nFROM CODART=#COD\nTO CODART=#COD");
   codcorr.set_var("#COD", TVariant(codart));
   codcorr.set_var("#CODCF", TVariant(codcf));
@@ -91,7 +91,8 @@ TObject* TCodArtEsselunga_cache::key2obj(const char* key)
 		codcorr.move_first();
 		return new TString80(codcorr.get(CODCORR_CODARTALT).as_string());
 	}
-	return NULL;
+	else
+		return new TString80(codart);
 }
 
 const TString& TCodArtEsselunga_cache::decode(const TString& codart)
@@ -252,13 +253,19 @@ void THardy_esselunga::elabora(const TMask& mask)
 		{
 			TDocumento* doc = new TDocumento(recset.cursor()->curr());
 			//  passo tutte le righe del documento all'AS400recordset
-		  FOR_EACH_PHYSICAL_RDOC(*doc, r, rigadoc)
+			TString16 numdoc;
+			const TString& num = doc->numerazione();
+			numdoc.format("%012d",doc->numero());
+			numdoc << cache().get("%NUM", num, "S7");
+			numdoc.strip("/");
+			numdoc.right(12);
+			FOR_EACH_PHYSICAL_RDOC(*doc, r, rigadoc)
 			{			
 				const TString80& codart_esselunga = cache_ca.decode(rigadoc->get(RDOC_CODART));
 				privat.new_rec("");
 				privat.set("CDC", TVariant(codcf_esselunga));
 				privat.set("CODART", codart_esselunga);			
-				privat.set("NUMBOLLA", "000000000000");
+				privat.set("NUMBOLLA", numdoc);
 				privat.set("DATABOLLA", recset.get(DOC_DATADOC));
 				real qta = rigadoc->get_real(RDOC_QTA);
 				TString16 qtastr = qta.string(8,2,'0');
@@ -266,7 +273,6 @@ void THardy_esselunga::elabora(const TMask& mask)
 				privat.set("QTACONS", qtastr);
 				privat.set("QTARESA", "0000000");
 			} //FOR_EACH...
-			delete doc;
 		} // if check_cliente...
   } //for (bool ok = recset.move_first()...