From dfccbed51d1b182ae2ab3b1e60cd671659ad1187 Mon Sep 17 00:00:00 2001
From: Jonathan Alexis Perez Morales <jonathan.perez@adssistemas.mx>
Date: Thu, 23 Jan 2020 12:54:30 -0700
Subject: [PATCH 1/4] Direcciones en web service

---
 asmx/WsTSoft.asmx | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/asmx/WsTSoft.asmx b/asmx/WsTSoft.asmx
index 94e8b0ab4..7d9e99ee5 100644
--- a/asmx/WsTSoft.asmx
+++ b/asmx/WsTSoft.asmx
@@ -62,9 +62,16 @@ Public Class WsTSoft
         Dim ObjGPS As New ClsGPS
         Dim Continuar As Boolean = ObjGPS.UltimaPosicionEquipoGetWS(DevID)
         Dim ObjPos As New LatLng
-        If Continuar Then
+        If Continuar Then
+            'CONSULTA DIRECCIONES
+            Dim Direcciones As JArray = ConsultarDirecciones(ObjGPS.DtResultados, "Lat", "Lng")
+            For Each Dir As JObject In Direcciones
+                ObjGPS.DtResultados.Rows(Dir("Indice").ToEntero())("Direccion") = Dir("Direccion").ToString()
+            Next
+
             ObjPos.Lat = ObjGPS.DtResultados.Rows("0")("Lat").ToString
-            ObjPos.Lng = ObjGPS.DtResultados.Rows("0")("Lng").ToString
+            ObjPos.Lng = ObjGPS.DtResultados.Rows("0")("Lng").ToString
+            ObjPos.Direccion = ObjGPS.DtResultados.Rows("0")("Direccion").ToString
         Else
             ObjPos.CurrentError = "No se pudo obtener la posición."
         End If
@@ -95,8 +102,17 @@ Public Class WsTSoft
         Dim objTsoft As New ClsTSoft
         Dim Continuar As Boolean = objTsoft.GETRemisionesHistorial(FolioRemision, NoEconomico)
         Dim objRem As New GetRemisionHistorialesObj
-        If Continuar Then
-            objRem.Historial = objTsoft.DtResultados.DataTableToObject(Of GetRemisionHistorialsObj)
+        If Continuar Then
+            Dim Dt = objTsoft.DtResultados.Copy()
+            Dt.Columns.Add("Direccion", GetType(String))
+
+            'CONSULTA DIRECCIONES
+            Dim Direcciones As JArray = ConsultarDirecciones(Dt, "Lat", "Lon")
+            For Each Dir As JObject In Direcciones
+                Dt.Rows(Dir("Indice").ToEntero())("Direccion") = Dir("Direccion").ToString()
+            Next
+
+            objRem.Historial = Dt.DataTableToObject(Of GetRemisionHistorialsObj)
             objRem.CurrentError = ""
         Else
             objRem.Historial = New List(Of GetRemisionHistorialsObj)
@@ -149,15 +165,15 @@ Public Class WsTSoft
     End Function
 
 
-    Public Function ConsultarDirecciones(Dt As DataTable) As JArray
+    Public Function ConsultarDirecciones(Dt As DataTable, Optional LatName As String = "Latitud", Optional LonName As String = "Longitud") As JArray
         Dim retorno As JArray = Nothing
         Dim posicionesArray = New JArray(From Row As DataRow In Dt
                                          Let index = Dt.Rows().IndexOf(Row)
                                          Select New JObject(
                                                                        New JProperty("indice", index),
                                                                        New JProperty("cveTrama", -1),
-                                                                       New JProperty("lat", Row("Latitud").ToString.ToDouble),
-                                                                       New JProperty("lon", Row("Longitud").ToString.ToDouble)
+                                                                       New JProperty("lat", Row(LatName).ToString.ToDouble),
+                                                                       New JProperty("lon", Row(LonName).ToString.ToDouble)
                                                                    ))
 
         Dim Base64array = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(posicionesArray.ToString()))
