sync SVN r18057

This commit is contained in:
2026-08-24 19:28:22 +03:00
parent 5d60d96d50
commit c6e401c408
11 changed files with 475 additions and 755 deletions

View File

@@ -1428,6 +1428,7 @@ DEFINE CLASS frm_introducere AS _frmbase OF "..\comun\clase\_frm_base.vcx"
*< OBJECTDATA: ObjPath="Clb_TVA" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Clb_prorataTVA" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Clb_amort_max_deductibil" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="chk_amort_max_deductibil" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="clb_valoare_reziduala" UniqueID="" Timestamp="" />
*<DefinedPropArrayMethod>
@@ -1565,6 +1566,15 @@ DEFINE CLASS frm_introducere AS _frmbase OF "..\comun\clase\_frm_base.vcx"
_LBBASE1.Name = "_LBBASE1"
*< END OBJECT: ClassLib="..\comun\clase\lb_tx.vcx" BaseClass="container" />
ADD OBJECT 'chk_amort_max_deductibil' AS _checkbox WITH ;
Alignment = 0, ;
Caption = "", ;
Left = 516, ;
Name = "chk_amort_max_deductibil", ;
Top = 180, ;
Value = .F.
*< END OBJECT: ClassLib="..\comun\clase\_baza.vcx" BaseClass="checkbox" />
ADD OBJECT 'ck_buncapital' AS _checkbox WITH ;
Alignment = 0, ;
Caption = "Bun de capital", ;
@@ -2129,6 +2139,7 @@ DEFINE CLASS frm_introducere AS _frmbase OF "..\comun\clase\_frm_base.vcx"
lcProrataTVA = Alltrim(Transform(Thisform.clb_prorataTVA.text_simplu1.Value))
pnAmortMaxDeductibil = Thisform.clb_amort_max_deductibil.text_simplu1.Value
pcAmortMaxDeductibil = Iif(Isnull(m.pnAmortMaxDeductibil), 'NULL', Alltrim(Str(m.pnAmortMaxDeductibil, 14, m.gnPC)))
pnValoareReziduala = Thisform.clb_valoare_reziduala.text_simplu1.Value
If Thisform.ntipmodificare = 4
@@ -2236,7 +2247,7 @@ DEFINE CLASS frm_introducere AS _frmbase OF "..\comun\clase\_frm_base.vcx"
IIF(Nvl(m.pnid_sucursala, 0) = 0, 'NULL', Alltrim(Str(m.pnid_sucursala))) + [,] + ;
ALLTRIM(Str(m.pnid_tip_amortizare)) + [,] + Alltrim(Str(m.pnprocent, 6, 2)) + [,] + Iif(Type('pncoeficient') = 'N', Alltrim(Str(m.pncoeficient, 6, 2)), 'NULL') + [,] + ;
ALLTRIM(Str(m.pnid_tip_imobilizare)) + [,'] + Alltrim(m.pccont) + [',] + ;
['] + Nvl(Alltrim(m.pcacont), []) + [',] + Alltrim(Str(m.gnIdUtil)) + [,] + Alltrim(Str(m.pnAmortMaxDeductibil, 14, m.gnPC)) + ;
['] + Nvl(Alltrim(m.pcacont), []) + [',] + Alltrim(Str(m.gnIdUtil)) + [,] + m.pcAmortMaxDeductibil + ;
[,0,?pnTipOperatie,?pcExplicOp,] + m.lcBunCapital + [,] + m.lcBazatva + [,] + m.lcTva + [,] + m.lcId_cotatva + [,] + m.lcProrataTVA + [); end;]
llSucces = goExecutor.oExecuta(lcsql)
@@ -2427,6 +2438,15 @@ DEFINE CLASS frm_introducere AS _frmbase OF "..\comun\clase\_frm_base.vcx"
this.clb_nr_inventar.text_simplu1.Value = m.lnNrInventar
ENDIF
*!* 11.11.2009
* (Dez)activez amortizarea maxima deductibila in functie de valoare
Local llAmortMaxDeductibilIsNull
If tnTipModificare = 1
Thisform.clb_amort_max_deductibil.text_simplu1.Value = NULL
Endif
llAmortMaxDeductibilIsNull = ISNULL(Thisform.clb_amort_max_deductibil.text_simplu1.Value)
Thisform.chk_amort_max_deductibil.Value = !m.llAmortMaxDeductibilIsNull
Thisform.clb_amort_max_deductibil.text_simplu1.ReadOnly = m.llAmortMaxDeductibilIsNull
ENDPROC
PROCEDURE Cb_cotaTva._CBBASE1.LostFocus
@@ -2463,6 +2483,17 @@ DEFINE CLASS frm_introducere AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Endif
ENDPROC
PROCEDURE chk_amort_max_deductibil.Valid
* (Dez)activez amortizarea maxima deductibila in functie de checkbox
Thisform.clb_amort_max_deductibil.text_simplu1.ReadOnly = !This.Value
IF !This.value
Thisform.clb_amort_max_deductibil.text_simplu1.Value = NULL
ELSE
Thisform.clb_amort_max_deductibil.text_simplu1.Value = 0
ENDIF
Thisform.clb_amort_max_deductibil.text_simplu1.Refresh()
ENDPROC
PROCEDURE ck_buncapital.Click
If this.Value = 1
thisform.Height=539