From 896be7e9cac297984f05cea610a2461a3d62d760 Mon Sep 17 00:00:00 2001 From: Marius Mutu Date: Thu, 20 Aug 2026 18:14:36 +0300 Subject: [PATCH] sync SVN r18023 --- docs/reguli_lucru.md | 3 ++- ferestre/frm_import_note_facturi_clienti.sc2 | 1 - ferestre/frm_initializare_facturi_balanta.sc2 | 3 --- programe/ofacturare_editare.prg | 9 +++++++-- utile/curatenie.ps1 | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/reguli_lucru.md b/docs/reguli_lucru.md index a073a3e..2d15b59 100644 --- a/docs/reguli_lucru.md +++ b/docs/reguli_lucru.md @@ -9,7 +9,8 @@ Patch-urile (in .gitignore, `docs/diff_runda*.patch`) nu se comit niciodata, raman local. Curatenia de dinainte de commit NU se face pe cap de agent, ci cu `powershell -File COMUN\utile\curatenie.ps1` (`-DryRun` listeaza fara sa stearga): patch-uri, - handoff-uri/planuri de runda, `*.pre_runda*.bak`, `.bak`-urile din cache-ul text si artefactele + handoff-uri/planuri de runda, notele de rezolvare (`docs/fix_*.md`, `docs/fix_*.diff`), + `*.pre_runda*.bak`, `.bak`-urile din cache-ul text si artefactele de test (`screenshots*`, `uisync*`, `.fxp`, `.err`, loguri). Sterge doar fisiere neurmarite de git — cele tracked sunt sarite. 2. Comentarii in cod SI in scripturile de migrare `.sql`: minime, strict functionale, descriu diff --git a/ferestre/frm_import_note_facturi_clienti.sc2 b/ferestre/frm_import_note_facturi_clienti.sc2 index 80b9496..80bf1b2 100644 --- a/ferestre/frm_import_note_facturi_clienti.sc2 +++ b/ferestre/frm_import_note_facturi_clienti.sc2 @@ -816,7 +816,6 @@ DEFINE CLASS form1 AS form Local llMaximize, llNotaNoua, lnIdSet, lnSucces lnSucces = 1 update_jtva_coloane("JV", 'crsExplicatiiTVATemp', 1) - SET STEP ON lcSql = [SELECT * FROM vact WHERE 1=2] llSucces = goExecutor.oExecuta(m.lcSql, 'actactan_temp') If m.llSucces diff --git a/ferestre/frm_initializare_facturi_balanta.sc2 b/ferestre/frm_initializare_facturi_balanta.sc2 index 75a0d0c..93de955 100644 --- a/ferestre/frm_initializare_facturi_balanta.sc2 +++ b/ferestre/frm_initializare_facturi_balanta.sc2 @@ -676,7 +676,6 @@ DEFINE CLASS form1 AS form pnIdFactD = 0 pnIdFactC = 0 ENDIF - SET STEP ON For lnCota = 1 To 7 * 21, 11, 5, 9, 19, 20, 24 Do Case @@ -1021,7 +1020,6 @@ DEFINE CLASS form1 AS form lnNrLuniP = m.lnAnP * 12 + m.lnLunaP llParteneriBalanta = (This.chkParteneriBalantaVerificare = 1) && creez balante de parteneri din balanta analitica si sterg apoi analiticele din balanta analitica - SET STEP ON TEXT TO lcMesaj NOSHOW Alegeti fisierul balanta.xlsx cu structura: "CONT, DENUMIRE, PRECDEB1, PRECCRED1, RULPRECDEB, RULPRECCRED, RULDEB, RULCRED, TOTDEB, TOTCRED, SOLDDEB, SOLDCRED" @@ -1422,7 +1420,6 @@ DEFINE CLASS form1 AS form Return m.llSucces Endif - SET STEP ON Select cFacturiTemp Scan Scatter Name loFact diff --git a/programe/ofacturare_editare.prg b/programe/ofacturare_editare.prg index 36d6645..9bae471 100644 --- a/programe/ofacturare_editare.prg +++ b/programe/ofacturare_editare.prg @@ -203,7 +203,7 @@ FUNCTION IncarcaVanzareNota ENDFUNC && IncarcaVanzareNota -*!* parametru: alias cu randurile notei (tact), cu campurile cod/nract/serie_act/dataact/sters +*!* parametru: alias cu randurile notei (tact), cu campurile cod/nract/serie_act/dataact si, optional, sters *!* incearca toate combinatiile distincte (cod, nract, serie_act, dataact) din alias (sters=0) pana *!* gaseste un rand in VANZARI; lasa workarea si pozitia curenta neschimbate, .F. cu tvanz gol daca nu gaseste FUNCTION IncarcaVanzareDinNota @@ -228,7 +228,12 @@ FUNCTION IncarcaVanzareDinNota Use In tmp_triplete_pozvanz ENDIF *!* cod se ia tot din cursor, nu de pe randul curent - acesta poate fi la EOF dupa CalculeazaTotal - SELECT DISTINCT cod, nract, serie_act, dataact FROM (m.tcAliasAct) WHERE sters = 0 INTO CURSOR tmp_triplete_pozvanz READWRITE + *!* sters lipseste in aliasurile de nota noua (initializare solduri) - atunci nu se filtreaza + IF Type(m.tcAliasAct + '.sters') = 'U' + SELECT DISTINCT cod, nract, serie_act, dataact FROM (m.tcAliasAct) INTO CURSOR tmp_triplete_pozvanz READWRITE + ELSE + SELECT DISTINCT cod, nract, serie_act, dataact FROM (m.tcAliasAct) WHERE sters = 0 INTO CURSOR tmp_triplete_pozvanz READWRITE + ENDIF SELECT tmp_triplete_pozvanz SCAN diff --git a/utile/curatenie.ps1 b/utile/curatenie.ps1 index 4aabcea..7a2d8a4 100644 --- a/utile/curatenie.ps1 +++ b/utile/curatenie.ps1 @@ -42,8 +42,8 @@ function Adauga($cale, $tipare, $recursiv, $director) { $docs = Join-Path $ProjectRoot 'docs' $teste = @((Join-Path $comun 'utile\Teste'), (Join-Path $ProjectRoot 'utile\Teste')) | Where-Object { Test-Path $_ } -# patch-uri de review, handoff-uri, planuri de runda, propuneri implementate -Adauga $docs @('diff_runda*.patch', 'handoff*.md', 'plan_runda*.md', 'runda*.md', 'propuneri_*.md') $false $false +# patch-uri de review, handoff-uri, planuri de runda, propuneri implementate, note de rezolvare +Adauga $docs @('diff_runda*.patch', 'handoff*.md', 'plan_runda*.md', 'runda*.md', 'propuneri_*.md', 'fix_*.md', 'fix_*.diff') $false $false # backup-uri de runda si de cache text Adauga $ProjectRoot @('*.pre_runda*.bak') $true $false Adauga $CacheRoot @('*.pre_runda*.bak', '*.vc2.bak', '*.sc2.bak') $true $false