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:
Jorge Luis caudillo esparza
2025-06-26 07:04:13 -07:00
parent da14272488 2d3852764e
commit 13acd88cc3
13 changed files with 105 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
App_Code/ClsNominas.vb
View File

@@ -615,7 +615,7 @@ Public Class ClsNominas
End Try End Try
Return retorno Return retorno
End Function End Function
Public Function GuardarAguinaldo(CveEmpresa As Integer, CveUsuario As Integer, registros As String) As Boolean Public Function GuardarAguinaldo(CveEmpresa As Integer, CveUsuario As Integer, registros As String) As Boolean
Dim retorno As Boolean = False Dim retorno As Boolean = False
@@ -2743,7 +2743,7 @@ Public Class ClsNominas
End Try End Try
Return retorno Return retorno
End Function End Function
Public Function ReporteVacacionesCalendario(CveProyecto As Integer, CveSubProyecto As Integer, cveEmpresa As Integer, fechaInicio As String, fechaFin As String) As Boolean Public Function ReporteVacacionesCalendario(CveProyecto As Integer, CveSubProyecto As Integer, cveEmpresa As Integer, fechaInicio As String, fechaFin As String) As Boolean
Dim retorno As Boolean = False Dim retorno As Boolean = False
Try Try

2
App_Code/ClsPaginas.vb
View File

@@ -1022,7 +1022,7 @@ Public Class ClsPaginas
For Each file As String In files For Each file As String In files
Dim fi As IO.FileInfo = New IO.FileInfo(file) Dim fi As IO.FileInfo = New IO.FileInfo(file)
If fi.LastAccessTime <DateTime.Now.AddMonths(-6) Then fi.Delete() If fi.LastAccessTime < DateTime.Now.AddMonths(-6) Then fi.Delete()
Next Next
Next Next
End If End If

12
App_Code/ClsProductosServicios.vb
View File