@@ -193,9 +209,10 @@ Public Class WsTSoft
     End Class
     <Serializable>
     Public Class LatLng
-        Public Lat As String
-        Public Lng As String
-        Public CurrentError As String
+        Public Property Lat As String
+        Public Property Lng As String
+        Public Property Direccion As String
+        Public Property CurrentError As String
     End Class
     <Serializable>
     Public Class GetRemisionHistorialsObj
@@ -203,7 +220,8 @@ Public Class WsTSoft
         Public Property FolioRemision As String
         Public Property NoEconomico As String
         Public Property Lat As String
-        Public Property Lon As String
+        Public Property Lon As String
+        Public Property Direccion As String
         Public Property Distancia As String
         Public Property TrackingNumber As String
         Public Property CveEstatus As Integer

From e104209faa405ec2da8b5d41e8e205a6b6d714b2 Mon Sep 17 00:00:00 2001
From: Jonathan Alexis Perez Morales <jonathan.perez@adssistemas.mx>
Date: Thu, 23 Jan 2020 12:55:24 -0700
Subject: [PATCH 2/4] Redondeos en ventas

---
 Ventas/Ventas.aspx.vb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index dffb2106e..952ba1f49 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -5745,8 +5745,8 @@ Partial Class Ventas
         Dim Cantidad, PU, Descuento, CantidadInventario As Decimal
         Dim CuentaPredial As String
         Cantidad = GvPS.Rows(e.RowIndex).FCTextBox("TxtCantidad").Text.ToDecimal
-        PU = Math.Round(GvPS.Rows(e.RowIndex).FCTextBox("TxtPrecio").Text.ToDecimal, 6)
-        Descuento = Math.Round(GvPS.Rows(e.RowIndex).FCTextBox("TxtDescuento").Text.ToDecimal, NumeroDecimales)
+        PU = (GvPS.Rows(e.RowIndex).FCTextBox("TxtPrecio").Text.ToDecimal).RoundSQL(6)
+        Descuento = (GvPS.Rows(e.RowIndex).FCTextBox("TxtDescuento").Text.ToDecimal).RoundSQL(NumeroDecimales)
         CuentaPredial = GvPS.Rows(e.RowIndex).FCTextBox("TxtPredial").Text.Trim
 
         Dim CantidadOriginal As Decimal = GvPS.Rows(e.RowIndex).DataKey("Cantidad").ToDecimal()
@@ -14128,7 +14128,7 @@ Partial Class Ventas
         Dim Row As DataRow = Nothing
         Dim TotalCalculableImpuestos As Decimal = 0
         Dim TotalCalculableImpuestosIVA As Decimal = 0
-        PU = Math.Round(PU, 6) ' el precio unitario puede llevar hasta 6 decimales permitidos
+        PU = PU.RoundSQL(6) ' el precio unitario puede llevar hasta 6 decimales permitidos
 
         Row = TmpDT.NewRow()
         Row("CveProyecto") = CveProyecto

From 839878500861869e9da931dd6b17e5108301fe2e Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <jose_antony11@hotmail.com>
Date: Thu, 23 Jan 2020 12:56:02 -0700
Subject: [PATCH 3/4] haciendo grande el qr de de los reportes

---
 Empresas/146/Formatos/Factura.rdlc     | 6 +++---
 Empresas/146/Formatos/NotaCredito.rdlc | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Empresas/146/Formatos/Factura.rdlc b/Empresas/146/Formatos/Factura.rdlc
index ed8648fc9..011fa5947 100644
--- a/Empresas/146/Formatos/Factura.rdlc
+++ b/Empresas/146/Formatos/Factura.rdlc
@@ -227,10 +227,10 @@
         <Source>External</Source>
         <Value>=Parameters!QR.Value</Value>
         <Sizing>FitProportional</Sizing>
