From 243caf7917f8a13546ea36847fdc2c8fe70465af Mon Sep 17 00:00:00 2001 From: Marius Mutu Date: Sat, 19 Sep 2026 23:45:21 +0300 Subject: [PATCH] sync SVN r18188 --- .gitignore | 1 + Programe/oproceduri_import.prg | 21 +++++++++++++++------ roacont.pj2 | 4 ++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 5fd1f6a..0b7a74f 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ COMUN/ docs/diff_*.patch .gstack/ docs/local/ +docs/ diff --git a/Programe/oproceduri_import.prg b/Programe/oproceduri_import.prg index 2b819eb..d05bd2f 100644 --- a/Programe/oproceduri_import.prg +++ b/Programe/oproceduri_import.prg @@ -370,7 +370,7 @@ Define Class ExtrasBanca As Custom Local lnDenumire, lnDocument, lnIdPartenerCasa, lnVariante, loPartener Local lcGrupIdLista, lcSqlGrup, lnIdPartAlternativ, lcPartAlternativ Local lcSqlIstoric, llIstoricOk, lcCheieTxt - Local lcSqlSolduri, llSolduriOk, llAlocatFacturi + Local lcSqlSolduri, llSolduriOk, llAlocatFacturi, lcListaIban PRIVATE pcContBanca, pnIdPartBanca, pcContBancaTert, pnIdPartenerTert @@ -507,7 +507,7 @@ Define Class ExtrasBanca As Custom If This.lFactura lcSqlSolduri = [select i.id_part, i.cont, Nvl(i.acont, ' ') acont, i.id_fact, max(i.nract) nract, min(i.dataact) dataact, ] + ; [max(i.id_valuta) id_valuta, sum(i.precdeb+i.debit-i.preccred-i.credit) sold ] + ; - [from ireg_parteneri i where i.an = ?gnAn and i.luna = ?gnLuna ] + ; + [from ireg_parteneri i where i.an = ?gnAn and i.luna = ?gnLuna ] + m.gcCondSucursala + ; [and i.cont in ('401','4111','419','4091','4092','4093','4094','404','461','462') ] + ; [group by i.id_part, i.cont, i.acont, i.id_fact ] + ; [having sum(i.precdeb+i.debit-i.preccred-i.credit) <> 0] @@ -532,6 +532,7 @@ Define Class ExtrasBanca As Custom * Caut/creez parteneri Create Cursor cGrupParteneriCui (id_part_ales N(10), id_part N(10), denumire C(100)) Create Cursor cIbanDeSalvat (id_part N(10), iban C(24), denumire C(100)) + Index On id_part Tag id_part SELECT distinct cod_fiscal, denumire, iban FROM cActTemp INTO CURSOR cParteneriTemp READWRITE SELECT cParteneriTemp lcRecc = Transform(Reccount()) @@ -556,7 +557,7 @@ Define Class ExtrasBanca As Custom If !Isnull(loPartener) lnIdPartener = Nvl(loPartener.id_part, 0) lcPartener = Alltrim(Nvl(loPartener.denumire, "")) - If PoateSalvaIbanPePartener(m.lnIdPartener, m.lcIBanPart) + If PoateSalvaIbanPePartener(m.lnIdPartener, m.lcIBanPart) And !Seek(m.lnIdPartener, "cIbanDeSalvat", "id_part") Insert Into cIbanDeSalvat (id_part, iban, denumire) Values (m.lnIdPartener, m.lcIBanPart, m.lcPartener) ENDIF If GetParteneriByCuiNormalizat(m.lcCodFiscal, "cGrupCuiTemp") And Reccount("cGrupCuiTemp") > 1 @@ -566,7 +567,7 @@ Define Class ExtrasBanca As Custom lcGrupIdLista = m.lcGrupIdLista + Iif(Empty(m.lcGrupIdLista), "", ",") + Transform(id_part) Endscan lcSqlGrup = [select id_part, count(*) as nr, sum(precdeb + debit - preccred - credit) as sold from ireg_parteneri ] + ; - [where an = ?gnAn and luna = ?gnLuna and id_part in (] + m.lcGrupIdLista + [) group by id_part ] + ; + [where an = ?gnAn and luna = ?gnLuna ] + m.gcCondSucursala + [ and id_part in (] + m.lcGrupIdLista + [) group by id_part ] + ; [order by count(*) desc, abs(sum(precdeb + debit - preccred - credit)) desc] If goExecutor.oExecuta(m.lcSqlGrup, "cGrupCuiDoc") And Reccount("cGrupCuiDoc") > 0 Select cGrupCuiTemp @@ -675,7 +676,15 @@ Define Class ExtrasBanca As Custom * IBAN tertului (1.3): o singura intrebare pentru toti candidatii adunati in bucla, nu una per rand If Reccount("cIbanDeSalvat") > 0 - If AMESSAGEBOX('Salvati IBAN-ul pentru ' + Transform(Reccount("cIbanDeSalvat")) + ' parteneri?', 4+32, _screen.Caption) = 6 + lcListaIban = "" + Select cIbanDeSalvat + Go Top + Scan Next 15 + lcListaIban = m.lcListaIban + Chr(13) + Alltrim(denumire) + ": " + Alltrim(iban) + Endscan + If AMESSAGEBOX('Partenerii de mai jos nu au cont bancar in nomenclator. In extras apar cu contul:' + Chr(13) + m.lcListaIban + ; + Iif(Reccount("cIbanDeSalvat") > 15, Chr(13) + "... si inca " + Transform(Reccount("cIbanDeSalvat") - 15), "") + Chr(13) + Chr(13) + ; + 'Salvati acest cont in fisa partenerului (' + Transform(Reccount("cIbanDeSalvat")) + ' parteneri)?', 4+32, _screen.Caption) = 6 Select cIbanDeSalvat Scan pcContBancaTert = cIbanDeSalvat.iban @@ -5204,7 +5213,7 @@ Function AlegePartenerDenumireAmbigua lcSql = [select p.id_part from nom_parteneri p where p.sters = 0 and p.inactiv = 0 and p.id_part in (] + m.lcGrupIdLista + [) ] + ; [and exists (select 1 from ireg_parteneri i where i.an = ?gnAn and i.luna = ?gnLuna ] + ; - [and i.id_part = p.id_part and i.cont = ?pcCont ] + ; + [and i.id_part = p.id_part and i.cont = ?pcCont ] + m.gcCondSucursala + ; [and (i.precdeb + i.debit - i.preccred - i.credit) <> 0)] llSucces = goExecutor.oExecuta(m.lcSql, "cCuFacturi") lnRezultat = 0 diff --git a/roacont.pj2 b/roacont.pj2 index ce8919d..e7e5ab1 100644 --- a/roacont.pj2 +++ b/roacont.pj2 @@ -25,14 +25,14 @@ _LegalTrademark = "" _ProductName = "ROA - Financiar Contabilitate" _MajorVer = "2" _MinorVer = "11" -_Revision = "80" +_Revision = "81" _LanguageID = "Romana" _AutoIncrement = "0" * * -*<.HomeDir = 'd:\roa\roacont2' /> +*<.HomeDir = 'd:\roa\roacont' /> FOR EACH loProject IN _VFP.Projects FOXOBJECT loProject.Close()