diff --git a/clase/ointroduceri.VCT b/clase/ointroduceri.VCT index 166b2a0..80e3eff 100644 Binary files a/clase/ointroduceri.VCT and b/clase/ointroduceri.VCT differ diff --git a/clase/ointroduceri.vcx b/clase/ointroduceri.vcx index 862faae..da7d1a2 100644 Binary files a/clase/ointroduceri.vcx and b/clase/ointroduceri.vcx differ diff --git a/programe/ocautare.prg b/programe/ocautare.prg index abe8e56..09ffa0c 100644 --- a/programe/ocautare.prg +++ b/programe/ocautare.prg @@ -560,7 +560,11 @@ Function cauta_nom_articole lcTitlu = [Alegeti articolele (mouse-click pe denumire sau apasati SPACE)] lcTitluColoane = [Denumire,Cod Material,Cod bare,UM,Grupa,Subgrupa,Cont,Analitic,DNF,Id] llMultipleArticles = .T. - lcSelect = [select a.denumire,a.codmat,a.codbare,a.um, a.grupa, a.subgrupa, a.id_grupa, a.id_subgrupa,a.dnf,a.cont, a.acont, a.inactiv, a.id_articol from ] + gcS + [.vnom_articole_toate a ] + lcSelect = [select a.denumire,a.codmat,a.codbare,a.um, a.grupa, a.subgrupa, a.id_grupa, a.id_subgrupa,a.dnf,a.cont, a.acont, a.inactiv, a.id_articol,] + ; + [ a.um2, a.um_iso, a.cod_um_iso, a.cant_bax, a.in_crm, a.in_stoc, a.codmatf, a.conditii_pastrare,] + ; + [ a.id_part, a.partener, a.indicativ, a.taxa_reconditionare, a.id_articol_general, a.articol_general,] + ; + [ a.listare_codbare, a.tip, a.timpn, a.codnc8, a.greutate, a.id_tara_origine, a.tara_origine, a.codcpv] + ; + [ from ] + gcS + [.vnom_articole_toate a ] lcFiltruOriginal = Iif(!Empty(tcFiltruOriginal), Alltrim(tcFiltruOriginal) + [ and ], "") + [a.inactiv = 0] lcNumeProc = [nom_articole] llToateIreg = .F.