-        <Top>5.87436in</Top>
+        <Top>5.8661in</Top>
         <Left>0.03915in</Left>
-        <Height>0.95455in</Height>
-        <Width>1.49755in</Width>
+        <Height>1.31478in</Height>
+        <Width>1.58997in</Width>
         <ZIndex>5</ZIndex>
         <Style>
           <Border>
diff --git a/Empresas/146/Formatos/NotaCredito.rdlc b/Empresas/146/Formatos/NotaCredito.rdlc
index 4cbb34b50..f9392e986 100644
--- a/Empresas/146/Formatos/NotaCredito.rdlc
+++ b/Empresas/146/Formatos/NotaCredito.rdlc
@@ -1447,9 +1447,9 @@
         <Source>External</Source>
         <Value>=Parameters!QR.Value</Value>
         <Sizing>FitProportional</Sizing>
-        <Top>3.13693in</Top>
+        <Top>3.09526in</Top>
         <Left>0.15526in</Left>
-        <Height>1.06738in</Height>
+        <Height>1.13682in</Height>
         <Width>1.49755in</Width>
         <ZIndex>6</ZIndex>
         <Style>

From 37057190f8f86c9d0a0e7a39dfae457dfbb7616c Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <jose_antony11@hotmail.com>
Date: Thu, 23 Jan 2020 16:03:35 -0700
Subject: [PATCH 4/4] aplicando cambios visuales y funcionamiento en global
 para "ContratosTipos"

---
 App_Code/ClsContratos.vb            |   5 +-
 App_Code/ClsPaginas.vb              |  21 +++-
 Contratos/CatContratosTipos.aspx    | 180 ++++++++++++++--------------
 Contratos/CatContratosTipos.aspx.vb |   4 +-
 Empresas/146/Formatos/Factura.rdlc  |   4 +-
 Global.asax                         |  16 +--
 6 files changed, 124 insertions(+), 106 deletions(-)

diff --git a/App_Code/ClsContratos.vb b/App_Code/ClsContratos.vb
index 02121ae13..2efbc2f65 100644
--- a/App_Code/ClsContratos.vb
+++ b/App_Code/ClsContratos.vb
@@ -1629,9 +1629,12 @@ Public Class ClsContratos
 
 
 #Region "T I P O S    C O N T R A T O S"
-    Public Function GetContratosTipos() As Boolean
+    Public Function GetContratosTipos(CveEmpresa As Integer) As Boolean
         Dim Retorno As Boolean = False
         DataAdapter("PA_Con_ContratosTiposGet")
+        With SqlAdapter.SelectCommand.Parameters
+            .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+        End With
         Try
             SqlAdapter.Fill(Data)
             Retorno = True
diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index 468f9e2d7..c096aacfe 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -1673,12 +1673,27 @@ Public Class ClsPaginas
             Application("GlobalDTContratos") = value
         End Set
     End Property
-    Property GlobalDTContratosTipos() As DataTable
+    Property GlobalDTContratosTipos(CveEmpresa As Integer) As DataTable
         Get
-            GlobalDTContratosTipos = DirectCast(Application("GlobalDTContratosTipos"), DataTable)
+            Dim AppNombre As String = String.Format("GlobalDTContratosTipos{0}", CveEmpresa)
+            If Application(AppNombre) Is Nothing Then
+                Dim ObjContratos As New ClsContratos
+                If ObjContratos.GetContratosTipos(CveEmpresa) Then
+                    Application(AppNombre) = ObjContratos.DtResultados
+                    If CveEmpresa <> -1 Then
+                        Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), "", DataViewRowState.CurrentRows)
+                        GlobalDTContratosTipos = Dv.ToTable
+                        Dv.Dispose()
+                    Else
+                        GlobalDTContratosTipos = DirectCast(Application(AppNombre), DataTable)
+                    End If
+                End If
+                End If
+                GlobalDTContratosTipos = DirectCast(Application("GlobalDTContratosTipos"), DataTable)
         End Get
         Set(value As DataTable)
