From f31cc37ee9ed1d5dc117449b68546337094ebd1e Mon Sep 17 00:00:00 2001 From: Rakcsle Supertramp Date: Thu, 24 Sep 2020 18:59:40 -0700 Subject: [PATCH 1/2] Solcitudes de aticipo --- Compras/Compras.aspx | 1 + OC/RepSolicitudesAnticipo.aspx | 5 +++++ OC/RepSolicitudesAnticipo.aspx.cs | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Compras/Compras.aspx b/Compras/Compras.aspx index 4afd58c6e..41f08a93f 100644 --- a/Compras/Compras.aspx +++ b/Compras/Compras.aspx @@ -477,6 +477,7 @@ + diff --git a/OC/RepSolicitudesAnticipo.aspx b/OC/RepSolicitudesAnticipo.aspx index 1cb414460..4c03a5549 100644 --- a/OC/RepSolicitudesAnticipo.aspx +++ b/OC/RepSolicitudesAnticipo.aspx @@ -117,6 +117,11 @@ + + + + + diff --git a/OC/RepSolicitudesAnticipo.aspx.cs b/OC/RepSolicitudesAnticipo.aspx.cs index 265ea97ca..ae72827e5 100644 --- a/OC/RepSolicitudesAnticipo.aspx.cs +++ b/OC/RepSolicitudesAnticipo.aspx.cs @@ -110,13 +110,13 @@ public partial class OC_RepSolicitudesAnticipo : ClsPaginas { GvSolicitudes.Columns[4].Visible = true; GvSolicitudes.Columns[5].Visible = true; - GvSolicitudes.Columns[6].Visible = false; + GvSolicitudes.Columns[7].Visible = false; } else { GvSolicitudes.Columns[4].Visible = false; GvSolicitudes.Columns[5].Visible = false; - GvSolicitudes.Columns[6].Visible = true; + GvSolicitudes.Columns[7].Visible = true; } CargaDatos(); } From 2ad7ba32970dedc13ccfde6e1aa6078c496f40ac Mon Sep 17 00:00:00 2001 From: Antonio Gonzalez Date: Thu, 24 Sep 2020 19:30:27 -0700 Subject: [PATCH 2/2] se agrego la columna de CveUsuarioModifico a las tablas de PrePoliza y prepolizadetalle --- App_Code/ClsContabilidad.vb | 9 +- Compras/Compras.aspx | 383 ++++++++++++------------- Compras/Compras.aspx.vb | 133 +++++---- Contabilidad/RegPoliza.aspx.vb | 2 +- Contabilidad/RegPrePoliza.aspx.vb | 7 +- Contabilidad/RegPrePoliza1.aspx.vb | 4 +- Contabilidad/RegPrePolizaS.aspx.vb | 4 +- PyME/Contabilidad/RegPrePoliza.aspx.vb | 2 +- 8 files changed, 276 insertions(+), 268 deletions(-) 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/Compras/Compras.aspx b/Compras/Compras.aspx index 4afd58c6e..583e2e36a 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*/ @@ -3296,195 +3304,6 @@ - <%--MODAL VINCULAR FLETES Y SERVICIOS--%> - - - - - - <%-- MODAL SERIE-LOTE ALMACEN --%>