diff --git a/db/dblib.cpp b/db/dblib.cpp index 8de7807ba..cd98f5b26 100755 --- a/db/dblib.cpp +++ b/db/dblib.cpp @@ -782,25 +782,28 @@ bool TDistinta_tree::set_livgiac_on_descr(int l, bool on) bool TDistinta_tree::get_description(TString& desc) const { TCodice_articolo codart; curr_code(codart); - if (!describe(codart, desc)) - desc = "???"; + TString des; + + desc.cut(0); + if (get_qta_on_descr()) + { + TCodice_um code; curr_um(code); + desc << curr_qta().string() << ' ' << code << ' ' << get_descr_separator() << ' '; + } + desc << codart << get_descr_separator() << ' '; + if (!describe(codart, des)) + desc << "???"; else { - for (int l = 1; l <= livgiac().last_level(); l++) if (get_livgiac_on_descr(l)) - { - TString16 giaclev; curr_giaclev(giaclev,l); - if (!giaclev.empty() ) - desc << ' ' << livgiac().name(l) << ' ' << giaclev; - } - if (get_qta_on_descr()) - { - TCodice_um code; curr_um(code); - desc << ' ' << get_descr_separator() << ' ' - << curr_qta().string() << ' ' << code; - } + desc << des << ' '; + for (int l = 1; l <= livgiac().last_level(); l++) + if (get_livgiac_on_descr(l)) + { + TString16 giaclev; curr_giaclev(giaclev,l); + if (!giaclev.empty() ) + desc << des << ' ' << livgiac().name(l) << ' ' << giaclev; + } } - desc.insert(format(" %c ",get_descr_separator()), 0); - desc.insert(codart, 0); return TRUE; }