-            Application("GlobalDTContratosTipos") = value
+            Dim AppNombre As String = String.Format("GlobalDTContratosTipos{0}", CveEmpresa)
+            Application(AppNombre) = value
         End Set
     End Property
     Property GlobalDTTipoAlmacen(CveEmpresa As Integer) As DataTable
diff --git a/Contratos/CatContratosTipos.aspx b/Contratos/CatContratosTipos.aspx
index 4eb20ced6..431a85ed2 100644
--- a/Contratos/CatContratosTipos.aspx
+++ b/Contratos/CatContratosTipos.aspx
@@ -12,110 +12,110 @@
 <asp:Content ID="Content5" ContentPlaceHolderID="H" runat="Server">
 </asp:Content>
 <asp:Content ID="Content6" ContentPlaceHolderID="C" runat="Server">
-                        <asp:UpdatePanel ID="UpDatos" runat="server" UpdateMode="Conditional">
-                            <ContentTemplate>
-                                <table border="0" class="">
-                                    <tr>
-                                        <td>
-                                                    <table class="table table-striped table-advance table-hover Widthall">
-                                                        <thead>
-                                                            <tr class="Titulos">
-                                                                 <th width="40px">
-                                                                    <asp:LinkButton ID="LinkButton1" runat="server" CausesValidation="false" Text="" CommandArgument="LimiteMaximo;0">
-                                                                        Clave
+    <asp:UpdatePanel ID="UpDatos" runat="server" UpdateMode="Conditional">
+        <ContentTemplate>
+            <table border="0" class="" style="width: 100%">
+                <tr>
+                    <td>
+                        <table class="table table-striped table-advance table-hover Widthall" style="width:100%">
+                            <thead>
+                                <tr class="Titulos">
+                                    <th width="10%">
+                                        <asp:LinkButton ID="LinkButton1" runat="server" CausesValidation="false" Text="" CommandArgument="LimiteMaximo;0">
+                                            Clave
                                                                     <asp:Literal ID="Literal1" runat="server" Text=" <i class='fa fa-sort' style='color:#999' ></i>"></asp:Literal>
-                                                                    </asp:LinkButton>
-                                                                </th>
-                                                                <th width="200px">
-                                                                    <asp:LinkButton ID="LbLimite" runat="server" CausesValidation="false" Text="" CommandArgument="LimiteMaximo;0">
-                                                                        Tipo Contrato
+                                        </asp:LinkButton>
+                                    </th>
+                                    <th width="200px">
+                                        <asp:LinkButton ID="LbLimite" runat="server" CausesValidation="false" Text="" CommandArgument="LimiteMaximo;0">
+                                            Tipo Contrato
                                                                     <asp:Literal ID="ImgLimiteMaximo" runat="server" Text=" <i class='fa fa-sort' style='color:#999' ></i>"></asp:Literal>
-                                                                    </asp:LinkButton>
-                                                                </th>
-                                                                <th width="200px">
-                                                                    <asp:LinkButton ID="LbComision" runat="server" CausesValidation="false" Text="" CommandArgument="Comision;0">
-                                                                        Descripción
+                                        </asp:LinkButton>
+                                    </th>
+                                    <th width="200px">
+                                        <asp:LinkButton ID="LbComision" runat="server" CausesValidation="false" Text="" CommandArgument="Comision;0">
+                                            Descripción
                                                                     <asp:Literal ID="ImgComision" runat="server" Text=" <i class='fa fa-sort' style='color:#999' ></i>"></asp:Literal>
