From 71769711f4bd97b2c69be27134adfc71fbca9d6e Mon Sep 17 00:00:00 2001 From: Marius Mutu Date: Thu, 10 Sep 2026 15:32:33 +0300 Subject: [PATCH] sync SVN r18091 --- Programe/oproceduri_imob.prg | 6 ++++-- roaimob.pj2 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Programe/oproceduri_imob.prg b/Programe/oproceduri_imob.prg index 4785757..baaaa4d 100644 --- a/Programe/oproceduri_imob.prg +++ b/Programe/oproceduri_imob.prg @@ -208,8 +208,10 @@ Procedure preluare_imob lcCursor = 'crsImobPreluare' 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 ] + ; - [ 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) ELSE 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 ; 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 ; Into Cursor crsPreluare Readwrite diff --git a/roaimob.pj2 b/roaimob.pj2 index 252388a..d1c8fe4 100644 --- a/roaimob.pj2 +++ b/roaimob.pj2 @@ -25,7 +25,7 @@ _LegalTrademark = "" _ProductName = "ROA - Imobilizari" _MajorVer = "2" _MinorVer = "1" -_Revision = "45" +_Revision = "46" _LanguageID = "Romana" _AutoIncrement = "0" *