From cb17b9335f4b47cb91dcbd34eaa87d24eeda52d3 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 24 Jun 2014 12:38:27 +0000 Subject: [PATCH] git-svn-id: svn://10.65.10.50/branches/R_10_00@22954 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- db/db1100.cpp | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/db/db1100.cpp b/db/db1100.cpp index 45a10b892..dd574bd55 100755 --- a/db/db1100.cpp +++ b/db/db1100.cpp @@ -860,45 +860,20 @@ bool TExplode_distinta_form::validate(TForm_item &f, TToken_string &t) else if (code == "_DES") { - TToken_string fa(re.path(), '~'); - TToken_string key(fa.get(0)); - TToken_string tmp("", '~'); - TString code; - - TToken_string & p = (TToken_string &) re.path(); - p.get(-2, (TString &)tmp); - tmp.get(2, code); - key.add(code); - - valore = cache().get(LF_RDIST, key, RDIST_DESCR); - - if (valore.full()) - { - f.set(valore); - return true; - } - switch (tipo) { - case 'A': - { - valore = cache().get(LF_ANAMAG, re.articolo(), ANAMAG_DESCR); - break; - } - case 'L': + case 'L': { const TLavorazione lav(re.articolo()); valore = lav.descr(); - break; } - case 'V': - { - const TRectype & dist = cache().get(LF_DIST, re.articolo()); - valore = dist.get("DESCR"); - break; - } - default: - break; + break; + case 'V': + valore = cache().get(LF_DIST, re.articolo(), "DESCR"); + break; + default: + valore = cache().get(LF_ANAMAG, re.articolo(), ANAMAG_DESCR); + break; } if (livelli_giacenza().enabled()) {