romfast/comun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync SVN r18023

Browse Source
This commit is contained in:
Marius Mutu
2026-08-20 18:14:36 +03:00
parent b046046251
commit 896be7e9ca
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/reguli_lucru.md
View File

@@ -9,7 +9,8 @@
Patch-urile (in .gitignore, `docs/diff_runda*.patch`) nu se comit niciodata, raman local. 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 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, `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 de test (`screenshots*`, `uisync*`, `.fxp`, `.err`, loguri). Sterge doar fisiere neurmarite de
git — cele tracked sunt sarite. git — cele tracked sunt sarite.
2. Comentarii in cod SI in scripturile de migrare `.sql`: minime, strict functionale, descriu 2. Comentarii in cod SI in scripturile de migrare `.sql`: minime, strict functionale, descriu

1
ferestre/frm_import_note_facturi_clienti.sc2
View File

@@ -816,7 +816,6 @@ DEFINE CLASS form1 AS form
Local llMaximize, llNotaNoua, lnIdSet, lnSucces Local llMaximize, llNotaNoua, lnIdSet, lnSucces
lnSucces = 1 lnSucces = 1
update_jtva_coloane("JV", 'crsExplicatiiTVATemp', 1) update_jtva_coloane("JV", 'crsExplicatiiTVATemp', 1)
SET STEP ON
lcSql = [SELECT * FROM vact WHERE 1=2] lcSql = [SELECT * FROM vact WHERE 1=2]
llSucces = goExecutor.oExecuta(m.lcSql, 'actactan_temp') llSucces = goExecutor.oExecuta(m.lcSql, 'actactan_temp')
If m.llSucces If m.llSucces

3
ferestre/frm_initializare_facturi_balanta.sc2
View File

@@ -676,7 +676,6 @@ DEFINE CLASS form1 AS form
pnIdFactD = 0 pnIdFactD = 0
pnIdFactC = 0 pnIdFactC = 0
ENDIF ENDIF
SET STEP ON
For lnCota = 1 To 7 For lnCota = 1 To 7
* 21, 11, 5, 9, 19, 20, 24 * 21, 11, 5, 9, 19, 20, 24
Do Case Do Case
@@ -1021,7 +1020,6 @@ DEFINE CLASS form1 AS form
lnNrLuniP = m.lnAnP * 12 + m.lnLunaP lnNrLuniP = m.lnAnP * 12 + m.lnLunaP
llParteneriBalanta = (This.chkParteneriBalantaVerificare = 1) && creez balante de parteneri din balanta analitica si sterg apoi analiticele din balanta analitica 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 TEXT TO lcMesaj NOSHOW
Alegeti fisierul balanta.xlsx cu structura: Alegeti fisierul balanta.xlsx cu structura:
"CONT, DENUMIRE, PRECDEB1, PRECCRED1, RULPRECDEB, RULPRECCRED, RULDEB, RULCRED, TOTDEB, TOTCRED, SOLDDEB, SOLDCRED" "CONT, DENUMIRE, PRECDEB1, PRECCRED1, RULPRECDEB, RULPRECCRED, RULDEB, RULCRED, TOTDEB, TOTCRED, SOLDDEB, SOLDCRED"
@@ -1422,7 +1420,6 @@ DEFINE CLASS form1 AS form
Return m.llSucces Return m.llSucces
Endif Endif
SET STEP ON
Select cFacturiTemp Select cFacturiTemp
Scan Scan
Scatter Name loFact Scatter Name loFact

9
programe/ofacturare_editare.prg
View File

@@ -203,7 +203,7 @@ FUNCTION IncarcaVanzareNota
ENDFUNC && 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 *!* 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 *!* gaseste un rand in VANZARI; lasa workarea si pozitia curenta neschimbate, .F. cu tvanz gol daca nu gaseste
FUNCTION IncarcaVanzareDinNota FUNCTION IncarcaVanzareDinNota
@@ -228,7 +228,12 @@ FUNCTION IncarcaVanzareDinNota
Use In tmp_triplete_pozvanz Use In tmp_triplete_pozvanz
ENDIF ENDIF
*!* cod se ia tot din cursor, nu de pe randul curent - acesta poate fi la EOF dupa CalculeazaTotal *!* 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 SELECT tmp_triplete_pozvanz
SCAN SCAN

4
utile/curatenie.ps1
View File

@@ -42,8 +42,8 @@ function Adauga($cale, $tipare, $recursiv, $director) {
$docs = Join-Path $ProjectRoot 'docs' $docs = Join-Path $ProjectRoot 'docs'
$teste = @((Join-Path $comun 'utile\Teste'), (Join-Path $ProjectRoot 'utile\Teste')) | Where-Object { Test-Path $_ } $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 # 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') $false $false 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 # backup-uri de runda si de cache text
Adauga $ProjectRoot @('*.pre_runda*.bak') $true $false Adauga $ProjectRoot @('*.pre_runda*.bak') $true $false
Adauga $CacheRoot @('*.pre_runda*.bak', '*.vc2.bak', '*.sc2.bak') $true $false Adauga $CacheRoot @('*.pre_runda*.bak', '*.vc2.bak', '*.sc2.bak') $true $false