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

This commit is contained in:
Simone Palacino 2020-07-07 15:16:33 +02:00
commit 52cdff68b2

View File

@ -2472,6 +2472,10 @@ void TConversione_archivi::update_righe_doc()
r.zero(old_conai_peso[j]);
changed = true;
}
const TString & sottocat = r.get(conai_sottocat_name(j + 1));
if (sottocat.full() && cache().get("&VESCC", sottocat).empty())
r.zero(conai_sottocat_name(j + 1));
if (r.get(conai_sottocat_name(j + 1)).blank() &&
r.get(conai_peso_name(j + 1)).full())
{