+ Tipo Folio:
+
+ General
+ Optima
+ Motobateria
+
+
+
+
+
+
+ Área:
+
+ Piso
+ Almacén
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- Tipo Folio:
-
-
- General
- Optima
- Motobateria
-
-
-
- <%-- --%>
-
-
-
-
-
-
-
- Área:
-
-
- Piso
- Almacén
-
-
+ <%-- --%>
+
+
+
+
+
+
+
+
+
<%--
diff --git a/App_Code/ClsOC.vb b/App_Code/ClsOC.vb
index 714db7d74..356e4e3d4 100644
--- a/App_Code/ClsOC.vb
+++ b/App_Code/ClsOC.vb
@@ -1649,7 +1649,7 @@ Public Class ClsOC
FechaFin As Date, CveOrdenCompra As Integer, CveProveedor As Integer, Folio As Integer, CveUsuarioRegistro As Integer, CveUsuario As Integer,
CveEmpresa As Integer, CvePS As Integer, Optional PendientePorSurtir As Boolean = False, Optional CveCliente As Integer = -1, Optional Guia As String = "-1",
Optional CveActivoFijo As Integer = -1, Optional SoloSubProyectosConPermiso As Boolean = False, Optional CveUsuarioAutorizo As Integer = -1,
- Optional CveUsuarioAsignado As Integer = -1, Optional EntregaDirecta As Integer = -1, Optional TopSelect As Integer = 10000) As Boolean
+ Optional CveUsuarioAsignado As Integer = -1, Optional EntregaDirecta As Integer = -1, Optional TopSelect As Integer = 10000, Optional CveMoneda As Integer = -1) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_OC_OrdenesCompraRep")
@@ -1678,6 +1678,7 @@ Public Class ClsOC
.Add("@CveUsuarioAsignado", SqlDbType.Int).Value = CveUsuarioAsignado
.Add("@EntregaDirecta", SqlDbType.Int).Value = EntregaDirecta
.Add("@TopSelect", SqlDbType.Int).Value = TopSelect
+ .Add("@CveMoneda", SqlDbType.Int).Value = CveMoneda
End With
diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb
index 49613218c..e48f19d44 100644
--- a/App_Code/ClsRH.vb
+++ b/App_Code/ClsRH.vb
@@ -1470,7 +1470,8 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
Public Property Estado As String
Public Property ClaveEstado As String
Public Property Telefono As String
- Public Property TelefonoEmergencia As String
+ Public Property TelefonoEmergencia As String
+ Public Property Beneficiario As String
Public Property Celular As String
Public Property LugarNacimiento As String
Public Property CredencialElector As String
@@ -1684,6 +1685,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
Me.ClaveEstado = Data.Rows(0)("ClaveEstado").ToString
Me.Telefono = Data.Rows(0)("Telefono").ToString
Me.TelefonoEmergencia = Data.Rows(0)("NombreTelEmergencia").ToString
+ Me.Beneficiario = Data.Rows(0)("Beneficiario").ToString
Me.Celular = Data.Rows(0)("Celular").ToString
Me.RFC = Data.Rows(0)("RFC").ToString
Me.CURP = Data.Rows(0)("CURP").ToString
@@ -1860,6 +1862,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
Me.Estado = Data.Rows(0)("Estado").ToString
Me.Telefono = Data.Rows(0)("Telefono").ToString
Me.TelefonoEmergencia = Data.Rows(0)("NombreTelEmergencia").ToString
+ Me.Beneficiario = Data.Rows(0)("Beneficiario").ToString
Me.Celular = Data.Rows(0)("Celular").ToString
Me.RFC = Data.Rows(0)("RFC").ToString
Me.CURP = Data.Rows(0)("CURP").ToString
@@ -1939,7 +1942,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
CveEstadoCivil As Integer, CveGenero As Integer, CveMotivoBaja As Integer, FechaBaja As String, CveEstatusPersonal As Integer, FechaNacimiento As Date, LugarNacimiento As String,
Calle As String, NumExt As String, NumInt As String, Colonia As String, CP As String, Ciudad As String, CveEstado As Integer, Telefono As String, TelefonoEmergencia As String, Celular As String, RFC As String, CURP As String, CredencialElector As String,
NombrePadre As String, NombreMadre As String, CveSATBanco As Integer, CveSATRiesgoPuesto As Integer, CveSATRegimenContratacion As Integer, CveClienteAsignado As Integer, CveSubProyecto As Integer, URL As String, CveSupervisor As Integer, CLABE As String, BancoNumCuenta As String,
- CveJornada As Integer, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, CveUsuario As Integer, CveEmpresa As Integer, CveUsuarioNomina As Integer, Optional CveSubProyectoZona As Integer = Nothing, Optional CveUniforme As Integer = -1,
+ CveJornada As Integer, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, CveUsuario As Integer, CveEmpresa As Integer, CveUsuarioNomina As Integer, Beneficiario As String, Optional CveSubProyectoZona As Integer = Nothing, Optional CveUniforme As Integer = -1,
Optional TelefonoExtension As String = "-1", Optional CelularPersonal As String = "-1", Optional TelefonoMarcadoRapido As String = "-1", Optional ContactoAlterno As String = "-1", Optional CveTipodeSalario As Integer = 1, Optional Sindicalizado As Boolean = False, Optional CvePais As Integer = -1,
Optional Pensionado As Boolean = False, Optional CveMedioTransporte As Integer = -1, Optional CveRegistroPatronal As Integer = -1, Optional CveEmpresaAsignado As Integer = -1, Optional CveTipoTrabajador As Integer = -1) As Boolean
@@ -2016,6 +2019,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
.Add("@CtaContPrestamos", SqlDbType.VarChar).Value = CtaContPrestamos
.Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+ .Add("@Beneficiario", SqlDbType.VarChar).Value = Beneficiario
.Add("@CveUsuarioNomina", SqlDbType.VarChar).Value = CveUsuarioNomina
.Add("@CveSubProyectoZona", SqlDbType.Int).Value = CveSubProyectoZona
.Add("@CveUniforme", SqlDbType.Int).Value = CveUniforme '
@@ -2073,7 +2077,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
CveEstadoCivil As Integer, CveGenero As Integer, CveMotivoBaja As Integer, FechaBaja As String, CveEstatusPersonal As Integer, FechaNacimiento As Date, LugarNacimiento As String,
Calle As String, NumExt As String, NumInt As String, Colonia As String, CP As String, Ciudad As String, CveEstado As Integer, Telefono As String, TelefonoEmergencia As String, Celular As String, RFC As String, CURP As String, CredencialElector As String,
NombrePadre As String, NombreMadre As String, CveSATBanco As Integer, CveSATRiesgoPuesto As Integer, CveSATRegimenContratacion As Integer, CveClienteAsignado As Integer, CveSubProyecto As Integer, CvePersonal As Integer, URL As String, CveSupervisor As Integer, CLABE As String, BancoNumCuenta As String,
- CveJornada As Integer, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, CveEmpresa As Integer, CveUsuarioNomina As Integer, Optional CveSubProyectoZona As Integer = Nothing, Optional CveUniforme As Integer = -1,
+ CveJornada As Integer, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, CveEmpresa As Integer, CveUsuarioNomina As Integer, Beneficiario As String, Optional CveSubProyectoZona As Integer = Nothing, Optional CveUniforme As Integer = -1,
Optional TelefonoExtension As String = "-1", Optional CelularPersonal As String = "-1", Optional TelefonoMarcadoRapido As String = "-1", Optional ContactoAlterno As String = "-1", Optional CveUsuarioModifico As Integer = -1,
Optional FechaActivo As Date = MinFecha, Optional FechaReingreso As Date = MinFecha, Optional CveTipodeSalario As Integer = 1, Optional Sindicalizado As Integer = -1, Optional CvePais As Integer = -1, Optional Pensionado As Boolean = False, Optional CveRegistroPatronal As Integer = -1,
Optional CveEmpresaAsignado As Integer = -1, Optional CveMedioTransporte As Integer = -1, Optional EsReserva As Integer = -1, Optional Fiscalizable As Integer = -1, Optional CveTipoTrabajador As Integer = -1) As Boolean
@@ -2152,6 +2156,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
.Add("@IdCtaContPrestamos", SqlDbType.Int).Value = IdCtaContPrestamos
.Add("@CtaContPrestamos", SqlDbType.VarChar).Value = CtaContPrestamos
.Add("@CveUsuarioNomina", SqlDbType.VarChar).Value = CveUsuarioNomina
+ .Add("@Beneficiario", SqlDbType.VarChar).Value = Beneficiario
.Add("@CveSubProyectoZona", SqlDbType.Int).Value = CveSubProyectoZona
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
.Add("@CveUniforme", SqlDbType.Int).Value = CveUniforme
diff --git a/Bancos/Transferencias.aspx.vb b/Bancos/Transferencias.aspx.vb
index e198bbd5b..e649693cd 100644
--- a/Bancos/Transferencias.aspx.vb
+++ b/Bancos/Transferencias.aspx.vb
@@ -404,6 +404,21 @@ Partial Class Bancos_Transferencias
End If
End If
+
+ If MsgError = "" Then
+ If ObjMov.ValidacionPrePolizaCuadre(CvePrePoliza, -1) Then
+ If ObjMov.ValorPolizaDescuadre > 0 Then
+ MsgError = ObjMov.MensajePolizaDescuadre
+ GuardaLogAD($"Bancos/Transferencias | Error:{ObjMov.MensajePolizaDescuadre} Diferencia:{ObjMov.ValorDiferencia} | CvePrePoliza:{CvePrePoliza}", "LogPrePolizas")
+ End If
+ Else
+ MsgError = "No se pudo validar la prepoliza de cuadre."
+ End If
+ End If
+
+
+
+
If MsgError = "" Then
'Conta ContPAQ
@@ -449,16 +464,7 @@ Partial Class Bancos_Transferencias
- If MsgError = "" Then
- If ObjMov.ValidacionPrePolizaCuadre(CvePrePoliza, -1) Then
- If ObjMov.ValorPolizaDescuadre > 0 Then
- MsgError = ObjMov.MensajePolizaDescuadre
- GuardaLogAD($"Bancos/Transferencias | Error:{ObjMov.MensajePolizaDescuadre} Diferencia:{ObjMov.ValorDiferencia} | CvePrePoliza:{CvePrePoliza}", "LogPrePolizas")
- End If
- Else
- MsgError = "No se pudo validar la prepoliza de cuadre."
- End If
- End If
+
If MsgError = "" Then
diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb
index 1521a8aa1..81769821a 100644
--- a/Compras/Compras.aspx.vb
+++ b/Compras/Compras.aspx.vb
@@ -16602,7 +16602,7 @@ Partial Class Compras_Compras
'HACEMOS CALCULOS
SubTotalIVA = TmpDT.SUM("IVA")
SubTotalIEPSIVA = TmpDT.SUM("IEPSPSIVA")
- SubTotal = TmpDT.SUM("Total") + TmpDT.SUM("Descuento")
+ SubTotal = (TmpDT.SUM("Total") + TmpDT.SUM("Descuento")).RoundSQL(6)
RetIVA = TmpDT.SUM("RetIVA")
RetISR = TmpDT.SUM("RetISR")
IEPSPS = TmpDT.SUM("IEPSPS")
diff --git a/Contabilidad2/RepEstadoResultadosHorizontal.aspx b/Contabilidad2/RepEstadoResultadosHorizontal.aspx
index 5f9ffb583..30ee612d3 100644
--- a/Contabilidad2/RepEstadoResultadosHorizontal.aspx
+++ b/Contabilidad2/RepEstadoResultadosHorizontal.aspx
@@ -65,24 +65,25 @@