diff --git a/App_Code/ClsClientes.vb b/App_Code/ClsClientes.vb
index 3da855b93..0c3f1856e 100644
--- a/App_Code/ClsClientes.vb
+++ b/App_Code/ClsClientes.vb
@@ -172,6 +172,7 @@ Public Class ClsClientes
Public Property CodigoRegimenFiscal As String
Public Property RegimenFiscal As String
+ Public Property RepresentanteLegal As String
#End Region
@@ -429,6 +430,7 @@ Public Class ClsClientes
_RegimenFiscal = Data(0)("RegimenFiscal").ToString
_CodigoRegimenFiscal = Data(0)("CodigoRegimenFiscal").ToString
+ _RepresentanteLegal = Data(0)("RepresentanteLegal").ToString
End If
Retorno = True
@@ -586,7 +588,8 @@ Public Class ClsClientes
Optional AplicaComercioExterior As Boolean = False, Optional CveTipoOperacion As Integer = -1, Optional CvePedimento As Integer = -1, Optional CveIncoterm As Integer = -1, Optional CvePais As Integer = -1, Optional CveEstado As Integer = -1, Optional CveMunicipio As Integer = -1, Optional CveColonia As Integer = -1,
Optional CveMotivoTraslado As Integer = 0, Optional NumRegIdTrib As String = "", Optional ComExtEstado As String = "-1", Optional ComExtMunicipio As String = "-1", Optional ComExtColonia As String = "-1", Optional RequiereOC As Boolean = False,
Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1, Optional CargoUsado As Boolean = False, Optional BonificacionUsado As Boolean = False, Optional CveTipoRetencion As Integer = 0,
- Optional CorreoEntregaCompras As String = "-1", Optional CorreoEntregaAlmacen As String = "-1", Optional CveSATEstado As Integer = -1, Optional CveAdminTrayecto As Integer = -1, Optional CveRegimenFiscal As Integer = 0, Optional RegimenSociedad As String = "-1", Optional TipoPersona As Boolean = False) As Boolean
+ Optional CorreoEntregaCompras As String = "-1", Optional CorreoEntregaAlmacen As String = "-1", Optional CveSATEstado As Integer = -1, Optional CveAdminTrayecto As Integer = -1, Optional CveRegimenFiscal As Integer = 0, Optional RegimenSociedad As String = "-1", Optional TipoPersona As Boolean = False,
+ Optional RepresentanteLegal As String = "") As Boolean
Dim Retorno As Boolean = False
@@ -731,6 +734,9 @@ Public Class ClsClientes
.Add("@RegimenSociedad", SqlDbType.VarChar).Value = RegimenSociedad
.Add("@TipoPersona", SqlDbType.Bit).Value = TipoPersona
+ .Add("@RepresentanteLegal", SqlDbType.VarChar).Value = RepresentanteLegal
+
+
@@ -782,7 +788,8 @@ Public Class ClsClientes
Optional CveMotivoTraslado As Integer = 0, Optional NumRegIdTrib As String = "-1", Optional ComExtEstado As String = "-1", Optional ComExtMunicipio As String = "-1", Optional ComExtColonia As String = "-1",
Optional ApellidoPaternoPF As String = "-1", Optional ApellidoMaternoPF As String = "-1", Optional NombresPF As String = "-1", Optional RequiereOC As Boolean = False,
Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1, Optional CargoUsado As Boolean = False, Optional BonificacionUsado As Boolean = False, Optional CveTipoRetencion As Integer = 0, Optional CorreoEntregaCompras As String = "-1", Optional CorreoEntregaAlmacen As String = "-1",
- Optional CveSATEstado As Integer = -1, Optional CveAdminTrayecto As Integer = -1, Optional NoDesglosaIVA As Boolean = False, Optional CveRegimenFiscal As Integer = 0, Optional RegimenSociedad As String = "-1", Optional TipoPersona As Boolean = False) As Boolean
+ Optional CveSATEstado As Integer = -1, Optional CveAdminTrayecto As Integer = -1, Optional NoDesglosaIVA As Boolean = False, Optional CveRegimenFiscal As Integer = 0, Optional RegimenSociedad As String = "-1", Optional TipoPersona As Boolean = False,
+ Optional RepresentanteLegal As String = "") As Boolean
Dim Retorno As Boolean = False
@@ -943,6 +950,7 @@ Public Class ClsClientes
.Add("@RegimenSociedad", SqlDbType.VarChar).Value = RegimenSociedad
.Add("@TipoPersona", SqlDbType.Bit).Value = TipoPersona
+ .Add("@RepresentanteLegal", SqlDbType.VarChar).Value = RepresentanteLegal
diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb
index 8a2a42d6a..e688b1a85 100644
--- a/App_Code/ClsNominas.vb
+++ b/App_Code/ClsNominas.vb
@@ -30,6 +30,10 @@ Public Class ClsNominas
Public Property FolioFiscal As String
Public Property Serie As String
Public Property Folio As Integer
+
+ Public Property FolioSolicitud As Integer
+
+
Public Property RegistroPatronal As String
Public Property SerieFolio As String
Public Property NominaFolio As String
@@ -3238,12 +3242,14 @@ Public Class ClsNominas
End Function
#Region "CRUD_SolicitudesNominas"
- Public Function SolicitudesGet(CveSolicitud As Integer, CveEmpresa As Integer, Optional CveTipoSolicitud As Integer = 1) As Boolean
+ Public Function SolicitudesGet(CveSolicitud As Integer, CveEmpresa As Integer, Optional CveTipoSolicitud As Integer = 1, Optional Estatus As Integer = -1, Optional Top As Integer = 100000) As Boolean
Dim retorno As Boolean = False
DataAdapter("PA_Gral_SAT_SolicitudesGet", CommandType.StoredProcedure)
addParameters("@CveSolicitud", SqlDbType.Int, CveSolicitud)
addParameters("@CveEmpresa", SqlDbType.Int, CveEmpresa)
addParameters("@CveTipoSolicitud", SqlDbType.Int, CveTipoSolicitud)
+ addParameters("@Estatus", SqlDbType.Int, Estatus)
+ addParameters("@Top", SqlDbType.Int, Top)
retorno = RunQuery("Ocurrió un error al obtener el SolicitudesNominas.")
Return retorno
End Function
@@ -3263,6 +3269,84 @@ Public Class ClsNominas
retorno = RunQuery("Ocurrió un error al agregar el SolicitudesNominas.")
Return retorno
End Function
+
+
+ Public Function SolicitudesAdd2(CveSolicitudCFDI As Integer, CveSolicitudMetadata As Integer, estatus As Integer, observaciones As String, fechaInicio As DateTime, fechaFin As DateTime, cveUsuarioIng As Int32, cveEmpresa As Int32, Optional CveTipoSolicitud As Integer = 1) As Integer
+
+ 'CveTipoSolicitud
+ '1 Nominas CFDI y Metadata
+ '101 Nominas CFDI
+ '201 Nominas Metadata
+
+ '2 eFacturas CFDI y Metadata
+ '102 eFacturas CFDI
+ '202 eFacturas Metadata
+
+ '3 Ingresos CFDI y Metadata
+ '103 Ingresos CFDI
+ '203 Ingresos Metadata
+
+ Dim CveSolictudAgregada As Integer = -1
+ FolioSolicitud = -1
+
+ Try
+ DataAdapter("PA_Gral_SAT_SolicitudesAdd2", CommandType.StoredProcedure)
+ addParameters("@CveSolicitudCFDI", SqlDbType.Int, CveSolicitudCFDI)
+ addParameters("@CveSolicitudMetadata", SqlDbType.Int, CveSolicitudMetadata)
+ addParameters("@Estatus", SqlDbType.Int, estatus)
+ addParameters("@Observaciones", SqlDbType.VarChar, observaciones)
+ addParameters("@FechaInicio", SqlDbType.DateTime, fechaInicio)
+ addParameters("@FechaFin", SqlDbType.DateTime, fechaFin)
+ addParameters("@CveUsuarioIng", SqlDbType.Int, cveUsuarioIng)
+ addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa)
+ addParameters("@CveTipoSolicitud", SqlDbType.Int, CveTipoSolicitud)
+
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("@CveSolicitud", SqlDbType.Int).Direction = ParameterDirection.Output
+ .Add("@Folio", SqlDbType.Int).Direction = ParameterDirection.Output
+ End With
+
+
+ SqlAdapter.Fill(Data)
+ CveSolictudAgregada = SqlAdapter.SelectCommand.Parameters("@CveSolicitud").Value.ToString.ToEntero
+ FolioSolicitud = SqlAdapter.SelectCommand.Parameters("@Folio").Value.ToString.ToEntero
+
+ Catch ex As Exception
+ CveSolictudAgregada = -1
+ OnError("Ocurrió un error al agregar la Solicitud.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+ End Try
+
+ Return CveSolictudAgregada
+
+
+ End Function
+
+
+ Public Function UpdateSolicitudDetalleCveSolicitudDetalle(CveEmpresa As Integer, UUID As String, CveSolicitudDetalle As Integer) As Boolean
+
+
+ Dim retorno As Boolean = False
+ Try
+ DataAdapter("PA_SAT_SolicitudesCFDIDataCveSolicitudDetalleUpdate", CommandType.StoredProcedure)
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+ .Add("@UUID", SqlDbType.VarChar).Value = UUID
+ .Add("@CveSolicitudDetalle", SqlDbType.Int).Value = CveSolicitudDetalle
+ End With
+ SqlAdapter.Fill(Data)
+
+ retorno = True
+
+ Catch ex As Exception
+ retorno = False
+ OnError("Ocurrió un error al Actualizar SolicitudesCFDIData.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ End Try
+
+ Return retorno
+
+
+ End Function
+
Public Function SolicitudesUp(CveSolicitud As Int32, CveSolicitudCFDI As Int32, CveSolicitudMetadata As Int32, estatus As Int32, observaciones As String, cveEmpresa As Int32) As Boolean
Dim retorno As Boolean = False
DataAdapter("PA_Gral_SAT_SolicitudesUp", CommandType.StoredProcedure)
diff --git a/App_Code/ClsOC.vb b/App_Code/ClsOC.vb
index 628310288..53feb942d 100644
--- a/App_Code/ClsOC.vb
+++ b/App_Code/ClsOC.vb
@@ -119,6 +119,7 @@ Public Class ClsOC
Public Property UsoCFDI As String
Public Property Promocion As String
Public Property CveProveedorContacto As Integer
+ Public Property NumRemision As String
Public ReadOnly Property DtResultados() As DataTable
Get
@@ -685,6 +686,7 @@ Public Class ClsOC
_UsoCFDI = dr("UsoCFDI").ToString
Promocion = IfNull(dr("Promocion"), "", dr("Promocion").ToString)
CveProveedorContacto = If(Not IsDBNull(dr("CveProveedorContacto")), dr("CveProveedorContacto").ToString.ToEntero, -1)
+ NumRemision = dr("NumRemision").ToString
Retorno = True
ElseIf Data.Rows.Count > 0 Then
@@ -704,7 +706,7 @@ Public Class ClsOC
Optional CveCliente As Integer = -1, Optional CveVendedor As Integer = -1, Optional PrioridadObservacion As String = "",
Optional PorcentajeIVA As Decimal = 0.16, Optional IVA As Decimal = 0, Optional RetIVA As Decimal = 0, Optional RetISR As Decimal = 0, Optional FechaExpiracion As Date = Nothing, Optional CveCotizacion As Integer = -1,
Optional FolioAdicional As String = "", Optional EntregaDirecta As Integer = -1, Optional CveDireccionEnvio As Integer = -1, Optional Guia As String = "-1", Optional IEPS As Decimal = -1,
- Optional CveIEAnticipo As Integer = -1, Optional ImporteAnticipo As Decimal = 0, Optional UsoCFDI As Integer = -1, Optional Promocion As String = "-1", Optional CveProveedorContacto As Integer = -1) As Boolean
+ Optional CveIEAnticipo As Integer = -1, Optional ImporteAnticipo As Decimal = 0, Optional UsoCFDI As Integer = -1, Optional Promocion As String = "-1", Optional CveProveedorContacto As Integer = -1, Optional NumRemision As String = "-1") As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_OC_OrdenesCompraAdd")
@@ -747,6 +749,7 @@ Public Class ClsOC
.Add("@UsoCFDI", SqlDbType.Int).Value = UsoCFDI
.Add("@Promocion", SqlDbType.VarChar).Value = Promocion
.Add("@CveProveedorContacto", SqlDbType.Int).Value = CveProveedorContacto
+ .Add("@NumRemision", SqlDbType.VarChar).Value = NumRemision
.Add("@vCveOrdenCompra", SqlDbType.Int).Direction = ParameterDirection.Output
.Add("@vFolio", SqlDbType.Int).Direction = ParameterDirection.Output
@@ -910,7 +913,7 @@ Public Class ClsOC
pCveProveedor As Integer, pCveOrdenCompra As Integer, pCveUsuarioModifico As Integer, Optional CveCliente As Integer = -1, Optional CveVendedor As Integer = -1, Optional PrioridadObservacion As String = "",
Optional IVA As Decimal = 0, Optional RetIVA As Decimal = 0, Optional RetISR As Decimal = 0, Optional IDPoliza As Integer = -1, Optional FechaExpiracion As Date = Nothing, Optional FolioAdicional As String = "",
Optional EntregaDirecta As Integer = -1, Optional CveDireccionEnvio As Integer = -1, Optional Guia As String = "-1", Optional IEPS As Decimal = -1, Optional UsoCFDI As Integer = -1, Optional Promocion As String = "-1",
- Optional pCveProveedorSucursal As Integer = -1, Optional CveProveedorContacto As Integer = -1, Optional PorcentajeIVA As Decimal = 0.16) As Boolean
+ Optional pCveProveedorSucursal As Integer = -1, Optional CveProveedorContacto As Integer = -1, Optional PorcentajeIVA As Decimal = 0.16, Optional NumRemision As String = "-1") As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_OC_OrdenesCompraUpdate")
@@ -944,6 +947,7 @@ Public Class ClsOC
.Add("@CveProveedorSucursal", SqlDbType.Int).Value = pCveProveedorSucursal
.Add("@CveProveedorContacto", SqlDbType.Int).Value = CveProveedorContacto
.Add("@PorcentajeIVA", SqlDbType.SmallMoney).Value = PorcentajeIVA
+ .Add("@NumRemision", SqlDbType.VarChar).Value = NumRemision
End With
Try
@@ -2506,6 +2510,30 @@ Public Class ClsOC
Return Retorno
End Function
+
+ Public Function GetVerificaNumRemision(CveProveedor As Integer, Tipo As String, NumRemision As String, CveEmpresa As Integer, CveOrdenCompraValida As Integer) As Boolean
+ Dim Retorno As Boolean = False
+ DataAdapter("PA_OC_OCVerificaNumRemisionGet")
+
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("@CveProveedor", SqlDbType.Int).Value = CveProveedor
+ .Add("@Tipo", SqlDbType.VarChar).Value = Tipo
+ .Add("@NumRemision", SqlDbType.VarChar).Value = NumRemision
+ .Add("@CveOrdenCompraValida", SqlDbType.Int).Value = CveOrdenCompraValida
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+ End With
+
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = True
+ Catch ex As Exception
+ OnError("Ocurrió un error al consultar las remiciones", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ End Try
+
+ Return Retorno
+ End Function
+
+
#Region " IDisposable Support "
' IDisposable
Protected Overridable Sub Dispose(ByVal disposing As Boolean)
diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb
index c642bf35c..aa784c42c 100644
--- a/App_Code/ClsRH.vb
+++ b/App_Code/ClsRH.vb
@@ -2163,11 +2163,18 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
Try
SqlAdapter.Fill(Data)
Retorno = True
- Catch Ex1 As SqlException
- If Ex1.Message.Contains("Número: 2627;") Then
+ Catch Ex1 As SqlException
+
+ If Ex1.Message.Contains("UK_Idx_Vw_Val_Nom_Curps") Then
+ Alert(String.Format("El personal no se guardó, el campo CURP '{0}' ya se encuentra registrado en otro empleado.", CURP), TipoMensaje.MsgAdvertencia)
+ ElseIf Ex1.Message.ToUpper.Contains("RFC") Then
+ Alert(String.Format("El personal no se guardó, el campo RFC '{0}' ya se encuentra registrado en otro empleado.", RFC), TipoMensaje.MsgAdvertencia)
+ ElseIf Ex1.Message.ToUpper.Contains("CODIGO") Then
+ Alert(String.Format("El personal no se guardó, el campo codigo '{0}' ya se encuentra registrado en otro empleado.", Codigo), TipoMensaje.MsgAdvertencia)
+ ElseIf Ex1.Message.Contains("Número: 2627;") Then
Alert("El Personal no se guardó debido a que actualmente se encuentra registrado.", TipoMensaje.MsgAdvertencia)
- ElseIf Ex1.Message.Contains("TR_RH_PersonalAltas000") Then
- Alert("El personal no se guardó el periodo de inicio y fin laboral del empleado está en conflicto con los anteriores, si es un reingreso favor de ingresar una fecha inicio mayor a la última fecha baja registrada.", TipoMensaje.MsgAdvertencia)
+ ElseIf Ex1.Message.Contains("TR_RH_PersonalAltas") Then
+ Alert("El personal no se guardó, el periodo de inicio y fin laboral del empleado está en conflicto con los anteriores, si es un reingreso favor de ingresar una fecha inicio mayor a la última fecha baja registrada.", TipoMensaje.MsgAdvertencia)
GuardaLog(String.Format("{0} DESCRIPCIÓN DETALLADA: {1} {2} {3}", "Ocurrió un error al intentar guardar los cambios en el Personal.", Ex1.ToString, vbCrLf, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()))
Else
Me.OnError("Ocurrió un error al intentar guardar los cambios en el Personal.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb
index c148ba7af..88145dd74 100644
--- a/Compras/PopUpVerFactura.aspx.vb
+++ b/Compras/PopUpVerFactura.aspx.vb
@@ -3048,6 +3048,16 @@ Partial Class PopUpVerFactura
CartaPorte = New Modelos.MSubReportData()
CartaPorte.Parametros.Add(New ReportParameter($"TieneCartaPorte", "False"))
End If
+ Else
+ If UsuarioActual.CveEmpresa = 13 AndAlso Vta.TipoDocto = "Egs" Then
+ CartaPorte = New Modelos.MSubReportData()
+ CartaPorte.Parametros.Add(New ReportParameter($"TieneCartaPorte", "False"))
+ End If
+ End If
+ Else
+ If UsuarioActual.CveEmpresa = 13 AndAlso Vta.TipoDocto = "Egs" Then
+ CartaPorte = New Modelos.MSubReportData()
+ CartaPorte.Parametros.Add(New ReportParameter($"TieneCartaPorte", "False"))
End If
End If
diff --git a/Compras/eFacturas.aspx.vb b/Compras/eFacturas.aspx.vb
index 85d745c64..b7a4ef535 100644
--- a/Compras/eFacturas.aspx.vb
+++ b/Compras/eFacturas.aspx.vb
@@ -2645,10 +2645,10 @@ Partial Class Compras_eFacturas
sbResultado.Append($"{resultSolicitud(1)}
")
Else
sbResultado.Append($"Solicitud Generada Correctamente")
- sbResultado.Append($"Se presento un error al verificar las solicitudes
{resultSolicitud(2)}
")
+ sbResultado.Append($"Se presento un error al verificar las solicitudes
{resultSolicitud(1)}
")
End If
Else
- sbResultado.Append($"{resultSolicitud(2)}")
+ sbResultado.Append($"{resultSolicitud(1)}")
TipoMensaje = ModExtensiones.TipoMensaje.MsgAdvertencia
End If
Else
@@ -2675,7 +2675,7 @@ Partial Class Compras_eFacturas
If Continuar Then
txtFechaIAdd.Text = ""
txtFechaFAdd.Text = ""
- Me.RegistraScript("$('#ModalAgregarSolicitud').modal('hide');")
+ Me.RegistraScript("$('#ModalViewSolicitudes').modal('hide');")
cargasolicitudes()
End If
@@ -2723,10 +2723,10 @@ Partial Class Compras_eFacturas
sbResultado.Append($"{resultSolicitud(2)}
")
Else
sbResultado.Append($"Solicitud Generada Correctamente")
- sbResultado.Append($"Se presento un error al verificar las solicitudes
{resultSolicitud(2)}
")
+ sbResultado.Append($"Se presento un error al verificar las solicitudes
{resultSolicitud(1)}
")
End If
Else
- sbResultado.Append($"{resultSolicitud(2)}")
+ sbResultado.Append($"{resultSolicitud(1)}")
TipoMensaje = ModExtensiones.TipoMensaje.MsgAdvertencia
End If
Else
@@ -2737,9 +2737,9 @@ Partial Class Compras_eFacturas
If SeVerifico AndAlso resultVerificacion.Count = 4 Then
If ResultadoVerificaionOK Then
- sbResultado.Append($"{resultVerificacion(2)}
")
+ sbResultado.Append($"{resultVerificacion(1)}
")
Else
- sbResultado.Append($"Se presento un error al verificar las solicitudes {resultVerificacion(2)}
")
+ sbResultado.Append($"Se presento un error al verificar las solicitudes {resultVerificacion(1)}
")
TipoMensaje = ModExtensiones.TipoMensaje.MsgAdvertencia
End If
Else
diff --git a/Empresas/Grales/Formatos/RepVentaDetalle.rdlc b/Empresas/Grales/Formatos/RepVentaDetalle.rdlc
index 816c4bfd3..2d2e81ef0 100644
--- a/Empresas/Grales/Formatos/RepVentaDetalle.rdlc
+++ b/Empresas/Grales/Formatos/RepVentaDetalle.rdlc
@@ -1114,7 +1114,7 @@
0.63559in