diff --git a/Programe/oproceduri_imob.prg b/Programe/oproceduri_imob.prg index baaaa4d..1a8cf2d 100644 --- a/Programe/oproceduri_imob.prg +++ b/Programe/oproceduri_imob.prg @@ -6,6 +6,10 @@ *!* marius.mutu *!* preluare_imob, verificare_balanta se verifica contul 303 in functie de optiunea IMOB_OBI +*!* 10.09.2026 +*!* marius.mutu +*!* preluare_imob - se selecteaza si imobilizarile cu data achizitie din luni anterioare, inregistrate in luna curenta (factura primita mai tarziu) + #Define CRLF Chr(13) + Chr(10) Procedure viz_jurnal @@ -232,18 +236,30 @@ Procedure preluare_imob If m.llSucces - Select Cont, nract, data_achizitie, Sum(valoare) As valinv ; - From crsImobPreluare ; - Where ID_TIP_IMOBILIZARE = tnTip And iesit_din_gest = 0 And ; - Year(data_achizitie) * 12 + Month(data_achizitie) = m.gnAn * 12 + m.gnLuna ; - Group By Cont, nract, data_achizitie ; - Into Cursor cListaImob + If m.tnTip = 3 + * cursorul e deja filtrat pe luna curenta (data achizitie sau data operatie) + Select Cont, nract, data_achizitie, Sum(valoare) As valinv ; + From crsImobPreluare ; + Where ID_TIP_IMOBILIZARE = m.tnTip And iesit_din_gest = 0 ; + Group By Cont, nract, data_achizitie ; + Into Cursor cListaImob + Else + * intrate in luna curenta: fie data achizitie in luna, fie operatia de intrare (1,2,3) facuta acum cu factura mai veche + Select Cont, nract, data_achizitie, Sum(valoare) As valinv ; + From crsImobPreluare ; + Where ID_TIP_IMOBILIZARE = m.tnTip And iesit_din_gest = 0 And ; + (Year(data_achizitie) * 12 + Month(data_achizitie) = m.gnAn * 12 + m.gnLuna Or ; + (Inlist(id_tip_operatie, 1, 2, 3) And ; + Year(data_operatie) * 12 + Month(data_operatie) = m.gnAn * 12 + m.gnLuna)) ; + Group By Cont, nract, data_achizitie ; + Into Cursor cListaImob + Endif Use In (Select('crsImobPreluare')) 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) OR YEAR(a.dataact) = )And ALLTRIM(a.Cont) == ALLTRIM(i.Cont) ; + Ttod(a.dataact) = Ttod(i.data_achizitie) And Alltrim(a.Cont) == Alltrim(i.Cont) ; Order By 1, 2, 3 ; Into Cursor crsPreluare Readwrite diff --git a/changelog_roaimob.txt b/changelog_roaimob.txt index 86bc906..2abd566 100644 --- a/changelog_roaimob.txt +++ b/changelog_roaimob.txt @@ -1,3 +1,11 @@ + +