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

sync SVN r18091

Browse Source
This commit is contained in:
Marius Mutu
2026-09-10 15:32:33 +03:00
parent 655ad82b22
commit 71769711f4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Programe/oproceduri_imob.prg
View File

@@ -208,8 +208,10 @@ Procedure preluare_imob
lcCursor = 'crsImobPreluare' lcCursor = 'crsImobPreluare'
If tnTip = 3 && IMOBILIZARI IN CURS If tnTip = 3 && IMOBILIZARI IN CURS
* data achizitie din luna in curs sau poate data achizitie din alta luna, dar data operatie din luna in curs si an, luna inceput = luna in curs
lcSel = [select 3 as id_tip_imobilizare, 0 as iesit_din_gest, cont, nract,data_achizitie, valoare ] + ; lcSel = [select 3 as id_tip_imobilizare, 0 as iesit_din_gest, cont, nract,data_achizitie, valoare ] + ;
[ from imob_vlista_curs WHERE TO_CHAR(DATA_ACHIZITIE,'MM/YYYY') = '] + Padl(gnLuna, 2, '0') + '/' + Padl(gnAn, 4, '0') + ['] + gcCondSucursala [ from imob_vlista_curs WHERE (TO_CHAR(DATA_ACHIZITIE,'MM/YYYY') = '] + Padl(gnLuna, 2, '0') + '/' + Padl(gnAn, 4, '0') + [' or ] + ;
[ (an = ?gnAn and luna = ?gnLuna and TO_CHAR(DATA_OPERATIE,'MM/YYYY') = '] + Padl(gnLuna, 2, '0') + '/' + Padl(gnAn, 4, '0') + ['))] + gcCondSucursala
llSucces = goExecutor.oExecuta(lcSel, lcCursor) llSucces = goExecutor.oExecuta(lcSel, lcCursor)
ELSE ELSE
llExperimental = .T. && 25.11.2021 llExperimental = (goApp.nExperimental = 1) llExperimental = .T. && 25.11.2021 llExperimental = (goApp.nExperimental = 1)
@@ -241,7 +243,7 @@ Procedure preluare_imob
Select tnTip As tip, Ttod(a.dataact) As dataact, a.nract, a.Part, a.Cont, a.acont, a.explicatia, a.suma_act, Nvl(i.valinv, Cast(0 As N(18, 4))) As suma_imob, (a.suma_act = Nvl(i.valinv, 0)) As introdus ; Select tnTip As tip, Ttod(a.dataact) As dataact, a.nract, a.Part, a.Cont, a.acont, a.explicatia, a.suma_act, Nvl(i.valinv, Cast(0 As N(18, 4))) As suma_imob, (a.suma_act = Nvl(i.valinv, 0)) As introdus ;
From cListaAct a Left Join cListaImob i On a.nract = i.nract And ; From cListaAct a Left Join cListaImob i On a.nract = i.nract And ;
Ttod(a.dataact) = Ttod(i.data_achizitie) And ALLTRIM(a.Cont) == ALLTRIM(i.Cont) ; (Ttod(a.dataact) = Ttod(i.data_achizitie) OR YEAR(a.dataact) = )And ALLTRIM(a.Cont) == ALLTRIM(i.Cont) ;
Order By 1, 2, 3 ; Order By 1, 2, 3 ;
Into Cursor crsPreluare Readwrite Into Cursor crsPreluare Readwrite

2
roaimob.pj2
View File

@@ -25,7 +25,7 @@ _LegalTrademark = ""
_ProductName = "ROA - Imobilizari" _ProductName = "ROA - Imobilizari"
_MajorVer = "2" _MajorVer = "2"
_MinorVer = "1" _MinorVer = "1"
_Revision = "45" _Revision = "46"
_LanguageID = "Romana" _LanguageID = "Romana"
_AutoIncrement = "0" _AutoIncrement = "0"
*</DevInfo> *</DevInfo>