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:
rrene
2022-02-28 20:07:39 -07:00
parent 59cbaaf572 77537020f9
commit a836be61b4
31 changed files with 3259 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Inventarios/RecepcionAlmacen.aspx
View File

@@ -829,6 +829,12 @@
<asp:TextBox runat="server" ID="TxtSerie" Width="300px" ClientIDMode="Static" />
<asp:RequiredFieldValidator ID="RFVSerie" runat="server" ControlToValidate="TxtSerie" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Serie''</b> es necesario, por favor ingréselo." ValidationGroup="GrpAgregaSerie"></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="VCESerie" runat="server" HighlightCssClass="vco" TargetControlID="RFVSerie" Width="300px"></ajax:ValidatorCalloutExtender>
<asp:CustomValidator id="ReVTxtSerie" runat="server" ControlToValidate="TxtSerie" Display="None" ClientValidationFunction="TamanioSerie"
ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Serie''</b> debe tener un minimo de 6 caracteres." ValidationGroup="GrpAgregaSerie" />
<ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender3" runat="server" HighlightCssClass="vco" TargetControlID="ReVTxtSerie" Width="300px"></ajax:ValidatorCalloutExtender>
</td>
<td><asp:Button Text="Agregar" CssClass="btn btn-primary" ID="BtnAgregarPS" OnClick="BtnAgregarPS_Click" ValidationGroup="GrpAgregaSerie" runat="server" /></td>
</tr>
@@ -1284,5 +1290,16 @@
}
}
function TamanioSerie(source, arguments) {
if (arguments.Value.trim().length >= 6) {
arguments.IsValid = true;
} else {
arguments.IsValid = false; }
}
</script>
</asp:Content>

4
Inventarios/RecepcionUsados.aspx.vb
View File

@@ -762,6 +762,10 @@ Partial Class Inventarios_RecepcionUsados
ObjRemisionNC = Nothing
End If
If TmpDTAjustes IsNot Nothing Then
TmpDTAjustes.Rows.Clear()
End If
CveRemisionRecibida = -1
EsDistribuidor = False
DdlClientes.SelectedValueExist("-1")

2
Inventarios/RepAlmacen.aspx
View File

@@ -163,7 +163,7 @@
<Columns>
<asp:TemplateField HeaderText="Almacén">
<ItemTemplate>
<asp:HyperLink ID="HyperLink1" Target="_blank" NavigateUrl='<%# String.Format("/Inventarios/RepEntradasSalidas.aspx?CveAlmacen={0}&FechaInicio={1:d}&FechaCorte={2:d}", Eval("CveAlmacen").ToString, Eval("FechaInicio"), Eval("FechaFin"))%>' runat="server"><%# Eval("Almacen") %></asp:HyperLink>
<asp:HyperLink ID="HyperLink1" Target="_blank" NavigateUrl='<%# String.Format("/Inventarios/RepEntradasSalidas.aspx?CveAlmacen={0}&FechaInicio={1:d}&FechaCorte={2:d}&Tipo=-1", Eval("CveAlmacen").ToString, Eval("FechaInicio"), Eval("FechaFin"))%>' runat="server"><%# Eval("Almacen") %></asp:HyperLink>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Tipo Almacén">

7
Inventarios/RepEntradasSalidas.aspx.vb
View File

@@ -54,6 +54,9 @@ Partial Class Inventarios_ReporteEntradasSalidas
Return (UsuarioActual.CveEmpresa.Contiene(72, 80))
End Get
End Property
#End Region
Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load
@@ -82,6 +85,10 @@ Partial Class Inventarios_ReporteEntradasSalidas
TxtFechaI.Text = Request("FechaInicio")
End If
If Not IsNothing(Request("Tipo")) Then
DdlMovs.SelectedValueExist(Request("Tipo").ToEntero)
End If
btConsultar_Click(Nothing, Nothing)
End If
CargaPermisos()