sync SVN r18180

clase/omodificari.vc2

@@ -6849,6 +6849,7 @@ DEFINE CLASS frm_modific2024 AS _frmbase OF "_frm_base.vcx"
 		*p: lrulajustat
 		*p: lverificare
 		*p: lvizualizare
+		*p: ncolorbuget
 		*p: ncontorautosalvare
 		*p: nidvanzare
 		*p: nid_set
@@ -6894,6 +6895,7 @@ DEFINE CLASS frm_modific2024 AS _frmbase OF "_frm_base.vcx"
 		lverificare = .F.
 		lvizualizare = .F.
 		Name = "frm_modific2024"
+		ncolorbuget = 0
 		ncontorautosalvare = 0
 		nidvanzare = 0
 		nid_set = 0
@@ -15173,9 +15175,13 @@ DEFINE CLASS frm_modific2024 AS _frmbase OF "_frm_base.vcx"
 			this.grid1.Column1.ControlSource = "IIF(tact.npoz > 0, TRANSFORM(tact.npoz) + tact.csursa_f, NRCRT())"
 			this.grid1.Column1.DynamicBackColor = "IIF(tact.npoz > 0, IIF(MOD(tact.ngrupa,2)=1, RGB(198,224,255), RGB(225,210,255)), IIF(ALES, RGB(255,255,225), RGB(255,255,255)))"
 		ENDIF
+		*!* 18.09.2026
+		*!* marius.mutu
+		*!* culoare comuna label/buton cu randul de plata la buget nedefalcat din grid; cursor mana pe label
 		IF This.lActivExtrase AND Type('tact.cbuget') = 'C'
 			LOCAL lcSqlBuget, lnSuccesBuget, lnColBuget, loColBuget, lcExprBuget, lcCtrlBuget
 			This.cContBugetAnalitic = ','
+			This.nColorBuget = RGB(255,200,200)
 			lcSqlBuget = [select distinct cont from ] + gcS + [.vplcont_analitic where cont in ('4423','436') and inactiv = 0 and an = ?gnAn]
 			lnSuccesBuget = goExecutor.oExecute(lcSqlBuget, 'crsContBugetAn')
 			IF m.lnSuccesBuget >= 0 AND USED('crsContBugetAn')
@@ -15186,14 +15192,20 @@ DEFINE CLASS frm_modific2024 AS _frmbase OF "_frm_base.vcx"
 				USE IN crsContBugetAn
 			ENDIF
 			This.NewObject('lblPlatiBuget', '_label', '_baza.vcx')
-			This.lblPlatiBuget.ForeColor = RGB(255,0,0)
+			This.lblPlatiBuget.ForeColor = RGB(0,0,0)
+			This.lblPlatiBuget.Anchor = 8
+			This.lblPlatiBuget.BackStyle = 1
+			This.lblPlatiBuget.BackColor = This.nColorBuget
 			This.lblPlatiBuget.FontBold = .T.
+			This.lblPlatiBuget.MousePointer = 15
 			This.lblPlatiBuget.Visible = .F.
 			Bindevent(This.lblPlatiBuget, 'Click', This, 'SaltPlataBuget')
 			This.NewObject('cmdDefalcareBuget', '_commandbutton', '_baza.vcx')
 			This.cmdDefalcareBuget.Caption = 'Defalcare buget'
 			This.cmdDefalcareBuget.Width = 110
 			This.cmdDefalcareBuget.Enabled = .F.
+			This.cmdDefalcareBuget.Themes = .F.
+			This.cmdDefalcareBuget.BackColor = This.nColorBuget
 			This.cmdDefalcareBuget.Visible = .T.
 			Bindevent(This.cmdDefalcareBuget, 'Click', This, 'DefalcareBuget')
 			This.lblPlatiBuget.Top = This.grid1.Top + This.grid1.Height + 4
@@ -15205,7 +15217,7 @@ DEFINE CLASS frm_modific2024 AS _frmbase OF "_frm_base.vcx"
 				IF EMPTY(m.lcExprBuget)
 					lcExprBuget = TRANSFORM(loColBuget.BackColor)
 				ENDIF
-				loColBuget.DynamicBackColor = "IIF(Thisform.EsteRandBugetNedefalcat(.T.), RGB(255,200,200), " + m.lcExprBuget + ")"
+				loColBuget.DynamicBackColor = "IIF(Thisform.EsteRandBugetNedefalcat(.T.), " + ALLTRIM(STR(Thisform.nColorBuget,8,0)) + ", " + m.lcExprBuget + ")"
 				lcCtrlBuget = loColBuget.CurrentControl
 				IF !EMPTY(m.lcCtrlBuget)
 					Bindevent(loColBuget.&lcCtrlBuget, 'RightClick', This, 'GridRightClickBuget')
@@ -15776,10 +15788,14 @@ DEFINE CLASS frm_modific2024 AS _frmbase OF "_frm_base.vcx"
 		*thisform.aleg_document_pereche(tnFel,odoc)
 		DO aleg_document_pereche WITH tnFel,odoc,lcSel IN oOperatii_comune.prg
 		SELECT (m.lcSel)
-		IF Type('tact.ngrupa') = 'N'
+		*!* 18.09.2026 marius.mutu - M doar daca s-a ales document (aleg_document_pereche sterge atunci randul original)
-			* randurile grupei (originalul plus cele adaugate de aleg_document_pereche) devin M
+		IF Type('tact.ngrupa') = 'N' AND BETWEEN(m.lnRecno, 1, RECCOUNT())
+			GO m.lnRecno
+			IF DELETED()
+				* randurile grupei adaugate de aleg_document_pereche devin M
 				REPLACE csursa_f WITH 'M' FOR ngrupa = odoc.ngrupa AND npoz = odoc.npoz
 			ENDIF
+		ENDIF
 		TRY 
 			GOTO m.lnRecno
 		CATCH 
@@ -15816,10 +15832,14 @@ DEFINE CLASS frm_modific2024 AS _frmbase OF "_frm_base.vcx"
 		*thisform.aleg_document_pereche(tnFel,odoc)
 		DO aleg_document_pereche WITH tnFel,odoc,lcSel IN oOperatii_comune.prg
 		SELECT (m.lcSel)
-		IF Type('tact.ngrupa') = 'N'
+		*!* 18.09.2026 marius.mutu - M doar daca s-a ales document (aleg_document_pereche sterge atunci randul original)
-			* randurile grupei (originalul plus cele adaugate de aleg_document_pereche) devin M
+		IF Type('tact.ngrupa') = 'N' AND BETWEEN(m.lnRecno, 1, RECCOUNT())
+			GO m.lnRecno
+			IF DELETED()
+				* randurile grupei adaugate de aleg_document_pereche devin M
 				REPLACE csursa_f WITH 'M' FOR ngrupa = odoc.ngrupa AND npoz = odoc.npoz
 			ENDIF
+		ENDIF
 		TRY 
 			GOTO m.lnRecno
 		CATCH