sync SVN r18224

This commit is contained in:
2026-09-29 16:36:55 +03:00
parent ca8e7ca694
commit 1ae4086ee6
14 changed files with 1092 additions and 9 deletions

View File

@@ -9591,6 +9591,7 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
*< OBJECTDATA: ObjPath="chkDeCompletat" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="lblCoadaAntet" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Lb_shortcuts2" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Sfsplitterv1" UniqueID="" Timestamp="" />
*<DefinedPropArrayMethod>
*m: actualizeazacontoare
@@ -10813,7 +10814,7 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
FontSize = 10, ;
GridLineColor = 192,192,192, ;
HeaderHeight = 35, ;
Height = 294, ;
Height = 292, ;
lcamptextneeditabil = .F., ;
Left = 7, ;
Name = "grdFacturi", ;
@@ -11818,6 +11819,22 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
ZOrderSet = 21
*< END OBJECT: ClassLib="_baza.vcx" BaseClass="label" />
ADD OBJECT 'Sfsplitterv1' AS sfsplitterv_panou WITH ;
Anchor = 10, ;
cinicheie = import_splitter_top, ;
cinisectiune = efactura, ;
cobject1name = grdFacturi, ;
cobject2name = grdDetaliiFacturi, ;
Height = 5, ;
Left = 7, ;
Name = "Sfsplitterv1", ;
nobject1minsize = 100, ;
nobject2minsize = 60, ;
Top = 364, ;
Width = 884, ;
gripper.Name = "gripper"
*< END OBJECT: ClassLib="sfsplitter.vcx" BaseClass="control" />
ADD OBJECT 'txtAcont' AS _textbox WITH ;
Anchor = 0, ;
ControlSource = "crsFacturi.Acont", ;
@@ -12550,6 +12567,13 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
loRecunoastere = Createobject('RecunoastereArticolEF')
llSuccesPotrivire = loRecunoastere.PotrivesteFactura(m.lnIdEFactura, m.lcCodFiscal, m.llPrimite, m.lnIdPart)
* achizitii: linia de discount/reducere se conteaza pe 767, nu pe contul articolului sau al furnizorului
IF m.llPrimite
Update crsDetaliiFacturi Set cont = '767', acont = '' ;
Where id_efactura = m.lnIdEFactura And Empty(Nvl(cont,'')) And Nvl(valoarefaratva,0) < 0 ;
And ('DISCOUNT' $ Upper(articol) Or 'REDUCER' $ Upper(articol))
ENDIF
IF m.llSuccesPotrivire
Select crsDetaliiFacturi
Scan For Empty(Nvl(id_articol,0)) OR m.llCompleteazaCont OR m.llCompleteazaGestiune
@@ -12797,6 +12821,7 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
IF Used('cAnaliticCerut')
Use In cAnaliticCerut
ENDIF
This.Sfsplitterv1.SavePosition()
ENDPROC
PROCEDURE do_anulare_lot
@@ -14903,6 +14928,12 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
Return Iif(Thisform.WindowState = 2, 0, Thisform.Top) + Thisform.grdFacturi.Top + Thisform.grdFacturi.HeaderHeight + 6 * Thisform.grdFacturi.RowHeight
ENDPROC
PROCEDURE Resize
DODEFAULT()
*!* restaureaza pozitia splitterului o singura data, dupa ce maximizarea a adus grdDetaliiFacturi la inaltimea reala
This.Sfsplitterv1.RestorePosition()
ENDPROC
PROCEDURE scrienote
ENDPROC