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

Registratura: adaugare/editare fara erori la partener NULL, lista doar ultimul document, fonturi Arial 10 (M1-M5)

Browse Source 
M1 modifica_reg_dg: garda id_part NULL/empty (mesaj + Return .F.), NVL pe id_part/nr_pag, functia intoarce succes.
M2 validare partener in toate cele 3 puncte de salvare, INAINTE de blocarea campurilor (Command2.Click salveaza inainte sa blocheze; bara laterala si Page3.Deactivate nu mai salveaza/prompteaza cu partener NULL).
M3 do_adauga: documentul nou intra direct in editare (llock=.F., focus cmdDenumire); eliminat mesajul fals "Toate modificarile au efect imediat!".
M4 viz_registratura + do_cauta: filtru initial "doar ultimul document" (subquery max(id_reg)); fara criterii de cautare se pastreaza filtrul, nu se incarca toata baza.
M5 fonturi: eliminate 154 suprascrieri "Arial Narrow" si rebazate 96 controale baseclass pe COMUN _baza.vcx (textbox/label/checkbox/commandbutton/optiongroup); Init de grid propaga fontul la coloane si headere (fara asta raman Arial 9 - verificat empiric).

Teste: harness headless (init env dedicat, form, adaugare+editare cu verificare in baza) + test UI vizual cu screenshots pe fluxul real (19 PASS / 0 FAIL). Diff-uri de audit in docs/diff_runda1_*.patch.

M6 (build EXE) BLOCAT headless: roaRegistratura.pjx refera 48 fisiere hardcodate pe "c:\program files\...\vfp 9" (masina 32-bit din 2021) + COMUN\utile\hpdf\ReportOutput\ctl32_progressbar.vcx redenumit _old; necesita repathing o data in VFP9 IDE.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_018H9za5A9Tk6wcLFof6seds
This commit is contained in:
Marius Mutu
2026-07-23 18:53:12 +03:00
parent 7cf1499a24
commit d2e87327a4
17 changed files with 3273 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
docs/analiza_registratura_adaugare_editare.md Normal file
View File

