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-10-18 13:45:03 -07:00
parent 2d0a35bb7a 333f7ab9f5
commit 919b7631b3
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OC/OC.aspx
View File

@@ -795,8 +795,8 @@
<asp:HiddenField ID="HdnCodigoAF" Value="-1" runat="server" ClientIDMode="Static" />
<asp:TextBox ID="LblCodigo" runat="server" Text="" onkeyup="EnterAF(event);" onblur="AFBlur();" ClientIDMode="Static" Width="40px" ValidationGroup="GrpDetalleGuardar"></asp:TextBox>
<asp:RequiredFieldValidator Enabled="false" ID="RFVcodigo" runat="server" ControlToValidate="LblCodigo" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Activo Fijo''</b> es necesario, por favor ingréselo." ValidationGroup="GrpDetalleGuardar"></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="VCEcodigo" runat="server" HighlightCssClass="vco" TargetControlID="RFVcodigo" Width="300px"></ajax:ValidatorCalloutExtender>
<%--<asp:RequiredFieldValidator Enabled="false" ID="RFVcodigo" runat="server" ControlToValidate="LblCodigo" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Activo Fijo''</b> es necesario, por favor ingréselo." ValidationGroup="GrpDetalleGuardar"></asp:RequiredFieldValidator>--%>
<%--<ajax:ValidatorCalloutExtender ID="VCEcodigo" runat="server" HighlightCssClass="vco" TargetControlID="RFVcodigo" Width="300px"></ajax:ValidatorCalloutExtender>--%>
<asp:HyperLink ID="HplMaq" runat="server" ClientIDMode="Static"><img alt="Activo Fijo" width="20px" height="20px" src="/Imagenes/Maquinaria.jpg" style="cursor:pointer;" onclick="$('#ajaxidmodal #myFrame').css({ width: 900 }); $('#ajaxidmodal ').css({ width: 900 });AbrirVentana('/AF/PopUpBuscarAF.aspx?OPCION=OC',1000,600,'N');"/></asp:HyperLink>
</ContentTemplate>

9
OS/OrdenesServicios.aspx.vb
View File

@@ -340,7 +340,7 @@ Partial Class OS_OrdenesServicios
hdnEsThickbox.Value = "S"
hdnClientIDLink.Value = "NoDefinido"
ImprimirAlGenerar()
End If
End Sub
@@ -2423,6 +2423,13 @@ Partial Class OS_OrdenesServicios
ImprimirPDF("Empresas/Grales/Formatos/OrdenServicio.rdlc", lrds, params, NombreArchivo:=String.Format("OrdenServicio-{0}", CveFolio))
End Sub
Private Sub ImprimirAlGenerar()
Dim params As New List(Of ReportParameter)
Dim report As LocalReport = New LocalReport()
report.ReportPath = String.Format("Empresas/{0}/Formatos/FormatoOS.rdlc", UsuarioActual.CveEmpresa)
Dim paramCollection = report.GetParameters
End Sub
#End Region
#Region "S O L I C I T A R M A T E R I A L"