From e37ee24eec70762e4a08dd130efbb29825cc2bfe Mon Sep 17 00:00:00 2001 From: cris Date: Thu, 21 Apr 2011 11:30:41 +0000 Subject: [PATCH] Patch level : Files correlati : Ricompilazione Demo : [ ] Commento : git-svn-id: svn://10.65.10.50/branches/R_10_00@22010 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ha/ha2200.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ha/ha2200.cpp b/ha/ha2200.cpp index 27a32469e..69c07f5cd 100755 --- a/ha/ha2200.cpp +++ b/ha/ha2200.cpp @@ -201,7 +201,7 @@ TFatture_recordset::TFatture_recordset() add_field("BGM.FINERECORD", AN, 2, 0, true, "\r\n"); TString80 str; - str << ditta.get(ANA_INDRES) << ", " << ditta.get(ANA_CIVRES); + str << anag.get(ANA_INDRES) << ", " << anag.get(ANA_CIVRES); // Record NAS: identificazione mittente add_field("NAS.TIPOREC", AN, 3, 1, true, "NAS"); @@ -212,7 +212,10 @@ TFatture_recordset::TFatture_recordset() add_field("NAS.CITTAF", AN, 35, 164, true, comres.get(COM_DENCOM)); add_field("NAS.PROVF", AN, 9, 199, true, comres.get(COM_PROVCOM)); add_field("NAS.CAPF", AN, 9, 208, true, anag.get(ANA_CAPRES)); - add_field("NAS.NAZIOF", AN, 3, 217, true, anag.get(ANA_STATORES)); + stato = anag.get(ANA_STATORES); + if (stato.empty()) + stato = "IT"; + add_field("NAS.NAZIOF", AN, 3, 217, true, stato); add_field("NAS.PIVANAZF", AN, 35, 220, true, anag.get(ANA_PAIV)); add_field("NAS.TRIBUNALE", AN, 35, 255, true, "MILANO"); add_field("NAS.LICIMPEXP", AN, 35, 290); @@ -238,7 +241,10 @@ TFatture_recordset::TFatture_recordset() add_field("NAI.CITTAI", AN, 35, 164, true, com_esselunga.get(COM_DENCOM)); add_field("NAI.PROVI", AN, 9, 199, true, com_esselunga.get(COM_PROVCOM)); add_field("NAI.CAPI", AN, 9, 208, true, cliente_esselunga.get(CLI_CAPCF)); - add_field("NAI.NAZIOI", AN, 3, 217, true, "IT"); + stato = cliente_esselunga.get(CLI_STATOCF); + if (stato.empty()) + stato = "IT"; + add_field("NAI.NAZIOI", AN, 3, 217, true, stato); add_field("NAI.PIVANAZI", AN, 35, 220, true, cliente_esselunga.get(CLI_PAIV)); add_field("NAI.FILLER", AN, 51, 255); add_field("NAI.FINERECORD", AN, 2, 0, true, "\r\n"); @@ -478,7 +484,7 @@ void THardy_esselunga_fat::add_rec_testata(TFatture_recordset& fat, TDocumento& numdoc.strip("/"); numdoc = numdoc.right(12); fat.set("BGM.NUMDOC", numdoc); - fat.set("BGM.DATADOC", doc.data().string()); + fat.set("BGM.DATADOC", doc.data()); fat.new_rec("NAS"); fat.new_rec("NAI"); @@ -557,7 +563,8 @@ void THardy_esselunga_fat::add_recs_dettaglio(TFatture_recordset& fat, TDocument fat.set("TAX.CATIMP", tipo_hardy); //fat.new_rec("ALD"); - //fat.new_rec("NAD"); + fat.new_rec("NAD"); + } }