From 3fe4baabc0ae8c8b128177b3b68968f9f41b728b Mon Sep 17 00:00:00 2001 From: Simone Palacino Date: Mon, 24 Feb 2020 13:17:56 +0100 Subject: [PATCH] Patch level : 12.0 954 Files correlati : fp0.exe Commento : - Modificata esportazione dati CONAI se non hai le personalizzazioni attive, in modo da poter personalizzare anche il CONAI. - Aggiunti dati precompilati per altri dati gestionali per CONAI. --- src/fp/fplib01.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/fp/fplib01.cpp b/src/fp/fplib01.cpp index 4d3de93fd..6a17afb97 100644 --- a/src/fp/fplib01.cpp +++ b/src/fp/fplib01.cpp @@ -1381,20 +1381,20 @@ bool TDoc_fp::export_info_articolo(TFPRiga_documento* rdoc, TPaf_record& paf1900 // Controllo se ha il CONAI in tal caso aggiungo i dati for (int i = 0; i < FR_CMAX; i++) { - if (rdoc->get(conai_peso_name(i)).full()) + if (rdoc->get(conai_peso_name(i)).full() && !_has_cust) { - reset(paf2100f); - paf2100f.set("PK_KEYNLINEA", static_cast(riga_doc)); - paf2100f.set("PK_KEYNLINAR", _idx_adg_doc_row++); - - TString scat = rdoc->get(conai_sottocat_name(i)); - TString msg_conai; - - msg_conai << "Contributo CONAI " << conai_material(conai_str2class(scat)) << " (KG)"; - paf2100f.set("PK_TIPODATO", "CONAI"); - paf2100f.set("PK_RIFDATO", msg_conai); - paf2100f.set("PK_RIFNUMERO", rdoc->get_real(conai_peso_name(i)).string()); - ok &= insert(paf2100f); + reset(paf2100f); + paf2100f.set("PK_KEYNLINEA", static_cast(riga_doc)); + paf2100f.set("PK_KEYNLINAR", _idx_adg_doc_row++); + + TString scat = rdoc->get(conai_sottocat_name(i)); + TString msg_conai; + + msg_conai << "Contributo CONAI " << conai_material(conai_str2class(scat)) << " (KG)"; + paf2100f.set("PK_TIPODATO", "CONAI"); + paf2100f.set("PK_RIFDATO", msg_conai); + paf2100f.set("PK_RIFNUMERO", rdoc->get_real(conai_peso_name(i)).string()); + ok &= insert(paf2100f); } } return ok;