@@ -34,6 +34,7 @@ Public Class ClsProductosServicios
Public Property NumeroParte As String Public Property NumeroParte As String
Public Property CodigoBarras As String Public Property CodigoBarras As String
Public Property PS As String Public Property PS As String
Public Property PSExtranjero As String
Public Property Precio As Double Public Property Precio As Double
Public Property PrecioMinimo As Double Public Property PrecioMinimo As Double
Public Property Oferta As Double Public Property Oferta As Double
@@ -245,6 +246,7 @@ Public Class ClsProductosServicios
Me.NumeroParte = Data.Rows(0)("NumeroParte").ToString Me.NumeroParte = Data.Rows(0)("NumeroParte").ToString
Me.CodigoBarras = Data.Rows(0)("CodigoBarras").ToString Me.CodigoBarras = Data.Rows(0)("CodigoBarras").ToString
Me.PS = Data.Rows(0)("PS").ToString Me.PS = Data.Rows(0)("PS").ToString
Me.PSExtranjero = Data.Rows(0)("PSExtranjero").ToString
Precio = Data.Rows(0)("Precio").ToString.ToDouble Precio = Data.Rows(0)("Precio").ToString.ToDouble
PrecioMinimo = Data.Rows(0)("PrecioMinimo").ToString.ToDouble PrecioMinimo = Data.Rows(0)("PrecioMinimo").ToString.ToDouble
Oferta = Data.Rows(0)("Oferta").ToString.ToDouble Oferta = Data.Rows(0)("Oferta").ToString.ToDouble
@@ -330,7 +332,6 @@ Public Class ClsProductosServicios
With SqlAdapter.SelectCommand.Parameters With SqlAdapter.SelectCommand.Parameters
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
End With End With
Try Try
@@ -402,7 +403,7 @@ Public Class ClsProductosServicios
Return Retorno Return Retorno
End Function End Function
Public Function AddPS(CveClasificacion As Integer, CveClasificacionCosto As Integer, CveUnidadMedida As Integer, Codigo As String, NumeroParte As String, CodigoBarras As String, PS As String, Precio As Double, IVA As Double, RetIVA As Double, Inventariable As Boolean, CveProveedorCompra As Integer, Public Function AddPS(CveClasificacion As Integer, CveClasificacionCosto As Integer, CveUnidadMedida As Integer, Codigo As String, NumeroParte As String, CodigoBarras As String, PS As String, Precio As Double, IVA As Double, RetIVA As Double, Inventariable As Boolean, CveProveedorCompra As Integer,
AplicaParaConcepto As Boolean, AplicaParaVenta As Boolean, CveUsuario As Integer, CveEmpresa As Integer, CveMetodoInventario As Integer, EsPaquete As Integer, AplicaParaConcepto As Boolean, AplicaParaVenta As Boolean, CveUsuario As Integer, CveEmpresa As Integer, CveMetodoInventario As Integer, EsPaquete As Integer, Optional PSExtranjero As String = "-1",
Optional CveTipoPS As Integer = -1, Optional FuePorXML As Boolean = True, Optional TipoServicio As Integer = -1, Optional CveClasificacion2 As Integer = -1, Optional CveTipoPS As Integer = -1, Optional FuePorXML As Boolean = True, Optional TipoServicio As Integer = -1, Optional CveClasificacion2 As Integer = -1,
Optional CveMarca As Integer = -1, Optional AlmacenSeccion As String = "", Optional AplicaIEPS As Boolean = False, Optional IEPSPorcentaje As Decimal = -1, Optional CveMarca As Integer = -1, Optional AlmacenSeccion As String = "", Optional AplicaIEPS As Boolean = False, Optional IEPSPorcentaje As Decimal = -1,
Optional CveCompuesto As Integer = -1, Optional CveSATPS As Integer = -1, Optional IEPSGrabaIVA As Boolean = False, Optional VentaMinima As Decimal = 0, Optional CveCompuesto As Integer = -1, Optional CveSATPS As Integer = -1, Optional IEPSGrabaIVA As Boolean = False, Optional VentaMinima As Decimal = 0,
@@ -421,8 +422,6 @@ Public Class ClsProductosServicios
DataAdapter("PA_ProductosServiciosAdd") DataAdapter("PA_ProductosServiciosAdd")
With SqlAdapter.SelectCommand.Parameters With SqlAdapter.SelectCommand.Parameters
.Add("@CveClasificacion", SqlDbType.Int).Value = CveClasificacion .Add("@CveClasificacion", SqlDbType.Int).Value = CveClasificacion
.Add("@CveClasificacionCosto", SqlDbType.Int).Value = CveClasificacionCosto .Add("@CveClasificacionCosto", SqlDbType.Int).Value = CveClasificacionCosto
.Add("@CveUnidadMedida", SqlDbType.Int).Value = CveUnidadMedida .Add("@CveUnidadMedida", SqlDbType.Int).Value = CveUnidadMedida
@@ -430,6 +429,7 @@ Public Class ClsProductosServicios
.Add("@NumeroParte", SqlDbType.VarChar).Value = If(NumeroParte = "", "-1", NumeroParte) .Add("@NumeroParte", SqlDbType.VarChar).Value = If(NumeroParte = "", "-1", NumeroParte)
.Add("@CodigoBarras", SqlDbType.VarChar).Value = If(CodigoBarras = "", "-1", CodigoBarras) .Add("@CodigoBarras", SqlDbType.VarChar).Value = If(CodigoBarras = "", "-1", CodigoBarras)
.Add("@PS", SqlDbType.VarChar).Value = If(PS.Length > 845, PS.Substring(0, 845), PS) .Add("@PS", SqlDbType.VarChar).Value = If(PS.Length > 845, PS.Substring(0, 845), PS)
.Add("@PSExtranjero", SqlDbType.VarChar).Value = If(PSExtranjero.Length > 845, PSExtranjero.Substring(0, 845), PSExtranjero)
.Add("@Precio", SqlDbType.Float).Value = Precio .Add("@Precio", SqlDbType.Float).Value = Precio
.Add("@IVA", SqlDbType.Float).Value = IVA .Add("@IVA", SqlDbType.Float).Value = IVA
.Add("@RetIVA", SqlDbType.Float).Value = RetIVA .Add("@RetIVA", SqlDbType.Float).Value = RetIVA
@@ -687,7 +687,7 @@ Public Class ClsProductosServicios
End Function End Function
Public Function UpdatePS(CveClasificacion As Integer, CveClasificacionCosto As Integer, CveUnidadMedida As Integer, Codigo As String, NumeroParte As String, CodigoBarras As String, PS As String, Precio As Double, IVA As Double, RetIVA As Double, Inventariable As Boolean, CveProveedorCompra As Integer, Public Function UpdatePS(CveClasificacion As Integer, CveClasificacionCosto As Integer, CveUnidadMedida As Integer, Codigo As String, NumeroParte As String, CodigoBarras As String, PS As String, Precio As Double, IVA As Double, RetIVA As Double, Inventariable As Boolean, CveProveedorCompra As Integer,
AplicaParaConcepto As Boolean, AplicaParaVenta As Boolean, Estado As Boolean, CveUsuario As Integer, CvePS As Integer, CveMetodoInventario As Integer, EsPaquete As Integer, CveSATPS As Integer, CveEmpresa As Integer, Optional CveTipoPS As Integer = -1, Optional TipoServicio As Integer = -1, AplicaParaConcepto As Boolean, AplicaParaVenta As Boolean, Estado As Boolean, CveUsuario As Integer, CvePS As Integer, CveMetodoInventario As Integer, EsPaquete As Integer, CveSATPS As Integer, CveEmpresa As Integer, Optional PSExtranjero As String = "-1", Optional CveTipoPS As Integer = -1, Optional TipoServicio As Integer = -1,
Optional CveClasificacion2 As Integer = -1, Optional CveMarca As Integer = -1, Optional AlmacenSeccion As String = "", Optional AplicaIEPS As Boolean = False, Optional IEPSPorcentaje As Decimal = -1, Optional CveClasificacion2 As Integer = -1, Optional CveMarca As Integer = -1, Optional AlmacenSeccion As String = "", Optional AplicaIEPS As Boolean = False, Optional IEPSPorcentaje As Decimal = -1,
Optional CveCompuesto As Integer = -1, Optional IEPSGrabaIVA As Boolean = False, Optional VentaMinima As Decimal = 0, Optional CveCompuesto As Integer = -1, Optional IEPSGrabaIVA As Boolean = False, Optional VentaMinima As Decimal = 0,
Optional CveMoneda As Integer = 1, Optional RetISR As Double = 0, Optional PrecioMinimo As Decimal = Nothing, Optional CveTipoFactor As Integer = 1, Optional CveMoneda As Integer = 1, Optional RetISR As Double = 0, Optional PrecioMinimo As Decimal = Nothing, Optional CveTipoFactor As Integer = 1,
@@ -713,6 +713,7 @@ Public Class ClsProductosServicios
.Add("@NumeroParte", SqlDbType.VarChar).Value = If(NumeroParte = "", "-1", NumeroParte) .Add("@NumeroParte", SqlDbType.VarChar).Value = If(NumeroParte = "", "-1", NumeroParte)
.Add("@CodigoBarras", SqlDbType.VarChar).Value = If(CodigoBarras = "", "-1", CodigoBarras) .Add("@CodigoBarras", SqlDbType.VarChar).Value = If(CodigoBarras = "", "-1", CodigoBarras)
.Add("@PS", SqlDbType.VarChar).Value = PS .Add("@PS", SqlDbType.VarChar).Value = PS
.Add("@PSExtranjero", SqlDbType.VarChar).Value = PSExtranjero
.Add("@Precio", SqlDbType.Float).Value = Precio .Add("@Precio", SqlDbType.Float).Value = Precio
.Add("@IVA", SqlDbType.Float).Value = IVA .Add("@IVA", SqlDbType.Float).Value = IVA
.Add("@RetIVA", SqlDbType.Float).Value = RetIVA .Add("@RetIVA", SqlDbType.Float).Value = RetIVA
@@ -734,7 +735,6 @@ Public Class ClsProductosServicios
.Add("@CveCompuesto", SqlDbType.Int).Value = CveCompuesto .Add("@CveCompuesto", SqlDbType.Int).Value = CveCompuesto
.Add("@CveSATPS", SqlDbType.Int).Value = CveSATPS .Add("@CveSATPS", SqlDbType.Int).Value = CveSATPS
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
'Nuevo R: 26/09/2017' 'Nuevo R: 26/09/2017'
.Add("@Inventariable", SqlDbType.Bit).Value = Inventariable .Add("@Inventariable", SqlDbType.Bit).Value = Inventariable
.Add("@CveProveedorCompra", SqlDbType.Int).Value = CveProveedorCompra .Add("@CveProveedorCompra", SqlDbType.Int).Value = CveProveedorCompra

4
Ashx/GenerarPDFFactura.ashx
View File

@@ -161,8 +161,8 @@ Public Class GenerarPDFFactura : Implements IHttpHandler
Dim rutaReporte As String = "Empresas\Grales\Formatos\FacturaSALI.rdlc" Dim rutaReporte As String = "Empresas\Grales\Formatos\FacturaSALI.rdlc"
Dim QR As ClbNegBICFDv3_2.ClsNegCBBGenerar = New ClbNegBICFDv3_2.ClsNegCBBGenerar() ' Dim QR As Byte() 'ClbNegBICFDv3_2.ClsNegCBBGenerar = New ClbNegBICFDv3_2.ClsNegCBBGenerar()
Dim cQr As Byte() = QR.GenerarCBBBytes(objxml.emisor.Rfc, objxml.receptor.Rfc, objxml.comprobante.Total, objxml.complemento.UUID) Dim cQr As Byte() = Nothing ' = QR.GenerarCBBBytes(objxml.emisor.Rfc, objxml.receptor.Rfc, objxml.comprobante.Total, objxml.complemento.UUID)
Dim parametros As List(Of ReportParameter) = New List(Of ReportParameter)() Dim parametros As List(Of ReportParameter) = New List(Of ReportParameter)()
parametros.Add(New ReportParameter("comprobante_Certificado", objxml.comprobante.Certificado)) parametros.Add(New ReportParameter("comprobante_Certificado", objxml.comprobante.Certificado))
parametros.Add(New ReportParameter("comprobante_CondicionesDePago", objxml.comprobante.CondicionesDePago)) parametros.Add(New ReportParameter("comprobante_CondicionesDePago", objxml.comprobante.CondicionesDePago))

2
Contabilidad/RepBalanzaComprobacion.aspx.vb
View File

@@ -188,7 +188,7 @@ Partial Class Contabilidad2_RepBalanzaComprobacion
End If End If
'Acomoda Deudor y Acreedor 'Acomoda Deudor y Acreedor
If e.Row.DBCampo("CveTipo") = "1" Then If e.Row.DBCampo("CveTipo") = "0" Then
e.Row.FCLabel("LbSaldoInicial").Text = String.Format("{0} ", e.Row.DBCampo("SaldoInicial").FormatoNumero) e.Row.FCLabel("LbSaldoInicial").Text = String.Format("{0} ", e.Row.DBCampo("SaldoInicial").FormatoNumero)
e.Row.FCLabel("LbSaldoInicial").Style.Remove("padding-right") e.Row.FCLabel("LbSaldoInicial").Style.Remove("padding-right")
e.Row.FCLabel("LbSaldoActual").Text = " " e.Row.FCLabel("LbSaldoActual").Text = " "

10
Contabilidad/RepIVA.aspx.cs
View File

@@ -401,6 +401,11 @@ public partial class Contabilidad_RepIVA : ClsPaginas
{ {
excelWorksheet.Columns[k + 1].Style.NumberFormat = "#,##0.00"; excelWorksheet.Columns[k + 1].Style.NumberFormat = "#,##0.00";
} }
//FOLIOS
if (excelWorksheet.Columns[k + 1].Name.Contiene("C", "M"))
{
excelWorksheet.Columns[k + 1].Style.HorizontalAlignment = HorizontalAlignmentStyle.Left;
}
break; break;
case "IVA Acreditable": case "IVA Acreditable":
//FECHAS,FOLIOS, NUM CUENTA //FECHAS,FOLIOS, NUM CUENTA
@@ -414,6 +419,11 @@ public partial class Contabilidad_RepIVA : ClsPaginas
excelWorksheet.Columns[k + 1].Style.NumberFormat = "0"; excelWorksheet.Columns[k + 1].Style.NumberFormat = "0";
excelWorksheet.Columns[k + 1].Style.HorizontalAlignment = HorizontalAlignmentStyle.Left; excelWorksheet.Columns[k + 1].Style.HorizontalAlignment = HorizontalAlignmentStyle.Left;
} }
//FOLIOS
if (excelWorksheet.Columns[k + 1].Name.Contiene("E", "Z"))
{
excelWorksheet.Columns[k + 1].Style.HorizontalAlignment = HorizontalAlignmentStyle.Left;
}
break; break;
default: default:
break; break;

38
General/Dashboard.aspx
View File

@@ -607,7 +607,7 @@
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvVentasPorSucursal" <asp:GridView ID="gvVentasPorSucursal"
runat="server" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvVentasPorSucursal_RowCreated"> OnRowCreated="gvVentasPorSucursal_RowCreated">
@@ -715,7 +715,7 @@
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvVentasPorVendedor" <asp:GridView ID="gvVentasPorVendedor"
runat="server" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvVentasPorVendedor_RowCreated"> OnRowCreated="gvVentasPorVendedor_RowCreated">
@@ -826,7 +826,7 @@
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvVentasPorClasificacion" <asp:GridView ID="gvVentasPorClasificacion"
runat="server" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvVentasPorClasificacion_RowCreated"> OnRowCreated="gvVentasPorClasificacion_RowCreated">
@@ -933,7 +933,7 @@
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvVentasPorMarca" <asp:GridView ID="gvVentasPorMarca"
runat="server" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvVentasPorMarca_RowCreated"> OnRowCreated="gvVentasPorMarca_RowCreated">
@@ -1042,7 +1042,7 @@
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvVentasPorPS" <asp:GridView ID="gvVentasPorPS"
runat="server" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvVentasPorPS_RowCreated"> OnRowCreated="gvVentasPorPS_RowCreated">
@@ -1149,7 +1149,7 @@
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvVentasPorCliente" <asp:GridView ID="gvVentasPorCliente"
runat="server" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvVentasPorCliente_RowCreated"> OnRowCreated="gvVentasPorCliente_RowCreated">
@@ -1259,7 +1259,7 @@
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvVentasPorProveedor" <asp:GridView ID="gvVentasPorProveedor"
runat="server" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvVentasPorProveedor_RowCreated"> OnRowCreated="gvVentasPorProveedor_RowCreated">
@@ -1394,7 +1394,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvCarteraPorSucursal" runat="server" <asp:GridView ID="gvCarteraPorSucursal" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvCarteraPorSucursal_RowCreated"> OnRowCreated="gvCarteraPorSucursal_RowCreated">
@@ -1482,7 +1482,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvCarteraPorVendedor" runat="server" <asp:GridView ID="gvCarteraPorVendedor" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvCarteraPorVendedor_RowCreated"> OnRowCreated="gvCarteraPorVendedor_RowCreated">
@@ -1574,7 +1574,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvRecuperacionPorSucursal" runat="server" <asp:GridView ID="gvRecuperacionPorSucursal" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvRecuperacionPorSucursal_RowCreated"> OnRowCreated="gvRecuperacionPorSucursal_RowCreated">
@@ -1644,7 +1644,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvRecuperacionPorCliente" runat="server" <asp:GridView ID="gvRecuperacionPorCliente" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvRecuperacionPorCliente_RowCreated"> OnRowCreated="gvRecuperacionPorCliente_RowCreated">
@@ -1721,7 +1721,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvComprasPorClasificacion" runat="server" <asp:GridView ID="gvComprasPorClasificacion" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvComprasPorClasificacion_RowCreated"> OnRowCreated="gvComprasPorClasificacion_RowCreated">
@@ -1827,7 +1827,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvComprasPorMarca" runat="server" <asp:GridView ID="gvComprasPorMarca" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvComprasPorMarca_RowCreated"> OnRowCreated="gvComprasPorMarca_RowCreated">
@@ -1936,7 +1936,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvComprasPorPS" runat="server" <asp:GridView ID="gvComprasPorPS" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvComprasPorPS_RowCreated"> OnRowCreated="gvComprasPorPS_RowCreated">
@@ -2042,7 +2042,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvComprasPorProveedor" runat="server" <asp:GridView ID="gvComprasPorProveedor" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvComprasPorProveedor_RowCreated"> OnRowCreated="gvComprasPorProveedor_RowCreated">
@@ -2173,7 +2173,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvCxPPorSucursal" runat="server" <asp:GridView ID="gvCxPPorSucursal" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvCxPPorSucursal_RowCreated"> OnRowCreated="gvCxPPorSucursal_RowCreated">
@@ -2259,7 +2259,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvCxPPorProveedor" runat="server" <asp:GridView ID="gvCxPPorProveedor" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvCxPPorProveedor_RowCreated"> OnRowCreated="gvCxPPorProveedor_RowCreated">
@@ -2348,7 +2348,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvPagosPorSucursal" runat="server" <asp:GridView ID="gvPagosPorSucursal" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvPagosPorSucursal_RowCreated"> OnRowCreated="gvPagosPorSucursal_RowCreated">
@@ -2418,7 +2418,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<asp:GridView ID="gvPagosPorProveedor" runat="server" <asp:GridView ID="gvPagosPorProveedor" runat="server"
CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid" CssClass="adssigrid-scroll adssigrid-order table table-hover table-light custom-grid thcenternowrap"
AutoGenerateColumns="false" AutoGenerateColumns="false"
Width="100%" Width="100%"
OnRowCreated="gvPagosPorProveedor_RowCreated"> OnRowCreated="gvPagosPorProveedor_RowCreated">

16
General/Dashboard.aspx.vb
View File

@@ -712,9 +712,9 @@ Partial Class General_Dashboard
Dim headerRow2 As New GridViewRow(1, 0, DataControlRowType.Header, DataControlRowState.Normal) Dim headerRow2 As New GridViewRow(1, 0, DataControlRowType.Header, DataControlRowState.Normal)
' Subheaders con checkboxes ' Subheaders con checkboxes
headerRow2.Cells.Add(CreateSubHeaderCell("TotalCxC", "chkTotalCxC", "Total CxC")) headerRow2.Cells.Add(CreateSubHeaderCell("Total CxC", "chkTotalCxC", "TotalCxC"))
headerRow2.Cells.Add(CreateSubHeaderCell("Vencido", "chkVencido", "Vencido")) headerRow2.Cells.Add(CreateSubHeaderCell("Vencido", "chkVencido", "Vencido"))
headerRow2.Cells.Add(CreateSubHeaderCell("PorVencer", "chkPorVencer", "Por Vencer")) headerRow2.Cells.Add(CreateSubHeaderCell("Por Vencer", "chkPorVencer", "PorVencer"))
headerRow2.TableSection = TableRowSection.TableHeader headerRow2.TableSection = TableRowSection.TableHeader
grid.Controls(0).Controls.AddAt(1, headerRow2) grid.Controls(0).Controls.AddAt(1, headerRow2)
@@ -749,9 +749,9 @@ Partial Class General_Dashboard
Dim headerRow2 As New GridViewRow(1, 0, DataControlRowType.Header, DataControlRowState.Normal) Dim headerRow2 As New GridViewRow(1, 0, DataControlRowType.Header, DataControlRowState.Normal)
' Subheaders con checkboxes ' Subheaders con checkboxes
headerRow2.Cells.Add(CreateSubHeaderCell("TotalCxC", "chkTotalCxC", "Total CxC")) headerRow2.Cells.Add(CreateSubHeaderCell("Total CxC", "chkTotalCxC", "Total CxC"))
headerRow2.Cells.Add(CreateSubHeaderCell("Vencido", "chkVencido", "Vencido")) headerRow2.Cells.Add(CreateSubHeaderCell("Vencido", "chkVencido", "Vencido"))
headerRow2.Cells.Add(CreateSubHeaderCell("PorVencer", "chkPorVencer", "Por Vencer")) headerRow2.Cells.Add(CreateSubHeaderCell("Por Vencer", "chkPorVencer", "Por Vencer"))
headerRow2.TableSection = TableRowSection.TableHeader headerRow2.TableSection = TableRowSection.TableHeader
grid.Controls(0).Controls.AddAt(1, headerRow2) grid.Controls(0).Controls.AddAt(1, headerRow2)
@@ -787,7 +787,7 @@ Partial Class General_Dashboard
' Subheaders con checkboxes ' Subheaders con checkboxes
headerRow2.Cells.Add(CreateSubHeaderCell("Recuperado", "chkRecuperado", "Recuperado")) headerRow2.Cells.Add(CreateSubHeaderCell("Recuperado", "chkRecuperado", "Recuperado"))
headerRow2.Cells.Add(CreateSubHeaderCell("PromedioDiasRecuperacion", "chkDiasRecuperado", "Avg. Días Recuperación")) headerRow2.Cells.Add(CreateSubHeaderCell("Avg. Días Recuperación", "chkDiasRecuperado", "PromedioDiasRecuperacion"))
headerRow2.TableSection = TableRowSection.TableHeader headerRow2.TableSection = TableRowSection.TableHeader
grid.Controls(0).Controls.AddAt(1, headerRow2) grid.Controls(0).Controls.AddAt(1, headerRow2)
@@ -823,7 +823,7 @@ Partial Class General_Dashboard
' Subheaders con checkboxes ' Subheaders con checkboxes
headerRow2.Cells.Add(CreateSubHeaderCell("Recuperado", "chkRecuperado", "Recuperado")) headerRow2.Cells.Add(CreateSubHeaderCell("Recuperado", "chkRecuperado", "Recuperado"))
headerRow2.Cells.Add(CreateSubHeaderCell("PromedioDiasRecuperacion", "chkDiasRecuperado", "Avg. Días Recuperación")) headerRow2.Cells.Add(CreateSubHeaderCell("Avg. Días Recuperación", "chkDiasRecuperado", "PromedioDiasRecuperacion"))
headerRow2.TableSection = TableRowSection.TableHeader headerRow2.TableSection = TableRowSection.TableHeader
grid.Controls(0).Controls.AddAt(1, headerRow2) grid.Controls(0).Controls.AddAt(1, headerRow2)
@@ -1085,7 +1085,7 @@ Partial Class General_Dashboard
' Subheaders con checkboxes ' Subheaders con checkboxes
headerRow2.Cells.Add(CreateSubHeaderCell("Recuperado", "chkRecuperado", "Pagado")) headerRow2.Cells.Add(CreateSubHeaderCell("Recuperado", "chkRecuperado", "Pagado"))
headerRow2.Cells.Add(CreateSubHeaderCell("PromedioDias", "chkDiasRecuperado", "Avg. Días")) headerRow2.Cells.Add(CreateSubHeaderCell("Avg. Días", "chkDiasRecuperado", "PromedioDias"))
headerRow2.TableSection = TableRowSection.TableHeader headerRow2.TableSection = TableRowSection.TableHeader
grid.Controls(0).Controls.AddAt(1, headerRow2) grid.Controls(0).Controls.AddAt(1, headerRow2)
@@ -1121,7 +1121,7 @@ Partial Class General_Dashboard
' Subheaders con checkboxes ' Subheaders con checkboxes
headerRow2.Cells.Add(CreateSubHeaderCell("Recuperado", "chkRecuperado", "Recuperado")) headerRow2.Cells.Add(CreateSubHeaderCell("Recuperado", "chkRecuperado", "Recuperado"))
headerRow2.Cells.Add(CreateSubHeaderCell("PromedioDias", "chkDiasRecuperado", "Avg. Días")) headerRow2.Cells.Add(CreateSubHeaderCell("Avg. Días", "chkDiasRecuperado", "PromedioDias"))
headerRow2.TableSection = TableRowSection.TableHeader headerRow2.TableSection = TableRowSection.TableHeader
grid.Controls(0).Controls.AddAt(1, headerRow2) grid.Controls(0).Controls.AddAt(1, headerRow2)

13
Transportes/Boletos.aspx.vb
View File

@@ -77,9 +77,6 @@ Partial Class Boletos
Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load
If Not IsPostBack Then If Not IsPostBack Then
If Request.QueryString("CveViaje") Is Nothing And UsuarioActual.CveVendedor <> Nothing And UsuarioActual.CveVendedor <> -1 Then If Request.QueryString("CveViaje") Is Nothing And UsuarioActual.CveVendedor <> Nothing And UsuarioActual.CveVendedor <> -1 Then
Response.Redirect("/Transportes/RepViajes.aspx") Response.Redirect("/Transportes/RepViajes.aspx")
End If End If
@@ -204,9 +201,7 @@ Partial Class Boletos
Else Else
ImporteR = ObjDestinos.DtResultados.FiltroPrimeroValor("Importe").ToDecimal.RoundSQL ImporteR = ObjDestinos.DtResultados.FiltroPrimeroValor("Importe").ToDecimal.RoundSQL
End If End If
ImporteR = If(edad <= 4 Or edad >= 60, ImporteR - 20, ImporteR) ImporteR = If(edad <= 4 Or edad >= 60, ImporteR - 20, ImporteR)
End If End If
If ImporteR > 0 Then If ImporteR > 0 Then
@@ -256,8 +251,6 @@ Partial Class Boletos
Try Try
For Each dr As DataRow In DtPasajeros.Rows For Each dr As DataRow In DtPasajeros.Rows
Dim CveViajePasajero As Integer = ObjTransporte.AddViajesPasajeros(CveViaje, dr("CveDestinoOrigen").ToString.ToEntero, dr("CveDestinoFinal").ToString.ToEntero, UsuarioActual.CveVendedor, dr("Importe").ToString.ToDecimal, dr("Asiento").ToString.ToEntero, dr("Nombre").ToString, dr("FechaNacimiento").ToString.ToDate, dr("CveSexo").ToString.ToBool, dr("Visa").ToString, dr("Celular").ToString, dr("Observaciones").ToString, UsuarioActual.CveUsuario) Dim CveViajePasajero As Integer = ObjTransporte.AddViajesPasajeros(CveViaje, dr("CveDestinoOrigen").ToString.ToEntero, dr("CveDestinoFinal").ToString.ToEntero, UsuarioActual.CveVendedor, dr("Importe").ToString.ToDecimal, dr("Asiento").ToString.ToEntero, dr("Nombre").ToString, dr("FechaNacimiento").ToString.ToDate, dr("CveSexo").ToString.ToBool, dr("Visa").ToString, dr("Celular").ToString, dr("Observaciones").ToString, UsuarioActual.CveUsuario)
If CveViajePasajero < 1 Then If CveViajePasajero < 1 Then
@@ -265,7 +258,6 @@ Partial Class Boletos
SbAlert.Append("Ocurrió un error al generar el viaje") SbAlert.Append("Ocurrió un error al generar el viaje")
Exit For Exit For
End If End If
dr("CveViajePasajero") = CveViajePasajero dr("CveViajePasajero") = CveViajePasajero
'dr("Numero") = dr("Importe").ToString 'dr("Numero") = dr("Importe").ToString
Next Next
@@ -490,6 +482,7 @@ Partial Class Boletos
ObjFactura.CveSubProyectoEjecucion = CveSubProyecto ObjFactura.CveSubProyectoEjecucion = CveSubProyecto
ObjFactura.SetSubProyecto() ObjFactura.SetSubProyecto()
ObjFactura.SetSubProyectoMatriz() ObjFactura.SetSubProyectoMatriz()
If ObjFactura.CveMoneda >= 2 Then ObjFactura.TipoCambio = GlobalTipoCambio(ObjFactura.Fecha).ToDecimal
For Each Dr As DataRow In DtPasajeros.Rows For Each Dr As DataRow In DtPasajeros.Rows
Dim Obs As String = Dr("Observaciones").ToString Dim Obs As String = Dr("Observaciones").ToString
@@ -501,7 +494,6 @@ Partial Class Boletos
End If End If
Dim PorcentajeIVA As Decimal = 0 Dim PorcentajeIVA As Decimal = 0
Dim DrPS As DataRow = ClsPaginas.GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=CvePSBoleto).FiltroPrimero("") ' Estado = -1 Dim DrPS As DataRow = ClsPaginas.GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=CvePSBoleto).FiltroPrimero("") ' Estado = -1
If DrPS Is Nothing Then If DrPS Is Nothing Then
@@ -544,7 +536,4 @@ Partial Class Boletos
Return Retorno Return Retorno
End Function End Function
End Class End Class

36
Ventas/PVCobranza.aspx.vb
View File

@@ -1358,7 +1358,6 @@ Partial Class Ventas_PVCobranza
RemisionesLista.Add(VentaRemision.CveVenta) RemisionesLista.Add(VentaRemision.CveVenta)
Dim DtRemisionesPS As New DataTable() Dim DtRemisionesPS As New DataTable()
Dim DtPagosFacturaGlobal As New DataTable()
If ObjClientes.GetVentasRemisionesTotales(VentaRemision.CveCliente, VentaRemision.CveVenta.ToString(), 1, UsuarioActual.CveEmpresa) Then If ObjClientes.GetVentasRemisionesTotales(VentaRemision.CveCliente, VentaRemision.CveVenta.ToString(), 1, UsuarioActual.CveEmpresa) Then
DtRemisionesPS = ObjClientes.DtResultados.Copy() DtRemisionesPS = ObjClientes.DtResultados.Copy()
@@ -1399,6 +1398,21 @@ Partial Class Ventas_PVCobranza
If GvRow.DataKey("Tipo").Contiene("NC", "IxC", "Ant") AndAlso GvRow.FCCheckBox("Chk" & GvRow.RowIndex) IsNot Nothing AndAlso GvRow.FCCheckBox("Chk" & GvRow.RowIndex).Checked Then If GvRow.DataKey("Tipo").Contiene("NC", "IxC", "Ant") AndAlso GvRow.FCCheckBox("Chk" & GvRow.RowIndex) IsNot Nothing AndAlso GvRow.FCCheckBox("Chk" & GvRow.RowIndex).Checked Then
Dim CveFormaPagoAnt = GvRow.DataKey("CveFormaPago").ToEntero() Dim CveFormaPagoAnt = GvRow.DataKey("CveFormaPago").ToEntero()
If GvRow.DataKey("Tipo").Contiene("Ant") Then
'SI NO ES AMORTIZACION DE ANTICIPO
If Not CveFormaPagoAnt = 21 Then
CveFormaPagoAnt = 21
End If
End If
'If GvRow.DataKey("Tipo").Contiene("NC") Then
' 'SI NO ES AMORTIZACION DE ANTICIPO o DEVOLUCION
' If Not CveFormaPagoAnt.Contiene(21, 11) Then
' CveFormaPagoAnt = 21
' End If
'End If
Dim Importe = GvRow.FCTextBox(String.Format("TxtAnticipo{0}", GvRow.RowIndex)).Text.ToDecimal() Dim Importe = GvRow.FCTextBox(String.Format("TxtAnticipo{0}", GvRow.RowIndex)).Text.ToDecimal()
DtPagos.Rows.Add({CveFormaPagoAnt, Importe}) DtPagos.Rows.Add({CveFormaPagoAnt, Importe})
@@ -1423,17 +1437,22 @@ Partial Class Ventas_PVCobranza
If TxtImporteEfectivo.Text.ToDecimal > 0 Then If TxtImporteEfectivo.Text.ToDecimal > 0 Then
Dim tpag As Decimal = LtlSaldo.Text.ToDecimal - PagadoSinEfectivo Dim tpag As Decimal = LtlSaldo.Text.ToDecimal - PagadoSinEfectivo
If TxtImporteEfectivo.Text.ToDecimal < tpag Then tpag = TxtImporteEfectivo.Text.ToDecimal If TxtImporteEfectivo.Text.ToDecimal < tpag Then tpag = TxtImporteEfectivo.Text.ToDecimal
DtPagos.Rows.Add({1, tpag})
If tpag > 0 Then
DtPagos.Rows.Add({1, tpag})
End If
End If End If
Dim PagoMaximo = DtPagos.MAX("Importe") Dim PagoMaximo = DtPagos.MAX("Importe")
Dim CveFormaPago As Integer = DtPagos.FiltroPrimeroValor("CveFormaPago", $"Importe = {PagoMaximo}").ToEntero() Dim CveFormaPago As Integer = DtPagos.FiltroPrimeroValor("CveFormaPago", $"Importe = {PagoMaximo}").ToEntero()
If CveFormaPago > 0 Then If CveFormaPago > 0 Then
ObjFactura.CveFormaPago = CveFormaPago ObjFactura.CveFormaPago = CveFormaPago
ObjFactura.CveMetodoPago = 1 ObjFactura.CveMetodoPago = 1
ObjFactura.ClaveMetodoPagoSAT = "PUE" ObjFactura.ClaveMetodoPagoSAT = "PUE"
ObjFactura.ClaveFormaPagoSAT = GlobalDTVtaFormaPago.FiltroPrimeroValor("ClaveFormaPagoSAT", $"CveFormaPago = {ObjFactura.CveFormaPago}") ObjFactura.ClaveFormaPagoSAT = GlobalDTVtaFormaPago.FiltroPrimeroValor("ClaveFormaPagoSAT", $"CveFormaPago = {ObjFactura.CveFormaPago}")
End If End If
ObjFactura.FechaPago = Now 'venta de cantado el mismo dia ObjFactura.FechaPago = Now 'venta de cantado el mismo dia
Else Else
'venta a crédito 'venta a crédito
@@ -2331,19 +2350,23 @@ Partial Class Ventas_PVCobranza
DbRowVenta = ObjVentas.DtResultados.Copy().FiltroPrimero("") DbRowVenta = ObjVentas.DtResultados.Copy().FiltroPrimero("")
End If End If
ObjVentas.Dispose() ObjVentas.Dispose()
Dim tTipoDocto As String
Dim tTipoDocto As String = ""
Dim PorcentajeIVA As Decimal = -1
If DbRowVenta IsNot Nothing Then If DbRowVenta IsNot Nothing Then
CveCliente = DbRowVenta("CveCliente").ToString().ToEntero() CveCliente = DbRowVenta("CveCliente").ToString().ToEntero()
CveVendedor = DbRowVenta("CveVendedor").ToString().ToEntero() CveVendedor = DbRowVenta("CveVendedor").ToString().ToEntero()
tTipoDocto = DbRowVenta("TipoDocto").ToString() tTipoDocto = DbRowVenta("TipoDocto").ToString()
PorcentajeIVA = DbRowVenta("PorcentajeIVA").ToString().ToDecimal()
End If End If
If CveCliente > 0 Then If CveCliente > 0 Then
CargaAnticipos(CveCliente, tTipoDocto) CargaAnticipos(CveCliente, tTipoDocto, PorcentajeIVA)
End If End If
End Sub End Sub
Private Sub CargaAnticipos(CveCliente As Integer, TipoDocto As String) Private Sub CargaAnticipos(CveCliente As Integer, TipoDocto As String, PorcentajeIVA As Decimal)
If CveCliente > 0 Then If CveCliente > 0 Then
Dim ObjMovtos As New ClsMovimientos() Dim ObjMovtos As New ClsMovimientos()
If ObjMovtos.GetAnticiposNCIxCCliente(CveCliente) Then If ObjMovtos.GetAnticiposNCIxCCliente(CveCliente) Then
@@ -2355,7 +2378,8 @@ Partial Class Ventas_PVCobranza
If TipoDocto = "Ant" Then TipoAnticipo = " 'IxC' " If TipoDocto = "Ant" Then TipoAnticipo = " 'IxC' "
If Me.TmpDTAnticiposNCIxCCliente IsNot Nothing Then If Me.TmpDTAnticiposNCIxCCliente IsNot Nothing Then
GVAnticipos.DataSource = Me.TmpDTAnticiposNCIxCCliente.FiltraParametros($"ISTotal = 0 AND Saldo > 0 AND Tipo IN ({TipoAnticipo}) ") GVAnticipos.DataSource = Me.TmpDTAnticiposNCIxCCliente.FiltraParametros($"ISTotal = 0 AND Saldo > 0 AND Tipo IN ({TipoAnticipo}) AND (PorcentajeIVA = {PorcentajeIVA} OR Tipo = 'IxC')")
'GVAnticipos.DataSource = Me.TmpDTAnticiposNCIxCCliente.FiltraParametros($"ISTotal = 0 AND Saldo > 0 AND Tipo IN ({TipoAnticipo})")
Else Else
GVAnticipos.DataSource = Nothing GVAnticipos.DataSource = Nothing
End If End If

18
Ventas/ProductosServicios.aspx
View File

@@ -285,6 +285,17 @@
<label class="truncate" style="padding-left: 1px;" for="<%= TxtPorMinimoUtilidad.ClientID.ToString()%>">% Minimo de utilidad:</label> <label class="truncate" style="padding-left: 1px;" for="<%= TxtPorMinimoUtilidad.ClientID.ToString()%>">% Minimo de utilidad:</label>
<i></i> <i></i>
</div> </div>
<div class="row" runat="server" visible="false">
<div class="col-md-12">
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox ID="TxtPSExtranjero" TextMode="MultiLine" Rows="2" CssClass="form-control" runat="server" MaxLength="846"></asp:TextBox>
<label class="truncate" for="<%= TxtPSExtranjero.ClientID.ToString()%>">Producto Extranjero:</label>
<i></i>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class=" col-md-12"> <div class=" col-md-12">
<div runat="server" id="DivCompuesto" class="form-group form-md-line-input input-iconright" visible="false"> <div runat="server" id="DivCompuesto" class="form-group form-md-line-input input-iconright" visible="false">
@@ -1882,15 +1893,12 @@
<HeaderStyle CssClass="Titulos" /> <HeaderStyle CssClass="Titulos" />
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Editar" ItemStyle-Width="40px"> <asp:TemplateField HeaderText="Editar" ItemStyle-Width="40px">
<EditItemTemplate> <EditItemTemplate>
<center>
<asp:LinkButton ID="imgU" runat="server" AlternateText="Actualizar" CausesValidation="True" CommandName="Update" <asp:LinkButton ID="imgU" runat="server" AlternateText="Actualizar" CausesValidation="True" CommandName="Update"
CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-check'></i>" ValidationGroup="GrpGV" /> CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-check'></i>" ValidationGroup="GrpGV" />
&nbsp;<asp:LinkButton ID="imgC" runat="server" AlternateText="Cancelar" CausesValidation="False" CommandName="Cancel" &nbsp;<asp:LinkButton ID="imgC" runat="server" AlternateText="Cancelar" CausesValidation="False" CommandName="Cancel"
CssClass="btn btn-circle btn-sm red" Text="<i class='fa fa-times'></i>" /> CssClass="btn btn-circle btn-sm red" Text="<i class='fa fa-times'></i>" />
</center>
</EditItemTemplate> </EditItemTemplate>
<ItemTemplate> <ItemTemplate>
<asp:LinkButton ID="imgE" runat="server" AlternateText="Editar" CausesValidation="False" CommandName="Edit" <asp:LinkButton ID="imgE" runat="server" AlternateText="Editar" CausesValidation="False" CommandName="Edit"

10
Ventas/ProductosServicios.aspx.vb
View File

@@ -983,6 +983,7 @@ Partial Class ProductosyServicios
TxtLitraje.Text = ObjProductosServicios.DtResultados.Rows(0)("Litraje").ToString TxtLitraje.Text = ObjProductosServicios.DtResultados.Rows(0)("Litraje").ToString
TxtPS.Text = ObjProductosServicios.PS TxtPS.Text = ObjProductosServicios.PS
TxtPSExtranjero.Text = ObjProductosServicios.PSExtranjero
TxtPrecio.Text = ObjProductosServicios.Precio.ToString("F4") 'no usa N4, porque pone comma TxtPrecio.Text = ObjProductosServicios.Precio.ToString("F4") 'no usa N4, porque pone comma
TxtPrecioMinimo.Text = ObjProductosServicios.PrecioMinimo.ToString("F4") TxtPrecioMinimo.Text = ObjProductosServicios.PrecioMinimo.ToString("F4")
@@ -1577,10 +1578,12 @@ Partial Class ProductosyServicios
End If End If
If CvePS = -1 Then If CvePS = -1 Then
Dim PSS As String = TxtPS.Text.Trim.Replace("|", "") Dim PSS As String = TxtPS.Text.Trim.Replace("|", "")
Dim PSSExtranjero As String = TxtPSExtranjero.Text.Trim.Replace("|", "")
If UsuarioActual.CveEmpresa.Contiene(1, 72, 80) Then PSS = PSS.ToUpper If UsuarioActual.CveEmpresa.Contiene(1, 72, 80) Then PSS = PSS.ToUpper
If UsuarioActual.CveEmpresa.Contiene(1, 72, 80) Then PSSExtranjero = PSSExtranjero.ToUpper
If ObjProductosServicios.AddPS(DdlClasificacion.SelectedValue.ToEntero, -1, DdlUnidadMedida.SelectedValue.ToEntero, TxtCodigo.Text.Trim, TxtNumeroParte.Text.Trim, TxtCodigoBarras.Text.Trim, PSS, If ObjProductosServicios.AddPS(DdlClasificacion.SelectedValue.ToEntero, -1, DdlUnidadMedida.SelectedValue.ToEntero, TxtCodigo.Text.Trim, TxtNumeroParte.Text.Trim, TxtCodigoBarras.Text.Trim, PSS,
TxtPrecio.Text.Trim.ToDouble, DdlIVA.SelectedValue.ToDouble, (TxtRetIVA.Text.Trim.ToDouble / 100), ChkInventariable.Checked, CveProveedor, True, TxtPrecio.Text.Trim.ToDouble, DdlIVA.SelectedValue.ToDouble, (TxtRetIVA.Text.Trim.ToDouble / 100), ChkInventariable.Checked, CveProveedor, True,
ChkAplicaParaVenta.Checked, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveMetodoInv, EsPaquete, CveTipoPS:=DdlTipoPS.SelectedValue.ToEntero, ChkAplicaParaVenta.Checked, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveMetodoInv, EsPaquete, PSSExtranjero, CveTipoPS:=DdlTipoPS.SelectedValue.ToEntero,
FuePorXML:=False, TipoServicio:=-1, CveClasificacion2:=CveClasificacion2, CveMarca:=CveMarca, AlmacenSeccion:=TxtAlmacenSeccion.Text.Trim, FuePorXML:=False, TipoServicio:=-1, CveClasificacion2:=CveClasificacion2, CveMarca:=CveMarca, AlmacenSeccion:=TxtAlmacenSeccion.Text.Trim,
AplicaIEPS:=ChkAplicaIeps.Checked, IEPSPorcentaje:=DdlIEPSPorcentaje.SelectedValue.ToDecimal, AplicaIEPS:=ChkAplicaIeps.Checked, IEPSPorcentaje:=DdlIEPSPorcentaje.SelectedValue.ToDecimal,
CveCompuesto:=DdlCompuesto.SelectedValue.ToEntero, CveSATPS:=DdlSATPS.SelectedValue.ToEntero, IEPSGrabaIVA:=ChkIepsIVA.Checked, VentaMinima:=TxtVentaMinima.Text.ToDecimal, CveCompuesto:=DdlCompuesto.SelectedValue.ToEntero, CveSATPS:=DdlSATPS.SelectedValue.ToEntero, IEPSGrabaIVA:=ChkIepsIVA.Checked, VentaMinima:=TxtVentaMinima.Text.ToDecimal,
@@ -1650,11 +1653,12 @@ Partial Class ProductosyServicios
'End If 'End If
Dim PSS As String = TxtPS.Text.Trim.Replace("|", "") Dim PSS As String = TxtPS.Text.Trim.Replace("|", "")
Dim PSSExtranjero As String = TxtPSExtranjero.Text.Trim.Replace("|", "")
If UsuarioActual.CveEmpresa.Contiene(1, 72, 80) Then PSS = PSS.ToUpper If UsuarioActual.CveEmpresa.Contiene(1, 72, 80) Then PSS = PSS.ToUpper
If UsuarioActual.CveEmpresa.Contiene(1, 72, 80) Then PSSExtranjero = PSSExtranjero.ToUpper
If ObjProductosServicios.UpdatePS(DdlClasificacion.SelectedValue.ToEntero, -1, DdlUnidadMedida.SelectedValue.ToEntero, TxtCodigo.Text.Trim, TxtNumeroParte.Text.Trim, TxtCodigoBarras.Text.Trim, PSS, If ObjProductosServicios.UpdatePS(DdlClasificacion.SelectedValue.ToEntero, -1, DdlUnidadMedida.SelectedValue.ToEntero, TxtCodigo.Text.Trim, TxtNumeroParte.Text.Trim, TxtCodigoBarras.Text.Trim, PSS,
TxtPrecio.Text.Trim.ToDouble, DdlIVA.SelectedValue.ToDouble, (TxtRetIVA.Text.Trim.ToDouble / 100), ChkInventariable.Checked, CveProveedor, True, TxtPrecio.Text.Trim.ToDouble, DdlIVA.SelectedValue.ToDouble, (TxtRetIVA.Text.Trim.ToDouble / 100), ChkInventariable.Checked, CveProveedor, True,
ChkAplicaParaVenta.Checked, ChkEstado.Checked, UsuarioActual.CveUsuario, CvePS, CveMetodoInv, EsPaquete, DdlSATPS.SelectedValue.ToEntero, UsuarioActual.CveEmpresa, ChkAplicaParaVenta.Checked, ChkEstado.Checked, UsuarioActual.CveUsuario, CvePS, CveMetodoInv, EsPaquete, DdlSATPS.SelectedValue.ToEntero, UsuarioActual.CveEmpresa, PSSExtranjero,
CveTipoPS:=DdlTipoPS.SelectedValue.ToEntero, TipoServicio:=-1, CveClasificacion2:=CveClasificacion2, CveMarca:=CveMarca, AlmacenSeccion:=TxtAlmacenSeccion.Text.Trim, CveTipoPS:=DdlTipoPS.SelectedValue.ToEntero, TipoServicio:=-1, CveClasificacion2:=CveClasificacion2, CveMarca:=CveMarca, AlmacenSeccion:=TxtAlmacenSeccion.Text.Trim,
AplicaIEPS:=ChkAplicaIeps.Checked, IEPSPorcentaje:=DdlIEPSPorcentaje.SelectedValue.ToDecimal, AplicaIEPS:=ChkAplicaIeps.Checked, IEPSPorcentaje:=DdlIEPSPorcentaje.SelectedValue.ToDecimal,
CveCompuesto:=DdlCompuesto.SelectedValue.ToEntero, IEPSGrabaIVA:=ChkIepsIVA.Checked, VentaMinima:=TxtVentaMinima.Text.ToDecimal, CveCompuesto:=DdlCompuesto.SelectedValue.ToEntero, IEPSGrabaIVA:=ChkIepsIVA.Checked, VentaMinima:=TxtVentaMinima.Text.ToDecimal,

10
asmx/WS_PuntoVenta.asmx
View File

@@ -1397,11 +1397,11 @@ Public Class WS_PuntoVenta
Dim objInventario As New ClsInventarios Dim objInventario As New ClsInventarios
Dim Respuesta As New RespuestaWS Dim Respuesta As New RespuestaWS
If objInventario.GetConceptoSAT() Then 'If objInventario.GetConceptoSAT() Then
Respuesta.Datos = objInventario.DtResultados '.FiltraParametros(String.Format("CveVendedor={0}", CveEmpresa)) ' Respuesta.Datos = objInventario.DtResultados '.FiltraParametros(String.Format("CveVendedor={0}", CveEmpresa))
Respuesta.Datos.TableName = "Inv_Conceptos" ' Respuesta.Datos.TableName = "Inv_Conceptos"
Respuesta.HuboError = False ' Respuesta.HuboError = False
End If 'End If
objInventario.Dispose() objInventario.Dispose()
Return Respuesta Return Respuesta