diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb
index afe153290..f5e70344e 100644
--- a/App_Code/ClsNominas.vb
+++ b/App_Code/ClsNominas.vb
@@ -771,10 +771,14 @@ Public Class ClsNominas
#Region "ClsNominasConceptos"
- Public Function GetNom_Refencias() As Boolean
+ Public Function GetNom_Refencias(CveEmpresa As Integer) As Boolean
Dim retorno As Boolean = False
- DataAdapter("SELECT CveNomReferencia,CveNomReferenciaPadre,Nivel,Texto,Campo,Tipo,IIF(EsUltimo=0,0,1) EsUltimo FROM [dbo].[Nom_Referencia] WHERE Estatus =1 ORDER BY Nivel ASC,CveNomReferencia ", CommandType.Text)
+ 'DataAdapter("SELECT CveNomReferencia,CveNomReferenciaPadre,Nivel,Texto,Campo,Tipo,IIF(EsUltimo=0,0,1) EsUltimo FROM [dbo].[Nom_Referencia] WHERE Estatus =1 ORDER BY Nivel ASC,CveNomReferencia ", CommandType.Text)
+ DataAdapter("PA_NOM_REFConceptosGET")
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+ End With
Try
SqlAdapter.Fill(Data)
retorno = True
@@ -806,7 +810,9 @@ Public Class ClsNominas
Return Retorno
End Function
- Public Function AddConcepto(Codigo As String, Concepto As String, Tipo As String, Formula As String, Sistema As Boolean, Estado As Boolean, CveConceptoPadre As Integer, CveUsuario As Integer, CveEmpresa As Integer, EsRetencion As Boolean, CveClasificacion As Integer, IdCtaContable As Integer, CveTipoGasto As Integer, TipoCalculo As Boolean, CveConceptoContable As Integer) As Integer
+ Public Function AddConcepto(Codigo As String, Concepto As String, Tipo As String, Formula As String, Sistema As Boolean, Estado As Boolean, CveConceptoPadre As Integer, CveUsuario As Integer, CveEmpresa As Integer,
+ EsRetencion As Boolean, CveClasificacion As Integer, IdCtaContable As Integer, CveTipoGasto As Integer, TipoCalculo As Boolean, CveConceptoContable As Integer,
+ AplicaFiniquito As Integer, AutomaticoGlobal As Integer, Especie As Integer, Imprimir As Integer) As Integer
Dim Retorno As Integer = -1
DataAdapter("PA_Nom_ConceptosAdd")
@@ -828,6 +834,10 @@ Public Class ClsNominas
.Add("TipoCalculo", SqlDbType.Bit).Value = TipoCalculo
.Add("@RETURN_VALUE", SqlDbType.Int).Direction = ParameterDirection.ReturnValue
.Add("CveConceptoContable", SqlDbType.Int).Value = CveConceptoContable
+ .Add("AplicaFiniquito", SqlDbType.Bit).Value = AplicaFiniquito
+ .Add("AutomaticoGlobal", SqlDbType.Bit).Value = AutomaticoGlobal
+ .Add("Especie", SqlDbType.Bit).Value = Especie
+ .Add("Imprimir", SqlDbType.Bit).Value = Imprimir
End With
Try
@@ -846,7 +856,9 @@ Public Class ClsNominas
Return Retorno
End Function
- Public Function UpdateConcepto(Codigo As String, Concepto As String, Tipo As String, Formula As String, Sistema As Boolean, Estado As Boolean, CveConceptoPadre As Integer, CveConcepto As Integer, EsRetencion As Boolean, CveClasificacion As Integer, IdCtaContable As Integer, CveTipoGasto As Integer, TipoCalculo As Boolean, CveConceptoContable As Integer) As Boolean
+ Public Function UpdateConcepto(Codigo As String, Concepto As String, Tipo As String, Formula As String, Sistema As Boolean, Estado As Boolean, CveConceptoPadre As Integer, CveConcepto As Integer,
+ EsRetencion As Boolean, CveClasificacion As Integer, IdCtaContable As Integer, CveTipoGasto As Integer, TipoCalculo As Boolean, CveConceptoContable As Integer,
+ AplicaFiniquito As Integer, AutomaticoGlobal As Integer, Especie As Integer, Imprimir As Integer) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_Nom_ConceptosUpdate")
@@ -866,6 +878,10 @@ Public Class ClsNominas
.Add("CveTipoGasto", SqlDbType.Int).Value = CveTipoGasto
.Add("TipoCalculo", SqlDbType.Bit).Value = TipoCalculo
.Add("CveConceptoContable", SqlDbType.Int).Value = CveConceptoContable
+ .Add("AplicaFiniquito", SqlDbType.Bit).Value = AplicaFiniquito
+ .Add("AutomaticoGlobal", SqlDbType.Bit).Value = AutomaticoGlobal
+ .Add("Especie", SqlDbType.Bit).Value = Especie
+ .Add("Imprimir", SqlDbType.Bit).Value = Imprimir
End With
Try
@@ -884,6 +900,28 @@ Public Class ClsNominas
Return Retorno
End Function
+ Public Function UpdateConceptoFormula(CveConcepto As Integer, Formula As String, TipoFormula As Integer) As Boolean
+ Dim Retorno As Boolean = False
+ DataAdapter("PA_Nom_ConceptosFormulaUpdate")
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("CveConcepto", SqlDbType.Int).Value = CveConcepto
+ .Add("Formula", SqlDbType.VarChar).Value = Formula
+ .Add("TipoFormula", SqlDbType.Int).Value = TipoFormula
+ End With
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = True
+ Catch Ex1 As SqlException
+ If Ex1.Message.Contains("Número: 2627;") Then
+ Alert("Ya existe un Concepto de Nomina con el mismo nombre: " & Codigo & ".", TipoMensaje.MsgAdvertencia)
+ Else
+ Me.OnError("Ocurrió un error el Concepto de Nomina", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ End If
+ Catch ex As Exception
+ OnError("Ocurrió un error al guardar los cambios en el Concepto de Nomina.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+ End Try
+ Return Retorno
+ End Function
Public Function RemoveConcepto(CveConcepto As Integer, CveEmpresa As Integer) As Boolean
Dim Retorno As Boolean = False
@@ -1805,6 +1843,7 @@ Public Class ClsNominas
Public Function GetNominaEmpleado(CveProyecto As Integer, CveSubProyecto As Integer, CveTurno As Integer, CvePeriodo As Integer, CveEmpresa As Integer, Agrupador As Integer) As Boolean
Dim retorno As Boolean = False
Try
+ DTSet = New DataSet()
DataAdapter("PA_Nom_NominaEmpleado", CommandType.StoredProcedure)
With SqlAdapter.SelectCommand.Parameters
.Add("@CveProyecto", SqlDbType.Int).Value = CveProyecto
diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb
index 0e0b12935..cb1eb927b 100644
--- a/App_Code/Modelos.vb
+++ b/App_Code/Modelos.vb
@@ -2171,7 +2171,7 @@ Namespace Modelos
If ObjConta.ValidacionPrePolizaCuadre(ObjFactura.CvePrePoliza, 5) Then
If ObjConta.ValorPolizaDescuadre > 0 Then
- 'ErrorPrepoliza = True
+ ErrorPrepoliza = True
GuardaLogAD($"Ventas/Ventas-ProcesoPrePolizas | Error:{ObjConta.MensajePolizaDescuadre} Diferencia:{ObjConta.ValorDiferencia} | CvePrePoliza:{ObjFactura.CvePrePoliza}", "LogPrePolizas")
'SIRVE PARA VER LA PREPOLIZA QUE SE VALIDA
@@ -2251,7 +2251,7 @@ Namespace Modelos
If ObjConta.ValidacionPrePolizaCuadre(ObjFactura.CvePrePoliza, 5) Then
If ObjConta.ValorPolizaDescuadre > 0 Then
- 'ErrorPrepoliza = True
+ ErrorPrepoliza = True
GuardaLogAD($"Ventas/Ventas-ProcesoPrePolizas | Error:{ObjConta.MensajePolizaDescuadre} Diferencia:{ObjConta.ValorDiferencia} | CvePrePoliza:{ObjFactura.CvePrePoliza}", "LogPrePolizas")
End If
End If
diff --git a/Inventarios/RepEntradasSalidas.aspx b/Inventarios/RepEntradasSalidas.aspx
index 1ca7f91cb..80fc47505 100644
--- a/Inventarios/RepEntradasSalidas.aspx
+++ b/Inventarios/RepEntradasSalidas.aspx
@@ -15,7 +15,7 @@
Personalizar Columnas
- Generar Excel
+ Generar Inventarios HP
diff --git a/Inventarios/RepEntradasSalidas.aspx.vb b/Inventarios/RepEntradasSalidas.aspx.vb
index 9b0c1832d..779276bc0 100644
--- a/Inventarios/RepEntradasSalidas.aspx.vb
+++ b/Inventarios/RepEntradasSalidas.aspx.vb
@@ -90,7 +90,7 @@ Partial Class Inventarios_ReporteEntradasSalidas
End If
CargaPermisos()
CargaGvBitacora()
- Lnkcompuxlsinventarios.Visible = (UsuarioActual.CveRol = 1)
+ Lnkcompuxlsinventarios.Visible = UsuarioActual.CveEmpresa = 72
End If
End Sub
@@ -579,12 +579,12 @@ Partial Class Inventarios_ReporteEntradasSalidas
Fila = Fila + 3
libro.Cell(Fila + 1, 1).Value = "IH"
- libro.Cell(Fila + 1, 2).Value = "12345678"
- libro.Cell(Fila + 1, 3).Value = "ABCD"
+ libro.Cell(Fila + 1, 2).Value = "10245068"
+ libro.Cell(Fila + 1, 3).Value = "COMPUPROVEEDORES SA DE CV"
libro.Cell(Fila + 1, 4).Value = "MX"
libro.Cell(Fila + 1, 5).Value = ""
- libro.Cell(Fila + 1, 6).Value = String.Format("{0:yyyyMMdd}", DateTime.Now)
- libro.Cell(Fila + 1, 6).Value = "N"
+ libro.Cell(Fila + 1, 6).Value = String.Format("{0:yyyyMMdd}", TxtFechaF.Text.ToDate())
+ libro.Cell(Fila + 1, 7).Value = "N"
Fila = Fila + 1
@@ -649,28 +649,31 @@ Partial Class Inventarios_ReporteEntradasSalidas
libro.Cell(Fila + 1, 16).Value = "OBLIGATORIO"
- For Each row As DataRow In dt.Select("CvePS>0")
+ If Not IsNothing(dt) AndAlso dt.Rows.Count > 0 Then
- Fila = Fila + 1
- libro.Cell(Fila + 1, 1).Value = "ID" ' "TIPO DO REGISTRO"
- libro.Cell(Fila + 1, 2).Value = String.Format("'{0}", row("Codigo")) ' "NÚMERO DEL PRODUCTO"
- libro.Cell(Fila + 1, 3).Value = "" ' "OPCION DEL PRODUCTO"
- libro.Cell(Fila + 1, 4).Value = "" ' "UPC"
- libro.Cell(Fila + 1, 5).Value = "" ' "CODIGO SKU"
- libro.Cell(Fila + 1, 6).Value = "" ' "ORDENES DE COMPRAS EN ABIERTO "
- libro.Cell(Fila + 1, 7).Value = String.Format("{0}", row("SaldoFCant")) ' "INVENTARIO DISPONIBLE"
- 'libro.Cell(Fila + 1, 7).Style.NumberFormat.Format = "N2"
- libro.Cell(Fila + 1, 8).Value = "" ' "DEVOLUCIONES"
- libro.Cell(Fila + 1, 9).Value = "" ' "INVENTARIO RESERVADO"
- libro.Cell(Fila + 1, 10).Value = String.Format("{0}", row("SaldoFImp")) ' "INVENTARIO TOTAL"
- libro.Cell(Fila + 1, 10).Style.NumberFormat.Format = "$ #,##0.00"
- libro.Cell(Fila + 1, 11).Value = "" ' "EN TRANSITO"
- libro.Cell(Fila + 1, 12).Value = "" ' "VALOR UNITARIO DEL PRODUCTO HP"
- libro.Cell(Fila + 1, 13).Value = "" ' "VALOR TOTAL DEL INVENTARIO"
- libro.Cell(Fila + 1, 14).Value = "" ' "NOMBRE DE LA TIENDA"
- libro.Cell(Fila + 1, 15).Value = "" ' "Codigo de la tienda"
- libro.Cell(Fila + 1, 16).Value = "MXN" ' "MONEDA"
- Next
+ For Each row As DataRow In dt.Select("CvePS>0 AND SaldoFCant >0")
+
+ Fila = Fila + 1
+ libro.Cell(Fila + 1, 1).Value = "ID" ' "TIPO DO REGISTRO"
+ libro.Cell(Fila + 1, 2).Value = String.Format("'{0}", row("Codigo")) ' "NÚMERO DEL PRODUCTO"
+ libro.Cell(Fila + 1, 3).Value = "" ' "OPCION DEL PRODUCTO"
+ libro.Cell(Fila + 1, 4).Value = "" ' "UPC"
+ libro.Cell(Fila + 1, 5).Value = "" ' "CODIGO SKU"
+ libro.Cell(Fila + 1, 6).Value = "" ' "ORDENES DE COMPRAS EN ABIERTO "
+ libro.Cell(Fila + 1, 7).Value = String.Format("{0}", row("SaldoFCant")) ' "INVENTARIO DISPONIBLE"
+ 'libro.Cell(Fila + 1, 7).Style.NumberFormat.Format = "N2"
+ libro.Cell(Fila + 1, 8).Value = "" ' "DEVOLUCIONES"
+ libro.Cell(Fila + 1, 9).Value = "" ' "INVENTARIO RESERVADO"
+ libro.Cell(Fila + 1, 10).Value = String.Format("{0}", row("SaldoFImp")) ' "INVENTARIO TOTAL"
+ libro.Cell(Fila + 1, 10).Style.NumberFormat.Format = "$ #,##0.00"
+ libro.Cell(Fila + 1, 11).Value = "" ' "EN TRANSITO"
+ libro.Cell(Fila + 1, 12).Value = "" ' "VALOR UNITARIO DEL PRODUCTO HP"
+ libro.Cell(Fila + 1, 13).Value = "" ' "VALOR TOTAL DEL INVENTARIO"
+ libro.Cell(Fila + 1, 14).Value = "" ' "NOMBRE DE LA TIENDA"
+ libro.Cell(Fila + 1, 15).Value = "" ' "Codigo de la tienda"
+ libro.Cell(Fila + 1, 16).Value = "MXN" ' "MONEDA"
+ Next
+ End If
Fila = Fila + 1
libro.Range(libro.Cell(Fila + 1, 1), libro.Cell(Fila + 2, 4)).Style.Fill.SetBackgroundColor(ClosedXML.Excel.XLColor.FromArgb(217, 225, 242))
@@ -727,7 +730,7 @@ Partial Class Inventarios_ReporteEntradasSalidas
Response.Buffer = True
Response.ContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
- Response.AddHeader("content-disposition", String.Format("attachment;filename={0}.xlsx", "Reporte de Inventarios"))
+ Response.AddHeader("content-disposition", String.Format("attachment;filename={0}.xlsx", "Reporte de Inventarios HP"))
Response.BinaryWrite(memoryStream.ToArray())
Response.End()
diff --git a/Nomina/ConceptoNomina.aspx b/Nomina/ConceptoNomina.aspx
index b6cfca8d2..fc3bcdd25 100644
--- a/Nomina/ConceptoNomina.aspx
+++ b/Nomina/ConceptoNomina.aspx
@@ -7,9 +7,20 @@