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:
JPerez
2025-06-06 13:03:21 -07:00
parent 6a8ba84dc8 ab133076e2
commit 61c8638ffb
9 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ventas/ClientesAbonar.aspx
View File

@@ -173,7 +173,7 @@
<div class="row">
<label class="col-md-2">Observaciones</label>
<div class="col-md-7">
<asp:TextBox ID="TxtObservaciones" CssClass="form-control input-sm" runat="server" MaxLength="500" Width="400px" Rows="2" TextMode="MultiLine" ClientIDMode="Static"></asp:TextBox>
<asp:TextBox ID="TxtObservaciones" CssClass="form-control input-sm" runat="server" MaxLength="750" Width="400px" Rows="2" TextMode="MultiLine" ClientIDMode="Static"></asp:TextBox>
<asp:HiddenField ID="HdnObs" runat="server" ClientIDMode="Static" />
</div>
<div class="col-md-2 input-icon">

9
Ventas/RepPedidosSTF.aspx.vb
View File

@@ -1,11 +1,10 @@
Option Explicit On
Option Strict On
Imports System.Activities.Expressions
Imports System.Data
Imports DocumentFormat.OpenXml.Office.CustomUI
Imports Extensiones
Imports Microsoft.Reporting.WebForms
Partial Class Ventas_RepPedidosSTF
Inherits ClsPaginas
@@ -297,6 +296,7 @@ Partial Class Ventas_RepPedidosSTF
ObjA.IniciaTransacSQL()
Dim TieneError As Boolean = False
Dim StrAlerta As New StringBuilder
Dim ActivaEnvio As Boolean = False
For Each drt As DataRow In TmpDTRemis.FiltraParametros("", DistinctColumns:={"CveCliente", "CveSubProyecto", "CveVendedor", "GastosEnvio"}).Rows
@@ -327,10 +327,13 @@ Partial Class Ventas_RepPedidosSTF
TieneError = True
End If
End If
If dr("CvePS").ToString.ToEntero = 1069499 Then ActivaEnvio = True
End If
Next
If drt("GastosEnvio").ToString.ToDecimal > 0 Then
If drt("GastosEnvio").ToString.ToDecimal > 0 AndAlso ActivaEnvio Then
Dim tCvePSEnvio As Integer = UsuarioActual.Empresa.Funcionalidad(160).ToEntero
If Not ObjFactura.AgregarPS(tCvePSEnvio, 1, drt("GastosEnvio").ToString.ToDecimal, 0, "", CveSubProyecto:=drt("CveSubProyecto").ToString.ToEntero) Then
TieneError = True

4
Ventas/Ventas.aspx.vb
View File

@@ -9115,10 +9115,10 @@ Partial Class Ventas
If UsuarioActual.Empresa.Funcionalidad(578) = "1" Then
If ModalidadEdicion Then
e.Row.FCLinkButton("imgE").Visible = True
e.Row.FCLinkButton("imgD").Visible = False
'e.Row.FCLinkButton("imgD").Visible = False
Else
e.Row.FCLinkButton("imgE").Visible = False
e.Row.FCLinkButton("imgD").Visible = False
'e.Row.FCLinkButton("imgD").Visible = False
End If
End If
End If