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:
AbrahamCastilloV
2024-02-07 23:47:27 -07:00
parent 8d86768cad 6294ac302e
commit c6d9b815a9
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Compras/RepRembolsoComprobaciones.aspx
View File

@@ -195,7 +195,7 @@
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>Monto Compra (Saldo Orig.)</HeaderTemplate>
<HeaderTemplate>Total Compra</HeaderTemplate>
<ItemTemplate>
<asp:Literal ID="LtlSaldoOriginal" runat="server" Text='<%# Eval("Original", "{0:N2}") %>'></asp:Literal>&nbsp;
@@ -243,7 +243,7 @@
<asp:HyperLink ID="HLProv" CssClass="Texto" Text='<%# Eval("CveProveedor")%>' runat="server"></asp:HyperLink>
</ItemTemplate>
</asp:TemplateField>
<asp:HyperLinkField HeaderText="Poliza" DataTextField="FolioPoliza" DataNavigateUrlFields="CvePrePoliza" DataNavigateUrlFormatString="/Contabilidad/RegPrePoliza.aspx?CvePrePoliza={0}" Target="_blank" ItemStyle-HorizontalAlign="Left" />
<asp:HyperLinkField HeaderText="Poliza" DataTextField="FolioPoliza" DataNavigateUrlFields="CvePrePoliza" DataNavigateUrlFormatString="/Contabilidad/RegPrePolizaS.aspx?CvePrePoliza={0}" Target="_blank" ItemStyle-HorizontalAlign="Left" />
</Columns>
</asp:GridView>
</ContentTemplate>

6
Compras/RepRembolsoComprobaciones.aspx.vb
View File

@@ -64,13 +64,9 @@ Partial Class Compras_RepRembolsoComprobaciones
DdlCajaChica.DataSource = dt
DdlCajaChica.DataBind()
Dim ObjPersonal As New ClsRH
ObjPersonal.GetPersonal(-1, UsuarioActual.CveEmpresa)
DdlPersonal.DataSource = ObjPersonal.DtResultados
ObjPersonal.Dispose()
DdlPersonal.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa)
DdlPersonal.DataBind()
End If
End Sub

5
Inventarios/RecepcionAlmacen.aspx.vb
View File

@@ -3329,8 +3329,7 @@ Partial Class Inventarios_RecepcionAlmacen
Dim CveConceptoContableCosto As Integer = -1
Dim CveConceptoContableCostoME As Integer = -1
Dim CveConceptoContableCostoComplementaria As Integer = -1
Dim UsaComplementariaFleteImportaciones As Boolean = False
If UsuarioActual.CveEmpresa = 119 Then UsaComplementariaFleteImportaciones = False
Dim UsaComplementariaFleteImportaciones As Boolean = True
If DtCostos.Rows.Count > 0 Then
If CveCompraSurtir > 0 Then
@@ -3358,7 +3357,7 @@ Partial Class Inventarios_RecepcionAlmacen
CveConceptoContableCostoME = 228
CveConceptoContableCostoComplementaria = 229
If UsuarioActual.CveEmpresa = 119 Then UsaComplementariaFleteImportaciones = True
UsaComplementariaFleteImportaciones = True
Else
ErrorMovInv = True

6
Inventarios/ResguardoMaterial.aspx.vb
View File

@@ -625,7 +625,7 @@ Partial Class Inventarios_ResguardoMaterial
Protected Sub GvMLiberacion_RowCreated(sender As Object, e As GridViewRowEventArgs)
If e.Row.RowType = DataControlRowType.DataRow Then
Dim Index = e.Row.RowIndex
Dim Index As Integer = e.Row.RowIndex
e.Row.FCTextBox("TxtCantidad").Attributes.Add("onKeyUp", String.Format("ValidarCantidad({0});", Index))
End If
End Sub
@@ -792,7 +792,7 @@ Partial Class Inventarios_ResguardoMaterial
'VALIDA LA EXISTENCIA DEL ALMACEN
Dim ObjInventario As New ClsInventarios
Dim ErrorExistencia = False
Dim ErrorExistencia As Boolean = False
Dim TextoExistencia As StringBuilder = New StringBuilder
Dim Existencia As Double
TextoExistencia.Append("Los siguiente productos se ajustaron por falta de exitencia:<br/>")
@@ -1079,7 +1079,7 @@ Partial Class Inventarios_ResguardoMaterial
Private Function AgregarAgenda(ByRef ObjEventos As ClsOIEventos, FolioEntrada As Integer, FolioSalida As Integer) As Boolean
Dim TieneError As Boolean = False
Dim RecurrenciaTipo = 0, Frecuencia = -1, DiasSemana = "-1", Dias = -1, Mes = -1, RecurrenciaFin = "-1", CveAgendaTipo = 4, Prioridad = 3, CveTipoEvento = 2, Importe = -1
Dim RecurrenciaTipo As Integer = 0, Frecuencia As Integer = -1, DiasSemana As String = "-1", Dias As Integer = -1, Mes As Integer = -1, RecurrenciaFin As String = "-1", CveAgendaTipo As Integer = 4, Prioridad As Integer = 3, CveTipoEvento As Integer = 2, Importe As Integer = -1
Dim Asunto As String = $"Vencimiento de Resguardo de Material. FolioEntrada:{FolioEntrada}, FolioSalida:{FolioSalida}"
Dim Descripcion As String = TxtObservaciones.Text.Trim()