@@ -0,0 +1,165 @@
# Analiza: adaugare/editare document in registratura + lista documentelor + fonturi
Data: 23.07.2026. Analiza pe surse (fara modificari de cod). Referintele de linie sunt in
fisierele text FoxBin2Prg (`.vc2`), sincronizate cu binarele la data analizei.
## 1. Fluxul actual (cum functioneaza azi)
Fereastra principala (`ofundal_registratura.vc2`, clasa `pg_meniu_princ`):
- **Page2 "Lista documentelor"** = `ct_registratura` (grid pe cursorul `cRegistratura`,
incarcat de `viz_registratura` din `Programe\oproceduri_roaregistratura.prg`).
- **Page3 "Datele documentului"** = `ct_part_nr_data` (Partener / Nr. doc / Data doc +
butonul **Modifica/Salveaza** cu lacat) + `ct_date_generale` (bara outlook cu butoanele
Date generale / Referinte / Observatii / Documente atasate, care deschid formulare
separate `podg_dg`, `podg_referinte`, `podg_obs`, `podg_link`).
- Starea editarii este `ct_part_nr_data.llock` (`.T.` = blocat). Butonul `Command2`
comuta: la deblocare afiseaza "Toate modificarile au efect imediat!", la a doua apasare
("Salveaza") apeleaza `modifica_reg_dg`.
- Salvarea reala e `modifica_reg_dg` (`oproceduri_roaregistratura.prg:100`) -> apel PL/SQL
`pack_registratura.modifica_registratura`.
- Adaugarea (`ct_registratura.do_adauga`, `ferestre_registratura.vc2:1206`): aloca numar
intern (`oGeneratorNumere`, seria 10), insereaza un rand GOL prin
`pack_registratura.adauga_registratura`, apoi sare pe Page3. Documentul nou are
**id_part NULL** pana alege utilizatorul partenerul.
## 2. Problemele identificate (cauze exacte)
### P1. Prompt "Doriti sa salvati modificarile facute?" aparut "din senin"
Doua locuri intreaba automat cand `llock = .F.`:
- `outlook2003bar.vc2:1009` (`do_arata_formular`): **orice click pe un buton din bara
laterala** (Date generale, Referinte, Observatii, Documente atasate) intreaba si, la Da,
ruleaza `modifica_reg_dg`.
- `ofundal_registratura.vc2:286` (`Page3.Deactivate`): la parasirea paginii, la fel.
Deci scenariul raportat: utilizatorul apasa **Modifica** (deblocare), apoi navigheaza
(ex. deschide sectiunea Date generale ca sa completeze campuri sau vrea partenerul) ->
prompt de salvare -> Da -> eroare, pentru ca documentul nou are partener NULL.
### P2. Eroarea la partener NULL
`modifica_reg_dg`, linia 111:
```
lcId_part = Alltrim(Str(loRegistratura.id_part)) && fara NVL!
```
`Str(.NULL.)` -> NULL, concatenarea in `lcSql` propaga NULL -> `goExecutor.oExecute(NULL)`
-> eroare. Aceeasi problema potentiala: `lcNr_pag` (linia 123, fara NVL) si `Dtos()` pe
date NULL (liniile 114/116 dau sir gol la NULL — tratat in IIF, ok).
Validarea de partener exista **doar** in `Command2.Click` (ramura Salveaza,
`ferestre_registratura.vc2:332`), dar:
- ruleaza DUPA ce campurile au fost deja blocate si caption-ul pus pe "Modifica"
(stare inconsistenta: mesaj "Alegeti partenerul!", dar formularul ramane blocat si
nesalvat);
- celelalte doua puncte de salvare (P1) NU au deloc validarea.
### P3. Flux confuz Modifica/Salveaza
- Mesajul de la deblocare ("Toate modificarile au efect imediat!") e fals: modificarile de
date generale se salveaza doar la "Salveaza"/prompt; doar `ck_avizat.Valid` scrie imediat.
- Dupa adaugare (`do_adauga`) documentul nou apare pe Page3 **blocat**: utilizatorul mai
trebuie sa apese Modifica inainte sa poata alege partenerul — pas inutil si sursa
promptului din P1.
- Raspunsul "Nu" la prompt arunca modificarile fara re-citirea datelor originale:
`goRegistratura` ramane cu valorile editate (afisare inselatoare pana la refresh).
### P4. Lista documentelor: incarcare integrala + pozitionare pe primul
- `viz_registratura` incarca TOATE inregistrarile cu `sters=0` din `vregistratura`
(fara filtru initial pe ultimul document), apoi `Go Top` -> se vede inceputul bazei.
- `Page2.Activate` apeleaza `do_cauta()` la fiecare activare; fara bife, filtrul devine
`STERS=0` -> reincarcare integrala la fiecare revenire pe lista.
### P5. Fonturi
- Clasele COMUN de baza (`_baza.vcx`: `_textbox`, `_label`, `_checkbox`, `_grid` etc.)
au deja **Arial 10** — controalele derivate din ele sunt OK.
- In proiect insa:
- `ferestre_registratura.vc2`: **75 aparitii** `FontName = "Arial Narrow"` (gridul
`grid_registratura` + toate coloanele/headerele/text-urile, checkbox-urile de filtru);
- `onom_clienti.vc2`: **79 aparitii**;
- `ct_part_nr_data`, `ct_date_generale` si mare parte din `frm_dg_date_generale` folosesc
controale **baseclass VFP** (textbox/label/checkbox/commandbutton fara clasa COMUN)
fara FontName -> mostenesc fontul formului sau raman pe default (Arial 9).
### P6. Alte observatii (fragilitate, de semnalat)
- `Ck_tipdoc` e legat de classlib `..\..\roacont\comun\clase\caut_ora.vcx` (referinta
cross-proiect catre ROACONT, nu COMUN-ul propriu) — `ferestre_registratura.vc2:589`.
- `cmdFel_document`/`cmdNresp`/etc. au Picture din `..\..\roacontracte\grafice\find.bmp`
(alt proiect).
- Proiectul nu a mai fost recompilat de mult cu COMUN-ul curent -> build necesar in VFP9
IDE dupa aplicarea modificarilor.
## 3. Modificari propuse (minime, in ordinea prioritatii)
### M1. `modifica_reg_dg` — garda si NVL (oproceduri_roaregistratura.prg)
- La inceput: daca `Isnull(toRegistratura.id_part) Or Empty(toRegistratura.id_part)` ->
`AMESSAGEBOX('Alegeti partenerul inainte de salvare!')` si `Return .F.`.
- `lcId_part`/`lcNr_pag` cu `Nvl(...)`; functia sa intoarca `.T./.F.` (succes), ca apelantii
sa poata reactiona.
### M2. Punct unic de salvare + prompt doar cand exista partener
- In `do_arata_formular` (outlook2003bar) si `Page3.Deactivate`: daca `llock=.F.` si
`id_part` NULL -> mesaj "Alegeti partenerul!" si **fara** apel `modifica_reg_dg`
(raman in editare in cazul barei laterale; la Deactivate se renunta explicit).
- In `Command2.Click` (Salveaza): validarea partenerului INAINTE de `blocheaza_campuri()`;
se blocheaza doar dupa salvarea reusita.
### M3. Dupa adaugare, intra direct in editare
In `do_adauga` / la comutarea pe Page3 pentru document nou: `llock=.F.`,
`deblocheaza_campuri()` (inclusiv pe formularele podg_* deschise) si focus pe
`cmdDenumire` -> utilizatorul alege direct partenerul, fara pasul Modifica.
Se elimina si mesajul fals "Toate modificarile au efect imediat!" (sau se inlocuieste cu
"Apasati Salveaza pentru a pastra modificarile").
### M4. Lista: initial doar ultimul document
- `viz_registratura` primeste filtrul initial:
`sters=0 and id_reg = (select max(id_reg) from vregistratura where sters=0)`
(de validat sintaxa cu gencursor la implementare; alternativ ordonare desc + `rownum=1`).
- `do_cauta`: daca nicio bifa de filtru nu e activa, pastreaza filtrul "ultimul document"
in loc de `STERS=0` (incarcare integrala doar la cautare explicita).
- Dupa incarcare: pozitionare pe ultimul (unicul) rand -> martor pentru ultimul numar
de inregistrare.
### M5. Fonturi Arial 10 — prin rebazare pe clasele din `_baza.vcx` (decizie Marius)
- Controalele **baseclass VFP** din proiect se rebazeaza pe clasele COMUN care au deja
Arial 10: `textbox` -> `_textbox`, `label` -> `_label`, `checkbox` -> `_checkbox`,
`commandbutton` -> `_commandbutton`, `optiongroup` -> `_optiongrup`
(toate `OF "..\comun\clase\_baza.vcx"`). Vizate: `ct_part_nr_data` (txtClient,
txtNumar, txtData_ctr, cmdDenumire, Command2, Label3/4/9), `frm_dg_date_generale`
(txt*, cmd*, Label*, ck_avizat, optIE) si textele/checkbox-urile din coloanele
gridului `grid_registratura`.
- Se ELIMINA suprascrierile explicite `FontName = "Arial Narrow"` (75 in
`ferestre_registratura.vc2`, 79 in `onom_clienti.vc2`), astfel incat controalele sa
mosteneasca Arial 10 din clasele de baza; gridul (`_grdrow` din `_grd_base.vcx`)
ramane pe mostenirea lui odata scoase suprascrierile.
- Controalele deja derivate din COMUN (`_lbbase`, `but_*`, `clb_tx_simplu`,
`ck_filtru_*` etc.) raman neatinse.
- Atentie la latimi: Arial e mai lat ca Arial Narrow — de verificat vizual coloanele
gridului si etichetele dupa schimbare (conventie_ux_formulare.md).
- Nota tehnica: rebazarea se face in textul `.vc2` (schimbarea `AS <clasa>` +
`ClassLib` in markerul `END OBJECT`), cu fidelity-check la write-back; e o
modificare mai invaziva decat schimbarea de font per control — de testat intai pe
un singur control, apoi extins.
### M6. Recompilare
Dupa aplicarea M1–M5: BUILD proiect in VFP9 IDE (recompilare cu COMUN-ul curent),
apoi `git_sync` si commit (dupa aprobarea diff-urilor).
## 4. Testare
Scripturi noi in `Teste\` (rulare headless `vfp9.exe -A -T`, log in `Teste\log_*.txt`,
mediu CENTRAL / MARIUSM_AUTO conform reguli_lucru.md):
- `test_init_env_registratura.prg` — init mediu neinteractiv pentru ROAREGISTRATURA
(SET PATH/CLASSLIB/PROCEDURE preluate din `Programe\roaregistratura.prg`).
- `test_registratura_form.prg` — incarca cursorul listei (`viz_registratura`),
verifica existenta cursorului, numarul de inregistrari si pozitionarea pe ultimul
document; instantiaza containerul `ct_registratura` pe un form ascuns.
- `test_registratura_adaugare.prg` — fluxul de adaugare SI editare: alocare numar intern,
`adauga_registratura`, apoi `modifica_reg_dg` cu partener NULL (se asteapta eroare/refuz
— reproduce bugul P2), cu partener valid (se asteapta succes), apoi EDITAREA
documentului (modificare descriere/nr_pag/data + re-salvare + verificare in baza —
fluxul Modifica -> Salveaza).
NOTA: scripturile NU se ruleaza pe baza de productie (JCSSERVER/CONTAFIN_ORACLE).
Daca schema de test nu contine `pack_registratura`, testele de adaugare logheaza eroarea
si se opresc curat (fara scrieri partiale).
## 5. Ce urmeaza
Dupa aprobare, implementarea se livreaza ca diff-uri pe fisierele text
(`docs\diff_runda1_*.patch`), write-back cu `txt2vcx.ps1` doar dupa OK.

1105
docs/diff_runda1_ferestre_M2_M3_M4_M5.patch Normal file
View File

File diff suppressed because it is too large Load Diff

17
docs/diff_runda1_ofundal_M2.patch Normal file
View File

@@ -0,0 +1,17 @@
diff --git "a/D:\\ROA\\ROAREGISTRATURA\\Clase\\ofundal_registratura.vc2.pre_runda1.bak" "b/D:\\ROA\\ROAREGISTRATURA\\Clase\\ofundal_registratura.vc2"
index a58ab1a..0fdd7a9 100644
--- "a/D:\\ROA\\ROAREGISTRATURA\\Clase\\ofundal_registratura.vc2.pre_runda1.bak"
+++ "b/D:\\ROA\\ROAREGISTRATURA\\Clase\\ofundal_registratura.vc2"
@@ -285,6 +285,12 @@ DEFINE CLASS pg_meniu_princ AS pg_meniu OF "..\comun\clase\ofundal.vcx"
PROCEDURE Page3.Deactivate
Local lnRaspuns
+ *!* 23.07.2026 MM - partener NULL: nu se salveaza, se renunta explicit (P1/P2)
+ If !This.ct_part_nr_data1.llock And (Isnull(goRegistratura.id_part) Or Empty(goRegistratura.id_part))
+ This.ct_part_nr_data1.llock = .T.
+ AMESSAGEBOX('Alegeti partenerul! Modificarile nu au fost salvate.',0+48,'Atentie')
+ This.ct_part_nr_data1.Refresh()
+ Endif
If !This.ct_part_nr_data1.llock
This.ct_part_nr_data1.llock = .T.
lnRaspuns = AMESSAGEBOX('Dori<72>i s<> salva<76>i modific<69>rile f<>cute?',4+32,'Confirmare')

894
docs/diff_runda1_onom_M5.patch Normal file
View File

@@ -0,0 +1,894 @@
diff --git "a/D:\\ROA\\ROAREGISTRATURA\\Clase\\onom_clienti.vc2.pre_runda1.bak" "b/D:\\ROA\\ROAREGISTRATURA\\Clase\\onom_clienti.vc2"
index 6cfc6a8..3c30eb1 100644
--- "a/D:\\ROA\\ROAREGISTRATURA\\Clase\\onom_clienti.vc2.pre_runda1.bak"
+++ "b/D:\\ROA\\ROAREGISTRATURA\\Clase\\onom_clienti.vc2"
@@ -449,7 +449,6 @@ DEFINE CLASS frm_agenti AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
Anchor = 15, ;
ColumnCount = 5, ;
DeleteMark = .F., ;
- FontName = "Arial Narrow", ;
Height = 336, ;
Left = 15, ;
Name = "grd_agenti", ;
@@ -461,27 +460,22 @@ DEFINE CLASS frm_agenti AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
ZOrderSet = 6, ;
Column1.ColumnOrder = 3, ;
Column1.ControlSource = "zona", ;
- Column1.FontName = "Arial Narrow", ;
Column1.Name = "cZona", ;
Column1.Width = 172, ;
Column2.ColumnOrder = 1, ;
Column2.ControlSource = "nume_agent", ;
- Column2.FontName = "Arial Narrow", ;
Column2.Name = "cNume", ;
Column2.Width = 205, ;
Column3.ColumnOrder = 4, ;
Column3.ControlSource = "telefon1", ;
- Column3.FontName = "Arial Narrow", ;
Column3.Name = "cTelefon1", ;
Column3.Width = 116, ;
Column4.ColumnOrder = 2, ;
Column4.ControlSource = "functie", ;
- Column4.FontName = "Arial Narrow", ;
Column4.Name = "cFunctia", ;
Column4.Width = 127, ;
Column5.ColumnOrder = 5, ;
Column5.ControlSource = "telefon2", ;
- Column5.FontName = "Arial Narrow", ;
Column5.Name = "cTelefon2", ;
Column5.Width = 116
*< END OBJECT: ClassLib="..\..\comun\clase\_grd_base.vcx" BaseClass="grid" />
@@ -489,81 +483,72 @@ DEFINE CLASS frm_agenti AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
ADD OBJECT 'grd_agenti.cFunctia.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Functie", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_agenti.cFunctia.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_agenti.cFunctia.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grd_agenti.cNume.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Nume", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_agenti.cNume.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_agenti.cNume.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grd_agenti.cTelefon1.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Telefon 1", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_agenti.cTelefon1.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_agenti.cTelefon1.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grd_agenti.cTelefon2.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Telefon 2", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_agenti.cTelefon2.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_agenti.cTelefon2.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grd_agenti.cZona.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Zona", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_agenti.cZona.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_agenti.cZona.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
PROCEDURE actualizeaza_grid1
Lparameters lcFiltru
@@ -1006,7 +991,6 @@ DEFINE CLASS frm_clienti AS _frmbase OF "..\comun\clase\_frm_base.vcx"
ADD OBJECT 'grd_clienti' AS _grdrow WITH ;
ColumnCount = 9, ;
DeleteMark = .F., ;
- FontName = "Arial Narrow", ;
Height = 366, ;
Left = 15, ;
Name = "grd_clienti", ;
@@ -1017,41 +1001,32 @@ DEFINE CLASS frm_clienti AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Width = 636, ;
ZOrderSet = 6, ;
Column1.ControlSource = "nume", ;
- Column1.FontName = "Arial Narrow", ;
Column1.Name = "cNume", ;
Column1.Width = 172, ;
Column2.ControlSource = "cod_fiscal", ;
- Column2.FontName = "Arial Narrow", ;
Column2.Name = "cCod_fiscal", ;
Column2.Width = 91, ;
Column3.ControlSource = "telefon", ;
- Column3.FontName = "Arial Narrow", ;
Column3.Name = "cTelefon", ;
Column4.ControlSource = "adresa", ;
- Column4.FontName = "Arial Narrow", ;
Column4.Name = "cAdresa", ;
Column4.Width = 270, ;
Column5.ControlSource = "banca", ;
- Column5.FontName = "Arial Narrow", ;
Column5.Name = "cBanca", ;
Column5.Width = 114, ;
Column6.ControlSource = "cont_banca", ;
- Column6.FontName = "Arial Narrow", ;
Column6.Name = "cCont_banca", ;
Column6.Width = 52, ;
Column7.ControlSource = "reg_comert", ;
- Column7.FontName = "Arial Narrow", ;
Column7.Name = "cReg_comert", ;
Column7.Width = 133, ;
Column8.ColumnOrder = 9, ;
Column8.ControlSource = "judet", ;
- Column8.FontName = "Arial Narrow", ;
Column8.Name = "cJudet", ;
Column8.Visible = .T., ;
Column8.Width = 68, ;
Column9.ColumnOrder = 8, ;
Column9.ControlSource = "localitate", ;
- Column9.FontName = "Arial Narrow", ;
Column9.Name = "cLocalitate", ;
Column9.Width = 127
*< END OBJECT: ClassLib="..\comun\clase\_grd_base.vcx" BaseClass="grid" />
@@ -1059,147 +1034,129 @@ DEFINE CLASS frm_clienti AS _frmbase OF "..\comun\clase\_frm_base.vcx"
ADD OBJECT 'grd_clienti.cAdresa.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Adresa", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_clienti.cAdresa.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_clienti.cAdresa.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grd_clienti.cBanca.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Banca", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_clienti.cBanca.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_clienti.cBanca.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grd_clienti.cCod_fiscal.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Cod fiscal", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_clienti.cCod_fiscal.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_clienti.cCod_fiscal.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grd_clienti.cCont_banca.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Cont", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_clienti.cCont_banca.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_clienti.cCont_banca.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grd_clienti.cJudet.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Judet", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_clienti.cJudet.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_clienti.cJudet.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1", ;
Visible = .T.
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grd_clienti.cLocalitate.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Localitate", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_clienti.cLocalitate.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_clienti.cLocalitate.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grd_clienti.cNume.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Nume client", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_clienti.cNume.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_clienti.cNume.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grd_clienti.cReg_comert.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Nr.Reg.Com.", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_clienti.cReg_comert.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_clienti.cReg_comert.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grd_clienti.cTelefon.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Telefon", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grd_clienti.cTelefon.Text1' AS textbox WITH ;
+ ADD OBJECT 'grd_clienti.cTelefon.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
PROCEDURE actualizeaza_grid1
Lparameters lcFiltru
@@ -1709,7 +1666,6 @@ DEFINE CLASS frm_curs AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
AutoSize = .T., ;
camp_nume = data, ;
Caption = "Data", ;
- FontName = "Arial Narrow", ;
Left = 54, ;
Name = "Ck_data", ;
TabIndex = 1, ;
@@ -1723,7 +1679,6 @@ DEFINE CLASS frm_curs AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
AutoSize = .T., ;
camp_nume = data2, ;
Caption = "Data2", ;
- FontName = "Arial Narrow", ;
Left = 99, ;
Name = "Ck_data2", ;
TabIndex = 1, ;
@@ -1738,7 +1693,6 @@ DEFINE CLASS frm_curs AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
camp_nume = nume_val, ;
Caption = "Valuta", ;
Comment = "*:OnResize=LT", ;
- FontName = "Arial Narrow", ;
Left = 6, ;
Name = "Ck_numeval", ;
TabIndex = 19, ;
@@ -1774,7 +1728,6 @@ DEFINE CLASS frm_curs AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
Anchor = 15, ;
ColumnCount = 4, ;
DeleteMark = .F., ;
- FontName = "Arial Narrow", ;
Height = 341, ;
Left = 8, ;
Name = "grid_curs", ;
@@ -1784,21 +1737,17 @@ DEFINE CLASS frm_curs AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
Top = 68, ;
Width = 258, ;
Column1.ControlSource = "nume_val", ;
- Column1.FontName = "Arial Narrow", ;
Column1.Name = "Column1", ;
Column1.Width = 74, ;
Column2.ControlSource = "curs", ;
- Column2.FontName = "Arial Narrow", ;
Column2.Format = "rk", ;
Column2.InputMask = (get_mask(10,gnPCurs)), ;
Column2.Name = "Column2", ;
Column2.Width = 58, ;
Column3.ControlSource = "data", ;
- Column3.FontName = "Arial Narrow", ;
Column3.Name = "Column3", ;
Column3.Width = 49, ;
Column4.ControlSource = "data2", ;
- Column4.FontName = "Arial Narrow", ;
Column4.Name = "Column4", ;
Column4.Width = 51
*< END OBJECT: ClassLib="..\..\comun\clase\_grd_base.vcx" BaseClass="grid" />
@@ -1806,66 +1755,58 @@ DEFINE CLASS frm_curs AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
ADD OBJECT 'grid_curs.Column1.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Nume valuta", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grid_curs.Column1.Text1' AS textbox WITH ;
+ ADD OBJECT 'grid_curs.Column1.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grid_curs.Column2.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Curs", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grid_curs.Column2.Text1' AS textbox WITH ;
+ ADD OBJECT 'grid_curs.Column2.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grid_curs.Column3.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Data", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grid_curs.Column3.Text1' AS textbox WITH ;
+ ADD OBJECT 'grid_curs.Column3.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'grid_curs.Column4.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Data2", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'grid_curs.Column4.Text1' AS textbox WITH ;
+ ADD OBJECT 'grid_curs.Column4.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
PROCEDURE actualizeaza_grid1
LPARAMETERS pcFiltru
@@ -2007,9 +1948,8 @@ DEFINE CLASS frm_curs_nou AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
Top = 1
*< END OBJECT: ClassLib="..\..\comun\clase\cmd_butoane.vcx" BaseClass="commandbutton" />
- ADD OBJECT 'Command2' AS commandbutton WITH ;
+ ADD OBJECT 'Command2' AS _commandbutton WITH ;
Caption = "", ;
- FontName = "Arial Narrow", ;
Height = 25, ;
Left = 168, ;
Name = "Command2", ;
@@ -2017,7 +1957,7 @@ DEFINE CLASS frm_curs_nou AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
TabIndex = 1, ;
Top = 36, ;
Width = 28
- *< END OBJECT: BaseClass="commandbutton" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="commandbutton" />
ADD OBJECT 'CUS_ODATA_CURS1' AS cus_odata_curs WITH ;
Left = 102, ;
@@ -2025,7 +1965,7 @@ DEFINE CLASS frm_curs_nou AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
Top = 8
*< END OBJECT: ClassLib="onom_clienti.vcx" BaseClass="custom" />
- ADD OBJECT 'Label1' AS label WITH ;
+ ADD OBJECT 'Label1' AS _label WITH ;
AutoSize = .T., ;
BackStyle = 0, ;
Caption = "Nume valuta", ;
@@ -2035,9 +1975,9 @@ DEFINE CLASS frm_curs_nou AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
TabIndex = 8, ;
Top = 41, ;
Width = 71
- *< END OBJECT: BaseClass="label" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="label" />
- ADD OBJECT 'Label2' AS label WITH ;
+ ADD OBJECT 'Label2' AS _label WITH ;
AutoSize = .T., ;
BackStyle = 0, ;
Caption = "Curs", ;
@@ -2047,9 +1987,9 @@ DEFINE CLASS frm_curs_nou AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
TabIndex = 9, ;
Top = 66, ;
Width = 29
- *< END OBJECT: BaseClass="label" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="label" />
- ADD OBJECT 'Label3' AS label WITH ;
+ ADD OBJECT 'Label3' AS _label WITH ;
AutoSize = .T., ;
BackStyle = 0, ;
Caption = "Data 1", ;
@@ -2059,9 +1999,9 @@ DEFINE CLASS frm_curs_nou AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
TabIndex = 10, ;
Top = 91, ;
Width = 38
- *< END OBJECT: BaseClass="label" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="label" />
- ADD OBJECT 'Label4' AS label WITH ;
+ ADD OBJECT 'Label4' AS _label WITH ;
AutoSize = .T., ;
BackStyle = 0, ;
Caption = "Data 2", ;
@@ -2071,9 +2011,9 @@ DEFINE CLASS frm_curs_nou AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
TabIndex = 11, ;
Top = 117, ;
Width = 38
- *< END OBJECT: BaseClass="label" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="label" />
- ADD OBJECT 'txtCurs' AS textbox WITH ;
+ ADD OBJECT 'txtCurs' AS _textbox WITH ;
ControlSource = "porec.curs", ;
Height = 23, ;
Left = 91, ;
@@ -2081,9 +2021,9 @@ DEFINE CLASS frm_curs_nou AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
TabIndex = 2, ;
Top = 63, ;
Width = 100
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
- ADD OBJECT 'txtData1' AS textbox WITH ;
+ ADD OBJECT 'txtData1' AS _textbox WITH ;
ControlSource = "porec.data", ;
Height = 23, ;
Left = 91, ;
@@ -2091,9 +2031,9 @@ DEFINE CLASS frm_curs_nou AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
TabIndex = 3, ;
Top = 88, ;
Width = 100
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
- ADD OBJECT 'txtData2' AS textbox WITH ;
+ ADD OBJECT 'txtData2' AS _textbox WITH ;
ControlSource = "porec.data2", ;
Height = 23, ;
Left = 91, ;
@@ -2101,9 +2041,9 @@ DEFINE CLASS frm_curs_nou AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
TabIndex = 4, ;
Top = 114, ;
Width = 100
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
- ADD OBJECT 'txtValuta' AS textbox WITH ;
+ ADD OBJECT 'txtValuta' AS _textbox WITH ;
ControlSource = "porec.nume_val", ;
Height = 23, ;
Left = 91, ;
@@ -2111,7 +2051,7 @@ DEFINE CLASS frm_curs_nou AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
TabIndex = 12, ;
Top = 36, ;
Width = 75
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
PROCEDURE inainte_de_do_termin
Private pnIdCursNou
@@ -2294,7 +2234,6 @@ DEFINE CLASS frm_delegati AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
ADD OBJECT 'gdelegati' AS _grdrow WITH ;
ColumnCount = 6, ;
DeleteMark = .F., ;
- FontName = "Arial Narrow", ;
Height = 300, ;
Left = 12, ;
Name = "gdelegati", ;
@@ -2305,36 +2244,30 @@ DEFINE CLASS frm_delegati AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
Top = 72, ;
Width = 565, ;
Column1.ControlSource = "nume_part", ;
- Column1.FontName = "Arial Narrow", ;
Column1.Name = "Column1", ;
Column1.ReadOnly = .T., ;
Column1.Width = 168, ;
Column2.ControlSource = "nume", ;
- Column2.FontName = "Arial Narrow", ;
Column2.Name = "Column2", ;
Column2.ReadOnly = .T., ;
Column2.Width = 169, ;
Column3.ControlSource = "bi_seria", ;
- Column3.FontName = "Arial Narrow", ;
Column3.Name = "Column3", ;
Column3.ReadOnly = .T., ;
Column3.Width = 49, ;
Column4.ColumnOrder = 5, ;
Column4.ControlSource = "eliberatde", ;
- Column4.FontName = "Arial Narrow", ;
Column4.Name = "Column4", ;
Column4.ReadOnly = .T., ;
Column4.Width = 77, ;
Column5.ColumnOrder = 6, ;
Column5.ControlSource = "inactiv", ;
- Column5.FontName = "Arial Narrow", ;
Column5.Name = "Column5", ;
Column5.ReadOnly = .T., ;
Column5.Sparse = .F., ;
Column5.Width = 48, ;
Column6.ColumnOrder = 4, ;
Column6.ControlSource = "bi_numar", ;
- Column6.FontName = "Arial Narrow", ;
Column6.Name = "Column6", ;
Column6.ReadOnly = .T., ;
Column6.Width = 66
@@ -2343,106 +2276,94 @@ DEFINE CLASS frm_delegati AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
ADD OBJECT 'gdelegati.Column1.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Client", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'gdelegati.Column1.Text1' AS textbox WITH ;
+ ADD OBJECT 'gdelegati.Column1.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1", ;
ReadOnly = .T.
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'gdelegati.Column2.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Delegat", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'gdelegati.Column2.Text1' AS textbox WITH ;
+ ADD OBJECT 'gdelegati.Column2.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1", ;
ReadOnly = .T.
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'gdelegati.Column3.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "BI_seria", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'gdelegati.Column3.Text1' AS textbox WITH ;
+ ADD OBJECT 'gdelegati.Column3.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1", ;
ReadOnly = .T.
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'gdelegati.Column4.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Eliberat de..", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'gdelegati.Column4.Text1' AS textbox WITH ;
+ ADD OBJECT 'gdelegati.Column4.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1", ;
ReadOnly = .T.
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
- ADD OBJECT 'gdelegati.Column5.Check1' AS checkbox WITH ;
+ ADD OBJECT 'gdelegati.Column5.Check1' AS _checkbox WITH ;
Alignment = 0, ;
Caption = "", ;
Centered = .T., ;
- FontName = "Arial Narrow", ;
Height = 17, ;
Left = 16, ;
Name = "Check1", ;
ReadOnly = .T., ;
Top = 71, ;
Width = 60
- *< END OBJECT: BaseClass="checkbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="checkbox" />
ADD OBJECT 'gdelegati.Column5.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Inactiv", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
ADD OBJECT 'gdelegati.Column6.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "BI_numar", ;
- FontName = "Arial Narrow", ;
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT 'gdelegati.Column6.Text1' AS textbox WITH ;
+ ADD OBJECT 'gdelegati.Column6.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
- FontName = "Arial Narrow", ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1"
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
PROCEDURE actualizeaza_grid1
LPARAMETERS pcFiltru
@@ -2874,14 +2795,14 @@ DEFINE CLASS frm_responsabili AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
Name = "Responsabill"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT '_gnom_responsabili.Column1.Text1' AS textbox WITH ;
+ ADD OBJECT '_gnom_responsabili.Column1.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1", ;
ReadOnly = .T.
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT '_gnom_responsabili.Column2.Header1' AS header WITH ;
Alignment = 2, ;
@@ -2889,16 +2810,16 @@ DEFINE CLASS frm_responsabili AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT '_gnom_responsabili.Column2.Text1' AS textbox WITH ;
+ ADD OBJECT '_gnom_responsabili.Column2.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1", ;
ReadOnly = .T.
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
- ADD OBJECT '_gnom_responsabili.Column3.Check1' AS checkbox WITH ;
+ ADD OBJECT '_gnom_responsabili.Column3.Check1' AS _checkbox WITH ;
Alignment = 0, ;
Caption = "", ;
Centered = .T., ;
@@ -2908,7 +2829,7 @@ DEFINE CLASS frm_responsabili AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
ReadOnly = .T., ;
Top = 30, ;
Width = 60
- *< END OBJECT: BaseClass="checkbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="checkbox" />
ADD OBJECT '_gnom_responsabili.Column3.Header1' AS header WITH ;
Alignment = 2, ;
@@ -2916,7 +2837,7 @@ DEFINE CLASS frm_responsabili AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT '_gnom_responsabili.Column4.Check1' AS checkbox WITH ;
+ ADD OBJECT '_gnom_responsabili.Column4.Check1' AS _checkbox WITH ;
Alignment = 0, ;
Caption = "", ;
Centered = .T., ;
@@ -2926,7 +2847,7 @@ DEFINE CLASS frm_responsabili AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
ReadOnly = .T., ;
Top = 30, ;
Width = 60
- *< END OBJECT: BaseClass="checkbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="checkbox" />
ADD OBJECT '_gnom_responsabili.Column4.Header1' AS header WITH ;
Alignment = 2, ;
@@ -2940,14 +2861,14 @@ DEFINE CLASS frm_responsabili AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT '_gnom_responsabili.Column5.Text1' AS textbox WITH ;
+ ADD OBJECT '_gnom_responsabili.Column5.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1", ;
ReadOnly = .T.
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT 'But_modifica1' AS but_modifica WITH ;
Left = 415, ;
@@ -3305,14 +3226,14 @@ DEFINE CLASS frm_tipc AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT '_grdrow1.Column1.Text1' AS textbox WITH ;
+ ADD OBJECT '_grdrow1.Column1.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1", ;
ReadOnly = .T.
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT '_grdrow1.Column2.Header1' AS header WITH ;
Alignment = 2, ;
@@ -3320,14 +3241,14 @@ DEFINE CLASS frm_tipc AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT '_grdrow1.Column2.Text1' AS textbox WITH ;
+ ADD OBJECT '_grdrow1.Column2.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1", ;
ReadOnly = .T.
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ADD OBJECT '_grdrow1.Column3.Header1' AS header WITH ;
Alignment = 2, ;
@@ -3335,13 +3256,13 @@ DEFINE CLASS frm_tipc AS _frmbase OF "..\..\comun\clase\_frm_base.vcx"
Name = "Header1"
*< END OBJECT: BaseClass="header" />
- ADD OBJECT '_grdrow1.Column3.Text1' AS textbox WITH ;
+ ADD OBJECT '_grdrow1.Column3.Text1' AS _textbox WITH ;
BackColor = 255,255,255, ;
BorderStyle = 0, ;
ForeColor = 0,0,0, ;
Margin = 0, ;
Name = "Text1", ;
ReadOnly = .T.
- *< END OBJECT: BaseClass="textbox" />
+ *< END OBJECT: ClassLib="..\..\comun\clase\_baza.vcx" BaseClass="textbox" />
ENDDEFINE

50
docs/diff_runda1_oproceduri_M1_M4.patch Normal file
View File

@@ -0,0 +1,50 @@
diff --git "a/D:\\ROA\\ROAREGISTRATURA\\Programe\\oproceduri_roaregistratura.prg.pre_runda1.bak" "b/D:\\ROA\\ROAREGISTRATURA\\Programe\\oproceduri_roaregistratura.prg"
index a6462e9..e4b8274 100644
--- "a/D:\\ROA\\ROAREGISTRATURA\\Programe\\oproceduri_roaregistratura.prg.pre_runda1.bak"
+++ "b/D:\\ROA\\ROAREGISTRATURA\\Programe\\oproceduri_roaregistratura.prg"
@@ -16,7 +16,7 @@ lcSelect = [select id_reg, id_part, denumire, id_pers, pers_contact, data, numar
lcOrder = []
lcgroup = []
-lcFiltru = [sters=0]
+lcFiltru = [sters=0 and id_reg=(select max(id_reg) from vregistratura where sters=0)] && *!* 23.07.2026 MM - initial doar ultimul document (P4)
lcFiltruOriginal = []
llModParam = .T.
llAfiseaza = .F.
@@ -103,12 +103,18 @@ Parameters toRegistratura
Local loRegistratura
loRegistratura = toRegistratura
+*!* 23.07.2026 MM - garda partener NULL/empty (P2), functia intoarce .T./.F.
+If Isnull(loRegistratura.id_part) Or Empty(loRegistratura.id_part)
+ AMESSAGEBOX("Alegeti partenerul inainte de salvare!",0+48,"Atentie")
+ Return .F.
+Endif
+
Local lcId_reg, lcId_part, lcId_pers, lcData, lcNumar, lcData_intern, lcNumar_intern, lcDescriere, lcObservatii, lcIdUtil
Local lnSucces
lnSucces = -1
lcId_reg = Alltrim(Str(loRegistratura.id_reg))
-lcId_part = Alltrim(Str(loRegistratura.id_part))
+lcId_part = Nvl(Alltrim(Str(loRegistratura.id_part)),'NULL')
lcId_pers = Nvl(Alltrim(Str(loRegistratura.id_pers)),'NULL')
lcId_responsabil = Nvl(Alltrim(Str(loRegistratura.id_responsabil)),'NULL')
lcData = Dtos(loRegistratura.Data)
@@ -120,7 +126,7 @@ lcDescriere = Nvl(Alltrim(loRegistratura.descriere),"")
lcObservatii = Nvl(Alltrim(loRegistratura.observatii)," ")
lcId_fdoc = Nvl(Alltrim(Str(loRegistratura.id_fdoc)),'NULL')
lcId_mediu = Nvl(Alltrim(Str(loRegistratura.id_mediu)),'NULL')
-lcNr_pag = Alltrim(Str(loRegistratura.nr_pag))
+lcNr_pag = Nvl(Alltrim(Str(loRegistratura.nr_pag)),'NULL')
lcIdUtil = Alltrim(Str(gnIdUtil))
lcSql = [begin pack_registratura.modifica_registratura(] + lcId_reg + [,] + lcId_part + [,] + lcId_pers + [,] + lcId_responsabil + ;
@@ -134,6 +140,7 @@ If lnSucces < 0
AMESSAGEBOX(goExecutor.cEroare,0+16,"Eroare")
Endif
+Return (lnSucces >= 0)
Endproc && modifica_reg_dg
***-----------------------------------------------------------------------------------------------------------------------------

23
docs/diff_runda1_outlook_M2.patch Normal file
View File

@@ -0,0 +1,23 @@
diff --git "a/D:\\ROA\\ROAREGISTRATURA\\Clase\\outlook2003bar.vc2.pre_runda1.bak" "b/D:\\ROA\\ROAREGISTRATURA\\Clase\\outlook2003bar.vc2"
index 1edf6f1..acf200b 100644
--- "a/D:\\ROA\\ROAREGISTRATURA\\Clase\\outlook2003bar.vc2.pre_runda1.bak"
+++ "b/D:\\ROA\\ROAREGISTRATURA\\Clase\\outlook2003bar.vc2"
@@ -1009,7 +1009,8 @@ DEFINE CLASS panelbutton AS container
PROCEDURE do_arata_formular
LOCAL loPagina
loPagina = goFundal._pgfrmbase1.page3
- IF !loPagina.ct_part_nr_data1.llock
+ *!* 23.07.2026 MM - partener NULL: fara prompt/salvare, raman in editare (P1/P2)
+ IF !loPagina.ct_part_nr_data1.llock AND !(ISNULL(goRegistratura.id_part) OR EMPTY(goRegistratura.id_part))
LOCAL lnRaspuns
loPagina.ct_part_nr_data1.llock = .T.
@@ -1134,7 +1135,7 @@ DEFINE CLASS splitter2 AS shape && Up-Down Splitter class. Support ActiveX con
*</DefinedPropArrayMethod>
HIDDEN hiddencontrols
- PROTECTED Init,MouseDown
+ PROTECTED Init,mousedown
*<PropValue>
Height = 4
MousePointer = 7