From c6e401c40849d027230b762de947abdace3ac5df Mon Sep 17 00:00:00 2001 From: Marius Mutu Date: Mon, 24 Aug 2026 19:28:22 +0300 Subject: [PATCH] sync SVN r18057 --- Clase/oimobilizari.vc2 | 33 ++- Meniuri/Vechi/editscurt.MNT | Bin 744 -> 0 bytes Meniuri/Vechi/editscurt.mnx | Bin 1465 -> 0 bytes Meniuri/Vechi/listcorp.mn2 | 135 --------- Meniuri/Vechi/listincurs.mn2 | 41 --- Meniuri/Vechi/listnecorp.mn2 | 126 -------- Meniuri/Vechi/mfix2000.mn2 | 421 --------------------------- Meniuri/Vechi/sitana.mn2 | 31 -- changelog_roaimob.txt | 8 + teste/test_chk_amort_introducere.prg | 196 +++++++++++++ teste/test_init_env_auto_roaimob.prg | 239 +++++++++++++++ 11 files changed, 475 insertions(+), 755 deletions(-) delete mode 100644 Meniuri/Vechi/editscurt.MNT delete mode 100644 Meniuri/Vechi/editscurt.mnx delete mode 100644 Meniuri/Vechi/listcorp.mn2 delete mode 100644 Meniuri/Vechi/listincurs.mn2 delete mode 100644 Meniuri/Vechi/listnecorp.mn2 delete mode 100644 Meniuri/Vechi/mfix2000.mn2 delete mode 100644 Meniuri/Vechi/sitana.mn2 create mode 100644 teste/test_chk_amort_introducere.prg create mode 100644 teste/test_init_env_auto_roaimob.prg diff --git a/Clase/oimobilizari.vc2 b/Clase/oimobilizari.vc2 index c0dcc08..48e03c9 100644 --- a/Clase/oimobilizari.vc2 +++ b/Clase/oimobilizari.vc2 @@ -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="" /> * @@ -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 diff --git a/Meniuri/Vechi/editscurt.MNT b/Meniuri/Vechi/editscurt.MNT deleted file mode 100644 index 876409de5692388d16e6b01060a7dafcfe776131..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 744 zcmZQzU=U|uU{D0&Q7{5Spb8BDgMbl;IpckUBZGZi{X(1208{}-a7KPnNpfikwlD*k zKu`f^jE!@CL1toAA{HYcZpckdiBHZisKlXwEhsg{CIy>zpazf$T=5_i3KEM;QUSE> BCk6lj diff --git a/Meniuri/Vechi/editscurt.mnx b/Meniuri/Vechi/editscurt.mnx deleted file mode 100644 index a3b1e272eb8a80e96423f9b72e2d37477476a37a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1465 zcmeH{KTpFj5XB7?1PG+^cPIlMU|>LMOQkX)xvon~b52wzNSzqEupuG%{=9S2G%*pM zfT#B4_;>ewj;(Z8N9{c!#C~gvSl9NB5b@|GT_%Qs-9p%|r!d#?IOj5#Kc}arxPf*89`?s~>R&=gIq38G)x-xb zHlg (Solo para binarios VFP 9 / Only for VFP 9 binaries) -* -*4 -*REPLACE - -* -DEFINE POPUP Shortcut SHORTCUT RELATIVE FROM MROW(),MCOL() -DEFINE BAR 1 OF Shortcut PROMPT "Cu Total \ - -* -PROCEDURE BAR_1_OF_Shortcut_FB2P - DO list_corp_general -ENDPROC && BAR_1_OF_Shortcut_FB2P - -PROCEDURE BAR_2_OF_Shortcut_FB2P - DO list_corp_peluni -ENDPROC && BAR_2_OF_Shortcut_FB2P - -PROCEDURE BAR_3_OF_Shortcut_FB2P - DO list_corp_pegrup -ENDPROC && BAR_3_OF_Shortcut_FB2P - -PROCEDURE BAR_4_OF_Shortcut_FB2P - DO list_corp_peSECTII -ENDPROC && BAR_4_OF_Shortcut_FB2P - -PROCEDURE BAR_6_OF_Shortcut_FB2P - DO lista_fiselor_corp_istoric -ENDPROC && BAR_6_OF_Shortcut_FB2P - -PROCEDURE BAR_1_OF_Listadeinv_FB2P - DO caut_alf WITH 'Numegest','numegest','NUMELE GESTIUNII','M.NUMEGEST' - IF buton=2 - RETURN - ENDIF - - SELE numegest - LOCATE FOR numegest=m.numegest - SCATTER MEMVAR - - - SELE mf - IF m.gest=-1 - SET FILTER TO fel=" " AND !CASAT AND !INACTIV - ELSE - SET FILTER TO gest=m.gest AND fel=" " AND !CASAT AND !INACTIV - ENDIF - - SET ORDER TO scdden - - REPORT FORM listmf_inv TO PRINTER PROMPT PREVIEW - SELECT mf - SET FILTER TO -ENDPROC && BAR_1_OF_Listadeinv_FB2P - -PROCEDURE BAR_2_OF_Listadeinv_FB2P - PRIVATE pddata - ldatacrt = "01/" + m.nl + "/" + m.an - pddata = GOMONTH(CTOD(ldatacrt),1) - 1 - - DO caut_alf WITH 'Numegest','numegest','NUMELE GESTIUNII','M.NUMEGEST' - IF buton=2 - RETURN - ENDIF - - SELE numegest - LOCATE FOR numegest=m.numegest - SCATTER MEMVAR - - - SELE mf - IF m.gest=-1 - SET FILTER TO fel=" " AND !CASAT AND !INACTIV - ELSE - SET FILTER TO gest=m.gest AND fel=" " AND !CASAT AND !INACTIV - ENDIF - - *SET ORDER TO scdden - Index On str(gest,4)+Str(Val(nrinv)) Tag SCDNRINV Of &LOC\&NFSCURT\TEMPO\mfi Ascending - - REPORT FORM nota_inv2005 TO PRINTER PROMPT PREVIEW - SET INDEX TO - SELECT mf - SET FILTER TO -ENDPROC && BAR_2_OF_Listadeinv_FB2P - -PROCEDURE BAR_9_OF_Shortcut_FB2P - DO evidenta_mf - -ENDPROC && BAR_9_OF_Shortcut_FB2P - -* diff --git a/Meniuri/Vechi/listincurs.mn2 b/Meniuri/Vechi/listincurs.mn2 deleted file mode 100644 index cfc5b4c..0000000 --- a/Meniuri/Vechi/listincurs.mn2 +++ /dev/null @@ -1,41 +0,0 @@ -*-------------------------------------------------------------------------------------------------------------------------------------------------------- -* (EN) AUTOGENERATED - ATTENTION!! - NOT INTENDED FOR EXECUTION!! USE ONLY FOR MERGING CHANGES AND STORING WITH SCM TOOLS!! -*-------------------------------------------------------------------------------------------------------------------------------------------------------- -*< FOXBIN2PRG: Version="1.21" SourceFile="listincurs.mnx" CPID="1252" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries) -* -*4 -*REPLACE - -* -DEFINE POPUP Shortcut SHORTCUT RELATIVE FROM MROW(),MCOL() -DEFINE BAR 1 OF Shortcut PROMPT "Model1" -ON SELECTION BAR 1 OF Shortcut DO BAR_1_OF_Shortcut_FB2P - -DEFINE BAR 2 OF Shortcut PROMPT "Model2" -ON SELECTION BAR 2 OF Shortcut DO BAR_2_OF_Shortcut_FB2P -ACTIVATE POPUP Shortcut - -* - -* -PROCEDURE BAR_1_OF_Shortcut_FB2P - Select mf - Set Filter To Upper(fel)="C" And !CASAT - *INDEX ON ALLTRIM(nrinv)+DTOS(dataact) TAG datapif of &loc\&nfscurt\tempo\mfi - Index On Padr(scd,4," ")+Str(Val(nrinv)) Tag SCDNRINV Of &LOC\&NFSCURT\TEMPO\mfi Ascending - Report Form listimobcurs To Printer Prompt Preview -ENDPROC && BAR_1_OF_Shortcut_FB2P - -PROCEDURE BAR_2_OF_Shortcut_FB2P - PRIVATE pddata - ldatacrt = "01/" + m.nl + "/" + m.an - pddata = GOMONTH(CTOD(ldatacrt),1) - 1 - - Select mf - Set Filter To Upper(fel)="C" And !CASAT - *INDEX ON ALLTRIM(nrinv)+DTOS(dataact) TAG datapif of &loc\&nfscurt\tempo\mfi - Index On str(gest,4)+Str(Val(nrinv)) Tag SCDNRINV Of &LOC\&NFSCURT\TEMPO\mfi Ascending - Report Form nota_inv2005 To Printer Prompt Preview -ENDPROC && BAR_2_OF_Shortcut_FB2P - -* diff --git a/Meniuri/Vechi/listnecorp.mn2 b/Meniuri/Vechi/listnecorp.mn2 deleted file mode 100644 index 40a209f..0000000 --- a/Meniuri/Vechi/listnecorp.mn2 +++ /dev/null @@ -1,126 +0,0 @@ -*-------------------------------------------------------------------------------------------------------------------------------------------------------- -* (EN) AUTOGENERATED - ATTENTION!! - NOT INTENDED FOR EXECUTION!! USE ONLY FOR MERGING CHANGES AND STORING WITH SCM TOOLS!! -*-------------------------------------------------------------------------------------------------------------------------------------------------------- -*< FOXBIN2PRG: Version="1.21" SourceFile="listnecorp.mnx" CPID="1252" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries) -* -*4 -*REPLACE - -* -DEFINE POPUP Shortcut SHORTCUT RELATIVE FROM MROW(),MCOL() -DEFINE BAR 1 OF Shortcut PROMPT "Cu Total \ - -* -PROCEDURE BAR_1_OF_Shortcut_FB2P - DO list_necorp_general -ENDPROC && BAR_1_OF_Shortcut_FB2P - -PROCEDURE BAR_2_OF_Shortcut_FB2P - DO list_necorp_peluni -ENDPROC && BAR_2_OF_Shortcut_FB2P - -PROCEDURE BAR_3_OF_Shortcut_FB2P - DO list_necorp_pegrup -ENDPROC && BAR_3_OF_Shortcut_FB2P - -PROCEDURE BAR_4_OF_Shortcut_FB2P - DO list_corp_peSECTII WITH 'N' -ENDPROC && BAR_4_OF_Shortcut_FB2P - -PROCEDURE BAR_6_OF_Shortcut_FB2P - DO lista_fiselor_necorp -ENDPROC && BAR_6_OF_Shortcut_FB2P - -PROCEDURE BAR_1_OF_Listadeinv_FB2P - - DO caut_alf WITH 'Numegest','numegest','NUMELE GESTIUNII','M.NUMEGEST' - IF buton=2 - RETURN - ENDIF - - SELE numegest - LOCATE FOR numegest=m.numegest - SCATTER MEMVAR - - - SELE mf - IF m.gest=-1 - SET FILTER TO UPPER(fel)='N' AND !CASAT AND !INACTIV - ELSE - SET FILTER TO gest=m.gest AND UPPER(fel)='N' AND !CASAT AND !INACTIV - ENDIF - SET ORDER TO scdden - - REPORT FORM listmf_inv TO PRINTER PROMPT PREVIEW - - SELECT mf - SET FILTER TO -ENDPROC && BAR_1_OF_Listadeinv_FB2P - -PROCEDURE BAR_2_OF_Listadeinv_FB2P - Private pddata - - ldatacrt = "01/" + m.nl + "/" + m.an - pddata = Gomonth(Ctod(ldatacrt),1) - 1 - - Do caut_alf With 'Numegest','numegest','NUMELE GESTIUNII','M.NUMEGEST' - If buton=2 - Return - Endif - - Sele numegest - Locate For numegest=m.numegest - Scatter Memvar - - Sele mf - If m.gest=-1 - Set Filter To fel="N" And !CASAT AND !INACTIV - Else - Set Filter To gest=m.gest And fel="N" And !CASAT AND !INACTIV - Endif - - Set Order To scdden - - Report Form nota_inv2005 To Printer Prompt Preview - Select mf - Set Filter To -ENDPROC && BAR_2_OF_Listadeinv_FB2P - -* diff --git a/Meniuri/Vechi/mfix2000.mn2 b/Meniuri/Vechi/mfix2000.mn2 deleted file mode 100644 index 9a0f313..0000000 --- a/Meniuri/Vechi/mfix2000.mn2 +++ /dev/null @@ -1,421 +0,0 @@ -*-------------------------------------------------------------------------------------------------------------------------------------------------------- -* (EN) AUTOGENERATED - ATTENTION!! - NOT INTENDED FOR EXECUTION!! USE ONLY FOR MERGING CHANGES AND STORING WITH SCM TOOLS!! -*-------------------------------------------------------------------------------------------------------------------------------------------------------- -*< FOXBIN2PRG: Version="1.21" SourceFile="mfix2000.mnx" CPID="1252" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries) -* -*1 -*REPLACE - -* -DEFINE MENU _msysmenu BAR -DEFINE PAD _000000001 OF _msysmenu PROMPT "\ - -* -PROCEDURE BAR_1_OF_OptiuniSis_FB2P - OSC=CREATE('schimbparola') - OSC.SHOW(1) -ENDPROC && BAR_1_OF_OptiuniSis_FB2P - -PROCEDURE BAR_2_OF_OptiuniSis_FB2P - OP=CREATE('parola') - OP.SHOW(1) - - if corect - or=create('redirect') - or.show(1) - endif - -ENDPROC && BAR_2_OF_OptiuniSis_FB2P - -PROCEDURE BAR_3_OF_Utile_FB2P - DO reindexare.prg WITH ['GCAPPPATH'$UPPER(CALEALFA)] -ENDPROC && BAR_3_OF_Utile_FB2P - -PROCEDURE BAR_5_OF_Utile_FB2P - do case - case file('C:\WINDOWS\CALC.EXE') - run /N C:\WINDOWS\CALC.EXE - case file('C:\WINDOWS\SYSTEM32\CALC.EXE') - run /N C:\WINDOWS\SYSTEM32\CALC.EXE - case file('C:\WINnt\system32\CALC.EXE') - run /N C:\WINnt\system32\CALC.EXE - otherwise - do mesajatent with 'Aplicatia "Calculator" nu este instalata','pe acest sistem!' - endcase -ENDPROC && BAR_5_OF_Utile_FB2P - -PROCEDURE BAR_6_OF_Utile_FB2P - ocal=crea('diary') - ocal.show(1) -ENDPROC && BAR_6_OF_Utile_FB2P - -PROCEDURE BAR_7_OF_Utile_FB2P - do case - case file('C:\WINDOWS\NOTEPAD.EXE') - run /N C:\WINDOWS\NOTEPAD.EXE - case file('C:\WINnt\system32\NOTEPAD.EXE') - run /N C:\WINnt\system32\NOTEPAD.EXE - otherwise - do mesajatent with 'Aplicatia "NOTEPAD" nu este instalata','pe acest sistem!' - endcase - -ENDPROC && BAR_7_OF_Utile_FB2P - -PROCEDURE BAR_9_OF_Utile_FB2P - quit -ENDPROC && BAR_9_OF_Utile_FB2P - -PROCEDURE BAR_1_OF_Initializa_FB2P - LOCAL LL,AA - LL=M.NL - AA=M.AN - - osp=crea('seriaper') - osp.show(1) - - M.AN=AA - M.NL=LL - *OSTART.SHOW(1) -ENDPROC && BAR_1_OF_Initializa_FB2P - -PROCEDURE BAR_4_OF_Initializa_FB2P - - PRIVATE pnLunaMax,pnAnMax,pnLunaNew,pnAnNew,pcLunaMax,pcAnMax,pcLunaNew,pcAnNew,pcNumeLuna - LOCAL lcAnCrt, lcLunaCrt - - lcAnCrt = m.an - lcLunaCrt = m.nl - - SELE CALENDAR - GOTO BOTTOM - - pcLunaMax = nl - pcAnMax = AN - pnLunaMax=VAL(pcLunaMax) - pnAnMax=VAL(pcAnMax) - - IF pnLunaMax = 12 THEN - pnAnNew = pnAnMax+1 - pnLunaNew = 1 - pcAnNew = ALLTRIM(STR(pnAnNew)) - pcLunaNew = '01' - ELSE - pnAnNew = pnAnMax - pnLunaNew = pnLunaMax + 1 - pcAnNew = pcAnMax - pcLunaNew = PADL(ALLTRIM(STR(pnLunaNew)),2,'0') - ENDIF - - SELE lunilean - SEEK(pcLunaNew) - pcNumeLuna = ALLTRIM(numeluna) - - oT=CREATEOBJ("TEXTR") - oT.LABEL2.CAPTION = "Deschidere de luna noua:" - oT.label3.CAPTION = 'Se deschide luna ' + pcNumeLuna + ' ' + pcAnNew + '?' - oT.label3.FONTBOLD= .T. - oT.SHOW(1) - - IF BUTON=2 - m.an = lcAnCrt - m.nl = lcLunaCrt - RETURN - ENDIF - - *DO DESCHIDL.PRG - DO deschid_luna_noua WITH pcAnNew, pcLunaNew IN redeschidere.prg - DO redeschid_luna WITH pcAnNew, pcLunaNew IN redeschidere.prg - - luna_neplatita=.T. - - OT1=CREATEOBJ("TEXT") - OT1.LABEL2.CAPTION= "Am deschis luna:" - OT1.label3.CAPTION= pcNumeLuna + ' ' + pcAnNew - OT1.label3.FONTBOLD=.T. - OT1.SHOW(1) - - lcFscurt = ALLTRIM(nfscurt) - lcFisS = "start_meniuri" - lcFisF = "sfirma" - adfirmaluna(lcFscurt,pcAnNew,pcLunaNew,lcFisS) - adfirmaluna(lcFscurt,pcAnNew,pcLunaNew,lcFisF) - - NUMEFIRMA=UPPER(RTRIM(m.flung)) - capapl = gcAppCaption + " Firma "+ NUMEFIRMA + "- Luna contabila: "+ pcNumeLuna + ' ' + pcAnNew - goApp.SetCaption(capapl) - - DO totv - - - - -ENDPROC && BAR_4_OF_Initializa_FB2P - -PROCEDURE BAR_5_OF_Initializa_FB2P - *do redeschid - DO redeschid_luna IN redeschidere.prg -ENDPROC && BAR_5_OF_Initializa_FB2P - -PROCEDURE BAR_6_OF_Initializa_FB2P - do form startfirma -ENDPROC && BAR_6_OF_Initializa_FB2P - -PROCEDURE BAR_1_OF_Blocaredel_FB2P - *!* orp=CREATE('parola') - *!* orp.SHOW(1) - *!* IF buton=3 - SELECT calendar - GO BOTTOM - DO FORM inchidluni - *!* ENDIF - - -ENDPROC && BAR_1_OF_Blocaredel_FB2P - -PROCEDURE BAR_10_OF_Initializa_FB2P - oge=create('afgest') - oge.show(1) -ENDPROC && BAR_10_OF_Initializa_FB2P - -PROCEDURE BAR_11_OF_Initializa_FB2P - ose=create('nom_sectii') - ose.show(1) -ENDPROC && BAR_11_OF_Initializa_FB2P - -PROCEDURE BAR_13_OF_Initializa_FB2P - DO FORM conversie -ENDPROC && BAR_13_OF_Initializa_FB2P - -PROCEDURE BAR_14_OF_Initializa_FB2P - DO FORM contamort -ENDPROC && BAR_14_OF_Initializa_FB2P - -PROCEDURE BAR_15_OF_Initializa_FB2P - DO FORM conversie_2005 -ENDPROC && BAR_15_OF_Initializa_FB2P - -PROCEDURE BAR_17_OF_Initializa_FB2P - opt = CREATEOBJECT('frm_optiuni') - opt.show(1) -ENDPROC && BAR_17_OF_Initializa_FB2P - -PROCEDURE BAR_1_OF_Ajutor_FB2P - *!* *oh=create('help_leg') - *!* *oh.show(1) - *!* IF FILE('&dirgen\imob2003\help\ajutor_imob.exe') - *!* CD &dirgen\imob2003\help - *!* RUN /n ajutor_imob.exe - *!* ELSE - *!* DO mesaj WITH 'Programul de ajutor nu a fost instalat','' - *!* endif - LOCAL cSite - cSite = ADDBS(dirgen)+"manual\prezentare_imob.htm" - IF !FILE(csite) - DO mesaj WITH "Nu a fost instalat manualul de utilizare","" - RETURN - ENDIF - oBrowser=CREATEOBJECT("internetexplorer.application") - oBrowser.Navigate(cSite) - oBrowser.Visible = .T. -ENDPROC && BAR_1_OF_Ajutor_FB2P - -PROCEDURE BAR_3_OF_Ajutor_FB2P - SELE norma - SCATTER NAME onorma BLANK - otr=CREATEOBJECT('normatree') - *otr.cmdtermin1.caption='\ diff --git a/Meniuri/Vechi/sitana.mn2 b/Meniuri/Vechi/sitana.mn2 deleted file mode 100644 index 757d805..0000000 --- a/Meniuri/Vechi/sitana.mn2 +++ /dev/null @@ -1,31 +0,0 @@ -*-------------------------------------------------------------------------------------------------------------------------------------------------------- -* (EN) AUTOGENERATED - ATTENTION!! - NOT INTENDED FOR EXECUTION!! USE ONLY FOR MERGING CHANGES AND STORING WITH SCM TOOLS!! -*-------------------------------------------------------------------------------------------------------------------------------------------------------- -*< FOXBIN2PRG: Version="1.21" SourceFile="sitana.mnx" CPID="1252" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries) -* -*4 -*REPLACE - -* -DEFINE POPUP Shortcut SHORTCUT RELATIVE FROM MROW(),MCOL() -DEFINE BAR 1 OF Shortcut PROMPT "Inchidere Mijloace Fixe" ; - SKIP FOR e_independent -ON SELECTION BAR 1 OF Shortcut DO BAR_1_OF_Shortcut_FB2P - -DEFINE BAR 2 OF Shortcut PROMPT "Inchidere Imobilizari necorporale" ; - SKIP FOR e_independent -ON SELECTION BAR 2 OF Shortcut DO BAR_2_OF_Shortcut_FB2P -ACTIVATE POPUP Shortcut - -* - -* -PROCEDURE BAR_1_OF_Shortcut_FB2P - DO list_inchid_amortizari -ENDPROC && BAR_1_OF_Shortcut_FB2P - -PROCEDURE BAR_2_OF_Shortcut_FB2P - DO list_inchid_amortizari_nec -ENDPROC && BAR_2_OF_Shortcut_FB2P - -* diff --git a/changelog_roaimob.txt b/changelog_roaimob.txt index a8fa4d9..86bc906 100644 --- a/changelog_roaimob.txt +++ b/changelog_roaimob.txt @@ -1,3 +1,11 @@ + +