AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://jperez@adsistemasof.sytes.net:8383/SIG.git

Browse Source
This commit is contained in:
Jonathan Alexis Perez Morales
2020-05-28 23:02:11 -07:00
parent ab1a809894 5ea615d241
commit 2da4a206f1
5 changed files with 190 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Bancos/IE.aspx.vb
View File

@@ -3332,6 +3332,9 @@ Partial Class Bancos_IE
#Region " NOTIFICACION PAGO " #Region " NOTIFICACION PAGO "
Private Sub NotificacionPago(CveIE As Integer, CorreoNotificarA As String) 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) Dim Param As New List(Of String)
Param.Add(CorreoNotificarA) 'Para Param.Add(CorreoNotificarA) 'Para
@@ -3342,6 +3345,11 @@ Partial Class Bancos_IE
Dim Hilo As New Threading.Thread(AddressOf MandaCorreo) Dim Hilo As New Threading.Thread(AddressOf MandaCorreo)
Hilo.Start(Param) Hilo.Start(Param)
End If
End Sub End Sub
Private Sub MandaCorreo(data As Object) Private Sub MandaCorreo(data As Object)
Dim Parametros As List(Of String) = DirectCast(data, List(Of String)) Dim Parametros As List(Of String) = DirectCast(data, List(Of String))

18
Bancos/PagoElectronicoGrupos.aspx.vb
View File

@@ -966,6 +966,16 @@ Partial Class Bancos_PagoElectronicoGrupos
RegistrosPago.Append("PSC") RegistrosPago.Append("PSC")
End If 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 If drow("CLABEOrigen").ToString.Trim.Length.Contiene(10, 18) Then
RegistrosPago.Append(drow("CLABEOrigen").ToString.PadLeft(18, CeroRelleno)) RegistrosPago.Append(drow("CLABEOrigen").ToString.PadLeft(18, CeroRelleno))
@@ -976,13 +986,7 @@ Partial Class Bancos_PagoElectronicoGrupos
Exit For Exit For
End If 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("Abreviatura").ToString)
RegistrosPago.Append(drow("Abonado").ToString.ToDecimal.ToString("0000000000000.00")) RegistrosPago.Append(drow("Abonado").ToString.ToDecimal.ToString("0000000000000.00"))

4
Bancos/ProveedoresAbonar.aspx.vb
View File

@@ -2680,6 +2680,8 @@ Partial Class Bancos_ProveedoresAbonar
#Region " NOTIFICACION PAGO " #Region " NOTIFICACION PAGO "
Private Sub NotificacionPago(CveIE As Integer, CorreoNotificarA As String) 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) 'Dim Param As New List(Of String)
'Param.Add(CorreoNotificarA) 'Para '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)) Dim Hilo As New Threading.Thread(Sub() MandaCorreo(CorreoNotificarA, "Notificaciones de pago", Body, CveIE, Comprobante, File))
Hilo.Start() Hilo.Start()
End If
End Sub End Sub
Private Sub MandaCorreo(Para As String, Asunto As String, Body As String, CveIE As Integer, Comprobante As String, File As Byte()) Private Sub MandaCorreo(Para As String, Asunto As String, Body As String, CveIE As Integer, Comprobante As String, File As Byte())

22
Inventarios/PrestamosdeProveedor.aspx
View File

@@ -1,19 +1,19 @@
<%@ Page Title="" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="PrestamosdeProveedor.aspx.vb" Inherits="Inventarios_PrestamosdeProveedor" %> <%@ 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>
<asp:Content ID="Content2" ContentPlaceHolderID="Css" Runat="Server"> <asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
</asp:Content> </asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="E" Runat="Server"> <asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server">
Préstamos de Proveedores Préstamos de Proveedores
</asp:Content> </asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="HB" Runat="Server"> <asp:Content ID="Content4" ContentPlaceHolderID="HB" runat="Server">
</asp:Content> </asp:Content>
<asp:Content ID="Content5" ContentPlaceHolderID="H" Runat="Server"> <asp:Content ID="Content5" ContentPlaceHolderID="H" runat="Server">
</asp:Content> </asp:Content>
<asp:Content ID="Content6" ContentPlaceHolderID="HA" Runat="Server"> <asp:Content ID="Content6" ContentPlaceHolderID="HA" runat="Server">
</asp:Content> </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"> <asp:UpdatePanel runat="server" ID="UpFiltraEntrega" UpdateMode="Conditional">
<ContentTemplate> <ContentTemplate>
<div class="portlet solid grey-cascade portlet-filter"> <div class="portlet solid grey-cascade portlet-filter">
@@ -25,7 +25,7 @@
<label class="col-md-1 truncate" style="text-align: right;">Proveedor:</label> <label class="col-md-1 truncate" style="text-align: right;">Proveedor:</label>
<div class="col-md-3"> <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> </div>
<label class="col-md-1 truncate" style="text-align: right;">Folio:</label> <label class="col-md-1 truncate" style="text-align: right;">Folio:</label>
@@ -102,6 +102,8 @@
<label class="col-md-3">Observaciones:</label> <label class="col-md-3">Observaciones:</label>
<div class="col-md-9"> <div class="col-md-9">
<asp:TextBox ID="TxtObservacionesEntrega" TextMode="MultiLine" Rows="2" runat="server" Width="300px"></asp:TextBox> <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> </div>
<div class="row"> <div class="row">
@@ -136,7 +138,7 @@
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Cantidad" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center"> <asp:TemplateField HeaderText="Cantidad" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center">
<ItemTemplate> <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="." /> <ajax:FilteredTextBoxExtender ID="SoloNumeros2" runat="server" TargetControlID="TxtCantidad" FilterType="Custom, Numbers" ValidChars="." />
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
@@ -153,7 +155,7 @@
</ContentTemplate> </ContentTemplate>
</asp:UpdatePanel> </asp:UpdatePanel>
</asp:Content> </asp:Content>
<asp:Content ID="Content8" ContentPlaceHolderID="JS" Runat="Server"> <asp:Content ID="Content8" ContentPlaceHolderID="JS" runat="Server">
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">

5
Ventas/Ventas.aspx.vb
View File

@@ -5728,7 +5728,10 @@ Partial Class Ventas
End If 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 'Si es una devolucion
If NuevaFactura = 0 Then If NuevaFactura = 0 Then