diff --git a/.gitignore b/.gitignore index 4e9d227..88abf63 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,6 @@ bash.exe.stackdump # --- COMUN este gestionat separat, prin propriul sau git (romfast/comun.git) --- COMUN/ + +# Patch-uri intermediare de review (reguli_lucru.md pct. 1) - raman doar local +docs/diff_runda*.patch diff --git a/Clase/oimobilizari.vc2 b/Clase/oimobilizari.vc2 index 366bb15..c0dcc08 100644 --- a/Clase/oimobilizari.vc2 +++ b/Clase/oimobilizari.vc2 @@ -2391,6 +2391,9 @@ DEFINE CLASS frm_introducere AS _frmbase OF "..\comun\clase\_frm_base.vcx" Thisform.clb_dataact.text_simplu1.Value = toMF.dataact Thisform.clb_valoare.text_simplu1.Value = toMF.valoare THISFORM.clb_cont.text_SIMPLU1.Value = toMF.cont + If Type('toMF.acont') = 'C' + Thisform.clb_cont.txtAcont.Value = Alltrim(Nvl(toMF.acont,'')) + Endif *!* 16.11.2009 thisform.clb_expl_mf.text_simplu1.Value = ALLTRIM(NVL(toMF.explicatia,'')) thisform.ed_denumire._edbase1.Value = ALLTRIM(NVL(toMF.explicatia,'')) @@ -3240,6 +3243,9 @@ DEFINE CLASS frm_introducere_curs AS _frmbase OF "..\comun\clase\_frm_base.vcx" Thisform.clb_dataact.text_simplu1.Value = toMF.dataact Thisform.clb_valoare.text_simplu1.Value = toMF.valoare THISFORM.clb_cont.text_SIMPLU1.Value = toMF.cont + If Type('toMF.acont') = 'C' + Thisform.clb_acont.text_simplu1.Value = Alltrim(Nvl(toMF.acont,'')) + Endif *!* 16.11.2009 thisform.clb_expl_op.text_simplu1.Value = ALLTRIM(NVL(toMF.explicatia,'')) thisform.ed_denumire._edbase1.Value = ALLTRIM(NVL(toMF.part,'')) @@ -8498,6 +8504,7 @@ DEFINE CLASS frm_lista_curs AS _frmbase OF "..\comun\clase\_frm_base.vcx" *< OBJECTDATA: ObjPath="_grdfooter1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="But_start_criterii1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="But_reset_criterii1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="But_verifica1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="Gridextra1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="Cmd_executa2" UniqueID="" Timestamp="" /> @@ -8516,7 +8523,7 @@ DEFINE CLASS frm_lista_curs AS _frmbase OF "..\comun\clase\_frm_base.vcx" FontCharSet = 238 Height = 582 Name = "frm_lista_curs" - ntip = 0 + ntip = 3 Width = 793 WindowState = 2 _SHAPE1.Anchor = 10 @@ -8618,6 +8625,13 @@ DEFINE CLASS frm_lista_curs AS _frmbase OF "..\comun\clase\_frm_base.vcx" Top = 0 *< END OBJECT: ClassLib="..\comun\clase\cmd_butoane.vcx" BaseClass="commandbutton" /> + ADD OBJECT 'But_verifica1' AS but_verifica WITH ; + Anchor = 8, ; + Left = 551, ; + Name = "But_verifica1", ; + Top = 0 + *< END OBJECT: ClassLib="..\comun\clase\cmd_butoane.vcx" BaseClass="commandbutton" /> + ADD OBJECT 'Cmd_executa1' AS cmd_executa WITH ; Anchor = 8, ; Caption = "\ '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 <> b on c.cont_amortizare = b.cont <> <> - where c.id_tip_imobilizare = <> < '303'], [])>> + where c.id_tip_imobilizare = <> <> < '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 ; diff --git a/changelog_roaimob.txt b/changelog_roaimob.txt index 3620a29..a8fa4d9 100644 --- a/changelog_roaimob.txt +++ b/changelog_roaimob.txt @@ -1,3 +1,17 @@ + +