romfast/roaimob
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync SVN r18202

Browse Source
This commit is contained in:
Marius Mutu
2026-09-24 23:07:56 +03:00
parent e8def3771f
commit fa7bbcf2f6
7 changed files with 1108 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Clase/oimobilizari.vc2
View File

@@ -4421,7 +4421,7 @@ DEFINE CLASS frm_jurnal AS _frmbase OF "..\comun\clase\_frm_base.vcx"
lcFiltru = m.lcFiltru + [ AND ID_SUCURSALA = ] + Alltrim(Str(m.gnIdSucursala))
Endif
If Len(Thisform.filtru_pretty) > 0
If Len(Thisform.filtru_pretty) > 0 And !(Thisform.filtru_pretty == "none")
lcFiltru = m.lcFiltru + " and (" + Alltrim(Thisform.filtru_pretty) + ")"
Endif
@@ -7501,7 +7501,7 @@ DEFINE CLASS frm_lista AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Endif
If Len(Thisform.filtru_pretty) > 0
If Len(Thisform.filtru_pretty) > 0 And !(Thisform.filtru_pretty == "none")
lcFiltru = m.lcFiltru + " and (" + Alltrim(Thisform.filtru_pretty) + ")"
Endif
@@ -7856,7 +7856,7 @@ DEFINE CLASS frm_lista AS _frmbase OF "..\comun\clase\_frm_base.vcx"
IIF(This.nfiscal = 1, "", ";\-;Situatia reevaluarilor - imobilizarile selectate;Situatia reevaluarilor - imobilizarile " + ;
IIF(nc = 1, "corporale","necorporale") + ";\-;Situatia majorarilor - imobilizarile selectate;Situatia majorarilor - imobilizarile " + ;
IIF(nc = 1, "corporale","necorporale") + ";\-;Situatia modificarilor - imobilizarile selectate;Situatia modificarilor - imobilizarile " + ;
IIF(nc = 1, "corporale","necorporale")))
IIF(nc = 1, "corporale","necorporale")) + ";\-;Proces-verbal de casare")
If Empty(m.lnOptiune)
Return
@@ -7874,6 +7874,9 @@ DEFINE CLASS frm_lista AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Do Case
CASE m.lnOptiune = IIF(This.nfiscal = 1, 9, 18)
do listare_pvcasare_mf with m.lcfiltru in oproceduri_listari.prg
Case m.lnOptiune = 1
lnSucces = update_calendar()
@@ -9268,7 +9271,7 @@ DEFINE CLASS frm_lista_curs AS _frmbase OF "..\comun\clase\_frm_base.vcx"
lcFiltru = "(1=1)"
ENDIF
If Len(Thisform.filtru_pretty) > 0
If Len(Thisform.filtru_pretty) > 0 And !(Thisform.filtru_pretty == "none")
lcFiltru = lcFiltru + ' and ' + Alltrim(Thisform.filtru_pretty)
Endif