diff --git a/App_Code/ClsAcumuladores.vb b/App_Code/ClsAcumuladores.vb index 46ca6341d..d2b74dfa7 100644 --- a/App_Code/ClsAcumuladores.vb +++ b/App_Code/ClsAcumuladores.vb @@ -926,7 +926,7 @@ Public Class ClsAcumuladores Return Retorno End Function - Public Function DistribuidorMovtosGet(CveCliente As Integer, CveEmpresa As Integer, Optional FechaI As Date = MinFecha, Optional FechaF As Date = MaxFecha) As Boolean + Public Function DistribuidorMovtosGet(CveCliente As Integer, CveEmpresa As Integer, Optional FechaI As Date = MinFecha, Optional FechaF As Date = MaxFecha, Optional CveVentaRNCCargo As Integer = -1) As Boolean Dim Retorno As Boolean = False 'Data = New DataTable @@ -937,6 +937,7 @@ Public Class ClsAcumuladores .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@FechaI", SqlDbType.Date).Value = FechaI .Add("@FechaF", SqlDbType.Date).Value = FechaF + .Add("@CveVentaRNCCargo", SqlDbType.Int).Value = CveVentaRNCCargo End With Try diff --git a/App_Code/ClsContabilidad.vb b/App_Code/ClsContabilidad.vb index 911f89a07..4085f9b24 100644 --- a/App_Code/ClsContabilidad.vb +++ b/App_Code/ClsContabilidad.vb @@ -253,7 +253,7 @@ Public Class ClsContabilidad Public Function UpdatePrepolizasDetalle(CvePrePolizaDetalle As Integer, Concepto As String, CveSubProyecto As Integer, IdCtaContable As Integer, TipoMovto As Boolean, ImporteMN As Decimal, Optional CveTipoGasto As Integer = -1, Optional CveConceptoContable As Integer = -1, Optional CveProveedor As Integer = -1, Optional CveCompra As Integer = -1, Optional CvePersonal As Integer = -1, Optional CveCliente As Integer = -1, Optional CveVenta As Integer = -1, - Optional Referencia As String = "-1") As Boolean + Optional Referencia As String = "-1", Optional CveUsuarioModifico As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -274,6 +274,7 @@ Public Class ClsContabilidad .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal .Add("@CveCliente", SqlDbType.Int).Value = CveCliente .Add("@CveVenta", SqlDbType.Int).Value = CveVenta + .Add("@CveUsuarioModifico", SqlDbType.Int).Value = CveUsuarioModifico End With Try @@ -1360,7 +1361,7 @@ Public Class ClsContabilidad End If If Not OcurrioError Then - If Not UpdatePrePoliza(Fecha, ObjConta.Folio, CveTipoPoliza, tIdPoliza, CvePrePoliza, Empresa.CveEmpresa) Then + If Not UpdatePrePoliza(Fecha, ObjConta.Folio, CveTipoPoliza, tIdPoliza, CvePrePoliza, Empresa.CveEmpresa, CveUsuarioModifico:=CveUsuario) Then OcurrioError = True End If End If @@ -1506,7 +1507,8 @@ Public Class ClsContabilidad End Function - Public Function UpdatePrePoliza(FechaConta As Date, FolioPoliza As Integer, CveTipoPoliza As Integer, IdPoliza As Integer, CvePrePoliza As Integer, CveEmpresa As Integer, Optional Concepto As String = "-1", Optional FechaPoliza As Date = MinFecha, Optional xxx As Integer = -1) As Boolean + Public Function UpdatePrePoliza(FechaConta As Date, FolioPoliza As Integer, CveTipoPoliza As Integer, IdPoliza As Integer, CvePrePoliza As Integer, CveEmpresa As Integer, + Optional Concepto As String = "-1", Optional FechaPoliza As Date = MinFecha, Optional xxx As Integer = -1, Optional CveUsuarioModifico As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -1521,6 +1523,7 @@ Public Class ClsContabilidad .Add("@CvePrePoliza", SqlDbType.Int).Value = CvePrePoliza .Add("@Concepto", SqlDbType.VarChar).Value = Concepto .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveUsuarioModifico", SqlDbType.Int).Value = CveUsuarioModifico End With Try diff --git a/App_Code/ClsGenerales.vb b/App_Code/ClsGenerales.vb index 69f64de00..2b82c5a1b 100644 --- a/App_Code/ClsGenerales.vb +++ b/App_Code/ClsGenerales.vb @@ -2410,7 +2410,7 @@ Public Class ClsGenerales Public Function GetHistorialBitacora(CveAcarreo As Integer, CveOrdenCompra As Integer, CveActivoFijo As Integer, CveOS As Integer, CvePS As Integer, CveCompra As Integer, CveIE As Integer, CveEmpresa As Integer, Optional CveUsuario As Integer = -1, Optional CvePersonal As Integer = -1, - Optional IdPoliza As Integer = -1) As Boolean + Optional IdPoliza As Integer = -1, Optional CvePrePoliza As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_HistorialBitacoraGet") @@ -2422,6 +2422,7 @@ Public Class ClsGenerales .Add("@CvePS", SqlDbType.Int).Value = CvePS .Add("@CveCompra", SqlDbType.Int).Value = CveCompra .Add("@CveIE", SqlDbType.Int).Value = CveIE + .Add("@CvePrePoliza", SqlDbType.Int).Value = CvePrePoliza .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal diff --git a/App_Code/ClsMovimientos.vb b/App_Code/ClsMovimientos.vb index 845ac3d6b..836be534b 100644 --- a/App_Code/ClsMovimientos.vb +++ b/App_Code/ClsMovimientos.vb @@ -319,7 +319,7 @@ Public Class ClsMovimientos End Function Public Function GetCxCDetalle(FechaI As String, FechaF As String, CveCliente As Integer, CveSubProyecto As Integer, CveVendedor As Integer, CveUsuario As Integer, Anio As Integer, Mes As Integer, - AnioMes As String, Fecha As String, CveClienteSucursal As Integer, Opcion As String, CveEstatus As Integer, IVA As String, Agrupador As Integer, CveEmpresa As Integer, + AnioMes As String, Fecha As String, CveClienteSucursal As Integer, Opcion As String, CveEstatus As Integer, IVA As String, Agrupador As Integer, CveEmpresa As Integer, CveResponsable As Integer, TipoCambio As Integer, Optional TCEspecifico As Double = -1, Optional TipoDocto As String = "-1", Optional FechaVI As String = "-1", Optional FechaVF As String = "1", Optional FechaCorte As Date = Nothing, Optional CveUsuarioConsulta As Integer = -1, Optional CveCobranzaEstatus As Integer = -1, Optional CveClienteClasificacion As Integer = -1, Optional LimiteCredito As Decimal = -1, @@ -361,10 +361,10 @@ Public Class ClsMovimientos .Add("@CveCobranzaEstatus", SqlDbType.Int).Value = CveCobranzaEstatus .Add("@CveClienteClasificacion", SqlDbType.Int).Value = CveClienteClasificacion .Add("@LimiteCredito", SqlDbType.Float).Value = LimiteCredito - .Add("@TipoCliente", SqlDbType.Int).Value = TipoCliente - .Add("@CveMoneda", SqlDbType.Int).Value = CveMoneda - .Add("@EstatusCliente", SqlDbType.Int).Value = EstatusCliente - + .Add("@TipoCliente", SqlDbType.Int).Value = TipoCliente + .Add("@CveMoneda", SqlDbType.Int).Value = CveMoneda + .Add("@EstatusCliente", SqlDbType.Int).Value = EstatusCliente + End With Try @@ -545,7 +545,7 @@ Public Class ClsMovimientos - Try + Try SqlAdapter.SelectCommand.CommandTimeout = 0 SqlAdapter.Fill(Data) @@ -863,8 +863,8 @@ Public Class ClsMovimientos DataAdapter("PA_Banc_ReporteChequesFYEGet") With SqlAdapter.SelectCommand.Parameters - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - .Add("@FechaI", SqlDbType.DateTime).Value = FechaI + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@FechaI", SqlDbType.DateTime).Value = FechaI .Add("@FechaF", SqlDbType.DateTime).Value = FechaF End With @@ -1190,9 +1190,9 @@ Public Class ClsMovimientos Public Function GetCxPDetalle(FechaI As String, FechaF As String, CveProveedor As Integer, CveProveedorClasificacion As Integer, CveProveedorSucursal As Integer, CveUsuario As Integer, CveUsuarioResponsable As Integer, Anio As Integer, Mes As Integer, AnioMes As String, CveMoneda As Integer, CveSubProyecto As Integer, - CveEstatusFactura As Integer, Fecha As String, Agrupador As Integer, Opcion As String, CveEmpresa As Integer, CveSucursal As Integer, - TipoCambio As Integer, Optional TCEspecifico As Double = -1, Optional FechaVI As String = "-1", Optional FechaVF As String = "1", - Optional FechaCorte As Date = Nothing, Optional CveUsuarioConsulta As Integer = -1, Optional CveTipoProveedor As Integer = -1, + CveEstatusFactura As Integer, Fecha As String, Agrupador As Integer, Opcion As String, CveEmpresa As Integer, CveSucursal As Integer, + TipoCambio As Integer, Optional TCEspecifico As Double = -1, Optional FechaVI As String = "-1", Optional FechaVF As String = "1", + Optional FechaCorte As Date = Nothing, Optional CveUsuarioConsulta As Integer = -1, Optional CveTipoProveedor As Integer = -1, Optional Comprobaciones As Integer = -1, Optional AplicaNC As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -1292,8 +1292,8 @@ Public Class ClsMovimientos .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal .Add("@CveCajaChica", SqlDbType.Int).Value = CveCajaChica - .Add("@NumeroReembolso", SqlDbType.VarChar).Value = NumeroReembolso - .Add("@FechaI", SqlDbType.DateTime).Value = FechaI + .Add("@NumeroReembolso", SqlDbType.VarChar).Value = NumeroReembolso + .Add("@FechaI", SqlDbType.DateTime).Value = FechaI .Add("@FechaF", SqlDbType.DateTime).Value = FechaF End With diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb index 45ff1f778..da59d111c 100644 --- a/App_Code/Modelos.vb +++ b/App_Code/Modelos.vb @@ -5612,6 +5612,7 @@ Namespace Modelos Public Property RefacturacionGeneroNC As Boolean = False Public Property Pagado As Decimal Public Property DescuentoProntoPago As Decimal + Public Property CveVentaRNCCargo As Integer 'Public Property Sucursal As SucursalModel Public Property SubProyecto As Modelos.SubProyectoModel diff --git a/Ashx/SIGWeb.ashx b/Ashx/SIGWeb.ashx index 865c667d4..fe81513fa 100644 --- a/Ashx/SIGWeb.ashx +++ b/Ashx/SIGWeb.ashx @@ -43,6 +43,8 @@ Public Class SIGWeb : Implements IHttpHandler, IRequiresSessionState ActualizaPrePoliza(context) Case "getpersonal" getpersonal(context) + Case "getcontratos" + GetContratos(context) Case "GettingCURP" context.Response.Write(GettingCURP(context.Request("Curp").ToString(), context.Request("year").ToString().ToEntero())) Case "ValidaCURP" @@ -1116,4 +1118,38 @@ Public Class SIGWeb : Implements IHttpHandler, IRequiresSessionState Return retorno End Function #End Region + +#Region "Get Contratos" + Private Function GetContratos(ByVal context As HttpContext) As String + Dim retorno As String = "" + Dim DtRetorno As DataTable = Nothing + + Dim usuario As Usuario = UsuarioActual(context) + Dim CveEmpresa As String + If IsNothing(usuario) Then + context.Response.Write("") + Else + CveEmpresa = usuario.CveEmpresa + Dim Name = IfNull(context.Request("Name"), "-1").ToString + + Dim dt As DataTable = DirectCast(context.Application("GlobalDTContratos"), DataTable).FiltraParametros(String.Format("CveEmpresa = {0}", CveEmpresa)) + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + DtRetorno = dt.FiltraParametros(String.Format("NumeroContrato like '%{0}%'", Name)) + End If + dt.Dispose() + End If + + If DtRetorno IsNot Nothing AndAlso DtRetorno.Rows.Count > 0 Then + DtRetorno.Columns("CveContrato").ColumnName = "id" + DtRetorno.Columns("NumeroContrato").ColumnName = "text" + retorno = JsonConvert.SerializeObject(DtRetorno).ToString + context.Response.Write(retorno) + Else + context.Response.Write("[]") + End If + + DtRetorno.Dispose() + Return retorno + End Function +#End Region End Class \ No newline at end of file diff --git a/Compras/Compras.aspx b/Compras/Compras.aspx index 4afd58c6e..2edbabca2 100644 --- a/Compras/Compras.aspx +++ b/Compras/Compras.aspx @@ -37,9 +37,6 @@
  • Agregar Otros Gastos
  • -
  • - Gastos y Servicios -
  • Costo Indirecto/Importaciones
  • @@ -147,6 +144,17 @@ border: 1px solid black; width: 85%; } + + .GastoIndirectoOpciones { + margin-left:auto; + margin-right:auto; + width:400px; + } + + .GastoIndirectoOpciones td + { + text-align:right /* Or any other value */ + } /*IPP*/ @@ -477,6 +485,7 @@ + @@ -3296,195 +3305,6 @@ - <%--MODAL VINCULAR FLETES Y SERVICIOS--%> - - - - - - <%-- MODAL SERIE-LOTE ALMACEN --%>