Preluare cont analitic, verificare balanta imobilizari in curs, calcul valoare noua la majorare (2.1.44)

- preluare_imob: aduce ascd (cont analitic) din nota contabila si il
  populeaza in frm_introducere / frm_introducere_curs la preluare
- verificare_balanta: accepta tip 3 (fara ramura amortizare, comparatie
  pe valoare_ramasa); frm_lista_curs: ntip=3, buton But_verifica1 si
  metoda do_verifica
- frm_op_majorare: recalculul valorii noi de intrare se face pe Valid
  (la InteractiveChange variabila din ControlSource nu e inca scrisa)
- changelog 2.1.44; .gitignore: patch-urile docs/diff_runda* raman local

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CpPGRsKnGofcJRQJ9euEre
This commit is contained in:
2026-07-24 13:46:29 +03:00
parent 6b58e92c13
commit 7364ca2abd
4 changed files with 43 additions and 6 deletions

View File

@@ -188,6 +188,7 @@ Procedure preluare_imob
SELECT dataact,
nract,
scd as cont,
max(ascd) as acont,
max(P.DENUMIRE) as part,
max(explicatia) as explicatia,
sum(suma) as suma_act,
@@ -238,7 +239,7 @@ Procedure preluare_imob
Use In (Select('crsImobPreluare'))
Select tnTip As tip, Ttod(a.dataact) As dataact, a.nract, a.Part, a.Cont, 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 ;
Ttod(a.dataact) = Ttod(i.data_achizitie) And ALLTRIM(a.Cont) == ALLTRIM(i.Cont) ;
Order By 1, 2, 3 ;
@@ -451,7 +452,7 @@ Procedure verificare_balanta(tnTip, tnAn, tnLuna)
lcMesaj = ''
llImobObiecteInventar = .F. && daca verific si contul 303 (obiecte de inventar)
lnTipImobilizare = Iif(Type('tnTip') <> 'N', 1, Iif(Inlist(tnTip, 1, 2), tnTip, 1))
lnTipImobilizare = Iif(Type('tnTip') <> 'N', 1, Iif(Inlist(tnTip, 1, 2, 3), tnTip, 1))
If Pcount() < 3
lnAn = gnAn
@@ -480,7 +481,7 @@ select 2 as tip, c.cont, c.cont_amortizare,
b.soldcred as sold
from imob_conturi c
left join <<Iif(glEMama,'vbalmama','vbal')>> b on c.cont_amortizare = b.cont <<lcCondSucursala>> <<Iif(!glEMama, ' and b.an = ' + Alltrim(Str(lnAn)) + ' and b.luna = ' + Alltrim(Str(lnLuna)),'')>>
where c.id_tip_imobilizare = <<lnTipImobilizare>> <<IIF(!m.llImobObiecteInventar, [ and c.cont <> '303'], [])>>
where c.id_tip_imobilizare = <<lnTipImobilizare>> <<Iif(m.lnTipImobilizare = 3, [ and 1 = 0], [])>> <<IIF(!m.llImobObiecteInventar, [ and c.cont <> '303'], [])>>
order by 1,2
Endtext
@@ -507,7 +508,7 @@ order by 1,2
ENDIF
If m.llSucces
Select Cont, Sum(valoare) As valinv, Sum(amort_prec + rata) As amorttot ;
Select Cont, Sum(Iif(m.lnTipImobilizare = 3, valoare_ramasa, valoare)) As valinv, Sum(amort_prec + rata) As amorttot ;
From crsListaVerificare ;
Where ID_TIP_IMOBILIZARE = lnTipImobilizare And iesit_din_gest = 0;
Group By Cont ;