-                                                                    </asp:LinkButton>
-                                                                </th>
-                                                                <th></th>
-                                                                <th width="165px">Comandos</th>
-                                                            </tr>
-                                                        </thead>
-                                                        <tr>
-                                                            <td style="width:40px;"></td>
-                                                            <td style="text-align: center">
-                                                                <asp:TextBox ID="TxtTipoContrato" runat="server" width="180px"></asp:TextBox>
-                                                                <asp:RequiredFieldValidator ID="RFVLimite" runat="server" ControlToValidate="TxtTipoContrato" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Contrato''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpGuardarCaracteristicas"></asp:RequiredFieldValidator>
-                                                                <ajax:ValidatorCalloutExtender ID="VCOLimite" runat="server" HighlightCssClass="vco" TargetControlID="RFVLimite" Width="300px"></ajax:ValidatorCalloutExtender>
-                                                            </td>
-                                                            <td style="text-align: center">
-                                                                <asp:TextBox ID="TxtDescripcion" runat="server"  width="180px"></asp:TextBox>
-                                                                <asp:RequiredFieldValidator ID="RFVDescripcion" runat="server" ControlToValidate="TxtDescripcion" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Descripción''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpGuardarCaracteristicas"></asp:RequiredFieldValidator>
-                                                                <ajax:ValidatorCalloutExtender ID="VCEDescripcion" runat="server" HighlightCssClass="vco" TargetControlID="RFVDescripcion" Width="300px"></ajax:ValidatorCalloutExtender>
-                                                            </td>
-                                                            <td></td>
-                                                            <td style="text-align: center">
-                                                                <asp:LinkButton ID="LbAgregarC" runat="server" CausesValidation="true" CssClass="Texto" Text="Agregar" ValidationGroup="GrpGuardarCaracteristicas"></asp:LinkButton></td>
-                                                        </tr>
-                                                    </table>
+                                        </asp:LinkButton>
+                                    </th>
+                                    <th></th>
+                                    <th width="165px">Comandos</th>
+                                </tr>
+                            </thead>
+                            <tr>
+                                <td style="width: 15%;"></td>
+                                <td style="text-align: center; width: 200px">
+                                    <asp:TextBox ID="TxtTipoContrato" runat="server" Width="180px"></asp:TextBox>
+                                    <asp:RequiredFieldValidator ID="RFVLimite" runat="server" ControlToValidate="TxtTipoContrato" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Contrato''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpGuardarCaracteristicas"></asp:RequiredFieldValidator>
+                                    <ajax:ValidatorCalloutExtender ID="VCOLimite" runat="server" HighlightCssClass="vco" TargetControlID="RFVLimite" Width="300px"></ajax:ValidatorCalloutExtender>
+                                </td>
+                                <td style="text-align: left; width: 800px">
+                                    <asp:TextBox ID="TxtDescripcion" runat="server" Width="100%"></asp:TextBox>
+                                    <asp:RequiredFieldValidator ID="RFVDescripcion" runat="server" ControlToValidate="TxtDescripcion" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Descripción''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpGuardarCaracteristicas"></asp:RequiredFieldValidator>
+                                    <ajax:ValidatorCalloutExtender ID="VCEDescripcion" runat="server" HighlightCssClass="vco" TargetControlID="RFVDescripcion" Width="300px"></ajax:ValidatorCalloutExtender>
+                                </td>
+                                <td style="width:0%"></td>
+                                <td style="text-align: center">
+                                    <asp:LinkButton ID="LbAgregarC" runat="server" CausesValidation="true" CssClass="Texto" Text="Agregar" ValidationGroup="GrpGuardarCaracteristicas"></asp:LinkButton></td>
+                            </tr>
+                        </table>
 
