root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/R_10_00' into R_10_00

Browse Source
This commit is contained in:
Simone Palacino 2020-07-07 16:01:32 +02:00
commit 4480ea870e
1 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fp/fplib01.cpp
View File

@ -1379,16 +1379,21 @@ bool TDoc_fp::export_info_articolo(TFPRiga_documento* rdoc, TPaf_record& paf1900
} }
} }
} }
// Controllo se ha il CONAI in tal caso aggiungo i dati // Controllo se ha il CONAI in tal caso aggiungo i dati
const TTipo_documento & tipodoc = rdoc->doc().tipo();
if (tipodoc.add_conai())
for (int i = 0; i < FR_CMAX; i++) for (int i = 0; i < FR_CMAX; i++)
{ {
if (rdoc->get(conai_peso_name(i)).full() && !_has_cust) const TString scat(rdoc->get(conai_sottocat_name(i)));
if (scat.full() && cache().get("&VESCC", scat).not_empty() && !_has_cust)
{ {
reset(paf2100f); reset(paf2100f);
paf2100f.set("PK_KEYNLINEA", static_cast<long>(riga_doc)); paf2100f.set("PK_KEYNLINEA", static_cast<long>(riga_doc));
paf2100f.set("PK_KEYNLINAR", _idx_adg_doc_row++); paf2100f.set("PK_KEYNLINAR", _idx_adg_doc_row++);
TString scat = rdoc->get(conai_sottocat_name(i));
TString msg_conai; TString msg_conai;
msg_conai << "Contributo CONAI " << conai_material(conai_str2class(scat)) << " (Kg)"; msg_conai << "Contributo CONAI " << conai_material(conai_str2class(scat)) << " (Kg)";