Merge branch 'master' of http://jperez@adsistemasof.sytes.net:8383/SIG.git
This commit is contained in:
@@ -3332,6 +3332,9 @@ Partial Class Bancos_IE
|
||||
|
||||
#Region " NOTIFICACION PAGO "
|
||||
Private Sub NotificacionPago(CveIE As Integer, CorreoNotificarA As String)
|
||||
|
||||
If Not DdlTipoTransaccion.SelectedValue.ToEntero.Contiene(9, 17) Then
|
||||
|
||||
Dim Param As New List(Of String)
|
||||
|
||||
Param.Add(CorreoNotificarA) 'Para
|
||||
@@ -3342,6 +3345,11 @@ Partial Class Bancos_IE
|
||||
|
||||
Dim Hilo As New Threading.Thread(AddressOf MandaCorreo)
|
||||
Hilo.Start(Param)
|
||||
|
||||
End If
|
||||
|
||||
|
||||
|
||||
End Sub
|
||||
Private Sub MandaCorreo(data As Object)
|
||||
Dim Parametros As List(Of String) = DirectCast(data, List(Of String))
|
||||
|
||||
@@ -966,6 +966,16 @@ Partial Class Bancos_PagoElectronicoGrupos
|
||||
RegistrosPago.Append("PSC")
|
||||
End If
|
||||
|
||||
|
||||
If drow("CLABEDestino").ToString.Trim.Length.Contiene(10, 18) Then
|
||||
RegistrosPago.Append(drow("CLABEDestino").ToString.PadLeft(18, CeroRelleno))
|
||||
Else
|
||||
ErrorLayout = True
|
||||
MENSAJEError.AppendLine("ERROR EN CLABE cuenta destino")
|
||||
Exit For
|
||||
End If
|
||||
|
||||
|
||||
If drow("CLABEOrigen").ToString.Trim.Length.Contiene(10, 18) Then
|
||||
|
||||
RegistrosPago.Append(drow("CLABEOrigen").ToString.PadLeft(18, CeroRelleno))
|
||||
@@ -976,13 +986,7 @@ Partial Class Bancos_PagoElectronicoGrupos
|
||||
Exit For
|
||||
End If
|
||||
|
||||
If drow("CLABEDestino").ToString.Trim.Length.Contiene(10, 18) Then
|
||||
RegistrosPago.Append(drow("CLABEDestino").ToString.PadLeft(18, CeroRelleno))
|
||||
Else
|
||||
ErrorLayout = True
|
||||
MENSAJEError.AppendLine("ERROR EN CLABE cuenta destino")
|
||||
Exit For
|
||||
End If
|
||||
|
||||
|
||||
RegistrosPago.Append(drow("Abreviatura").ToString)
|
||||
RegistrosPago.Append(drow("Abonado").ToString.ToDecimal.ToString("0000000000000.00"))
|
||||
|
||||
@@ -2680,6 +2680,8 @@ Partial Class Bancos_ProveedoresAbonar
|
||||
#Region " NOTIFICACION PAGO "
|
||||
|
||||
Private Sub NotificacionPago(CveIE As Integer, CorreoNotificarA As String)
|
||||
|
||||
If Not DdlTipoTransaccion.SelectedValue.ToEntero.Contiene(9, 17) Then
|
||||
'Dim Param As New List(Of String)
|
||||
|
||||
'Param.Add(CorreoNotificarA) 'Para
|
||||
@@ -2696,6 +2698,8 @@ Partial Class Bancos_ProveedoresAbonar
|
||||
|
||||
Dim Hilo As New Threading.Thread(Sub() MandaCorreo(CorreoNotificarA, "Notificaciones de pago", Body, CveIE, Comprobante, File))
|
||||
Hilo.Start()
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub MandaCorreo(Para As String, Asunto As String, Body As String, CveIE As Integer, Comprobante As String, File As Byte())
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
<%@ Page Title="" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="PrestamosdeProveedor.aspx.vb" Inherits="Inventarios_PrestamosdeProveedor" %>
|
||||
|
||||
<asp:Content ID="Content1" ContentPlaceHolderID="CP" Runat="Server">
|
||||
<asp:Content ID="Content1" ContentPlaceHolderID="CP" runat="Server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content2" ContentPlaceHolderID="Css" Runat="Server">
|
||||
<asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content3" ContentPlaceHolderID="E" Runat="Server">
|
||||
<asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server">
|
||||
Préstamos de Proveedores
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content4" ContentPlaceHolderID="HB" Runat="Server">
|
||||
<asp:Content ID="Content4" ContentPlaceHolderID="HB" runat="Server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content5" ContentPlaceHolderID="H" Runat="Server">
|
||||
<asp:Content ID="Content5" ContentPlaceHolderID="H" runat="Server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content6" ContentPlaceHolderID="HA" Runat="Server">
|
||||
<asp:Content ID="Content6" ContentPlaceHolderID="HA" runat="Server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content7" ContentPlaceHolderID="C" Runat="Server">
|
||||
<asp:Content ID="Content7" ContentPlaceHolderID="C" runat="Server">
|
||||
<asp:UpdatePanel runat="server" ID="UpFiltraEntrega" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<div class="portlet solid grey-cascade portlet-filter">
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
<label class="col-md-1 truncate" style="text-align: right;">Proveedor:</label>
|
||||
<div class="col-md-3">
|
||||
<ADS:DropDownLost ID="ddlProveedor" runat="server" DataValueField="CveProveedor" DataTextField="RazonSocial" AutoPostBack="true" CssClassDdl="select2me" CssStyle="width: 300px; "></ADS:DropDownLost>
|
||||
<ADS:Dropdownlost ID="ddlProveedor" runat="server" DataValueField="CveProveedor" DataTextField="RazonSocial" AutoPostBack="true" CssClassDdl="select2me" CssStyle="width: 300px; "></ADS:Dropdownlost>
|
||||
</div>
|
||||
|
||||
<label class="col-md-1 truncate" style="text-align: right;">Folio:</label>
|
||||
@@ -102,6 +102,8 @@
|
||||
<label class="col-md-3">Observaciones:</label>
|
||||
<div class="col-md-9">
|
||||
<asp:TextBox ID="TxtObservacionesEntrega" TextMode="MultiLine" Rows="2" runat="server" Width="300px"></asp:TextBox>
|
||||
<asp:RequiredFieldValidator ID="RfvObservaciones" runat="server" ControlToValidate="TxtObservacionesEntrega" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Observaciones''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpRecibir"></asp:RequiredFieldValidator>
|
||||
<ajax:ValidatorCalloutExtender ID="VceObservaciones" runat="server" HighlightCssClass="vco" TargetControlID="RfvObservaciones" Width="350px"></ajax:ValidatorCalloutExtender>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
@@ -136,7 +138,7 @@
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Cantidad" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center">
|
||||
<ItemTemplate>
|
||||
<asp:TextBox ID="TxtCantidad" Visible="false" Width="60px" runat="server" Text="0" enabled="false"></asp:TextBox>
|
||||
<asp:TextBox ID="TxtCantidad" Visible="false" Width="60px" runat="server" Text="0" Enabled="false"></asp:TextBox>
|
||||
<ajax:FilteredTextBoxExtender ID="SoloNumeros2" runat="server" TargetControlID="TxtCantidad" FilterType="Custom, Numbers" ValidChars="." />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
@@ -153,7 +155,7 @@
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content8" ContentPlaceHolderID="JS" Runat="Server">
|
||||
<asp:Content ID="Content8" ContentPlaceHolderID="JS" runat="Server">
|
||||
|
||||
<script type="text/javascript" language="javascript">
|
||||
|
||||
|
||||
@@ -5728,7 +5728,10 @@ Partial Class Ventas
|
||||
|
||||
End If
|
||||
|
||||
If UsuarioActual.TienePermisoProceso(68) Then e.Row.FCTextBox("TxtPrecio").Enabled = False
|
||||
If UsuarioActual.TienePermisoProceso(68) Then
|
||||
e.Row.FCTextBox("TxtPrecio").Enabled = False
|
||||
e.Row.FCTextBox("TxtDescuento").Enabled = False
|
||||
End If
|
||||
|
||||
'Si es una devolucion
|
||||
If NuevaFactura = 0 Then
|
||||
|
||||
Reference in New Issue
Block a user