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

sync SVN r18093

Browse Source
This commit is contained in:
Marius Mutu
2026-09-10 16:10:35 +03:00
parent 71769711f4
commit 759810348d
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Programe/oproceduri_imob.prg
View File

@@ -6,6 +6,10 @@
*!* marius.mutu *!* marius.mutu
*!* preluare_imob, verificare_balanta se verifica contul 303 in functie de optiunea IMOB_OBI *!* 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) #Define CRLF Chr(13) + Chr(10)
Procedure viz_jurnal Procedure viz_jurnal
@@ -232,18 +236,30 @@ Procedure preluare_imob
If m.llSucces If m.llSucces
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 ; Select Cont, nract, data_achizitie, Sum(valoare) As valinv ;
From crsImobPreluare ; From crsImobPreluare ;
Where ID_TIP_IMOBILIZARE = tnTip And iesit_din_gest = 0 And ; Where ID_TIP_IMOBILIZARE = m.tnTip And iesit_din_gest = 0 ;
Year(data_achizitie) * 12 + Month(data_achizitie) = m.gnAn * 12 + m.gnLuna ;
Group By Cont, nract, data_achizitie ; Group By Cont, nract, data_achizitie ;
Into Cursor cListaImob 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')) 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 ; 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) 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 ; Order By 1, 2, 3 ;
Into Cursor crsPreluare Readwrite Into Cursor crsPreluare Readwrite

8
changelog_roaimob.txt
View File

@@ -1,3 +1,11 @@
<!--
10/09/2026
ROAIMOB - 2.1.46
:modificare:
La preluarea din contabilitate se selecteaza si imobilizarile cu data achizitie din luni anterioare, inregistrate in luna curenta (factura primita mai tarziu).
-->
<!-- <!--
24/08/2026 24/08/2026
ROAIMOB - 2.1.45 ROAIMOB - 2.1.45