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:
janeth arvizu
2019-09-02 14:15:42 -07:00
parent ea17ad2b55 0a085332fc
commit 7d0d6aa1aa
3 changed files with 277 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Inventarios/EntradasSalidas.aspx.vb
View File

@@ -1089,7 +1089,7 @@ Partial Class Inventarios_EntradasSalidas
If ObjConta IsNot Nothing Then ObjConta.RollBack() If ObjConta IsNot Nothing Then ObjConta.RollBack()
Inv.RollBack() Inv.RollBack()
Alert("Ocurrió un error al eliminar el movimiento. Por favor vuelva a intetar.", TipoMensaje.MsgError) Alert("Ocurrió un error al eliminar el movimiento. Por favor vuelva a intentar.", TipoMensaje.MsgError)
End If End If
CveMovimiento = 0 CveMovimiento = 0

8
Ventas/ProductosServicios.aspx
View File

@@ -210,6 +210,14 @@
<i></i> <i></i>
</div> </div>
<div class="form-group form-md-line-input input-iconright" id="DivClasificacionDetalle" runat="server" visible="false">
<asp:DropDownList ID="DropDownList1" CssClass="form-control input-sm select2me " Width="70%" runat="server" AppendDataBoundItems="true" CausesValidation="true" DataTextField="ClasificacionDetalle" DataValueField="CveClasificacionDetalle" Enabled="true">
<asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
</asp:DropDownList>
<label for="<%= DdlTipoPSDes.ClientID.ToString()%>">Tipo:</label>
<asp:LinkButton ID="LinkButton1" runat="server" OnClick="BtnAddClasificacionDetalle_Click" CssClass="btn btn-default btn-circle btn-xs " data-toggle="tooltip" title="Registrar un Tipo"><i class='fa fa-plus' style="color:black" ></i></asp:LinkButton>
</div>
<div class="form-group form-md-line-input input-iconright" id="DvTamanio" runat="server" visible="false"> <div class="form-group form-md-line-input input-iconright" id="DvTamanio" runat="server" visible="false">
<asp:DropDownList ID="DdlTamanio" CssClass="form-control input-sm select2me" runat="server" AppendDataBoundItems="true" CausesValidation="true" DataTextField="Tamaño" DataValueField="CveTamaño" Width="350px"> <asp:DropDownList ID="DdlTamanio" CssClass="form-control input-sm select2me" runat="server" AppendDataBoundItems="true" CausesValidation="true" DataTextField="Tamaño" DataValueField="CveTamaño" Width="350px">
<asp:ListItem Value="-1">Seleccione</asp:ListItem> <asp:ListItem Value="-1">Seleccione</asp:ListItem>