-                                            <asp:UpdatePanel ID="UpGVContratos" runat="server" UpdateMode="Conditional">
-                                                <ContentTemplate>
-                                                    <asp:GridView ID="GvContratos" runat="server" AutoGenerateColumns="False" DataKeyNames="CveContratoTipo" EmptyDataText="No se encontraron Tipos de Contratos." ToolTip="Listado de tipos de Contratos." CssClass="table table-striped table-advance table-hover Widthall" Style="margin-top: -10px; text-align: center;" GridLines="None">
-                                                        <Columns>
-                                                            <asp:BoundField DataField="CveContratoTipo" ReadOnly="true" />
+                        <asp:UpdatePanel ID="UpGVContratos" runat="server" UpdateMode="Conditional">
+                            <ContentTemplate>
+                                <asp:GridView ID="GvContratos" runat="server" AutoGenerateColumns="False" DataKeyNames="CveContratoTipo" EmptyDataText="No se encontraron Tipos de Contratos." ToolTip="Listado de tipos de Contratos." CssClass="table table-striped table-advance table-hover Widthall" Style="margin-top: -10px; text-align: center;" GridLines="None">
+                                    <Columns>
+                                        <asp:BoundField DataField="CveContratoTipo" ItemStyle-Width="10%" ItemStyle-Wrap="false" />
 
-                                                            <asp:TemplateField ItemStyle-Width="180px" ItemStyle-HorizontalAlign="left">
-                                                                <ItemTemplate>
-                                                                    <asp:Literal ID="LtlContrato" runat="server" Text='<%# Eval("ContratoTipo", "&nbsp;{0}") %>'></asp:Literal>
-                                                                </ItemTemplate>
-                                                                <EditItemTemplate>
-                                                                    <asp:TextBox ID="TxtTipoContrato" runat="server" CausesValidation="true" MaxLength="50" Text='<%# Eval("ContratoTipo")%>' Width="180px"></asp:TextBox>
-                                                                    <asp:RequiredFieldValidator ID="RFVCaracteristica" runat="server" ControlToValidate="TxtTipoContrato" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Tipo Contrato''</b> es necesario, por favor ingréselo."></asp:RequiredFieldValidator>
-                                                                    <ajax:ValidatorCalloutExtender ID="VCOCaracteristica" runat="server" HighlightCssClass="vco" TargetControlID="RFVCaracteristica" Width="100px"></ajax:ValidatorCalloutExtender>
-                                                                </EditItemTemplate>
-                                                            </asp:TemplateField>
+                                        <asp:TemplateField ItemStyle-Width="15%" ItemStyle-HorizontalAlign="left">
+                                            <ItemTemplate>
+                                                <asp:Literal ID="LtlContrato" runat="server" Text='<%# Eval("ContratoTipo", "&nbsp;{0}") %>'></asp:Literal>
+                                            </ItemTemplate>
+                                            <EditItemTemplate>
+                                                <asp:TextBox ID="TxtTipoContrato" runat="server" CausesValidation="true" MaxLength="50" Text='<%# Eval("ContratoTipo")%>' Width="180px"></asp:TextBox>
+                                                <asp:RequiredFieldValidator ID="RFVCaracteristica" runat="server" ControlToValidate="TxtTipoContrato" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Tipo Contrato''</b> es necesario, por favor ingréselo."></asp:RequiredFieldValidator>
+                                                <ajax:ValidatorCalloutExtender ID="VCOCaracteristica" runat="server" HighlightCssClass="vco" TargetControlID="RFVCaracteristica" Width="100px"></ajax:ValidatorCalloutExtender>
+                                            </EditItemTemplate>
+                                        </asp:TemplateField>
 
 
-                                                                <asp:TemplateField ItemStyle-Width="200px">
-                                                                <ItemTemplate>
-                                                                    <asp:Literal ID="LtlDescripcion" runat="server" Text='<%# Eval("Descripcion", "&nbsp;{0}") %>'></asp:Literal>
-                                                                </ItemTemplate>
-                                                                <EditItemTemplate>
-                                                                   <asp:TextBox ID="TxtDescripcion" runat="server" CausesValidation="true" MaxLength="50" Text='<%# Eval("Descripcion")%>' Width="180px"></asp:TextBox>
-                                                                    <asp:RequiredFieldValidator ID="RFVDescripcion" runat="server" ControlToValidate="TxtDescripcion" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Descripción''</b> es necesario, por favor ingréselo."></asp:RequiredFieldValidator>
-                                                                    <ajax:ValidatorCalloutExtender ID="VCODescripcion" runat="server" HighlightCssClass="vco" TargetControlID="RFVDescripcion" Width="100px"></ajax:ValidatorCalloutExtender>
-                                                                </EditItemTemplate>
-                                                            </asp:TemplateField>
+                                        <asp:TemplateField ItemStyle-Width="200px">
+                                            <ItemTemplate>
+                                                <asp:Literal ID="LtlDescripcion" runat="server" Text='<%# Eval("Descripcion", "&nbsp;{0}") %>'></asp:Literal>
+                                            </ItemTemplate>
+                                            <EditItemTemplate>
+                                                <asp:TextBox ID="TxtDescripcion" runat="server" CausesValidation="true" MaxLength="50" Text='<%# Eval("Descripcion")%>' Width="180px"></asp:TextBox>
+                                                <asp:RequiredFieldValidator ID="RFVDescripcion" runat="server" ControlToValidate="TxtDescripcion" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Descripción''</b> es necesario, por favor ingréselo."></asp:RequiredFieldValidator>
+                                                <ajax:ValidatorCalloutExtender ID="VCODescripcion" runat="server" HighlightCssClass="vco" TargetControlID="RFVDescripcion" Width="100px"></ajax:ValidatorCalloutExtender>
+                                            </EditItemTemplate>
+                                        </asp:TemplateField>
 
