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

mejoras en indirectos

Browse Source
This commit is contained in:
rrene
2022-04-20 20:44:45 -07:00
parent eee3a413a1
commit ecf786ad64
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
App_Code/ClsInventarios.vb
View File

@@ -4997,7 +4997,7 @@ Public Class ClsInventarios
Public Function GetFletesRep(CveEmpresa As Integer, Optional CveFlete As Integer = -1, Optional Folio As String = "-1", Optional CveProveedor As Integer = -1, Public Function GetFletesRep(CveEmpresa As Integer, Optional CveFlete As Integer = -1, Optional Folio As String = "-1", Optional CveProveedor As Integer = -1,
Optional CveOC As Integer = -1, Optional CveCompra As Integer = -1, Optional FechaInicio As Date = MinFecha, Optional CveOC As Integer = -1, Optional CveCompra As Integer = -1, Optional FechaInicio As Date = MinFecha,
Optional FechaFin As Date = MaxFecha, Optional TipoGasto As Integer = -1) As Boolean Optional FechaFin As Date = MaxFecha, Optional TipoGasto As Integer = -1, Optional CveEstatus As Integer = -1) As Boolean
Dim Retorno As Boolean = False Dim Retorno As Boolean = False
DataAdapter("PA_Inv_FletesRep") DataAdapter("PA_Inv_FletesRep")
With SqlAdapter.SelectCommand.Parameters With SqlAdapter.SelectCommand.Parameters
@@ -5010,6 +5010,7 @@ Public Class ClsInventarios
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
.Add("@CveFlete", SqlDbType.Int).Value = CveFlete .Add("@CveFlete", SqlDbType.Int).Value = CveFlete
.Add("@TipoGasto", SqlDbType.Int).Value = TipoGasto .Add("@TipoGasto", SqlDbType.Int).Value = TipoGasto
.Add("@CveEstatus", SqlDbType.Int).Value = CveEstatus
End With End With
Try Try
SqlAdapter.Fill(Data) SqlAdapter.Fill(Data)

15
Compras/Compras.aspx.vb
View File

@@ -2194,9 +2194,8 @@ Partial Class Compras_Compras
DdlRetISRConcepto.Items.Clear() DdlRetISRConcepto.Items.Clear()
DdlRetISRConcepto.Items.Insert(0, New ListItem("Honorarios", "1")) DdlRetISRConcepto.Items.Insert(0, New ListItem("Honorarios", "1"))
DdlRetISRConcepto.Items.Insert(1, New ListItem("Arrendamiento", "2")) DdlRetISRConcepto.Items.Insert(1, New ListItem("Arrendamiento", "2"))
If UsuarioActual.CveEmpresa.Contiene(119, 7, 11, 12, 122, 145) Then DdlRetISRConcepto.Items.Insert(1, New ListItem("Resico", "3"))
DdlRetISRConcepto.Items.Insert(1, New ListItem("Resico", "3"))
End If
End If End If
UpPS.Update() UpPS.Update()
End Sub End Sub
@@ -14675,7 +14674,7 @@ Partial Class Compras_Compras
Protected Sub BtnRefacturacionVer_Click(sender As Object, e As EventArgs) Handles BtnRefacturacionVer.Click Protected Sub BtnRefacturacionVer_Click(sender As Object, e As EventArgs) Handles BtnRefacturacionVer.Click
Dim Opcion As Integer = 1 Dim Opcion As Integer = 1
If UsuarioActual.CveEmpresa.Contiene(119, 1) Then Opcion = 2 If UsuarioActual.CveEmpresa.Contiene(119, 1, 140) Then Opcion = 2
Dim ObjCompras As New ClsCompras Dim ObjCompras As New ClsCompras
@@ -20315,10 +20314,14 @@ Partial Class Compras_Compras
ObjCompras.Dispose() ObjCompras.Dispose()
Dim ObjInv As New ClsInventarios Dim ObjInv As New ClsInventarios
If ObjInv.GetFletes(UsuarioActual.CveEmpresa, OpcionInventario:=1) Then If ObjInv.GetFletesRep(UsuarioActual.CveEmpresa, -1, "-1", -1, -1, -1, MinFecha, MaxFecha, TipoGasto:=1, CveEstatus:=0) Then
DdlFletes.DataSource = ObjInv.DtResultados DdlFletes.DataSource = ObjInv.DtResultados.FiltraParametros("CveFlete > 0")
DdlFletes.Items.Insert(0, New ListItem("Seleccione", "-1")) DdlFletes.Items.Insert(0, New ListItem("Seleccione", "-1"))
End If End If
'If ObjInv.GetFletes(UsuarioActual.CveEmpresa, OpcionInventario:=1) Then
' DdlFletes.DataSource = ObjInv.DtResultados
' DdlFletes.Items.Insert(0, New ListItem("Seleccione", "-1"))
'End If
ObjInv.Dispose() ObjInv.Dispose()
DdlImportaciones.DataBind() DdlImportaciones.DataBind()