Correciones SMS
This commit is contained in:
@@ -6,7 +6,6 @@ Imports System.Xml
|
|||||||
Imports System.Diagnostics
|
Imports System.Diagnostics
|
||||||
Imports System.Globalization
|
Imports System.Globalization
|
||||||
Imports System.IO
|
Imports System.IO
|
||||||
Imports System.IO
|
|
||||||
Imports System.Threading.Tasks
|
Imports System.Threading.Tasks
|
||||||
Imports Newtonsoft.Json
|
Imports Newtonsoft.Json
|
||||||
Imports Extensiones
|
Imports Extensiones
|
||||||
@@ -20748,14 +20747,16 @@ Partial Class Compras_Compras
|
|||||||
Public Function ValidaPresupuesto(Opcion As Integer, Optional ValCveSubProyecto As Integer = -1, Optional ValSubProyecto As String = "", Optional ValCveClasificacion As Integer = -1, Optional ValClasificacion As String = "",
|
Public Function ValidaPresupuesto(Opcion As Integer, Optional ValCveSubProyecto As Integer = -1, Optional ValSubProyecto As String = "", Optional ValCveClasificacion As Integer = -1, Optional ValClasificacion As String = "",
|
||||||
Optional ValCveTipoGasto As Integer = -1, Optional ValTipoGasto As String = "", Optional ValImporte As Decimal = 0) As Boolean
|
Optional ValCveTipoGasto As Integer = -1, Optional ValTipoGasto As String = "", Optional ValImporte As Decimal = 0) As Boolean
|
||||||
|
|
||||||
|
|
||||||
Dim respuesta As Boolean = False
|
Dim respuesta As Boolean = False
|
||||||
|
|
||||||
If DdlTipoComprobante.SelectedValue <> "Fac" Then
|
|
||||||
Return True
|
|
||||||
End If
|
|
||||||
|
|
||||||
If UsuarioActual.Empresa.Funcionalidad(532) = "1" Then
|
If UsuarioActual.Empresa.Funcionalidad(532) = "1" Then
|
||||||
|
|
||||||
|
If Opcion = 1 Or OCVinculada Or DdlTipoComprobante.SelectedValue <> "Fac" Then
|
||||||
|
Return True
|
||||||
|
End If
|
||||||
|
|
||||||
Dim ObjCon As New ClsContratos
|
Dim ObjCon As New ClsContratos
|
||||||
Dim CvePresupuesto As Integer = 0
|
Dim CvePresupuesto As Integer = 0
|
||||||
Dim Autorizado As Double = 0
|
Dim Autorizado As Double = 0
|
||||||
|
|||||||
@@ -15,14 +15,14 @@ Partial Class Inventarios_EntregaAlmacen
|
|||||||
Inherits ClsPaginas
|
Inherits ClsPaginas
|
||||||
|
|
||||||
#Region "PROPIEDADES"
|
#Region "PROPIEDADES"
|
||||||
Private Property CveVentaAD As Integer
|
'Private Property CveVentaAD As Integer
|
||||||
Get
|
' Get
|
||||||
Return CType(ViewState("CveVentaAD"), Integer)
|
' Return CType(ViewState("CveVentaAD"), Integer)
|
||||||
End Get
|
' End Get
|
||||||
Set(value As Integer)
|
' Set(value As Integer)
|
||||||
ViewState("CveVentaAD") = value
|
' ViewState("CveVentaAD") = value
|
||||||
End Set
|
' End Set
|
||||||
End Property
|
'End Property
|
||||||
Private Property DtDatos As DataTable
|
Private Property DtDatos As DataTable
|
||||||
Get
|
Get
|
||||||
Return CType(ViewState("DtDatos"), DataTable)
|
Return CType(ViewState("DtDatos"), DataTable)
|
||||||
@@ -468,14 +468,14 @@ Partial Class Inventarios_EntregaAlmacen
|
|||||||
#Region " CARGA PARAMETROS - EXCLUSIVO USO AD "
|
#Region " CARGA PARAMETROS - EXCLUSIVO USO AD "
|
||||||
Private Sub CargaParametrosAD()
|
Private Sub CargaParametrosAD()
|
||||||
|
|
||||||
CveVentaAD = -1
|
'CveVentaAD = -1
|
||||||
|
|
||||||
'If UsuarioActual.CveUsuario <> 100 Then
|
'If UsuarioActual.CveUsuario <> 100 Then
|
||||||
' Exit Sub
|
' Exit Sub
|
||||||
'End If
|
'End If
|
||||||
|
|
||||||
If Not IsNothing(Request("CveVenta")) AndAlso IsNumeric(Request("CveVenta")) Then
|
If Not IsNothing(Request("CveVenta")) AndAlso IsNumeric(Request("CveVenta")) Then
|
||||||
CveVentaAD = Request("CveVenta").ToEntero()
|
'CveVentaAD = Request("CveVenta").ToEntero()
|
||||||
CargaVentaPorSurtir(Request("CveVenta").ToEntero())
|
CargaVentaPorSurtir(Request("CveVenta").ToEntero())
|
||||||
'LbSurtida.Visible = True
|
'LbSurtida.Visible = True
|
||||||
'LbSurtida.Text = "SOLO MODO VISUAL"
|
'LbSurtida.Text = "SOLO MODO VISUAL"
|
||||||
@@ -611,7 +611,7 @@ Partial Class Inventarios_EntregaAlmacen
|
|||||||
Dim GvRow As GridViewRow = DirectCast((DirectCast(sender, LinkButton)).NamingContainer, GridViewRow)
|
Dim GvRow As GridViewRow = DirectCast((DirectCast(sender, LinkButton)).NamingContainer, GridViewRow)
|
||||||
Dim CveOS As Integer = GvRow.DataKey("CveOS").ToEntero
|
Dim CveOS As Integer = GvRow.DataKey("CveOS").ToEntero
|
||||||
|
|
||||||
CveVentaAD = -1
|
'CveVentaAD = -1
|
||||||
|
|
||||||
If Boton.CommandArgument.ToEntero() > 0 Then
|
If Boton.CommandArgument.ToEntero() > 0 Then
|
||||||
TimmerRefresh.Enabled = False
|
TimmerRefresh.Enabled = False
|
||||||
@@ -634,7 +634,7 @@ Partial Class Inventarios_EntregaAlmacen
|
|||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
Protected Sub BtnBuscar_Click(sender As Object, e As EventArgs)
|
Protected Sub BtnBuscar_Click(sender As Object, e As EventArgs)
|
||||||
CveVentaAD = -2
|
'CveVentaAD = -2
|
||||||
CargaVentaPorSurtir(DdlFolio.SelectedValue.ToEntero())
|
CargaVentaPorSurtir(DdlFolio.SelectedValue.ToEntero())
|
||||||
End Sub
|
End Sub
|
||||||
Private Sub CargaVentaPorSurtir(CveVenta As Integer, Optional CveAlmacen As Integer = -1, Optional CveOS As Integer = -1)
|
Private Sub CargaVentaPorSurtir(CveVenta As Integer, Optional CveAlmacen As Integer = -1, Optional CveOS As Integer = -1)
|
||||||
@@ -692,7 +692,8 @@ Partial Class Inventarios_EntregaAlmacen
|
|||||||
|
|
||||||
EsDevolucionVenta = drE("EsDevolucionVenta").ToString().ToEntero()
|
EsDevolucionVenta = drE("EsDevolucionVenta").ToString().ToEntero()
|
||||||
TipoDocto = DtDatos.Rows(0)("TipoDocto").ToString()
|
TipoDocto = DtDatos.Rows(0)("TipoDocto").ToString()
|
||||||
TipoMovimiento = If(TipoDocto.Contiene({"Rem", "Ped", "Ing", "Ped", "PeC", "Ant"}) And (EsDevolucionVenta = 0 Or CveVentaAD > 0), 1, 2)
|
'TipoMovimiento = If(TipoDocto.Contiene({"Rem", "Ped", "Ing", "Ped", "PeC", "Ant"}) And (EsDevolucionVenta = 0 Or CveVentaAD > 0), 1, 2)
|
||||||
|
TipoMovimiento = If(TipoDocto.Contiene({"Rem", "Ped", "Ing", "Ped", "PeC", "Ant"}) And (EsDevolucionVenta = 0), 1, 2)
|
||||||
|
|
||||||
If UsuarioActual.Empresa.Funcionalidad(578).ToEntero = 1 AndAlso TipoDocto.Contiene("Ped", "Ing") Then
|
If UsuarioActual.Empresa.Funcionalidad(578).ToEntero = 1 AndAlso TipoDocto.Contiene("Ped", "Ing") Then
|
||||||
TxtObservaciones.Text = $"Dr. {drE("Medico").ToString}{vbCrLf}Cx. {drE("Procedimiento").ToString}{vbCrLf}F. Cirugía {drE("FechaParaSurtir").ToString.ToDateTime.ToString("dd/MM/yyyy HH:mm")}{vbCrLf}H. {drE("Sucursal").ToString}{vbCrLf}"
|
TxtObservaciones.Text = $"Dr. {drE("Medico").ToString}{vbCrLf}Cx. {drE("Procedimiento").ToString}{vbCrLf}F. Cirugía {drE("FechaParaSurtir").ToString.ToDateTime.ToString("dd/MM/yyyy HH:mm")}{vbCrLf}H. {drE("Sucursal").ToString}{vbCrLf}"
|
||||||
|
|||||||
@@ -229,9 +229,16 @@
|
|||||||
</asp:TemplateField>
|
</asp:TemplateField>
|
||||||
<asp:TemplateField ItemStyle-Width="60px" HeaderText="Hora Servicio">
|
<asp:TemplateField ItemStyle-Width="60px" HeaderText="Hora Servicio">
|
||||||
<ItemTemplate>
|
<ItemTemplate>
|
||||||
<asp:Literal ID="LtlHoraServicio" runat="server" Visible="false" Text='<%# Eval("HoraCita", "{0:t}")%>'> ></asp:Literal>
|
<table style="width:58px!important">
|
||||||
<cc1:TimeSelector ID="TimeSelector" runat="server" DisplaySeconds="false" DisplayButtons="false" Visible="false" SelectedTimeFormat="TwentyFour" Width="60px" Height="20px" CssClass="test" >
|
<tr>
|
||||||
</cc1:TimeSelector>
|
<td style="width:58px!important">
|
||||||
|
<asp:Literal ID="LtlHoraServicio" runat="server" Visible="false" Text='<%# Eval("HoraCita", "{0:t}")%>'> ></asp:Literal>
|
||||||
|
<cc1:TimeSelector ID="TimeSelector" runat="server" DisplaySeconds="false" DisplayButtons="false" Visible="false" SelectedTimeFormat="TwentyFour" Width="60px" Height="20px" CssClass="test" >
|
||||||
|
</cc1:TimeSelector>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
</ItemTemplate>
|
</ItemTemplate>
|
||||||
</asp:TemplateField>
|
</asp:TemplateField>
|
||||||
<%--11--%>
|
<%--11--%>
|
||||||
|
|||||||
@@ -465,7 +465,7 @@ Partial Class OS_OrdenesServicios
|
|||||||
DvTxtEpisodioModal.Visible = True
|
DvTxtEpisodioModal.Visible = True
|
||||||
DvTxtFolioRemisionModal.Visible = True
|
DvTxtFolioRemisionModal.Visible = True
|
||||||
|
|
||||||
If CveOS > 0 And TipoEstatus >= 3 Then
|
If CveOS > 0 And TipoEstatus >= 2 Then
|
||||||
DdlUsuarioAtendio.Enabled = True
|
DdlUsuarioAtendio.Enabled = True
|
||||||
DVUsuarioAtendio3.Visible = True
|
DVUsuarioAtendio3.Visible = True
|
||||||
End If
|
End If
|
||||||
|
|||||||
Reference in New Issue
Block a user