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

Merge branch 'master' of http://jperez@192.168.10.111:8383/SIG.git

Browse Source
This commit is contained in:
Jonathan Alexis Perez Morales
2021-07-31 12:53:11 -07:00
parent 4395692ea9 89d76c3546
commit a8742805cc
9 changed files with 28 additions and 11345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Ashx/CargaEventos.ashx
View File

@@ -28,16 +28,16 @@ Public Class CargaEventos : Implements IHttpHandler, IRequiresSessionState
FI = context.Request("start").ToDate
FF = context.Request("end").ToDate
If Not GetEventos(CveUsuario, CveEmpresa, FI, FF) Then
'Convierte el objeto de Eventos en JSON
'Dim oSerializer As System.Web.Script.Serialization.JavaScriptSerializer = New System.Web.Script.Serialization.JavaScriptSerializer
Dim sJSON As String = Newtonsoft.Json.JsonConvert.SerializeObject(events)
context.Response.Write(sJSON)
End If
End If
If Not GetEventos(CveUsuario, CveEmpresa, FI, FF) Then
'Convierte el objeto de Eventos en JSON
'Dim oSerializer As System.Web.Script.Serialization.JavaScriptSerializer = New System.Web.Script.Serialization.JavaScriptSerializer
Dim sJSON As String = Newtonsoft.Json.JsonConvert.SerializeObject(events)
context.Response.Write(sJSON)
End If
End Sub
Public ReadOnly Property IsReusable() As Boolean Implements IHttpHandler.IsReusable

5802
Empresas/1/Formatos/FacturaBack.rdlc
View File

File diff suppressed because it is too large Load Diff

3664
Empresas/111/Formatos/Factura.rdlc
View File

File diff suppressed because it is too large Load Diff

1862
Empresas/111/Formatos/OC.rdlc
View File

File diff suppressed because it is too large Load Diff

5
Ventas/ActualizarPrecios.aspx
View File

@@ -161,8 +161,9 @@
<asp:CheckBox runat="server" ID="chkPS" />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="Codigo" ItemStyle-Width="10%" HeaderText="Código" />
<asp:BoundField DataField="PS" ItemStyle-Width="30%" HeaderText="Producto/Servicio" />
<asp:BoundField DataField="Codigo" ItemStyle-Width="5%" HeaderText="Código" />
<asp:BoundField DataField="Codigo2" ItemStyle-Width="5%" HeaderText="Código CPK" Visible="false" />
<asp:BoundField DataField="PS" HeaderText="Producto/Servicio" />
<asp:BoundField DataField="Clasificacion" ItemStyle-Width="15%" HeaderText="Clasificación" />
<asp:BoundField DataField="PrecioLista" NullDisplayText="N/A" ItemStyle-Width="10%" HeaderText="Importe" DataFormatString="$ {0:N2}" ItemStyle-HorizontalAlign="right" />
<asp:TemplateField HeaderText="">

8
Ventas/ActualizarPrecios.aspx.vb
View File

@@ -175,7 +175,13 @@ Partial Class Ventas_ActualizarPrecios
CveProveedor:=CveProveedor, Estado:=DdlEstado.SelectedValue.ToEntero, Marcas:=Marcas, CveModelo:=DdlModelo.SelectedValue.ToEntero) Then
GVPrecios.DataSource = objPS.DtResultados
End If
objPS.Dispose()
objPS.Dispose()
If UsuarioActual.Empresa.Funcionalidad(531) = "1" Then
GVPrecios.Columns(2).Visible = True
End If
dvDatos.Visible = True
GVPrecios.DataBind()

2
Ventas/ProductosServicios.aspx
View File

@@ -133,7 +133,7 @@
<div class="row">
<div class="col-md-12">
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox ID="TxtPS" TextMode="MultiLine" Rows="2" CssClass="form-control Mayuscula" runat="server" MaxLength="846"></asp:TextBox>
<asp:TextBox ID="TxtPS" TextMode="MultiLine" Rows="2" CssClass="form-control" runat="server" MaxLength="846"></asp:TextBox>
<label class="truncate" for="<%= TxtPS.ClientID.ToString()%>">Descripción del Producto / Servicio:</label>
<asp:RequiredFieldValidator ID="RFVPS" runat="server" ControlToValidate="TxtPS" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Producto Servicio''</b> es necesario, por favor ingréselo." ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="VCEPS" runat="server" HighlightCssClass="vco" TargetControlID="RFVPS" Width="300px"></ajax:ValidatorCalloutExtender>

10
Ventas/ProductosServicios.aspx.vb
View File

@@ -251,6 +251,10 @@ Partial Class ProductosyServicios
'DdlTipoPSDes.Attributes.Add("onChange", "CreaDescripcionPS();")
End If
If UsuarioActual.CveEmpresa.Contiene(72, 80) Then
TxtPS.CssClass = "form-control Mayuscula"
End If
If UsuarioActual.CveEmpresa.Contiene(72, 80) And CvePS = -1 Then
'DivDatos.Attributes("class") = "col-md-12"
@@ -1327,9 +1331,9 @@ Partial Class ProductosyServicios
End If
Else
If CodigoBarrasCargado.Length > 0 And TxtCodigoBarras.Text.Length = 0 Then
TxtCodigoBarras.Text = CodigoBarrasCargado
End If
'If CodigoBarrasCargado.Length > 0 And TxtCodigoBarras.Text.Length = 0 Then 'RMF.2021.07.30, se comentó, por no entender la validaci´n, y nodeja limpiar codigos
' TxtCodigoBarras.Text = CodigoBarrasCargado
'End If
Dim PSS As String = TxtPS.Text.Trim.Replace("|", "")
If UsuarioActual.CveEmpresa.Contiene(1, 72, 80) Then PSS = PSS.ToUpper

4
Ventas/Ventas.aspx.vb
View File

@@ -22763,8 +22763,8 @@ Partial Class Ventas
Private Sub BtnCargaExcel_Click(sender As Object, e As EventArgs) Handles BtnCargaExcel.Click
If TxtExcel.getfiles().Archivos.Count > 0 Then
Dim file As Archivo = TxtExcel.getfiles().Archivos(0)
Dim Directorio As String = ModExtensiones.DirectorioBaseEmpresas & file.patch
Dim Tipo As String = If(file.Extencion.Contiene("xlsx", "xlsx", "xlsm", "xlsb"), "EXCEL", "CSV")
Dim Directorio As String = ModExtensiones.DirectorioBaseEmpresas & file.path
Dim Tipo As String = If(file.Extension.Contiene("xlsx", "xlsx", "xlsm", "xlsb"), "EXCEL", "CSV")
CargarArchivo(Directorio, file.filename, Tipo, file.FileUrl)
Else
Alert("No existe el archivo. Favor de subir un archivo excel a la plataforma.", TipoMensaje.MsgError)