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:
Oscar Irigoyen
2023-06-22 09:19:47 -07:00
parent 79968bdce6 6d66ab2929
commit bbc9e55607
3 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Acumuladores/CatFoliosGarantia.aspx
View File

@@ -90,9 +90,9 @@
<div class="col-md-2">
<asp:DropDownList ID="DdlEstatus" runat="server" CssClass="select2me" Width="100px" ValidationGroup="GrpGuardar">
<asp:ListItem Text="Todos" Value="-1"></asp:ListItem>
<asp:ListItem Text="Activo" Value="1" Selected="True"></asp:ListItem>
<asp:ListItem Text="Inactivo" Value="0"></asp:ListItem>
<asp:ListItem Text="Activo" Value="1" Selected="True"></asp:ListItem>
<asp:ListItem Text="Enviado" Value="2"></asp:ListItem>
<asp:ListItem Text="Cerrado" Value="0"></asp:ListItem>
</asp:DropDownList>
</div>
<label class="col-md-1 truncate">SubProyecto:</label>
@@ -172,6 +172,11 @@
</asp:TemplateField>
<asp:HyperLinkField HeaderText="Mov. Salida" DataTextField="FolioAlmacen" DataNavigateUrlFields="CveMovimiento" DataNavigateUrlFormatString="/Inventarios/EntradasSalidas.aspx?CveMovimiento={0}" Target="_blank" ControlStyle-CssClass="Texto"/>
<asp:TemplateField HeaderText="Notas" ItemStyle-Width ="120px" >
<ItemTemplate>
<asp:Literal ID="LblSerieFolioNotas" runat="server" Text='<%# Eval("SerieFolioNotas") %>'></asp:Literal>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ItemStyle-HorizontalAlign="Right" ItemStyle-Width="120px">
<ItemTemplate>
<asp:LinkButton ID="ImgVer" OnClick="ImgVer_Click" runat="server" AlternateText="Editar" CausesValidation="False"

23
Compras/Compras.aspx
View File

@@ -854,7 +854,7 @@
</div>
<div class="row">
<div class="col-md-6">
<div class="col-md-6" style="min-height:200px">
<asp:UpdatePanel ID="UPPAnticiposSel" runat="server" UpdateMode="Conditional">
<ContentTemplate>
@@ -915,6 +915,12 @@
</asp:GridView>
</ContentTemplate>
</asp:UpdatePanel>
<div style=" vertical-align: bottom; display: table-cell;">
<asp:Button runat="server" ID="btnProrateo" Visible="false" Text="Prorratear" CommandArgument="Compras" CssClass="btn btn-success" />
<asp:Button runat="server" ID="btnProrateo2" Visible="false" Text="Prorratear Nomina" CommandArgument="Nomina" CssClass="btn btn-success" />
<asp:Button runat="server" ID="BtnProrateoDeducible" Visible="false" Text="Prorratear 8.5%" CommandArgument="Prorratear Deducible" CssClass="btn btn-success" />
</div>
</div>
<div class="col-md-6 ">
@@ -976,13 +982,7 @@
</td>
<td align="right">&nbsp
&nbsp;
<asp:HyperLink ID="HLAplicaNCFact" NavigateUrl="#" Visible="false" data-toggle="modal" data-target="#FacturaNC" runat="server"><i title="Aplicar Notas de Credito" data-toggle="tooltip" class='fa fa-money font-green'></i></asp:HyperLink>
</td>
</tr>
@@ -1117,12 +1117,7 @@
</table>
</div>
</div>
<div class="col-md-6 ">
<asp:Button runat="server" ID="btnProrateo" Visible="false" Text="Prorratear" CommandArgument="Compras" CssClass="btn btn-success" />
<asp:Button runat="server" ID="btnProrateo2" Visible="false" Text="Prorratear Nomina" CommandArgument="Nomina" CssClass="btn btn-success" />
<asp:Button runat="server" ID="BtnProrateoDeducible" Visible="false" Text="Prorratear 8.5%" CommandArgument="Prorratear Deducible" CssClass="btn btn-success" />
</div>
</div>
</ContentTemplate>

13
Compras/Compras.aspx.vb
View File

@@ -1418,11 +1418,6 @@ Partial Class Compras_Compras
End If
If UsuarioActual.TienePermisoProceso(360) Then
BtnProrateoDeducible.Visible = True
End If
ElseIf Request("CveCompra") IsNot Nothing AndAlso IsNumeric(Request("CveCompra")) AndAlso Request("CveCompra").ToEntero > 0 Then
ViewState("CveCompra") = Request("CveCompra")
@@ -1462,9 +1457,9 @@ Partial Class Compras_Compras
UpLnkPaqueteriaGuias.Update()
End If
If Not CveCompra > 0 Then
LIContratos.Visible = True
End If
If UsuarioActual.TienePermisoProceso(360) Then BtnProrateoDeducible.Visible = True
If Not CveCompra > 0 Then LIContratos.Visible = True
'SI ES UNA COMPRA NUEVA SE PONE EL TOTAL, SI NO EL SALDO
LblSaldoFactura.Text = If(CveCompra > 0, CompraSaldo.FormatoNumero, TxtTotal.Text.FormatoNumero)
@@ -10171,7 +10166,7 @@ Partial Class Compras_Compras
CargaGvInv()
CargaGVsAF()
CargaGvPersonal()
Alert("El Concepto ha sido eliminado correctamente", TipoMensaje.MsgInformacion)
Alert("El Concepto ha sido eliminado correctamente", TipoMensaje.ToastInformacion)
End Sub
Private Sub GvDeudores_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvDeudores.RowDataBound
If e.Row.RowType = DataControlRowType.DataRow Then