sync SVN r18031

This commit is contained in:
2026-08-20 23:14:53 +03:00
parent 58d4c4a891
commit 03d23222ec
3 changed files with 107 additions and 4 deletions

View File

@@ -16878,13 +16878,17 @@ DEFINE CLASS frm_sincronizare_articole AS frm_termin_renunt OF "_frm_child.vcx"
*<PropValue>
BorderStyle = 1
cDirectie = "RUL_SURSA"
cdirectie = "RUL_SURSA"
DoCreate = .T.
Height = 480
Name = "frm_sincronizare_articole"
oFormArticole = .F.
oformarticole = .F.
Width = 700
_shape1.Height = 29
_shape1.Left = 0
_shape1.Name = "_shape1"
_shape1.Top = 0
_shape1.Width = 708
_shape1.ZOrderSet = 1
_shape2.Height = 29
_shape2.Left = 636
@@ -16926,13 +16930,17 @@ DEFINE CLASS frm_sincronizare_articole AS frm_termin_renunt OF "_frm_child.vcx"
Top = 108, ;
Width = 668, ;
ZOrderSet = 2, ;
Column1.ColumnOrder = 1, ;
Column1.ControlSource = "ALLTRIM(propunere_afisata.denumire) + ' (' + ALLTRIM(propunere_afisata.codmat) + ')'", ;
Column1.DynamicForeColor = "IIF(ALLTRIM(propunere_afisata.actiune)='N-A',RGB(150,150,150),RGB(0,0,0))", ;
Column1.FontSize = 9, ;
Column1.Name = "cArticolProp", ;
Column1.ReadOnly = .T., ;
Column1.Width = 180, ;
Column2.ColumnOrder = 2, ;
Column2.ControlSource = "propunere_afisata.cantitate_veche", ;
Column2.DynamicForeColor = "IIF(ALLTRIM(propunere_afisata.actiune)='N-A',RGB(150,150,150),RGB(0,0,0))", ;
Column2.FontSize = 9, ;
Column2.Format = "R", ;
Column2.InputMask = (get_mask(12,gnPCANT)), ;
Column2.Name = "cCantVecheProp", ;
@@ -16940,6 +16948,7 @@ DEFINE CLASS frm_sincronizare_articole AS frm_termin_renunt OF "_frm_child.vcx"
Column2.Width = 100, ;
Column3.ControlSource = "propunere_afisata.cantitate_noua", ;
Column3.DynamicForeColor = "IIF(ALLTRIM(propunere_afisata.actiune)='N-A',RGB(150,150,150),RGB(0,0,0))", ;
Column3.FontSize = 9, ;
Column3.Format = "R", ;
Column3.InputMask = (get_mask(12,gnPCANT)), ;
Column3.Name = "cCantNouaProp", ;
@@ -16947,6 +16956,7 @@ DEFINE CLASS frm_sincronizare_articole AS frm_termin_renunt OF "_frm_child.vcx"
Column3.Width = 100, ;
Column4.ControlSource = "propunere_afisata.pret_vechi", ;
Column4.DynamicForeColor = "IIF(ALLTRIM(propunere_afisata.actiune)='N-A',RGB(150,150,150),RGB(0,0,0))", ;
Column4.FontSize = 9, ;
Column4.Format = "R", ;
Column4.InputMask = (get_mask(12,gnPPRET)), ;
Column4.Name = "cPretVechiProp", ;
@@ -16954,6 +16964,7 @@ DEFINE CLASS frm_sincronizare_articole AS frm_termin_renunt OF "_frm_child.vcx"
Column4.Width = 100, ;
Column5.ControlSource = "propunere_afisata.pret_nou", ;
Column5.DynamicForeColor = "IIF(ALLTRIM(propunere_afisata.actiune)='N-A',RGB(150,150,150),RGB(0,0,0))", ;
Column5.FontSize = 9, ;
Column5.Format = "R", ;
Column5.InputMask = (get_mask(12,gnPPRET)), ;
Column5.Name = "cPretNouProp", ;
@@ -16961,6 +16972,7 @@ DEFINE CLASS frm_sincronizare_articole AS frm_termin_renunt OF "_frm_child.vcx"
Column5.Width = 100, ;
Column6.ControlSource = "propunere_afisata.actiune", ;
Column6.DynamicForeColor = "IIF(ALLTRIM(propunere_afisata.actiune)='N-A',RGB(150,150,150),RGB(0,0,0))", ;
Column6.FontSize = 9, ;
Column6.Name = "cActiuneProp", ;
Column6.ReadOnly = .T., ;
Column6.Width = 88
@@ -16975,6 +16987,7 @@ DEFINE CLASS frm_sincronizare_articole AS frm_termin_renunt OF "_frm_child.vcx"
*< END OBJECT: BaseClass="header" />
ADD OBJECT 'grdPropunere.cArticolProp.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Articol", ;
FontName = "Arial", ;
FontSize = 9, ;
@@ -17052,7 +17065,7 @@ DEFINE CLASS frm_sincronizare_articole AS frm_termin_renunt OF "_frm_child.vcx"
OPTION2.Top = 24
*< END OBJECT: ClassLib="_baza.vcx" BaseClass="optiongroup" />
PROCEDURE ActualizeazaCapeteColoane
PROCEDURE actualizeazacapetecoloane
*!* capetele coloanelor spun singure ce e sursa si ce se suprascrie, in loc de "vechi/nou" plus o
*!* legenda separata - se refac la fiecare schimbare de directie
LOCAL lcTinta, lcSursa
@@ -17066,7 +17079,7 @@ DEFINE CLASS frm_sincronizare_articole AS frm_termin_renunt OF "_frm_child.vcx"
ENDWITH
ENDPROC
PROCEDURE ConstruiesteEnumerare
PROCEDURE construiesteenumerare
*!* propunere_sincronizare se recreeaza la fiecare apel, deci gridul nu poate sta legat de el;
*!* continutul se copiaza in propunere_afisata, cursorul stabil creat in Load
LOCAL lnAreaOrigine, lnAplicabile