diff --git a/App_Code/ClsInventarios.vb b/App_Code/ClsInventarios.vb index 81d96ea9f..6656873c3 100644 --- a/App_Code/ClsInventarios.vb +++ b/App_Code/ClsInventarios.vb @@ -376,7 +376,8 @@ Public Class ClsInventarios End Function - Public Function AddAlmacen(Almacen As String, CveTipoAlmacen As Integer, Modalidad As Integer, CveUsuario As Integer, CveEmpresa As Integer, Inventariable As Byte, CveSubProyecto As Integer, Optional Orden As Integer = -1, Optional CveCuenta As Integer = -1, Optional CveUsuarioAutoriza As Integer = -1, Optional CveAlmacenVirtual As Integer = -1) As Boolean + Public Function AddAlmacen(Almacen As String, CveTipoAlmacen As Integer, Modalidad As Integer, CveUsuario As Integer, CveEmpresa As Integer, Inventariable As Byte, CveSubProyecto As Integer, Optional Orden As Integer = -1, Optional CveCuenta As Integer = -1, + Optional CveUsuarioAutoriza As Integer = -1, Optional CveAlmacenVirtual As Integer = -1, Optional AlmacenAbreviatura As String = "-1") As Boolean Dim Retorno As Boolean = False CveAlmacenAgregado = -1 @@ -394,6 +395,7 @@ Public Class ClsInventarios .Add("@CveCuenta", SqlDbType.Int).Value = CveCuenta .Add("@CveUsuarioAutoriza", SqlDbType.Int).Value = CveUsuarioAutoriza .Add("@CveAlmacenVirtual", SqlDbType.Int).Value = CveAlmacenVirtual + .Add("@AlmacenAbreviatura", SqlDbType.VarChar).Value = AlmacenAbreviatura .Add("@CveAlmacenAgregado", SqlDbType.Int).Direction = ParameterDirection.Output End With @@ -414,7 +416,8 @@ Public Class ClsInventarios Return Retorno End Function - Public Function UpdateAlmacen(Almacen As String, CveTipoAlmacen As Integer, Modalidad As Integer, Estatus As Boolean, CveAlmacen As Integer, Inventariable As Byte, CveSubProyecto As Integer, CveEmpresa As Integer, Optional Orden As Integer = -1, Optional CveCuenta As Integer = -1, Optional CveUsuarioAutoriza As Integer = -1, Optional CveAlmacenVirtual As Integer = -1) As Boolean + Public Function UpdateAlmacen(Almacen As String, CveTipoAlmacen As Integer, Modalidad As Integer, Estatus As Boolean, CveAlmacen As Integer, Inventariable As Byte, CveSubProyecto As Integer, CveEmpresa As Integer, Optional Orden As Integer = -1, + Optional CveCuenta As Integer = -1, Optional CveUsuarioAutoriza As Integer = -1, Optional CveAlmacenVirtual As Integer = -1, Optional AlmacenAbreviatura As String = "-1") As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Inv_AlmacenesUpdate") @@ -432,6 +435,7 @@ Public Class ClsInventarios .Add("@CveCuenta", SqlDbType.Int).Value = CveCuenta .Add("@CveUsuarioAutoriza", SqlDbType.Int).Value = CveUsuarioAutoriza .Add("@CveAlmacenVirtual", SqlDbType.Int).Value = CveAlmacenVirtual + .Add("@AlmacenAbreviatura", SqlDbType.VarChar).Value = AlmacenAbreviatura End With diff --git a/Bancos/ProveedoresAbonar.aspx.vb b/Bancos/ProveedoresAbonar.aspx.vb index 4ff0e0107..c647ba164 100644 --- a/Bancos/ProveedoresAbonar.aspx.vb +++ b/Bancos/ProveedoresAbonar.aspx.vb @@ -1980,7 +1980,7 @@ Partial Class Bancos_ProveedoresAbonar If PSRow IsNot Nothing Then - Dim CompraRNC As New ClsCompraManagerCompras(UsuarioActual) With { + Dim CompraRNC As New ClsCompraManagerComprasCA(UsuarioActual) With { .TipoDocto = "RNC", .CveProveedor = CveProveedor, .CveTipoProveedor = CveTipoProveedor, @@ -2090,7 +2090,7 @@ End Class -Public Class ClsCompraManagerCompras +Public Class ClsCompraManagerComprasCA Enum EnumCargaCompra DesdeXML diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb index c71e4ea0a..55b31a532 100644 --- a/Compras/Compras.aspx.vb +++ b/Compras/Compras.aspx.vb @@ -22368,7 +22368,7 @@ Partial Class Compras_Compras Protected Sub LnkProrrateoGasolina_Click(sender As Object, e As EventArgs) - InicializaDTProrrateoGasolina() + 'InicializaDTProrrateoGasolina() CargarCentrosDeCosto(Nothing, Nothing, Nothing, LblSubProyectoProrrateoGasolina,) GvProrrateoGasolina.Columns(0).HeaderText = LblSubProyectoProrrateoGasolina.Text LblRiruloProrrareo.Text = $"Prorratear por { LblSubProyectoProrrateoGasolina.Text}" diff --git a/Inventarios/CatAlmacenes.aspx b/Inventarios/CatAlmacenes.aspx index 494eb4c65..fcf4a1343 100644 --- a/Inventarios/CatAlmacenes.aspx +++ b/Inventarios/CatAlmacenes.aspx @@ -151,18 +151,20 @@ - +   - <%-- + + -   +   - --%> +   @@ -230,11 +232,19 @@