From 3c20ef1034cff1ae79f240c6a47eda88d6dc4b4f Mon Sep 17 00:00:00 2001 From: Marius Mutu Date: Thu, 20 Aug 2026 18:14:34 +0300 Subject: [PATCH] sync SVN r18023 --- Programe/oproceduri_import.prg | 8 +++++--- changelog_roacont.txt | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Programe/oproceduri_import.prg b/Programe/oproceduri_import.prg index 28f5191..520d044 100644 --- a/Programe/oproceduri_import.prg +++ b/Programe/oproceduri_import.prg @@ -4560,13 +4560,15 @@ Procedure CompleteazaParteneriROA lcSelect = Select() lcSqlPart = [select id_part, cod_fiscal, denumire from nom_parteneri where sters = 0 and inactiv = 0] - llSucces = goExecutor.oExecuta(m.lcSqlPart, 'cParteneriROA') + llSucces = goExecutor.oExecuta(m.lcSqlPart, 'cParteneriSql') If !m.llSucces Return m.llSucces Endif - Select id_part, cod_fiscal, denumire, NormalizeazaCUI(cod_fiscal) As cui_norm From cParteneriROA Into Cursor cParteneriROA Readwrite + *!* 20.08.2026 sursa nu poate fi si destinatie la INTO CURSOR (eroare 24 - alias deja folosit) + Select id_part, cod_fiscal, denumire, Padr(NormalizeazaCUI(cod_fiscal), Len(cod_fiscal), ' ') As cui_norm From cParteneriSql Into Cursor cParteneriROA Readwrite + Use In (Select('cParteneriSql')) Index On cui_norm Tag cuinorm lcAdreseParteneri = [select id_adresa, id_part, localitate, id_loc, judet, id_judet, tara, id_tara from vadrese_parteneri] @@ -4662,7 +4664,7 @@ Procedure CompleteazaParteneriROA Select (m.tcCursorParteneri) Replace id_part With m.pnIdPart - INSERT INTO cParteneriROA (id_part, cod_fiscal, denumire) VALUES (m.pnIdPart, m.lcCod_fiscal, m.lcDenumire) + INSERT INTO cParteneriROA (id_part, cod_fiscal, denumire, cui_norm) VALUES (m.pnIdPart, m.lcCod_fiscal, m.lcDenumire, NormalizeazaCUI(m.lcCod_fiscal)) If m.llCallBack m.toCallBackForm.trace('Client nou ' + Alltrim(denumire) + ' CUI: ' + Alltrim(cod_fiscal) + ' ID: ' + Alltrim(Transform(id_part))) diff --git a/changelog_roacont.txt b/changelog_roacont.txt index b4ea72e..cede123 100644 --- a/changelog_roacont.txt +++ b/changelog_roacont.txt @@ -1,4 +1,11 @@ +