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
2019-10-04 13:35:50 -07:00
parent f139a6df34 bdc0488168
commit a238e42a2b
6 changed files with 279 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
App_Code/ClsContPAQi.vb
View File

@@ -1067,11 +1067,12 @@ Public Class ClsContPAQi
StrSQL.Append(" CASE WHEN ISNUMERIC(c.Codigo) = 1 THEN FORMAT(CAST (c.Codigo AS FLOAT),(SELECT REPLACE(Mascarilla,'X','0') FROM Parametros)) ELSE c.Codigo END + ' - ' + c.Nombre + ' ' AS CtaCodigo, ") 'Roberto 8/Nov/2014 StrSQL.Append(" CASE WHEN ISNUMERIC(c.Codigo) = 1 THEN FORMAT(CAST (c.Codigo AS FLOAT),(SELECT REPLACE(Mascarilla,'X','0') FROM Parametros)) ELSE c.Codigo END + ' - ' + c.Nombre + ' ' AS CtaCodigo, ") 'Roberto 8/Nov/2014
StrSQL.Append(" SUM (CASE WHEN mp.TipoMovto = 0 THEN mp.Importe ELSE 0 END) AS Cargo, SUM (CASE WHEN mp.TipoMovto = 1 THEN mp.Importe ELSE 0 END) AS Abono, ") StrSQL.Append(" SUM (CASE WHEN mp.TipoMovto = 0 THEN mp.Importe ELSE 0 END) AS Cargo, SUM (CASE WHEN mp.TipoMovto = 1 THEN mp.Importe ELSE 0 END) AS Abono, ")
StrSQL.Append(" SUM (CASE WHEN mp.TipoMovto = 0 THEN mp.ImporteME ELSE 0 END) AS CargoME, SUM (CASE WHEN mp.TipoMovto = 1 THEN mp.ImporteME ELSE 0 END) AS AbonoME, ") StrSQL.Append(" SUM (CASE WHEN mp.TipoMovto = 0 THEN mp.ImporteME ELSE 0 END) AS CargoME, SUM (CASE WHEN mp.TipoMovto = 1 THEN mp.ImporteME ELSE 0 END) AS AbonoME, ")
StrSQL.Append(" mp.TipoMovto, CASE WHEN ISNUMERIC(c.CODIGO) = 1 THEN FORMAT(CAST (c.CODIGO AS FLOAT),(SELECT REPLACE(Mascarilla,'X','0') FROM Parametros)) ELSE c.CODIGO END CuentaFormato, '' as Estado ") StrSQL.Append(" mp.TipoMovto, CASE WHEN ISNUMERIC(c.CODIGO) = 1 THEN FORMAT(CAST (c.CODIGO AS FLOAT),(SELECT REPLACE(Mascarilla,'X','0') FROM Parametros)) ELSE c.CODIGO END CuentaFormato, '' as Estado,MAX(U.Nombre) AS UsuarioRegistro ")
StrSQL.Append(" FROM MovimientosPoliza mp ") StrSQL.Append(" FROM MovimientosPoliza mp ")
StrSQL.Append(" INNER JOIN Polizas p ON mp.IdPoliza = p.Id ") StrSQL.Append(" INNER JOIN Polizas p ON mp.IdPoliza = p.Id ")
StrSQL.Append(" INNER JOIN Cuentas c ON c.Id = mp.IdCuenta ") StrSQL.Append(" INNER JOIN Cuentas c ON c.Id = mp.IdCuenta ")
StrSQL.Append(" INNER JOIN TiposPolizas t ON mp.TipoPol = t.Codigo ") StrSQL.Append(" INNER JOIN TiposPolizas t ON mp.TipoPol = t.Codigo ")
StrSQL.Append(" LEFT JOIN SERVIDOR.Ventas.dbo.Usuarios U ON U.CveUsuario = P.IdUsuario ")
StrSQL.Append(" LEFT JOIN SegmentosNegocio s ON mp.IdSegNeg = s.id ") StrSQL.Append(" LEFT JOIN SegmentosNegocio s ON mp.IdSegNeg = s.id ")
StrSQL.Append(" WHERE (@IdPoliza = -1 OR mp.IdPoliza = @IdPoliza) ") StrSQL.Append(" WHERE (@IdPoliza = -1 OR mp.IdPoliza = @IdPoliza) ")
StrSQL.Append(" AND (@Eje = -1 OR mp.Ejercicio = @Eje) ") StrSQL.Append(" AND (@Eje = -1 OR mp.Ejercicio = @Eje) ")

506
Compras/Compras.aspx.vb
View File