-                                                             <asp:TemplateField HeaderText="Editar" ItemStyle-Width="89px">
-                                                                <EditItemTemplate>
-                                                                    <center>
+                                        <asp:TemplateField HeaderText="Editar" ItemStyle-Width="1px">
+                                            <EditItemTemplate>
+                                                <center>
                                                                             <asp:LinkButton ID="ImageButton1" runat="server" AlternateText="Actualizar" CausesValidation="True" CommandName="Update" CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-check'></i>"/>
                                                                             &nbsp;<asp:LinkButton ID="ImageButton2" runat="server" AlternateText="Cancelar" CausesValidation="False" CommandName="Cancel" CssClass="btn btn-circle btn-sm red" Text="<i class='fa fa-times'></i>" />
                                                                         </center>
-                                                                </EditItemTemplate>
-                                                                <ItemTemplate>
-                                                                    <asp:LinkButton ID="ImageButton3" runat="server" AlternateText="Editar" CausesValidation="False" CommandName="Edit" CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-pencil'></i>" />
-                                                                </ItemTemplate>
-                                                            </asp:TemplateField>
+                                            </EditItemTemplate>
+                                            <ItemTemplate>
+                                                <asp:LinkButton ID="ImageButton3" runat="server" AlternateText="Editar" CausesValidation="False" CommandName="Edit" CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-pencil'></i>" />
+                                            </ItemTemplate>
+                                        </asp:TemplateField>
 
-                                                            <asp:TemplateField HeaderText="Eliminar" ItemStyle-Width="83px">
-                                                                <ItemTemplate>
-                                                                    <asp:LinkButton ID="ImageButton4" runat="server" AlternateText="Eliminar" CausesValidation="False" CommandName="Delete" CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="confirmar" data-btn-ok-label="si" />
-                                                                </ItemTemplate>
-                                                            </asp:TemplateField>
-                                                        </Columns>
-                                                        <AlternatingRowStyle CssClass="TextoAlterno" />
-                                                    </asp:GridView>
-                                                </ContentTemplate>
-                                            </asp:UpdatePanel>
-                                        </td>
-                                    </tr>
-                                </table>
+                                        <asp:TemplateField HeaderText="Eliminar" ItemStyle-Width="1px">
+                                            <ItemTemplate>
+                                                <asp:LinkButton ID="ImageButton4" runat="server" AlternateText="Eliminar" CausesValidation="False" CommandName="Delete" CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="confirmar" data-btn-ok-label="si" />
+                                            </ItemTemplate>
+                                        </asp:TemplateField>
+                                    </Columns>
+                                    <AlternatingRowStyle CssClass="TextoAlterno" />
+                                </asp:GridView>
                             </ContentTemplate>
                         </asp:UpdatePanel>
