From 257721aebb71601a797918d52fb38b3fa0c69091 Mon Sep 17 00:00:00 2001 From: Marius Mutu Date: Wed, 16 Sep 2026 15:18:07 +0300 Subject: [PATCH] sync SVN r18142 --- AGENTS.md | 1 + CLAUDE.md | 1 + Programe/oproceduri_import.prg | 12 ++++++------ changelog_roacont.txt | 16 ++++++++++++++++ roacont.pj2 | 2 +- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 845ddc7..b4c5757 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -16,4 +16,5 @@ skill-ului. - garzi pe valori NULL din Oracle in VFP -> skill `roa-vfp-null-guards` - `GO` pe un `Recno()` capturat sau primit ca parametru -> skill `roa-vfp-go-recno` - procedura PL/SQL cu `SELECT ... INTO` apelata din VFP (randuri pierdute tacut) -> skill `roa-oracle-sqlexec-no-data` +- inrolezi un calculator nou sau un proiect nou in fluxul git-text / expui skill-urile pe masina / aplici backstop-ul de rutare -> skill `roa-onboarding` diff --git a/CLAUDE.md b/CLAUDE.md index 56a881a..ee099a1 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -310,4 +310,5 @@ skill-ului. - garzi pe valori NULL din Oracle in VFP -> skill `roa-vfp-null-guards` - `GO` pe un `Recno()` capturat sau primit ca parametru -> skill `roa-vfp-go-recno` - procedura PL/SQL cu `SELECT ... INTO` apelata din VFP (randuri pierdute tacut) -> skill `roa-oracle-sqlexec-no-data` +- inrolezi un calculator nou sau un proiect nou in fluxul git-text / expui skill-urile pe masina / aplici backstop-ul de rutare -> skill `roa-onboarding` diff --git a/Programe/oproceduri_import.prg b/Programe/oproceduri_import.prg index a8b81e0..50334be 100644 --- a/Programe/oproceduri_import.prg +++ b/Programe/oproceduri_import.prg @@ -501,7 +501,7 @@ Define Class ExtrasBanca As Custom * Solduri facturi deschise (401/4111 + extinderile 404/461/462; 419/4091-4094 doar pentru avans existent) If This.lFactura - lcSqlSolduri = [select i.id_part, i.cont, i.acont, i.id_fact, max(i.nract) nract, min(i.dataact) dataact, ] + ; + 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 ] + ; [and i.cont in ('401','4111','419','4091','4092','4093','4094','404','461','462') ] + ; @@ -522,7 +522,7 @@ Define Class ExtrasBanca As Custom Index On id_part Tag id_part Use In (Select("cSolduriBrut")) Endif - Create Cursor cAlocTemp (nrec I, npoz I, id_fact I, nract I, cont C(4), acont C(20), suma N(15, 2), csursa C(1)) + Create Cursor cAlocTemp (nrec I, npoz I, id_fact I, nract I, cont C(4) Null, acont C(20) Null, suma N(15, 2), csursa C(1)) Endif * Caut/creez parteneri @@ -1251,8 +1251,8 @@ Procedure AplicaAlocareFactura lnAlocat = Min(m.tnRest, ramas) lnIdFact = id_fact lnNract = nract - lcCont = Alltrim(Cont) - lcAcont = acont + lcCont = Alltrim(Nvl(Cont, '')) + lcAcont = Alltrim(Nvl(acont, '')) tnNpoz = m.tnNpoz + 1 * campurile sursa (cSolduriFact) copiate in variabile - Insert Into rezolva numele necalificate pe cursorul tinta, nu pe cel curent Insert Into cAlocTemp (nrec, npoz, id_fact, nract, cont, acont, suma, csursa) ; @@ -2914,8 +2914,8 @@ Define Class ExtrasBanca_General As ExtrasBanca USE IN (SELECT('cXLSXTmp')) - UPDATE C_TMP_I SET data_v = TRANSFORM(ExcelSerialNumber2Date(INT(VAL(data_v)))) WHERE !('.'$data_v OR '/'$data_v) - UPDATE C_TMP_I SET data_t = TRANSFORM(ExcelSerialNumber2Date(INT(VAL(data_t)))) WHERE !('.'$data_v OR '/'$data_t) + UPDATE C_TMP_I SET data_v = TRANSFORM(ExcelSerialNumber2Date(INT(VAL(data_v)))) WHERE !('.'$data_v OR '/'$data_v OR '-'$data_v) + UPDATE C_TMP_I SET data_t = TRANSFORM(ExcelSerialNumber2Date(INT(VAL(data_t)))) WHERE !('.'$data_t OR '/'$data_t OR '-'$data_t) Select C_TMP_I Scan For !Empty(data_v) Select c_iex diff --git a/changelog_roacont.txt b/changelog_roacont.txt index 3f4a3ed..928c6fd 100644 --- a/changelog_roacont.txt +++ b/changelog_roacont.txt @@ -1,3 +1,19 @@ + + + +