@@ -3755,7 +3755,7 @@ Partial Class Compras_Compras
Dim GuardaNoDeducibles As Boolean = False Dim GuardaNoDeducibles As Boolean = False
If ChkEsNoDeducible.Checked Then If ChkEsNoDeducible.Checked Then
For Each Row As DataRow In TmpDT.Rows For Each Row As DataRow In TmpDT.Rows
If Row("NoDeducible").ToString = "True" Then If Row("NoDeducible").ToString().ToUpper() = "TRUE" OrElse Row("NoDeducible").ToString().ToUpper() = "1" Then
GuardaNoDeducibles = True GuardaNoDeducibles = True
End If End If
Next Next
@@ -4748,7 +4748,7 @@ Partial Class Compras_Compras
CveTipoGasto:=Row("CveTipoGasto").ToString.ToEntero, AF_Medida:=Row("AFMedida").ToString.ToEntero, AF_TipoMantenimiento:=Row("AFTipoMantenimiento").ToString.ToEntero, Referencia:=Referencia, OtrosGastos:=Row("OtrosGastos").ToString.ToDecimal, CveTipoGasto:=Row("CveTipoGasto").ToString.ToEntero, AF_Medida:=Row("AFMedida").ToString.ToEntero, AF_TipoMantenimiento:=Row("AFTipoMantenimiento").ToString.ToEntero, Referencia:=Referencia, OtrosGastos:=Row("OtrosGastos").ToString.ToDecimal,
RetIVA:=Row("RetIVA").ToString.ToDouble, RetISR:=Row("RetISR").ToString.ToDouble, IEPSPS:=Row("IEPSPS").ToString.ToDouble, IEPSPSIVA:=Row("IEPSPSIVA").ToString.ToDouble, RetIVA:=Row("RetIVA").ToString.ToDouble, RetISR:=Row("RetISR").ToString.ToDouble, IEPSPS:=Row("IEPSPS").ToString.ToDouble, IEPSPSIVA:=Row("IEPSPSIVA").ToString.ToDouble,
IVAPorcentaje:=Row("IVAPorcentaje").ToString.ToDouble, RetIVAPorcentaje:=Row("RetIVAPorcentaje").ToString.ToDouble, RetISRPorcentaje:=Row("RetISRPorcentaje").ToString.ToDouble, IVAPorcentaje:=Row("IVAPorcentaje").ToString.ToDouble, RetIVAPorcentaje:=Row("RetIVAPorcentaje").ToString.ToDouble, RetISRPorcentaje:=Row("RetISRPorcentaje").ToString.ToDouble,
IEPSPSPorcentaje:=Row("IEPSPSPorcentaje").ToString.ToDouble, IEPSPSIVAPorcentaje:=Row("IEPSPSIVAPorcentaje").ToString.ToDouble, NoDeducible:=If(Row("NoDeducible").ToString = "True" AndAlso EsNoDeducible, True, False)) Then IEPSPSPorcentaje:=Row("IEPSPSPorcentaje").ToString.ToDouble, IEPSPSIVAPorcentaje:=Row("IEPSPSIVAPorcentaje").ToString.ToDouble, NoDeducible:=If((Row("NoDeducible").ToString = "True" OrElse Row("NoDeducible").ToString = "1") AndAlso EsNoDeducible, True, False)) Then
ErrorDetalles = True ErrorDetalles = True
Exit For Exit For
@@ -9518,15 +9518,15 @@ Partial Class Compras_Compras
Dim Referencia As String = $"{TxtSerie.Text}-{TxtFolio.Text}" ' concatenation interpolation Dim Referencia As String = $"{TxtSerie.Text}-{TxtFolio.Text}" ' concatenation interpolation
Select Case ConceptoContable Select Case ConceptoContable
Case 5 'Case 5
IdCtaContable = 1244 ' IdCtaContable = 1244
If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, True, importeMovimiento, Referencia, 5, Referencia, FechaMovimiento, IdCtaContable, -1, CveCompra:=CveCompra, CveProveedor:=DdlProveedor.SelectedValue.ToEntero, CvePersonal:=CvePersonal, CveMovimientoAlmacen:=CveMovimientoInventario, ImporteMX:=TxtTotal.Text.ToDecimal, ImporteME:=If(tipoCambioActual = 1, 0, TxtTotal.Text.ToDecimal), CveCuenta:=CveCuenta) Then ' If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, True, importeMovimiento, Referencia, 5, Referencia, FechaMovimiento, IdCtaContable, -1, CveCompra:=CveCompra, CveProveedor:=DdlProveedor.SelectedValue.ToEntero, CvePersonal:=CvePersonal, CveMovimientoAlmacen:=CveMovimientoInventario, ImporteMX:=TxtTotal.Text.ToDecimal, ImporteME:=If(tipoCambioActual = 1, 0, TxtTotal.Text.ToDecimal), CveCuenta:=CveCuenta) Then
ErrorPrepoliza = True ' ErrorPrepoliza = True
End If ' End If
IdCtaContable = 1243 ' IdCtaContable = 1243
If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, False, importeMovimiento, Referencia, 205, Referencia, FechaMovimiento, IdCtaContable, -1, CveCompra:=CveCompra, CveProveedor:=DdlProveedor.SelectedValue.ToEntero, CvePersonal:=CvePersonal, CveMovimientoAlmacen:=CveMovimientoInventario, ImporteMX:=TxtTotal.Text.ToDecimal, ImporteME:=If(tipoCambioActual = 1, 0, TxtTotal.Text.ToDecimal), CveCuenta:=CveCuenta) Then ' If Not ObjConta.AddPrePolizasDetalle(CvePrePoliza, False, importeMovimiento, Referencia, 205, Referencia, FechaMovimiento, IdCtaContable, -1, CveCompra:=CveCompra, CveProveedor:=DdlProveedor.SelectedValue.ToEntero, CvePersonal:=CvePersonal, CveMovimientoAlmacen:=CveMovimientoInventario, ImporteMX:=TxtTotal.Text.ToDecimal, ImporteME:=If(tipoCambioActual = 1, 0, TxtTotal.Text.ToDecimal), CveCuenta:=CveCuenta) Then
ErrorPrepoliza = True ' ErrorPrepoliza = True
End If ' End If
Case 6 Case 6
Dim CveProveedorConcepto As Integer = 0, CveAcreedor As Integer = 0, CveIE As Integer = 0, CveColectiva As Integer = 0, CveCreditoDetalle As Integer = 0 Dim CveProveedorConcepto As Integer = 0, CveAcreedor As Integer = 0, CveIE As Integer = 0, CveColectiva As Integer = 0, CveCreditoDetalle As Integer = 0
Dim ConceptoPersonal As String = "", Concepto As String = "" Dim ConceptoPersonal As String = "", Concepto As String = ""
@@ -9815,11 +9815,11 @@ Partial Class Compras_Compras
BtnGuardar.Enabled = True BtnGuardar.Enabled = True
UpFacturar.Update() UpFacturar.Update()
End Sub End Sub
#End Region #End Region
#Region "CargaXML" #Region "CargaXML"
Private Function ValorXML(n As XmlNode, Campo As String, Optional Retorno As String = "") As String Private Function ValorXML(n As XmlNode, Campo As String, Optional Retorno As String = "") As String
Dim o As XmlNode = n.Attributes.Cast(Of XmlAttribute)().SingleOrDefault(Function(a) String.Compare(a.Name, Campo, True) = 0) Dim o As XmlNode = n.Attributes.Cast(Of XmlAttribute)().SingleOrDefault(Function(a) String.Compare(a.Name, Campo, True) = 0)
If o Is Nothing Then If o Is Nothing Then
@@ -10024,10 +10024,10 @@ Partial Class Compras_Compras
'End Try 'End Try
End Sub End Sub
#End Region #End Region
#Region "GV'S" #Region "GV'S"
Protected Sub GVAnticipos_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GVAnticipos.RowDataBound Protected Sub GVAnticipos_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GVAnticipos.RowDataBound
If e.Row.RowType = DataControlRowType.DataRow Then If e.Row.RowType = DataControlRowType.DataRow Then
@@ -10292,9 +10292,9 @@ Partial Class Compras_Compras
End If End If
End Sub End Sub
#End Region #End Region
#Region "METODOS" #Region "METODOS"
Private Sub GeneraGlobalDT(data As Object) Private Sub GeneraGlobalDT(data As Object)
Dim ObjPS As New ClsProductosServicios Dim ObjPS As New ClsProductosServicios
@@ -10727,66 +10727,66 @@ Partial Class Compras_Compras
CargarUMAlias() CargarUMAlias()
End Sub End Sub
#End Region #End Region
#Region " ALGO DE AF QUE NUNCA SE USABA " #Region " ALGO DE AF QUE NUNCA SE USABA "
'Protected Sub GVAF_RowCreated(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GVAF.RowCreated 'Protected Sub GVAF_RowCreated(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GVAF.RowCreated
' If e.Row.RowType = DataControlRowType.DataRow AndAlso (e.Row.RowState = DataControlRowState.Alternate OrElse e.Row.RowState = DataControlRowState.Normal) Then ' If e.Row.RowType = DataControlRowType.DataRow AndAlso (e.Row.RowState = DataControlRowState.Alternate OrElse e.Row.RowState = DataControlRowState.Normal) Then
' e.Row.FCDropDownList("DdlTipoActivoFijo").DataSource = TmpDTTiposAF ' e.Row.FCDropDownList("DdlTipoActivoFijo").DataSource = TmpDTTiposAF
' e.Row.FCDropDownList("DdlTipoActivoFijo").DataBind() ' e.Row.FCDropDownList("DdlTipoActivoFijo").DataBind()
' e.Row.FCDropDownList("DdlSubTipoActivoFijo").DataSource = Nothing ' e.Row.FCDropDownList("DdlSubTipoActivoFijo").DataSource = Nothing
' e.Row.FCDropDownList("DdlSubTipoActivoFijo").DataBind() ' e.Row.FCDropDownList("DdlSubTipoActivoFijo").DataBind()
' e.Row.FCDropDownList("DdlSubTipoActivoFijo").Items.Insert(0, New ListItem("Seleccione", "-1")) ' e.Row.FCDropDownList("DdlSubTipoActivoFijo").Items.Insert(0, New ListItem("Seleccione", "-1"))
' e.Row.FCDropDownList("DdlAF").DataSource = Nothing ' e.Row.FCDropDownList("DdlAF").DataSource = Nothing
' e.Row.FCDropDownList("DdlAF").DataBind() ' e.Row.FCDropDownList("DdlAF").DataBind()
' e.Row.FCDropDownList("DdlAF").Items.Insert(0, New ListItem("Seleccione", "-1")) ' e.Row.FCDropDownList("DdlAF").Items.Insert(0, New ListItem("Seleccione", "-1"))
' End If ' End If
'End Sub 'End Sub
'Protected Sub GVAF_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GVAF.RowDataBound 'Protected Sub GVAF_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GVAF.RowDataBound
' If e.Row.RowType = DataControlRowType.DataRow Then ' If e.Row.RowType = DataControlRowType.DataRow Then
' If e.Row.RowIndex = 0 Then ' If e.Row.RowIndex = 0 Then
' e.Row.Cells(0).Width = Unit.Pixel(20) ' e.Row.Cells(0).Width = Unit.Pixel(20)
' e.Row.Cells(1).Width = Unit.Pixel(140) ' e.Row.Cells(1).Width = Unit.Pixel(140)
' e.Row.Cells(2).Width = Unit.Pixel(250) ' e.Row.Cells(2).Width = Unit.Pixel(250)
' End If ' End If
' e.Row.Cells(0).HorizontalAlign = HorizontalAlign.Right ' e.Row.Cells(0).HorizontalAlign = HorizontalAlign.Right
' e.Row.Cells(1).HorizontalAlign = HorizontalAlign.Left ' e.Row.Cells(1).HorizontalAlign = HorizontalAlign.Left
' e.Row.Cells(2).HorizontalAlign = HorizontalAlign.Left ' e.Row.Cells(2).HorizontalAlign = HorizontalAlign.Left
' End If ' End If
'End Sub 'End Sub
'Protected Sub DdlTipoActivoFijo_SelectedIndexChanged(sender As Object, e As System.EventArgs) 'Protected Sub DdlTipoActivoFijo_SelectedIndexChanged(sender As Object, e As System.EventArgs)
' Dim Array() As String = Nothing ' Dim Array() As String = Nothing
' Dim DdlGVSubTipoAF As DropDownList = Nothing ' Dim DdlGVSubTipoAF As DropDownList = Nothing
' Array = DirectCast(sender, DropDownList).ClientID.Split("_"c) ' Array = DirectCast(sender, DropDownList).ClientID.Split("_"c)
' If Array.Length > 0 Then ' If Array.Length > 0 Then
' DdlGVSubTipoAF = DirectCast(GVAF.Rows(Array(3).ToEntero).Controls(4).Controls(1), DropDownList) ' DdlGVSubTipoAF = DirectCast(GVAF.Rows(Array(3).ToEntero).Controls(4).Controls(1), DropDownList)
' End If ' End If
' If DdlGVSubTipoAF IsNot Nothing Then CargaSubTipoAF(DirectCast(sender, DropDownList), DdlGVSubTipoAF) ' If DdlGVSubTipoAF IsNot Nothing Then CargaSubTipoAF(DirectCast(sender, DropDownList), DdlGVSubTipoAF)
'End Sub 'End Sub
'Protected Sub GvOCC2_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvOCC2.RowDataBound 'Protected Sub GvOCC2_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvOCC2.RowDataBound
' If e.Row.RowType = DataControlRowType.DataRow Then ' If e.Row.RowType = DataControlRowType.DataRow Then
' e.Row.Cells(0).Text = (e.Row.RowIndex + 1).ToString ' e.Row.Cells(0).Text = (e.Row.RowIndex + 1).ToString
' End If ' End If
'End Sub 'End Sub
'Protected Sub chkFuncionariosEmpleados_CheckedChanged(sender As Object, e As EventArgs) Handles chkFuncionariosEmpleados.CheckedChanged 'Protected Sub chkFuncionariosEmpleados_CheckedChanged(sender As Object, e As EventArgs) Handles chkFuncionariosEmpleados.CheckedChanged
' PnlPagoContado.Visible = Not chkFuncionariosEmpleados.Checked ' PnlPagoContado.Visible = Not chkFuncionariosEmpleados.Checked
' PnlFuncionarioEmpleado.Visible = chkFuncionariosEmpleados.Checked ' PnlFuncionarioEmpleado.Visible = chkFuncionariosEmpleados.Checked
' UPCondicionesPago.Update() ' UPCondicionesPago.Update()
'End Sub 'End Sub
Protected Sub BtnOCAceptar_Click(sender As Object, e As EventArgs) Handles BtnOCAceptar.Click Protected Sub BtnOCAceptar_Click(sender As Object, e As EventArgs) Handles BtnOCAceptar.Click
'carga la OC 'carga la OC
Dim CveOC As Integer = -1 Dim CveOC As Integer = -1
@@ -10823,45 +10823,45 @@ Partial Class Compras_Compras
'UpnAF.Update() 'UpnAF.Update()
End Sub End Sub
#End Region #End Region
#Region "Estimaciones" #Region "Estimaciones"
'Private Sub CargaDatosEstimaciones(pCveProveedor As Integer) 'Private Sub CargaDatosEstimaciones(pCveProveedor As Integer)
' Dim Con As New ClsContratos ' Dim Con As New ClsContratos
' If Con.GetEstimaciones(pCveProveedor, -1, -1, -1, -1, 0, UsuarioActual.CveEmpresa) Then ' If Con.GetEstimaciones(pCveProveedor, -1, -1, -1, -1, 0, UsuarioActual.CveEmpresa) Then
' GVEst.DataSource = Con.DtResultados ' GVEst.DataSource = Con.DtResultados
' GVEst.DataBind() ' GVEst.DataBind()
' End If ' End If
' UPEstimaciones.Update() ' UPEstimaciones.Update()
' Con.Dispose() ' Con.Dispose()
'End Sub 'End Sub
'Protected Sub GVEst_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GVEst.RowDataBound 'Protected Sub GVEst_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GVEst.RowDataBound
' If e.Row.RowType = DataControlRowType.DataRow Then ' If e.Row.RowType = DataControlRowType.DataRow Then
' If e.Row.RowIndex = 0 Then ' If e.Row.RowIndex = 0 Then
' e.Row.Cells(0).Width = Unit.Pixel(30) ' e.Row.Cells(0).Width = Unit.Pixel(30)
' e.Row.Cells(1).Width = Unit.Pixel(30) 'Seccion ' e.Row.Cells(1).Width = Unit.Pixel(30) 'Seccion
' e.Row.Cells(2).Width = Unit.Pixel(300) 'SubSeccion ' e.Row.Cells(2).Width = Unit.Pixel(300) 'SubSeccion
' e.Row.Cells(3).Width = Unit.Pixel(100) 'Cantidad ' e.Row.Cells(3).Width = Unit.Pixel(100) 'Cantidad
' End If ' End If
' If e.Row.DBCampo("RazonSocial") = "" Then ' If e.Row.DBCampo("RazonSocial") = "" Then
' e.Row.CssClass = "Totales" : e.Row.Height = 25 ' e.Row.CssClass = "Totales" : e.Row.Height = 25
' ElseIf e.Row.DBCampo("Contrato") = "" Then ' ElseIf e.Row.DBCampo("Contrato") = "" Then
' e.Row.CssClass = "SubTotales2" : e.Row.Height = 25 ' e.Row.CssClass = "SubTotales2" : e.Row.Height = 25
' ElseIf e.Row.DBCampo("Seccion") = "" Then ' ElseIf e.Row.DBCampo("Seccion") = "" Then
' e.Row.CssClass = "SubTotales" : e.Row.Height = 25 ' e.Row.CssClass = "SubTotales" : e.Row.Height = 25
' ElseIf e.Row.DBCampo("Clasificacion") = "" Then ' ElseIf e.Row.DBCampo("Clasificacion") = "" Then
' e.Row.CssClass = "SubTotales3" : e.Row.Height = 25 ' e.Row.CssClass = "SubTotales3" : e.Row.Height = 25
' End If ' End If
' End If ' End If
'End Sub 'End Sub
#End Region #End Region
#Region " ALMACEN " #Region " ALMACEN "
Private Sub CargaGvInv() Private Sub CargaGvInv()
@@ -11178,11 +11178,11 @@ Partial Class Compras_Compras
UpAlmacenEvidencia.Update() UpAlmacenEvidencia.Update()
End Sub End Sub
#End Region #End Region
#Region "PESTAÑA INFORMACION GENERAL DE BANCO IE" #Region "PESTAÑA INFORMACION GENERAL DE BANCO IE"
Private Sub CargaTipoTransaccion() Private Sub CargaTipoTransaccion()
DdlTipoTransaccion.DataSource = GlobalDTTipoTransacciones.FiltraParametros("Tipo = 'Egs'") DdlTipoTransaccion.DataSource = GlobalDTTipoTransacciones.FiltraParametros("Tipo = 'Egs'")
DdlTipoTransaccion.DataBind() DdlTipoTransaccion.DataBind()
@@ -11203,52 +11203,52 @@ Partial Class Compras_Compras
DdlCuentaCaja.DataSource = GlobalDTBancosCuentas(UsuarioActual.CveUsuario).FiltraParametros(String.Format("CveTipoCuenta = 1")) DdlCuentaCaja.DataSource = GlobalDTBancosCuentas(UsuarioActual.CveUsuario).FiltraParametros(String.Format("CveTipoCuenta = 1"))
DdlCuentaCaja.DataBind() DdlCuentaCaja.DataBind()
DdlCuentaCaja.Items.Insert(0, New ListItem("Seleccione", "-1")) DdlCuentaCaja.Items.Insert(0, New ListItem("Seleccione", "-1"))
End Sub End Sub
#End Region #End Region
#Region "FINANCIAMIENTO - AC" #Region "FINANCIAMIENTO - AC"
'Private Sub CreaDtAC() 'Private Sub CreaDtAC()
' DtAC = New DataTable ' DtAC = New DataTable
' DtAC.Columns.Add("IdCuenta", GetType(String)) ' DtAC.Columns.Add("IdCuenta", GetType(String))
' DtAC.Columns.Add("Cuenta", GetType(String)) ' DtAC.Columns.Add("Cuenta", GetType(String))
' DtAC.Columns.Add("Saldo", GetType(String)) ' DtAC.Columns.Add("Saldo", GetType(String))
'End Sub 'End Sub
'Protected Sub CargaGvAc(Optional datos As DataTable = Nothing) 'Protected Sub CargaGvAc(Optional datos As DataTable = Nothing)
' If UsuarioActual.Empresa.UsaAC Then ' If UsuarioActual.Empresa.UsaAC Then
' GvAC.DataBind() ' GvAC.DataBind()
' GvAC.DataSource = If(datos IsNot Nothing, datos, DtAC) ' GvAC.DataSource = If(datos IsNot Nothing, datos, DtAC)
' GvAC.DataBind() ' GvAC.DataBind()
' Dim Total As Double = GvAC.Rows.Cast(Of GridViewRow)().Sum(Function(gvr) gvr.DataKey("PorDevengar").ToDouble) ' Dim Total As Double = GvAC.Rows.Cast(Of GridViewRow)().Sum(Function(gvr) gvr.DataKey("PorDevengar").ToDouble)
' Lbtotalsaldo.Text = Total.ToString.FormatoNumero ' Lbtotalsaldo.Text = Total.ToString.FormatoNumero
' UPPM.Update() ' UPPM.Update()
' PnlAC.Visible = True ' PnlAC.Visible = True
' End If ' End If
'End Sub 'End Sub
'Protected Sub CargaAC() 'Protected Sub CargaAC()
' Dim Cont As New ClsContPAQi(UsuarioActual.Empresa) ' Dim Cont As New ClsContPAQi(UsuarioActual.Empresa)
' If Cont.GetACSaldos(UsuarioActual.Empresa.EjercicioActual, 2) Then ' If Cont.GetACSaldos(UsuarioActual.Empresa.EjercicioActual, 2) Then
' DtAC = Cont.DtResultados.Copy.FiltraParametros("PorDevengar > 0") ' DtAC = Cont.DtResultados.Copy.FiltraParametros("PorDevengar > 0")
' Else ' Else
' Alert("Ocurrio un error al cargar los Presupuestos. Por favor vuelva a cargar la pagina") ' Alert("Ocurrio un error al cargar los Presupuestos. Por favor vuelva a cargar la pagina")
' End If ' End If
' Cont.Dispose() ' Cont.Dispose()
'End Sub 'End Sub
'Protected Sub GvAC_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GvAC.RowDataBound 'Protected Sub GvAC_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GvAC.RowDataBound
' If e.Row.RowType = DataControlRowType.DataRow Then ' If e.Row.RowType = DataControlRowType.DataRow Then
' e.Row.FCTextBox("TxtImporte").Attributes.Add("onkeyup", String.Format("ValidaImporte(this,{0});", e.Row.DBCampo("PorDevengar"))) ' e.Row.FCTextBox("TxtImporte").Attributes.Add("onkeyup", String.Format("ValidaImporte(this,{0});", e.Row.DBCampo("PorDevengar")))
' End If ' End If
'End Sub 'End Sub
#End Region #End Region
#Region "TAB - PERSONAL" #Region "TAB - PERSONAL"
Private Sub CargaGvPersonal() Private Sub CargaGvPersonal()
GvPersonal.DataSource = TmpDT GvPersonal.DataSource = TmpDT
@@ -11419,13 +11419,13 @@ Partial Class Compras_Compras
Next Next
End Sub End Sub
#End Region #End Region
#Region "TAB - ACTIVOS FIJOS -AF" #Region "TAB - ACTIVOS FIJOS -AF"
Protected Sub CargarGvActivosFijos(sender As Object, e As EventArgs) Protected Sub CargarGvActivosFijos(sender As Object, e As EventArgs)
Tab.ActiveTabIndex = 3 Tab.ActiveTabIndex = 3
@@ -11655,58 +11655,58 @@ Partial Class Compras_Compras
End Sub End Sub
Protected Sub BtnAFMedida_Click(sender As Object, e As EventArgs) Protected Sub BtnAFMedida_Click(sender As Object, e As EventArgs)
TmpDT(HdnIndexTmpDT.Value.ToEntero)("AFMedida") = HdnTxtAFMedida.Value TmpDT(HdnIndexTmpDT.Value.ToEntero)("AFMedida") = HdnTxtAFMedida.Value
End Sub End Sub
#End Region #End Region
#Region "C O N T R A T O S" #Region "C O N T R A T O S"
'Protected Sub ImgBtnBuscarContrato_Click(sender As Object, e As ImageClickEventArgs) Handles ImgBtnBuscarContrato.Click 'Protected Sub ImgBtnBuscarContrato_Click(sender As Object, e As ImageClickEventArgs) Handles ImgBtnBuscarContrato.Click
' If CveProveedor <= 0 Then ' If CveProveedor <= 0 Then
' Alert("Debe de Seleccionar un proveedor") ' Alert("Debe de Seleccionar un proveedor")
' Exit Sub ' Exit Sub
' End If ' End If
' RegistraScript(String.Format("AbrirVentana('/Contratos/PopUpBuscarContrato.aspx?V=VCCOMP',730,300,'N');")) ' RegistraScript(String.Format("AbrirVentana('/Contratos/PopUpBuscarContrato.aspx?V=VCCOMP',730,300,'N');"))
'End Sub 'End Sub
'Protected Sub CargaVContrato(sender As Object, e As EventArgs) 'Protected Sub CargaVContrato(sender As Object, e As EventArgs)
' CargaVContrato2(HdnVCveContrato.Value) ' CargaVContrato2(HdnVCveContrato.Value)
'End Sub 'End Sub
'Protected Sub CargaVContrato2(CveContrato As String) 'Protected Sub CargaVContrato2(CveContrato As String)
' If TxtContrato.Text <> "" Then ' If TxtContrato.Text <> "" Then
' Dim ObjContratos As New ClsContratos ' Dim ObjContratos As New ClsContratos
' Dim DTContratosTemp As DataTable = Nothing ' Dim DTContratosTemp As DataTable = Nothing
' GvContratos1.DataSource = TmpDT ' GvContratos1.DataSource = TmpDT
' GvContratos1.DataBind() ' GvContratos1.DataBind()
' UPGVContratos1.Update() ' UPGVContratos1.Update()
' Dim ArrayCveContratos As String() = HdnVCveContrato.Value.Split(New Char() {","c}) ' Dim ArrayCveContratos As String() = HdnVCveContrato.Value.Split(New Char() {","c})
' For i As Integer = 1 To ArrayCveContratos.Count ' For i As Integer = 1 To ArrayCveContratos.Count
' If ObjContratos.GetContratosDetalle(ArrayCveContratos(i - 1).ToEntero) Then ' If ObjContratos.GetContratosDetalle(ArrayCveContratos(i - 1).ToEntero) Then
' If IsNothing(DTContratosTemp) Then ' If IsNothing(DTContratosTemp) Then
' DTContratosTemp = ObjContratos.DtResultados.Copy ' DTContratosTemp = ObjContratos.DtResultados.Copy
' Else ' Else
' DTContratosTemp.Merge(ObjContratos.DtResultados) ' DTContratosTemp.Merge(ObjContratos.DtResultados)
' End If ' End If
' Else ' Else
' Alert("Ocurrio un ERROR al cargar el Contrato") ' Alert("Ocurrio un ERROR al cargar el Contrato")
' DTContratosTemp.Rows.Clear() ' DTContratosTemp.Rows.Clear()
' Exit For ' Exit For
' End If ' End If
' Next ' Next
' GvContratos2.DataSource = DTContratosTemp ' GvContratos2.DataSource = DTContratosTemp
' GvContratos2.DataBind() ' GvContratos2.DataBind()
' UPGVContratos2.Update() ' UPGVContratos2.Update()
' ObjContratos.Dispose() ' ObjContratos.Dispose()
' End If ' End If
'End Sub 'End Sub
#End Region #End Region
#Region "TAB ALMACEN - INVENTARIOS ISRAEL PIÑA - 5 FEBRERO 2015" #Region "TAB ALMACEN - INVENTARIOS ISRAEL PIÑA - 5 FEBRERO 2015"
Protected Sub CalculaTotalPorDevengar() Protected Sub CalculaTotalPorDevengar()
Dim total = TxtTotal.Text.ToDouble Dim total = TxtTotal.Text.ToDouble
For Each Gvr As GridViewRow In GvInv.Rows For Each Gvr As GridViewRow In GvInv.Rows
@@ -11720,10 +11720,10 @@ Partial Class Compras_Compras
Protected Sub CambiaTotalDevengar(sender As Object, e As EventArgs) Protected Sub CambiaTotalDevengar(sender As Object, e As EventArgs)
CalculaTotalPorDevengar() CalculaTotalPorDevengar()
End Sub End Sub
#End Region #End Region
#Region " AJUSTA IMPORTES " #Region " AJUSTA IMPORTES "
Private Sub AjustaImporteUltimoConcepto(ImporteAjuste As Decimal, Optional EsCarga As Boolean = False) Private Sub AjustaImporteUltimoConcepto(ImporteAjuste As Decimal, Optional EsCarga As Boolean = False)
'Dim TempSubTotal = TxtSubTotal.Text.ToDouble 'Dim TempSubTotal = TxtSubTotal.Text.ToDouble
@@ -11822,9 +11822,9 @@ Partial Class Compras_Compras
GvPS.DataBind() GvPS.DataBind()
UpPS.Update() UpPS.Update()
End Sub End Sub
#End Region #End Region
#Region "DDL'S" #Region "DDL'S"
Protected Sub DdlCredito_SelectedIndexChanged(sender As Object, e As EventArgs) Handles DdlCredito.SelectedIndexChanged Protected Sub DdlCredito_SelectedIndexChanged(sender As Object, e As EventArgs) Handles DdlCredito.SelectedIndexChanged
CargaCreditosDetalle(DdlCredito.SelectedValue.ToEntero) CargaCreditosDetalle(DdlCredito.SelectedValue.ToEntero)
@@ -12053,9 +12053,9 @@ Partial Class Compras_Compras
RVDocumentoImporteFE.MaximumValue = saldo.ToString RVDocumentoImporteFE.MaximumValue = saldo.ToString
UPCondicionesPago.Update() UPCondicionesPago.Update()
End Sub End Sub
#End Region #End Region
#Region "CHK'S" #Region "CHK'S"
Protected Sub RBLCajaChica_SelectedIndexChanged(sender As Object, e As EventArgs) Handles RBLCajaChica.SelectedIndexChanged Protected Sub RBLCajaChica_SelectedIndexChanged(sender As Object, e As EventArgs) Handles RBLCajaChica.SelectedIndexChanged
Select Case RBLCajaChica.SelectedValue Select Case RBLCajaChica.SelectedValue
@@ -12277,9 +12277,9 @@ Partial Class Compras_Compras
ElseIf RblRembolso.SelectedValue.ToEntero = 2 Then ElseIf RblRembolso.SelectedValue.ToEntero = 2 Then
TrRembolsoCajaChica.Visible = True TrRembolsoCajaChica.Visible = True
End If End If
End Sub End Sub
#End Region #End Region
#Region "ARMONIZACION CONTABLE - AC - SIMPLIFICADO" #Region "ARMONIZACION CONTABLE - AC - SIMPLIFICADO"
Private Sub CargaPresupuestosEgresos(Optional CargaTodo As Boolean = True) Private Sub CargaPresupuestosEgresos(Optional CargaTodo As Boolean = True)
@@ -12543,10 +12543,10 @@ Partial Class Compras_Compras
EjercicioAC = Ejercicio EjercicioAC = Ejercicio
End If End If
End Sub End Sub
#End Region #End Region
#Region "E V E N T O - B I T A C O R A" #Region "E V E N T O - B I T A C O R A"
Protected Sub GVEventoBitacora_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvEB.RowDataBound Protected Sub GVEventoBitacora_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvEB.RowDataBound
If e.Row.RowType = DataControlRowType.DataRow Then If e.Row.RowType = DataControlRowType.DataRow Then
@@ -12643,9 +12643,9 @@ Partial Class Compras_Compras
End If End If
ObjEventoBitacora.Dispose() ObjEventoBitacora.Dispose()
GvEB.DataBind() GvEB.DataBind()
End Sub End Sub
#End Region #End Region
#Region " C O N T A B I L I D A D " #Region " C O N T A B I L I D A D "
Protected Sub BtnDescontabilizar_Click(sender As Object, e As EventArgs) Protected Sub BtnDescontabilizar_Click(sender As Object, e As EventArgs)
'Alert("Hola entre", TipoMensaje.MsgError) 'Alert("Hola entre", TipoMensaje.MsgError)
@@ -13034,10 +13034,10 @@ Partial Class Compras_Compras
If Not ErrorCompra Then If Not ErrorCompra Then
CargaCompra() CargaCompra()
End If End If
End Sub End Sub
#End Region #End Region
#Region " REEMBOLSOS NO USA AC " #Region " REEMBOLSOS NO USA AC "
Protected Sub DdlPersonal2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles DdlPersonalReembolso.SelectedIndexChanged Protected Sub DdlPersonal2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles DdlPersonalReembolso.SelectedIndexChanged
ViewState("CvePersonal") = DdlPersonalReembolso.SelectedValue ViewState("CvePersonal") = DdlPersonalReembolso.SelectedValue
@@ -13051,13 +13051,13 @@ Partial Class Compras_Compras
CveCuentaBancaria = dr("IdCtaContableSIG").ToString.ToEntero CveCuentaBancaria = dr("IdCtaContableSIG").ToString.ToEntero
End If End If
ViewState("CveCajaChica") = DdlCuentaCajaChicaReembolso.SelectedValue ViewState("CveCajaChica") = DdlCuentaCajaChicaReembolso.SelectedValue
End Sub End Sub
#End Region #End Region
#Region " ALMACEN " #Region " ALMACEN "
#End Region #End Region
#Region " CONSIGNACIONES " #Region " CONSIGNACIONES "
Protected Sub ChkConsignacion_CheckedChanged(sender As Object, e As EventArgs) Protected Sub ChkConsignacion_CheckedChanged(sender As Object, e As EventArgs)
@@ -13327,13 +13327,13 @@ Partial Class Compras_Compras
BtnGuardar.Enabled = True BtnGuardar.Enabled = True
UpFacturar.Update() UpFacturar.Update()
End Sub End Sub
#End Region #End Region
#Region " ***** Devoluciones INV ***** " #Region " ***** Devoluciones INV ***** "
'*se envia true si hubo un error*' '*se envia true si hubo un error*'
Private Function guardardevolucion(ObjInventario As ClsInventarios, CveCompra As Integer, subtotal As Double, Fecha As Date) As Boolean Private Function guardardevolucion(ObjInventario As ClsInventarios, CveCompra As Integer, subtotal As Double, Fecha As Date) As Boolean
Dim ErrorMovInv As Boolean = False Dim ErrorMovInv As Boolean = False
Dim CveAlmacen As Integer Dim CveAlmacen As Integer
@@ -13530,9 +13530,9 @@ Partial Class Compras_Compras
ImgBtnBuscarOC.Visible = False ImgBtnBuscarOC.Visible = False
UpParametros.Update() UpParametros.Update()
UpPSS.Update() UpPSS.Update()
End Sub End Sub
#End Region #End Region
#Region " REFACTURACION " #Region " REFACTURACION "
Private Sub ValidaRefacturacion() Private Sub ValidaRefacturacion()
If Not CveCompra > 0 AndAlso DdlTipoComprobante.SelectedValue = "Fac" And UsuarioActual.Empresa.CvePlataforma <> 2 Then If Not CveCompra > 0 AndAlso DdlTipoComprobante.SelectedValue = "Fac" And UsuarioActual.Empresa.CvePlataforma <> 2 Then
@@ -13766,10 +13766,10 @@ Partial Class Compras_Compras
End If End If
Return ErrorBitacora Return ErrorBitacora
End Function End Function
#End Region #End Region
#Region " CANCELAR COMPRA " #Region " CANCELAR COMPRA "
Private Sub ValidaCancelarCompra() Private Sub ValidaCancelarCompra()
If UsuarioActual.TienePermisoProceso(140) Then If UsuarioActual.TienePermisoProceso(140) Then
@@ -14048,10 +14048,10 @@ Partial Class Compras_Compras
DivValesCombustible.Visible = True DivValesCombustible.Visible = True
RegistraScript(String.Format("$('#{0}').modal('show')", DivValesCombustible.ClientID)) RegistraScript(String.Format("$('#{0}').modal('show')", DivValesCombustible.ClientID))
UPPValesCombustible.Update() UPPValesCombustible.Update()
End Sub End Sub
#End Region #End Region
#Region " VALES COMBUSTIBLES " #Region " VALES COMBUSTIBLES "
Protected Sub BtnValesVincular_Click(sender As Object, e As EventArgs) Protected Sub BtnValesVincular_Click(sender As Object, e As EventArgs)
IdVale = New List(Of Integer) IdVale = New List(Of Integer)
@@ -14071,9 +14071,9 @@ Partial Class Compras_Compras
' Alert(cve.ToString) ' Alert(cve.ToString)
'Next 'Next
End If End If
End Sub End Sub
#End Region #End Region
#Region " VINCULAR OC " #Region " VINCULAR OC "
Private Sub InicializaOC() Private Sub InicializaOC()
'BORRAR OC 'BORRAR OC
@@ -15106,11 +15106,11 @@ Partial Class Compras_Compras
Alert($"El concepto <b>{PS}</b> tiene especificada la cantidad <b>{Cantidad}</b> pero un costo de cero ($0). <br/><br/> <b>En caso de vincular la OC de esta manera la cantidad especificada sera considerada como recibida.</b> <br/><br/> De ser correcto Continue o de lo contrario rectifique.", TipoMensaje.MsgAdvertencia) Alert($"El concepto <b>{PS}</b> tiene especificada la cantidad <b>{Cantidad}</b> pero un costo de cero ($0). <br/><br/> <b>En caso de vincular la OC de esta manera la cantidad especificada sera considerada como recibida.</b> <br/><br/> De ser correcto Continue o de lo contrario rectifique.", TipoMensaje.MsgAdvertencia)
End Sub End Sub
#End Region #End Region
#Region "F L E T E S Y S E R V I C I O S" #Region "F L E T E S Y S E R V I C I O S"
Public Sub CreaDTFacturas() Public Sub CreaDTFacturas()
Dim dt As New DataTable Dim dt As New DataTable
@@ -18957,11 +18957,11 @@ Partial Class Compras_Compras
Dim gvr As GridViewRow = CType(Chk.BindingContainer, GridViewRow) Dim gvr As GridViewRow = CType(Chk.BindingContainer, GridViewRow)
For Each drt As DataRow In TmpDT.Select("Consec = " & gvr.RowIndex + 1) For Each drt As DataRow In TmpDT.Select("Consec = " & gvr.RowIndex + 1)
drt("NoDeducible") = Chk.Checked drt("NoDeducible") = Chk.Checked
Next Next
TmpDT.AcceptChanges() TmpDT.AcceptChanges()
Alert((TmpDT.Select("Consec = " & gvr.RowIndex + 1)(0))("NoDeducible").ToString())
AddPS2(EsNoDeducible:=EsNoDeducible) AddPS2(EsNoDeducible:=EsNoDeducible)
End Sub End Sub

5
Empresas/119/Formatos/Polizas.rdlc
View File

@@ -1099,10 +1099,10 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value /> <Value>=Fields!UsuarioRegistro.Value</Value>
<Style> <Style>
<FontFamily>calibri</FontFamily> <FontFamily>calibri</FontFamily>
<FontSize>8pt</FontSize> <FontSize>1pt</FontSize>
<Color>White</Color> <Color>White</Color>
</Style> </Style>
</TextRun> </TextRun>
@@ -1120,6 +1120,7 @@
<PaddingBottom>1pt</PaddingBottom> <PaddingBottom>1pt</PaddingBottom>
</Style> </Style>
</Textbox> </Textbox>
<rd:Selected>true</rd:Selected>
</CellContents> </CellContents>
</TablixCell> </TablixCell>
<TablixCell> <TablixCell>

8
OS/CatEstatusOrdenServicio.aspx
View File

@@ -4,6 +4,10 @@
</asp:Content> </asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server"> <asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
<style> <style>
.columnaUsuarios{
text-align:left;
font-weight:bold;
}
.Widthall { .Widthall {
width: 100% !important; width: 100% !important;
} }
@@ -131,13 +135,13 @@
<asp:GridView ID="Prueba" GridLines="None" CssClass="table table-striped table-advance table-hover" Width="100%" runat="server" AutoGenerateColumns="false" DataKeyNames="CveUsuario" EmptyDataText="No se encontraron Usuarios Registrados" ToolTip="Listado de Usuarios" Style="text-align: center"> <asp:GridView ID="Prueba" GridLines="None" CssClass="table table-striped table-advance table-hover" Width="100%" runat="server" AutoGenerateColumns="false" DataKeyNames="CveUsuario" EmptyDataText="No se encontraron Usuarios Registrados" ToolTip="Listado de Usuarios" Style="text-align: center">
<HeaderStyle VerticalAlign="Middle" /> <HeaderStyle VerticalAlign="Middle" />
<Columns> <Columns>
<asp:TemplateField> <%--<asp:TemplateField>
<HeaderTemplate>Estatus</HeaderTemplate> <HeaderTemplate>Estatus</HeaderTemplate>
<ItemStyle Width="150px" BorderStyle="None" /> <ItemStyle Width="150px" BorderStyle="None" />
<ItemTemplate> <ItemTemplate>
<asp:Label Font-Bold="true" Style="text-align: left" Width="250px" ID="LblUsuario" runat="server" Text='<%# Eval("Nombre")%>'></asp:Label> <asp:Label Font-Bold="true" Style="text-align: left" Width="250px" ID="LblUsuario" runat="server" Text='<%# Eval("Nombre")%>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>--%>
</Columns> </Columns>
</asp:GridView> </asp:GridView>
<div style="width: 100%; text-align: center"> <div style="width: 100%; text-align: center">

18
OS/CatEstatusOrdenServicio.aspx.vb
View File

@@ -105,7 +105,7 @@ Partial Class OS_CatEstatusOrdenServicio
If HdnModalidad.Value = "I" Then If HdnModalidad.Value = "I" Then
If ObjEstatusOrdenServicios.AddEstatusOrdenServicio(TxtEstatusOS.Text.Trim, DdlTipoEstatus.SelectedValue.ToEntero, If(ChkEstatus.Checked, 1, 0), UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) Then If ObjEstatusOrdenServicios.AddEstatusOrdenServicio(TxtEstatusOS.Text.Trim, DdlTipoEstatus.SelectedValue.ToEntero, If(ChkEstatus.Checked, 1, 0), UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) Then
CargaDatos() 'CargaDatos()
Alert("Estatus agregado") Alert("Estatus agregado")
End If End If
Else Else
@@ -117,12 +117,13 @@ Partial Class OS_CatEstatusOrdenServicio
If Not TieneError Then If Not TieneError Then
GvDatos.EditIndex = -1 GvDatos.EditIndex = -1
CargaDatos() 'CargaDatos()
Alert("Estatus actualizado") Alert("Estatus actualizado")
Else Else
Alert("Ocurrio un error al actualizar los datos", TipoMensaje.MsgAdvertencia) Alert("Ocurrio un error al actualizar los datos", TipoMensaje.MsgAdvertencia)
End If End If
End If End If
CargaDatos()
ObjEstatusOrdenServicios.Dispose() ObjEstatusOrdenServicios.Dispose()
RegistraScript(String.Format("$('#{0}').modal('hide');", "divAddEstatusOS")) RegistraScript(String.Format("$('#{0}').modal('hide');", "divAddEstatusOS"))
@@ -130,7 +131,7 @@ Partial Class OS_CatEstatusOrdenServicio
AsociarEstatusUsuarios() AsociarEstatusUsuarios()
CargarUsuarioConEstatus() CargarUsuarioConEstatus()
UpDatos.Update() UpDatos.Update()
'UpPrueba.Update() UpPrueba.Update()
'Response.Redirect(HttpContext.Current.Request.Url.ToString(), True) 'Response.Redirect(HttpContext.Current.Request.Url.ToString(), True)
End Sub End Sub
Public Sub Edit_Click(sender As Object, e As EventArgs) Public Sub Edit_Click(sender As Object, e As EventArgs)
@@ -171,6 +172,10 @@ Partial Class OS_CatEstatusOrdenServicio
ObjEstatusOrdenServicios.Dispose() ObjEstatusOrdenServicios.Dispose()
CargaDatos() CargaDatos()
UpDatos.Update() UpDatos.Update()
EstatusUsuariosGridActualizar()
AsociarEstatusUsuarios()
CargarUsuarioConEstatus()
UpPrueba.Update()
'Response.Redirect(HttpContext.Current.Request.Url.ToString(), True) 'Response.Redirect(HttpContext.Current.Request.Url.ToString(), True)
End Sub End Sub
Protected Sub GvDatos_RowUpdating(sender As Object, e As System.Web.UI.WebControls.GridViewUpdateEventArgs) Handles GvDatos.RowUpdating Protected Sub GvDatos_RowUpdating(sender As Object, e As System.Web.UI.WebControls.GridViewUpdateEventArgs) Handles GvDatos.RowUpdating
@@ -209,6 +214,11 @@ Partial Class OS_CatEstatusOrdenServicio
End Sub End Sub
Private Sub CargarUsuarioConEstatus() Private Sub CargarUsuarioConEstatus()
Dim nombresUsuarios As New BoundField
nombresUsuarios.DataField = "Nombre"
nombresUsuarios.HeaderText = "Usuario"
nombresUsuarios.ItemStyle.CssClass = "columnaUsuarios"
Prueba.Columns.Add(nombresUsuarios)
For Each Estatus As DataRow In DtEstatusOS.Rows For Each Estatus As DataRow In DtEstatusOS.Rows
Dim test As New CheckBoxField Dim test As New CheckBoxField
test.HeaderText = Estatus.Item("EstatusOrdenServicio").ToString test.HeaderText = Estatus.Item("EstatusOrdenServicio").ToString
@@ -270,7 +280,7 @@ Partial Class OS_CatEstatusOrdenServicio
Private Sub EstatusUsuariosGridActualizar() Private Sub EstatusUsuariosGridActualizar()
DtEstatusUsuariosAsociados = Nothing DtEstatusUsuariosAsociados = Nothing
Prueba.DataBind() Prueba.DataBind()
For Contador As Integer = (Prueba.Columns.Count - 1) To 1 Step -1 For Contador As Integer = (Prueba.Columns.Count - 1) To 0 Step -1
Prueba.Columns.RemoveAt(Contador) Prueba.Columns.RemoveAt(Contador)
Next Next
End Sub End Sub

2
Ventas/ClientesAbonar.aspx.vb
View File

@@ -394,7 +394,7 @@ Partial Class Ventas_ClientesAbonar
Private Function CargaCliente(tCveCliente As Integer, tCveMoneda As Integer) As Boolean Private Function CargaCliente(tCveCliente As Integer, tCveMoneda As Integer) As Boolean
Dim Retorno As Boolean = False Dim Retorno As Boolean = False
Dim ObjCliente As New ClsClientes() Dim ObjCliente As New ClsClientes()
If ObjCliente.GetClientes(tCveCliente, "-1", "-1", "-1", "-1", "-1", "-1", -1, UsuarioActual.CveEmpresa, -1) Then If ObjCliente.GetClientes(tCveCliente, "-1", "-1", "-1", "-1", "-1", "-1", -1, UsuarioActual.CveEmpresa, -1, TipoCliente:=-1) Then
If ObjCliente.DtResultados.Rows.Count > 0 Then If ObjCliente.DtResultados.Rows.Count > 0 Then
Retorno = True Retorno = True
CargaCuentas() CargaCuentas()