AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
Jonathan Alexis Perez Morales
2025-02-28 19:12:18 -07:00
parent 2ebaa45aa7 5f588ec52d
commit bf5c841771
3 changed files with 65 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Ashx/TareasProgramadas.ashx
View File

File diff suppressed because one or more lines are too long

4
Nomina/CalculoISRAnual.aspx.cs
View File

@@ -252,8 +252,8 @@ public partial class Nomina_CalculoISRAnual : ClsPaginas
{ {
XElement xempleado = new XElement("empleado"); XElement xempleado = new XElement("empleado");
xempleado.SetAttributeValue("CvePersonal", item.DataKey("CvePersonal")); xempleado.SetAttributeValue("CvePersonal", item.DataKey("CvePersonal"));
xempleado.SetAttributeValue("ACarago", item.DataKey("Acargo")); xempleado.SetAttributeValue("ACargo", item.DataKey("Acargo").ToDecimal().RoundSQL(2));
xempleado.SetAttributeValue("ACompensar", item.DataKey("Acompensar")); xempleado.SetAttributeValue("ACompensar", item.DataKey("Acompensar").ToDecimal().RoundSQL(2));
xfolder.Add(xempleado); xfolder.Add(xempleado);
} }

8
Ventas/Promociones.aspx.vb
View File

@@ -329,6 +329,7 @@ Partial Class Ventas_Promociones
TxtPromocion.Enabled = False TxtPromocion.Enabled = False
TxtPromocion.ReadOnly = True TxtPromocion.ReadOnly = True
CargaFolio()
End If End If
@@ -1577,6 +1578,11 @@ Partial Class Ventas_Promociones
Protected Sub DdlSubProyecto_SelectedIndexChanged(sender As Object, e As EventArgs) Protected Sub DdlSubProyecto_SelectedIndexChanged(sender As Object, e As EventArgs)
CargaFolio()
End Sub
Private Sub CargaFolio()
If UsuarioActual.Empresa.Funcionalidad(382) = "1" Then
If Me.CvePromocion <= 0 Then If Me.CvePromocion <= 0 Then
Dim ObjFolios As New ClsGralFolios() Dim ObjFolios As New ClsGralFolios()
If ObjFolios.GetFolios("PRM", UsuarioActual.CveEmpresa, DdlSubProyecto.SelectedValue.ToEntero()) Then If ObjFolios.GetFolios("PRM", UsuarioActual.CveEmpresa, DdlSubProyecto.SelectedValue.ToEntero()) Then
@@ -1592,5 +1598,7 @@ Partial Class Ventas_Promociones
UpGenerales.Update() UpGenerales.Update()
End If End If
End If
End Sub End Sub
End Class End Class