+                    </td>
+                </tr>
+            </table>
+        </ContentTemplate>
+    </asp:UpdatePanel>
 </asp:Content>
 
 <asp:Content ID="Content7" ContentPlaceHolderID="JS" runat="Server">
diff --git a/Contratos/CatContratosTipos.aspx.vb b/Contratos/CatContratosTipos.aspx.vb
index 254d6551d..044ce9b99 100644
--- a/Contratos/CatContratosTipos.aspx.vb
+++ b/Contratos/CatContratosTipos.aspx.vb
@@ -15,9 +15,9 @@ Partial Class Contratos_CatContratosTipos
 #Region "      CARGAS      "
     Private Sub CargaDatos()
         Dim Objeto As New ClsContratos
-        If Objeto.GetContratosTipos() Then
+        If Objeto.GetContratosTipos(UsuarioActual.CveEmpresa) Then
             GvContratos.DataSource = Objeto.DtResultados
-            GlobalDTContratosTipos = Objeto.DtResultados
+            GlobalDTContratosTipos(UsuarioActual.CveEmpresa) = Objeto.DtResultados
         End If
         GvContratos.DataBind()
         Objeto.Dispose()
diff --git a/Empresas/146/Formatos/Factura.rdlc b/Empresas/146/Formatos/Factura.rdlc
index 011fa5947..c28587a0e 100644
--- a/Empresas/146/Formatos/Factura.rdlc
+++ b/Empresas/146/Formatos/Factura.rdlc
@@ -229,8 +229,8 @@
         <Sizing>FitProportional</Sizing>
         <Top>5.8661in</Top>
         <Left>0.03915in</Left>
-        <Height>1.31478in</Height>
-        <Width>1.58997in</Width>
+        <Height>1.10236in</Height>
+        <Width>1.10236in</Width>
         <ZIndex>5</ZIndex>
         <Style>
           <Border>
diff --git a/Global.asax b/Global.asax
index ebb88fa8b..973a330a8 100644
--- a/Global.asax
+++ b/Global.asax
@@ -449,14 +449,14 @@
 
         Dim ObjContratos As New ClsContratos
         If ObjContratos.GetContratos(-1, -1) Then Application("GlobalDTContratos") = ObjContratos.DtResultados Else Application("GlobalDTContratos") = Nothing
-        If ObjContratos.GetSecciones() Then Application("GlobalDTContratosSecciones") = ObjContratos.DtResultados Else Application("GlobalDTContratosSecciones") = Nothing
-        If ObjContratos.GetContratosTipos() Then Application("GlobalDTContratosTipos") = ObjContratos.DtResultados Else Application("GlobalDTContratosTipos") = Nothing
-        ObjContratos.Dispose()
-
-
-        '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-        'V E N D E D O R E S
-
+        If ObjContratos.GetSecciones() Then Application("GlobalDTContratosSecciones") = ObjContratos.DtResultados Else Application("GlobalDTContratosSecciones") = Nothing
+        'If ObjContratos.GetContratosTipos(-1) Then Application("GlobalDTContratosTipos") = ObjContratos.DtResultados Else Application("GlobalDTContratosTipos") = Nothing
+        ObjContratos.Dispose()
+
+
+        '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+        'V E N D E D O R E S
+
         Dim ObjVendedores As New ClsVtaVendedores
         If ObjVendedores.GetVendedores(-1) Then Application("GlobalDTVendedores") = ObjVendedores.DtResultados Else Application("GlobalDTVendedores") = Nothing
         ObjVendedores.Dispose()