From fd54d7053566ae5cd67df1e65bb3268109cf4ac1 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Tue, 5 Nov 2019 18:58:46 +0100 Subject: [PATCH] Patch level : 12.0 896 Files correlati : ve0.exe ve1.exe ve1.exe ve5,exe ve6.exe tutti i profili Commento to : Gestione conai --- src/fp/fplib01.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/fp/fplib01.cpp b/src/fp/fplib01.cpp index 04040d219..707afa71e 100644 --- a/src/fp/fplib01.cpp +++ b/src/fp/fplib01.cpp @@ -1373,19 +1373,21 @@ bool TDoc_fp::export_info_articolo(TFPRiga_documento* rdoc, TPaf_record& paf1900 } } // Controllo se ha il CONAI in tal caso aggiungo i dati - FOR_EACH_CONFIGURED_CONAI_CLASS(cc) + for (int i = 0; i < FR_CMAX; i++) { - const TString conai_fld(conai_peso_name(cc, LF_RIGHEDOC)); - if (rdoc->get(conai_fld).full()) + if (rdoc->get(conai_peso_name(i)).full()) { reset(paf2100f); paf2100f.set("PK_KEYNLINEA", static_cast(riga_doc)); paf2100f.set("PK_KEYNLINAR", _idx_adg_doc_row++); - static TString msg_conai; - msg_conai.cut(0) << "Contributo CONAI " << conai_material(cc) << " (KG)"; + + 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_fld).string()); + paf2100f.set("PK_RIFNUMERO", rdoc->get_real(conai_peso_name(i)).string()); ok &= insert(paf2100f); } }