Merge branch 'master' of http://jperez@192.168.10.111:8383/SIG.git

2021-03-09 12:07:40 -07:00
parent fc7e2271e7 0686c35690
commit 01dca1ac2a
13 changed files with 413 additions and 263 deletions
--- a/Contabilidad2/CatCuentas.aspx
+++ b/Contabilidad2/CatCuentas.aspx
@@ -103,7 +103,6 @@
                        </div>
                    </div>
                    <br />
-                    <hr />
                    <div class="form-line">
                        <div class="catcuentas left">Subcuenta de</div>
                        <div class="catcuentas right">
@@ -171,7 +170,6 @@
                        </div>
                    </div>
                    <br />
-                    <hr />
                    <div class="form-line">
                        <div class="catcuentas left">Concepto</div>
                        <div class="catcuentas right">
--- a/Contabilidad2/CatCuentas.aspx.vb
+++ b/Contabilidad2/CatCuentas.aspx.vb
@@ -154,6 +154,7 @@ Partial Class Contabilidad2_CatCuentas
        ArbolCuentas.nodoid = "CveCuenta"
        ArbolCuentas.padre = "CvePadre"
        ArbolCuentas.titulo = "CtaCodigo"
+        ArbolCuentas.DataBind()


    End Sub
@@ -175,7 +176,7 @@ Partial Class Contabilidad2_CatCuentas
        dt = getNodospadreHijos(IDSelected)
        If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
            Dim dr As DataRow = dt.Rows(0)
-            TxtCuenta.Text = Trim(dr("CuentaFormato").ToString.Replace("-", "").ToString)
+            'TxtCuenta.Text = Trim(dr("CuentaFormato").ToString.Replace("-", "").ToString)
            'Tcuenta.Text = Trim(dr("CuentaFormato").ToString.Replace("-", "").ToString)
            Tsubcuenta.Text = dr("CuentaFormato").ToString()
            DTcuenta.SelectedValue = dr("Tipo").ToString()
@@ -371,7 +372,6 @@ Partial Class Contabilidad2_CatCuentas

        'Dim ObjConta As New ClsContPAQi(UsuarioActual.Empresa)
        Dim ObjConta As New ClsContabilidad
-        Dim ObjConta2 As New ClsContPAQi(UsuarioActual.Empresa)

        Dim CuentaEfectivo As Integer = 0
        Dim Afectable As Integer = 1 'If(DcuentaMayor.SelectedValue <> 2, 0, 1) ' cuando sea tipo 2, va a ser afectable
@@ -386,65 +386,69 @@ Partial Class Contabilidad2_CatCuentas
        End If

        If idnew > 0 Then
+            If UsuarioActual.Empresa.TipoContabilidad <> 1 Then
+                Dim ObjConta2 As New ClsContPAQi(UsuarioActual.Empresa)
+                Dim codigoPadre As String = DtDatos.FiltroPrimeroValor("Codigo", $"CveCuenta={IDSelected}") 'Tsubcuenta.Text
+                If ObjConta2.GetCuentas(-1, "-1", -1) Then
+                    Dim IdPadre As Integer = ObjConta2.DtResultados.FiltroPrimeroValor("Id", $"Codigo='{codigoPadre}'").ToEntero
+                    Dim IdAgrupador As Integer

-            Dim codigoPadre As String = DtDatos.FiltroPrimeroValor("Codigo", $"CveCuenta={IDSelected}") 'Tsubcuenta.Text
-            If ObjConta2.GetCuentas(-1, "-1", -1) Then
-                Dim IdPadre As Integer = ObjConta2.DtResultados.FiltroPrimeroValor("Id", $"Codigo='{codigoPadre}'").ToEntero
-                Dim IdAgrupador As Integer
-
-                If ObjConta2.GetAgrupadoresSAT() Then
-                    IdAgrupador = ObjConta2.DtResultados.FiltroPrimeroValor("Id", $"CodigoNombre='{DdlAgrupadorSAT.SelectedItem.Text}'").ToEntero
-                End If
-
-                If IdPadre > 0 Then
-                    Dim idnew2 As Integer = ObjConta2.AddCuenta(TxtCuenta.Text.Replace("-", ""), Tnombre.Text, DTcuenta.SelectedValue.ToString, DcuentaMayor.SelectedValue.ToString.ToEntero, CuentaEfectivo, DdlMoneda.SelectedValue.ToEntero, TxtDigAgrup.Text.ToEntero, TxtNomIngles.Text.Trim, Afectable, IdPadre, IdAgrupador)
-
-                    If idnew2 > 0 Then
-                        If ObjConta.UpdateCuentaCompaq(idnew, idnew2, UsuarioActual.CveEmpresa) Then
-                        End If
+                    If ObjConta2.GetAgrupadoresSAT() Then
+                        IdAgrupador = ObjConta2.DtResultados.FiltroPrimeroValor("Id", $"CodigoNombre='{DdlAgrupadorSAT.SelectedItem.Text}'").ToEntero
                    End If

+                    If IdPadre > 0 Then
+                        Dim idnew2 As Integer = ObjConta2.AddCuenta(TxtCuenta.Text.Replace("-", ""), Tnombre.Text, DTcuenta.SelectedValue.ToString, DcuentaMayor.SelectedValue.ToString.ToEntero, CuentaEfectivo, DdlMoneda.SelectedValue.ToEntero, TxtDigAgrup.Text.ToEntero, TxtNomIngles.Text.Trim, Afectable, IdPadre, IdAgrupador)
+
+                        If idnew2 > 0 Then
+                            If ObjConta.UpdateCuentaCompaq(idnew, idnew2, UsuarioActual.CveEmpresa) Then
+                            End If
+                        End If
+
+                    End If
                End If
+                ObjConta2.Dispose()
            End If

-            Dim dr As DataRow = DtDatos.NewRow
-            dr("CveCuenta") = idnew
-            dr("CuentaFormato") = TxtCuenta.Text
-            'dr("CuentaFormato") = Tcuenta.Text
-            dr("Nombre") = Tnombre.Text
-            dr("CtaCodigo") = String.Format("{0} - {1}", TxtCuenta.Text, Tnombre.Text)
-            'dr("CtaCodigo") = String.Format("{0} - {1}", Tcuenta.Text, Tnombre.Text)
-            dr("Tipo") = DTcuenta.SelectedValue.ToString
-            dr("CtaMayor") = DcuentaMayor.SelectedValue.ToString
-            dr("CvePadre") = IDSelected
-            dr("Codigo") = Tnombre.Text
-            dr("CveMoneda") = DdlMoneda.SelectedValue.ToEntero
-            dr("DigAgrup") = TxtDigAgrup.Text.Trim.ToEntero
-            dr("NomIdioma") = TxtNomIngles.Text.Trim
-            DtDatos.Rows.Add(dr)
-            ArbolCuentas.DataSource = DtDatos
-            '.Attributes.Add("data-hijos","0");
-            Dim item As ADServerControl.DragableItem = DirectCast(ArbolCuentas.FindControl(String.Format("{0}", IDSelected)), ADServerControl.DragableItem)
-            item.Attributes.Item("data-hijos") = item.Attributes.Item("data-hijos").ToEntero + 1
-            Dim objul As ADServerControl.DragableUL = DirectCast(ArbolCuentas.FindControl(String.Format("ul{0}", IDSelected)), ADServerControl.DragableUL)
-            If (IsNothing(objul)) Then
-                objul = New ADServerControl.DragableUL
-                objul.ID = String.Format("ul{0}", item.Cve)
-                item.Controls.Add(objul)
-            End If
-            ArbolCuentas.additem(objul, idnew, IDSelected, String.Format("{0} - {1}", TxtCuenta.Text, Tnombre.Text))
-            'ArbolCuentas.additem(objul, idnew, IDSelected, String.Format("{0} - {1}", Tcuenta.Text, Tnombre.Text))

-            'updatos.Visible = False
-            'nuevacuenta.Visible = False
+            'Dim dr As DataRow = DtDatos.NewRow
+            'dr("CveCuenta") = idnew
+            'dr("CuentaFormato") = TxtCuenta.Text
+            ''dr("CuentaFormato") = Tcuenta.Text
+            'dr("Nombre") = Tnombre.Text
+            'dr("CtaCodigo") = String.Format("{0} - {1}", TxtCuenta.Text, Tnombre.Text)
+            ''dr("CtaCodigo") = String.Format("{0} - {1}", Tcuenta.Text, Tnombre.Text)
+            'dr("Tipo") = DTcuenta.SelectedValue.ToString
+            'dr("CtaMayor") = DcuentaMayor.SelectedValue.ToString
+            'dr("CvePadre") = IDSelected
+            'dr("Codigo") = Tnombre.Text
+            'dr("CveMoneda") = DdlMoneda.SelectedValue.ToEntero
+            'dr("DigAgrup") = TxtDigAgrup.Text.Trim.ToEntero
+            'dr("NomIdioma") = TxtNomIngles.Text.Trim
+            'DtDatos.Rows.Add(dr)
+            'ArbolCuentas.DataSource = DtDatos
+            ''.Attributes.Add("data-hijos","0");
+            'Dim item As ADServerControl.DragableItem = DirectCast(ArbolCuentas.FindControl(String.Format("{0}", IDSelected)), ADServerControl.DragableItem)
+            'item.Attributes.Item("data-hijos") = item.Attributes.Item("data-hijos").ToEntero + 1
+            'Dim objul As ADServerControl.DragableUL = DirectCast(ArbolCuentas.FindControl(String.Format("ul{0}", IDSelected)), ADServerControl.DragableUL)
+            'If (IsNothing(objul)) Then
+            '    objul = New ADServerControl.DragableUL
+            '    objul.ID = String.Format("ul{0}", item.Cve)
+            '    item.Controls.Add(objul)
+            'End If
+            'ArbolCuentas.additem(objul, idnew, IDSelected, String.Format("{0} - {1}", TxtCuenta.Text, Tnombre.Text))
+            ''ArbolCuentas.additem(objul, idnew, IDSelected, String.Format("{0} - {1}", Tcuenta.Text, Tnombre.Text))
+
+            ''updatos.Visible = False
+            ''nuevacuenta.Visible = False
            LimpiarCampos()
            updatos.Update()
            CargaDatos()
+
            Alert("La cuenta se guardo correctamente")
        End If

        ObjConta.Dispose()
-        ObjConta2.Dispose()
    End Sub
    Private Sub LimpiarCampos()
        TxtCuenta.Text = ""
@@ -469,7 +473,6 @@ Partial Class Contabilidad2_CatCuentas
    Protected Sub BtnEliminar_Click(sender As Object, e As EventArgs) Handles BtnEliminar.Click
        'Dim ObjConta As New ClsContPAQi(UsuarioActual.Empresa)
        Dim ObjConta As New ClsContabilidad
-        Dim ObjConta2 As New ClsContPAQi(UsuarioActual.Empresa)
        'ObjConta.IniciaTransacSQL()

        If ObjConta.RemoveCuenta(IDSelected.ToEntero) Then
@@ -492,21 +495,27 @@ Partial Class Contabilidad2_CatCuentas
            Alert("La Cuenta ha sido eliminada", TipoMensaje.MsgInformacion)

            Dim codigo As String = DtDatos.FiltroPrimeroValor("Codigo", $"CveCuenta={IDSelected}")
-            If ObjConta2.GetCuentas(-1, "-1", -1) Then
-                Dim Id As Integer = ObjConta2.DtResultados.FiltroPrimeroValor("Id", $"Codigo='{codigo}'").ToEntero

-                If Id > 0 Then
-                    If ObjConta2.RemoveCuenta(Id) Then
+            If UsuarioActual.Empresa.TipoContabilidad <> 1 Then
+                Dim ObjConta2 As New ClsContPAQi(UsuarioActual.Empresa)
+                If ObjConta2.GetCuentas(-1, "-1", -1) Then
+                    Dim Id As Integer = ObjConta2.DtResultados.FiltroPrimeroValor("Id", $"Codigo='{codigo}'").ToEntero
+
+                    If Id > 0 Then
+                        If ObjConta2.RemoveCuenta(Id) Then
+                        End If
                    End If
                End If
+                ObjConta2.Dispose()
+
            End If
+
        Else
            Alert("La Cuenta no pudo ser eliminada", TipoMensaje.MsgError)
            '  ObjConta.RollBack()
        End If

        ObjConta.Dispose()
-        ObjConta2.Dispose()

    End Sub
    'Protected Sub BtnCambiaAgrupadorSAT_Click(sender As Object, e As EventArgs)
--- a/Metronic/assets/admin/layout/css/custom.css
+++ b/Metronic/assets/admin/layout/css/custom.css
@@ -30,7 +30,7 @@ table > tr > th.adsCol, table.table > tr > th.adsCol {
 }

 .ADSContainer > div {
-    display: table;
+    /*display: table;*/
    overflow: hidden;
 }

--- a/Nomina/Nomina2.aspx
+++ b/Nomina/Nomina2.aspx
@@ -138,16 +138,22 @@
    <asp:UpdatePanel ID="UpAccciones" runat="server" UpdateMode="Conditional">
        <ContentTemplate>
            <li>
-                <asp:LinkButton ID="LnkAutorizar" Visible ="true" OnClick="LnkAutorizar_Click" runat="server"><i class="fa fa-thumbs-up" aria-hidden="true"></i>Autorizar</asp:LinkButton>
+                <asp:LinkButton ID="LnkAutorizar" Visible ="false" OnClick="LnkAutorizar_Click" runat="server"><i class="fa fa-thumbs-up" aria-hidden="true"></i>Autorizar</asp:LinkButton>
            </li>
            <li>
-                <asp:LinkButton ID="LnkRegistrarProvision" OnClick="LnkRegistrarProvision_Click" runat="server"><i class="fa fa-thumbs-up" aria-hidden="true"></i>Registrar provisión</asp:LinkButton>
+                <asp:LinkButton ID="LnkRegistrarProvision" Visible ="false" OnClick="LnkRegistrarProvision_Click" runat="server"><i class="fa fa-thumbs-up" aria-hidden="true"></i>Registrar provisión</asp:LinkButton>
            </li>
            <li>
-                <asp:LinkButton ID="LnkCargaAsistenciaMasiva" OnClick="LnkCargaAsistenciaMasiva_Click" runat="server"><i class="fa fa-check" aria-hidden="true"></i>Carga masiva de Asistencia</asp:LinkButton>
+                <asp:HyperLink ID="LnkProvisionNomina" Visible="false"  runat="server"><i class="fa fa-eye"></i>Ver provisón</asp:HyperLink>
            </li>
            <li>
-                <asp:LinkButton ID="LnkListaRaya" OnClick="LnkListaRaya_Click" runat="server"><i class="fa fa-file-text" aria-hidden="true"></i>Lista de raya</asp:LinkButton>
+                <asp:LinkButton ID="LnkTimbrarTodos" Visible="false" OnClick="LnkTimbrarTodos_Click" runat="server"><i class="fa fa-bell"></i> Timbrar todos</asp:LinkButton>
+            </li>
+            <li>
+                <asp:LinkButton ID="LnkCargaAsistenciaMasiva" OnClick="LnkCargaAsistenciaMasiva_Click" runat="server"><i class="fa fa-check" aria-hidden="true"></i>Carga masiva de asistencia</asp:LinkButton>
+            </li>
+            <li>
+                <asp:LinkButton ID="LnkListaRaya" Visible="false" OnClick="LnkListaRaya_Click" runat="server"><i class="fa fa-file-text" aria-hidden="true"></i>Lista de raya</asp:LinkButton>
            </li>
            <li>
                <asp:LinkButton ID="LnkModalPlantillaNomina" OnClick="LnkModalPlantillaNomina_Click" runat="server"><i class="fa fa-upload"></i>Cargar masiva de conceptos</asp:LinkButton>
@@ -159,7 +165,7 @@
                <asp:HyperLink ID="HypAsistencia" NavigateUrl="/RH/Asistencias.aspx" runat="server"><i class="fa fa-list" aria-hidden="true"></i>Ir a asistencia</asp:HyperLink>
            </li>
            <li>
-                <asp:LinkButton ID="LnkFormatoTabular" OnClick="LnkFormatoTabular_Click" CssClass="" runat="server"><i class="fa fa-download"></i> Nomina tabular</asp:LinkButton>
+                <asp:LinkButton ID="LnkFormatoTabular"  Visible="false" OnClick="LnkFormatoTabular_Click" CssClass="" runat="server"><i class="fa fa-download"></i> Nómina tabular</asp:LinkButton>
            </li>
            <li>
                <asp:LinkButton ID="LnkSimulador" OnClick="LnkSimulador_Click" runat="server"><i class="fa fa-calculator"></i> Simulador</asp:LinkButton>
@@ -168,13 +174,10 @@
                <asp:LinkButton ID="LnkUpSuamodal" OnClick="LnkUpSuamodal_Click" runat="server"><i class="fa fa-check"></i> Procesar archivo SUA</asp:LinkButton>
            </li>
            <li>
-                <asp:LinkButton ID="LnkDownArchivosSua" OnClick="LnkDownArchivosSua_Click" runat="server"><i class="fa fa-download"></i> Descargar Archivos SUA</asp:LinkButton>
+                <asp:LinkButton ID="LnkDownArchivosSua" OnClick="LnkDownArchivosSua_Click" runat="server"><i class="fa fa-download"></i> Descargar archivos SUA</asp:LinkButton>
            </li>
            <li>
-                <asp:LinkButton ID="LnkTimbrarTodos" Visible="true" OnClick="LnkTimbrarTodos_Click" runat="server"><i class="fa fa-bell"></i> Timbrar todos</asp:LinkButton>
-            </li>
-            <li>
-                <asp:HyperLink ID="HypPDFSTimbrados" NavigateUrl="#" runat="server"><i class="fa fa-download" aria-hidden="true"></i>PDF Timbrado</asp:HyperLink>
+                <asp:HyperLink ID="HypPDFSTimbrados"  Visible="false" onclick="GETPDF(-1,0)" NavigateUrl="#" runat="server"><i class="fa fa-download" aria-hidden="true"></i>Recibos timbrados</asp:HyperLink>
            </li>
        </ContentTemplate>
        <Triggers>
@@ -461,8 +464,8 @@
                                                    <asp:HyperLink ID="HypXml" Visible="false" NavigateUrl="#" runat="server">XML</asp:HyperLink>
                                                    <asp:HyperLink ID="HypPDF" Visible="false" NavigateUrl="#" runat="server"><i class="fa fa-ad-pdf"></i></asp:HyperLink>
                                                    <asp:LinkButton runat="server" ID="LnkTimbrar" CssClass="btn btn-circle btn-sm blue mysmallbtn" Text="<i class='fa fa-bell'></i>" OnClick="LnkTimbrar_Click" data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea Timbrar?" data-btn-ok-label="si" />
-                                                    <asp:LinkButton runat="server" ID="ImgDelete" CssClass="btn btn-circle btn-sm red mysmallbtn" Text="<i class='icon-trash'></i>" OnClick="ImgDelete_Click" CommandArgument='<%# Eval("CveNomina") %>' Visible='<%# (Eval("CveNomina").ToString() != "" && Eval("SeTimbro").ToString() == "False"? true :false)%>' data-popout="true" data-original-title="¿Está seguro que desea eliminar la nómina?" data-btn-ok-label="si" />
-                                                    <asp:LinkButton runat="server" ID="LnkCancelar" CssClass="btn btn-circle btn-sm red mysmallbtn" Text="<i class='fas fa-ban'></i>" OnClick="LnkCancelar_Click" CommandArgument='<%# Eval("CveNomina") %>' Visible='<%# (Eval("CveNomina").ToString() != "" && PermisoCancelarEmitido && Eval("SeTimbro").ToString() == "True"? true :false)%>' data-popout="true" data-original-title="¿Está seguro que desea cancelar la nómina?" data-btn-ok-label="si" />
+                                                    <asp:LinkButton runat="server" ID="ImgDelete" CssClass="btn btn-circle btn-sm red mysmallbtn" Text="<i class='icon-trash'></i>" OnClick="ImgDelete_Click" CommandArgument='<%# Eval("CveNomina") %>' Visible='<%# (Eval("CveNomina").ToString() != "" && Eval("SeTimbro").ToString() == "False"? true :false)%>' data-toggle="confirmation"  data-popout="true" data-original-title="¿Está seguro que desea eliminar la nómina?" data-btn-ok-label="si" />
+                                                    <asp:LinkButton runat="server" ID="LnkCancelar" CssClass="btn btn-circle btn-sm red mysmallbtn" Text="<i class='fa fa-ban'></i>" OnClick="LnkCancelar_Click" CommandArgument='<%# Eval("CveNomina") %>' Visible='<%# (Eval("CveNomina").ToString() != "" && PermisoCancelarEmitido && Eval("SeTimbro").ToString() == "True"? true :false)%>' data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea cancelar la nómina?" data-btn-ok-label="si" />
                                                </div>
                                            </ItemTemplate>
                                        </asp:TemplateField>
--- a/Nomina/Nomina2.aspx.cs
+++ b/Nomina/Nomina2.aspx.cs
@@ -365,6 +365,23 @@ public partial class Nomina_Nomina2 : ClsPaginas

            using (ClsNominas objnom = new ClsNominas())
            {
+                if (objnom.GetPeriodos(-1, UsuarioActual.CveEmpresa, -1, -1, FiltCvePeriodo))
+                {
+                    DataRow drow = objnom.DtResultados.Rows[0];
+                    int Estatus = drow["Estatus"].ToString().ToEntero();
+                    int CvePrePolizaProvision = drow["CvePrePolizaProvision"].ToString().ToEntero();
+
+                    LnkAutorizar.Visible = (Estatus == 1);
+                    LnkRegistrarProvision.Visible = (Estatus > 2);
+                    LnkTimbrarTodos.Visible = (Estatus > 1);
+
+                    LnkProvisionNomina.Visible = CvePrePolizaProvision > 0;
+                    LnkProvisionNomina.NavigateUrl = $"../Contabilidad/RegPrePoliza.aspx?CvePrePoliza={CvePrePolizaProvision}&Tipo=NOMPROV";
+                    UpAccciones.Update();
+                }
+                LnkListaRaya.Visible = true;
+                LnkFormatoTabular.Visible = true;
+                HypPDFSTimbrados.Visible = true;
                if (objnom.GetNominaEmpleado(FiltCveProyecto, FiltCveSubProyecto, FiltCveTurno, FiltCvePeriodo, CveEmpresa, FiltAgrupador, DdlRegimenContratacion.SelectedValue.ToEntero()) && objnom.DTSetResultados.Tables.Count > 1)
                {
                    dtempleados = objnom.DTSetResultados.Tables[3];
@@ -383,7 +400,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
        if (continuar)
        {

-            string ctipo = "P";
+            //string ctipo = "P";
            /*
            while (GvNominas.Columns.Count > 3)
            {
@@ -1045,11 +1062,17 @@ public partial class Nomina_Nomina2 : ClsPaginas
                string RFCEmisor = UsuarioActual.Empresa.RFC;


-                if (ObjTimbrado.CFDICancelar(UsuarioActual.Empresa, FolioFiscal, Total, RFCReceptor, RFCEmisor))
+                if (ObjTimbrado.CFDICancelar(UsuarioActual.Empresa, FolioFiscal, Total, RFCReceptor, RFCEmisor,4))
                {
                    Nom.UpdateEstatusNomNominas(2, UsuarioActual.Empresa.CvePAC, "", "", ("01/01/2000").ToDate(), CveNomina, 0, 0, 0, 0, 0);

-                    Alert("La nómina con folio fiscal fue cancelada ante el SAT", TipoMensaje.MsgInformacion);
+                    Alert($"La nómina con folio fiscal '{FolioFiscal}' fue cancelada ante el SAT", TipoMensaje.MsgInformacion);
+                }
+                else
+                {
+
+                    ObjTimbrado.MensajeErrorCFDI.GuardaLog();
+                    Alert($"no se pudo cancelar el folio fiscal<br>{ObjTimbrado.MensajeErrorCFDI}", TipoMensaje.MsgAdvertencia);
                }
            }

@@ -2352,7 +2375,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
            if (iniciotipe < column)
            {
                libro.Range(filainicio + 1, iniciotipe + 1, filainicio + 1, column).Style.Alignment.Horizontal = ClosedXML.Excel.XLAlignmentHorizontalValues.Center;
-                libro.Range(filainicio + 1, iniciotipe + 1, filainicio+1, column).Merge().Value = "Obligaciones";
+                libro.Range(filainicio + 1, iniciotipe + 1, filainicio + 1, column).Merge().Value = "Obligaciones";
            }

            //libro.Row(1).CellsUsed().Style.Font.FontColor = ClosedXML.Excel.XLColor.White;
@@ -2364,7 +2387,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
            //libro.Row(3).CellsUsed().Style.Fill.SetBackgroundColor(ClosedXML.Excel.XLColor.FromArgb(79, 129, 189));
            int maxnocolumn = column;

-            int Fila = filainicio+3;
+            int Fila = filainicio + 3;
            int cveSupProyecto = -5;
            string subproyecto = "";
            int oldcveSupProyecto = -5;
@@ -2388,7 +2411,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
                column = 1;
                libro.Cell(Fila, column).Value = string.Format("'{0}", erow["Codigo"]);
                column++;
-                if (newsubproyectoTitulo) {
+                if (newsubproyectoTitulo)
+                {
                    libro.Cell(Fila - 1, column).Value = subproyecto;
                    libro.Range(Fila - 1, 1, Fila - 1, maxnocolumn).Style.Fill.SetBackgroundColor(ClosedXML.Excel.XLColor.FromArgb(155, 194, 230));
                }
@@ -2489,7 +2513,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
            Response.Buffer = true;

            Response.ContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-            Response.AddHeader("content-disposition", string.Format("attachment;filename={0} {1}.xlsx", "Nomina tabular", periodo ));
+            Response.AddHeader("content-disposition", string.Format("attachment;filename={0} {1}.xlsx", "Nomina tabular", periodo));
            Response.BinaryWrite(memoryStream.ToArray());
            Response.End();
        }
@@ -5049,7 +5073,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
    }
    public static byte[] MergeFiles(List<byte[]> sourceFiles)
    {
-        string destinationFile;
+        //string destinationFile;
        try
        {
            using (MemoryStream ms = new MemoryStream())
@@ -5145,8 +5169,9 @@ public partial class Nomina_Nomina2 : ClsPaginas
                {
                    mimeType = MimeMapping.GetMimeMapping(PathXML);
                }
-                catch (Exception ex)
+                catch (Exception )
                {
+                    
                }
                // Response.Write(path)
                Response.Clear();
--- a/Nomina/ReportedeAcumulados.aspx.cs
+++ b/Nomina/ReportedeAcumulados.aspx.cs
@@ -194,7 +194,7 @@ public partial class Nomina_ReportedeAcumulados : ClsPaginas
        if (continuar)
        {

-            string ctipo = "P";
+            //string ctipo = "P";

            int CurrentColumn = 2;
            BoundField bf;
@@ -319,7 +319,7 @@ public partial class Nomina_ReportedeAcumulados : ClsPaginas
                GvNominas.Columns[i].Visible = false;

            }
-            bool tr = false;
+            //bool tr = false;
            setGVNominas();
        }
        else
--- a/RH/CalculoSBC.aspx
+++ b/RH/CalculoSBC.aspx
@@ -88,7 +88,7 @@
                            </tr>
                        </table>
                        <asp:GridView ID="GVCalculosSBC" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD Widthall GVCalculosSBC" AutoGenerateColumns="False" data-tableheader="#tableheader"
-                            DataKeyNames="CvePersonal,Codigo,Nombre,FechaInicio,Antiguedad,Incapacitado,NumeroSS,CveTipodeSalario,TipodeSalario,SalarioDiario,SDI,SalarioVariable,SalarioDiarioSS,PorPrimaVacacional,NumDiasAguinaldo,Acumulado,diasBimestre,Faltas,Incapaciadad,diaslaborados">
+                            DataKeyNames="CvePersonal,Codigo,Nombre,FechaInicio,Antiguedad,Incapacitado,NumeroSS,CveTipodeSalario,TipodeSalario,SalarioDiario,SDINuevo,SalarioVariableNuevo,SalarioDiarioSSNuevo,SDI,SalarioVariable,SalarioDiarioSS,PorPrimaVacacional,NumDiasAguinaldo,Acumulado,diasBimestre,Faltas,Incapaciadad,diaslaborados,Movtotxt">
                            <Columns>
                                <asp:TemplateField HeaderText="Código">
                                    <ItemTemplate>
--- a/RH/CalculoSBC.aspx.cs
+++ b/RH/CalculoSBC.aspx.cs
@@ -5,8 +5,19 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using Extensiones;
-public partial class RH_CalculoSBC :  ClsPaginas
+public partial class RH_CalculoSBC : ClsPaginas
 {
+
+    //private DataTable dtPeriodos
+    //{
+    //    get
+    //    {
+    //        if (ViewState["dtPeriodos"] == null) { return null; }
+    //        else { return (DataTable)ViewState["dtPeriodos"]; }
+    //    }
+
+    //    set { ViewState["dtPeriodos"] = value; }
+    //}
    protected void Page_Load(object sender, EventArgs e)
    {

@@ -14,9 +25,9 @@ public partial class RH_CalculoSBC :  ClsPaginas

    protected void LnkCalcular_Click(object sender, EventArgs e)
    {
-        using(ClsNominas objnom = new ClsNominas() )
+        using (ClsNominas objnom = new ClsNominas())
        {
-           if( objnom.GetCalculoSBC(UsuarioActual.CveEmpresa,TxtFechaPago.Text))
+            if (objnom.GetCalculoSBC(UsuarioActual.CveEmpresa, TxtFechaPago.Text))
            {
                GVCalculosSBC.DataSource = objnom.DTSetResultados.Tables[0];
                GVCFija.DataSource = objnom.DTSetResultados.Tables[0];
@@ -32,12 +43,12 @@ public partial class RH_CalculoSBC :  ClsPaginas
    {

        string concater = "";
-        string MovtosAfil = "";
+        //string MovtosAfil = "";
        string MovtosmodSalario = "";
-        string movtosBajas = "";
+        //string movtosBajas = "";
        using (ClsRH ObjPersonal = new ClsRH())
        {
-            if (ObjPersonal.GetMovimientosToSUA(UsuarioActual.CveEmpresa,"2021-01-01", "2021-02-28"))
+            if (ObjPersonal.GetMovimientosToSUA(UsuarioActual.CveEmpresa, "2021-03-01", "2021-03-03"))
            {
                ////01: MovtosAfil
                //concater = "";
@@ -47,14 +58,29 @@ public partial class RH_CalculoSBC :  ClsPaginas
                //    concater = "\\r\\n";
                //}

-                //02: MovtosmodSalario 
+                //02: MovtosmodSalario GVCalculosSBC
                concater = "";
+                int contador = 0;
                foreach (var item in ObjPersonal.DtResultados.Select("Tipo=2"))
                {

                    MovtosmodSalario = string.Format("{0}{1}{2}", MovtosmodSalario, concater, item["Movtotxt"]);
                    concater = "\\r\\n";
+                    contador++;
                }
+                foreach (GridViewRow item in GVCalculosSBC.Rows)
+                {
+                    double SalarioDiarioSSNuevo =Math.Round( item.DataKey("SalarioDiarioSSNuevo").ToDouble(),2);
+                    double SalarioDiarioSS = Math.Round(item.DataKey("SalarioDiarioSS").ToDouble(),2);
+                    if (SalarioDiarioSSNuevo != SalarioDiarioSS)
+                    {
+                        MovtosmodSalario = string.Format("{0}{1}{2}", MovtosmodSalario, concater, item.DataKey("Movtotxt"));
+                        concater = "\\r\\n";
+                        contador++;
+                    }
+                }
+                MovtosmodSalario = string.Format("{0}{1}{2}", MovtosmodSalario, concater,
+                $"*************                                           00{(contador < 1000 ? "0" : "")}{(contador < 100 ? "0" : "")}{(contador < 10 ? "0" : "")}{contador}                                                                       00001                             9");
                ////03: movtosBajas
                //concater = "";
                //foreach (var item in ObjPersonal.DtResultados.Select("Tipo=3"))
@@ -64,15 +90,48 @@ public partial class RH_CalculoSBC :  ClsPaginas
                //}

            }
-            RegistraScript(string.Format("SaveCsv(\"MovtosmodSalario.txt\", '{0}');", MovtosmodSalario));
+            RegistraScript(string.Format("SaveCsv(\"MovtosmodSalario{1:ddMMMyyyy}.txt\", '{0}');", MovtosmodSalario, TxtFechaPago.Text.ToDateTimeExcat("dd/MM/yyyy")));
            //RegistraScript(string.Format("SaveCsv(\"MovtosAfil.txt\", '{0}');SaveCsv(\"MovtosmodSalario.txt\", '{1}');SaveCsv(\"movtosBajas.txt\", '{2}');", MovtosAfil.Replace("'", "\\'"), MovtosmodSalario.Replace("'", "\\'"), movtosBajas.Replace("'", "\\'")));
-            RegistraScript("$('#DmodalGetSua').modal('hide');");
+            //RegistraScript("$('#DmodalGetSua').modal('hide');");
        }
    }

    protected void LnkGuardarCambios_Click(object sender, EventArgs e)
    {
-        Alert("Se registro la modificación de salario correctamente.");
+        string fecha = TxtFechaPago.Text.ToDateTimeExcat("dd/MM/yyyy").ToString("yyyy/MM/dd");
+        bool continuar = true;
+        using (ClsRH objrh = new ClsRH())
+        {
+
+            foreach (GridViewRow item in GVCalculosSBC.Rows)
+            {
+                int CvePersonal = item.DataKey("Movtotxt").ToEntero();//,,,
+                double SalarioDiario = item.DataKey("SalarioDiario").ToDouble();
+                double SDINuevo = item.DataKey("SDINuevo").ToDouble();
+                double SalarioDiarioSSNuevo = Math.Round(item.DataKey("SalarioDiarioSSNuevo").ToDouble(),2);
+                double SalarioVariableNuevo = item.DataKey("SalarioVariableNuevo").ToDouble();
+                double SalarioDiarioSS = Math.Round(item.DataKey("SalarioDiarioSS").ToDouble(),2);
+                if (continuar && SalarioDiarioSSNuevo != SalarioDiarioSS && (continuar = objrh.UpdateSalarios(CvePersonal, fecha, UsuarioActual.CveEmpresa, SalarioDiario, SDINuevo, SalarioDiarioSSNuevo, SalarioDiario)))
+                {
+
+                }
+            }
+        }
+        if (continuar)
+        {
+            Alert("Se registro la modificación de salario correctamente.");
+            LnkDownArchivosSua_Click(null, null);
+        }
+        else
+        {
+
+        }
+        /*
+        
+        Using ObjPersonal As ClsRH = New ClsRH()
+            If ObjPersonal.UpdateSalarios(CvePersonal, TxtFechamodSalario.Text.ToDate().ToString("yyyy/MM/dd"), UsuarioActual.CveEmpresa, TxtSalarioDiarioM.Text.ToDecimal(), TxtFISalarioDiarioIntegrado.Text.ToDecimal(), TxtFISalarioDiarioIntegrado.Text.ToDecimal(), TxtSalarioDiarioM.Text.ToDecimal()) Then
+
+         * */
    }

    protected void LnkDescargar_Click(object sender, EventArgs e)
--- a/RH/CatPersonal.aspx
+++ b/RH/CatPersonal.aspx
@@ -471,10 +471,10 @@
                                    &nbsp;<asp:Literal ID="LtlProyecto" runat="server" Text='<%# Eval("Proyecto", "{0}") %>'></asp:Literal>
                                </ItemTemplate>
                            </asp:TemplateField>
-                            <asp:TemplateField Visible="false">
+                            <asp:TemplateField >
                                <HeaderTemplate>FechaIngreso</HeaderTemplate>
                                <ItemTemplate>
-                                    <asp:Literal ID="LtlFechaIngreso" runat="server" Text='<%# Eval("FechaIngreso") %>'></asp:Literal>
+                                    <asp:Literal ID="LtlFechaIngreso" runat="server" Text='<%# Eval("FechaIngreso", "{0:dd/MM/yyyy}") %>'></asp:Literal>
                                </ItemTemplate>
                            </asp:TemplateField>
                            <asp:TemplateField>
@@ -603,7 +603,7 @@
                                    <asp:Literal ID="LtlClienteAsignado" runat="server" Text='<%# Eval("ClienteAsignado") %>'></asp:Literal>
                                </ItemTemplate>
                            </asp:TemplateField>
-                            <asp:TemplateField>
+                            <asp:TemplateField  Visible="false">
                                <HeaderTemplate>Fecha registro</HeaderTemplate>
                                <ItemTemplate>
                                    <asp:Literal ID="LtlFechaIng" runat="server" Text='<%# Eval("FechaIng   ", "{0:d}") %>'></asp:Literal>
@@ -708,7 +708,7 @@
                                    </div>
                                    <div class="row">
                                        <div class="col-md-3">
-                                            <asp:CheckBox ID="ChkFechaIngreso" runat="server" Text="Fecha de Ingreso" />
+                                            <asp:CheckBox ID="ChkFechaIngreso" Checked="true" runat="server" Text="Fecha de Ingreso" />
                                        </div>
                                        <div class="col-md-3">
                                            <asp:CheckBox ID="ChkSeInscribioSS" runat="server" Text="SeInscribioSS" />
--- a/Scripts/custom.js
+++ b/Scripts/custom.js
@@ -1,7 +1,7 @@
 var IHAVEALLTHEPOWER = false;
 var objscollapse = null;
 var objsexpand = null;
-var adscrollerposition =[];
+var adscrollerposition = [];
 conf = {
    error: console.error,
    info: console.info,
@@ -78,10 +78,10 @@ function FiltrarTabla(idtxt, idtable, idcontador) {
 }

 function FiltrarTablaV2(idtxt, idtable, idcontador) {
-    if ($( idtxt).val() == '') { $(idtable + ' tr').css('display', 'table-row'); }
-    else { $(idtable + ' tr:not(.ADtr)').css('display', 'none'); $(idtable + ' tr:contains("' + $( idtxt).val() + '")').css('display', 'table-row'); }
+    if ($(idtxt).val() == '') { $(idtable + ' tr').css('display', 'table-row'); }
+    else { $(idtable + ' tr:not(.ADtr)').css('display', 'none'); $(idtable + ' tr:contains("' + $(idtxt).val() + '")').css('display', 'table-row'); }
    if ($('#' + idcontador).length > 0) {
-        $('#' + idcontador).html($( idtable + ' tr:visible').length);
+        $('#' + idcontador).html($(idtable + ' tr:visible').length);
    }
 }

@@ -354,7 +354,7 @@ function ADScroller2() {
            var heightGral = $(window).height() - HeightMenos;
            if (Heightfijo > 0) { heightGral = Heightfijo; }
            if (widthGral < 300) { widthGral = 300; }
-            if (heightGral < 300) { heightGral =300; }
+            if (heightGral < 300) { heightGral = 300; }

            widthGral = Tthis.parent().parent().width();
            Tthis.removeClass('ADSCROLLER2');
@@ -426,8 +426,8 @@ function ADScroller2() {


            var contenedor = $('<div class="ADSContainer" style="width:' + widthGral + 'px;height:' + heightGral + 'px;"></div>');
-            var divheader = $('<div style="width:' + widthGral + 'px;"></div>');
-            var divcenter = $('<div style="width:' + widthGral + 'px;"></div>');
+            var divheader = $('<div class="HeaderContainer" style="width:' + widthGral + 'px;"></div>');
+            var divcenter = $('<div class="CenterContainer" style="width:' + widthGral + 'px;"></div>');
            var divheader1 = $('<div class="AdsCEll" ></div>');
            var divheader2 = $('<div class="AdsRHeader"></div>');
            var divcenterCols = $('<div class="AdsCHeader"></div>');
@@ -451,6 +451,11 @@ function ADScroller2() {
            divheader1.append(THeader1);

            var anchoc1 = divheader1.outerWidth();
+
+            var divheader1button = $('<div></div>');
+            divheader1button.width(anchoc1);
+            divheader1.append(divheader1button);
+            divheader1button.append(THeader1);
            var altoc1 = divheader1.outerHeight() + 15;
            divheaderScroll = $('<div class="ADSCroll RHeader" style="width:' + (widthGral - anchoc1) + 'px;"></div>').append(THeader2);
            divheader2.append(divheaderScroll);
@@ -483,6 +488,11 @@ function ADScroller2() {
                divcolsScroll.unbind('scroll');
            });
            let sizeoftablefunc = function () {
+                let widthtx = divheader1.outerWidth() + divheader2.outerWidth();
+                let widthtxb = divcenterCols.outerWidth() + divcenterbody.outerWidth();
+                divheader.css('width', widthtx);
+                divcenter.css('width', widthtx);
+
                let sizetable = Tthis.outerHeight();
                if (sizetable < divbodyScroll.height()) {
                    sizetable = sizetable + 20;
@@ -493,10 +503,11 @@ function ADScroller2() {
            };
            let resizefncscroller = function () {

-                var widthGral = $(window).width() - WidthMenos;
+                //var widthGral = $(window).width() - WidthMenos;
                /*console.log(widthGral);*/
-                contenedor.css('width', 1);
-                widthGral = Tthis.parent().parent().parent().parent().parent().width();
+                //contenedor.css('width', 1);
+                //widthGral = Tthis.parent().parent().parent().parent().parent().width();
+                widthGral = Tthis.parent().parent().width();
                /* console.log(widthGral);*/
                var heightGral = $(window).height() - HeightMenos;
                //console.log(heightGral);
@@ -510,6 +521,8 @@ function ADScroller2() {
                divcolsScroll.css('height', (heightGral - altoc1 + 20));
                divbodyScroll.css('width', (widthGral - anchoc1));
                divbodyScroll.css('height', (heightGral - altoc1 + 20));
+
+                setTimeout(sizeoftablefunc, 100);
            };
            //$(window).resize(function () {
            //    setTimeout(resizefncscroller, 50);
@@ -517,14 +530,16 @@ function ADScroller2() {
            //});

            $('table#ADCol' + Tid + ' tr').hover(
-                function () { $('table#' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').addClass('hover');},
-                function () { $('table#' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').removeClass('hover');});
+                function () { $('table#' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').addClass('hover'); },
+                function () { $('table#' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').removeClass('hover'); });
            $('table#' + Tid + ' tr').hover(
-                function () { $('table#ADCol' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').addClass('hover');},
+                function () { $('table#ADCol' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').addClass('hover'); },
                function () { $('table#ADCol' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').removeClass('hover'); });
            setTimeout(sizeoftablefunc, 100);
-
-
+             
+            Tthis.parent().parent().bind('resize', function () {
+                setTimeout(resizefncscroller, 100);
+            })
            let found = adscrollerposition.find(element => element.id = 'C_Tab_TabNominas_GvNominas');
            if (found != null) {

@@ -784,7 +799,7 @@ function loadadscroll() {

        var colVisibles = isNaN(Number(TThis.data('cols'))) ? 0 : Number(TThis.data('cols'));
        if (colVisibles > 0) {
-            if ((Number(TThis.data('heighterror'))) && !(Number(TThis.data('heightmenos')))) { TThis.data('heightmenos', TThis.data('heighterror'));}  
+            if ((Number(TThis.data('heighterror'))) && !(Number(TThis.data('heightmenos')))) { TThis.data('heightmenos', TThis.data('heighterror')); }
            TThis.removeClass("ScrollAD");
            TThis.addClass("ADSCROLLER2");
        } else {
@@ -862,7 +877,7 @@ ADSScroll = function (tablescroll) {
            }
        }
        let firsttr = null;
-        tablescroll.find('> tbody > tr' + scrollwidthrow + ',> thead > tr' + scrollwidthrow + ',> tr' + scrollwidthrow +'').each(function () {
+        tablescroll.find('> tbody > tr' + scrollwidthrow + ',> thead > tr' + scrollwidthrow + ',> tr' + scrollwidthrow + '').each(function () {
            var retorno = false;
            firsttr = $(this);
            if (firsttr.find(' > td[colspan], > th[colspan]').length) { retorno = true; }
@@ -1186,7 +1201,7 @@ function setwebservice(idDdlWS, idhdValue, idhdText, btn) {
                        Pagina: (!(DdlWS.data('pagina')) || DdlWS.data('pagina') == '') ? '-2' : DdlWS.data('pagina'),
                        ColTexto: (!(DdlWS.data('coltexto')) || DdlWS.data('coltexto') == '') ? 'NC' : DdlWS.data('coltexto'),
                        aplicaparaventa: (!(DdlWS.data('aplicaparaventa')) || DdlWS.data('aplicaparaventa') == '') ? -1 : DdlWS.data('aplicaparaventa')
-                        
+
                        //Metodo: metodo
                    };
                },
--- a/Ventas/RepConciliacionEmitidosSat.aspx.cs
+++ b/Ventas/RepConciliacionEmitidosSat.aspx.cs
@@ -224,7 +224,7 @@ public partial class Ventas_RepConciliacionEmitidosSat : ClsPaginas
                ClsCGame ObjCGame = new ClsCGame(ObjVentas.IniciaTransacSQL());
                ClsEdocumentacion ObjDocCliente = new ClsEdocumentacion(ObjVentas.IniciaTransacSQL());
                ClsAcumuladores ObjAcum = new ClsAcumuladores(ObjVentas.IniciaTransacSQL());
-                ClsContPAQi ObjContPaq = null;
+                //ClsContPAQi ObjContPaq = null;
                //StringBuilder MensajeAlert = new StringBuilder() ;
                Modelos.Factura.MMensajeFactura Resp = new Modelos.Factura.MMensajeFactura();
                DataTable DtDetalle = objfact.DtDetalle;
--- a/WebBase.config
+++ b/WebBase.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 
    Note: As an alternative to hand editing this file you can use the 
    web admin tool to configure settings for your application. Use
@@ -9,56 +9,58 @@
 -->
 <configuration>
  <configSections>
-    <section name="ajaxControlToolkit" type="AjaxControlToolkit.AjaxControlToolkitConfigSection, AjaxControlToolkit"/>
+    <section name="ajaxControlToolkit" type="AjaxControlToolkit.AjaxControlToolkitConfigSection, AjaxControlToolkit" />
    <sectionGroup name="businessObjects">
      <sectionGroup name="crystalReports">
-        <section name="rptBuildProvider" type="CrystalDecisions.Shared.RptBuildProviderHandler, CrystalDecisions.Shared, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, Custom=null"/>
-        <section name="crystalReportViewer" type="System.Configuration.NameValueSectionHandler"/>
+        <section name="rptBuildProvider" type="CrystalDecisions.Shared.RptBuildProviderHandler, CrystalDecisions.Shared, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, Custom=null" />
+        <section name="crystalReportViewer" type="System.Configuration.NameValueSectionHandler" />
      </sectionGroup>
    </sectionGroup>
  </configSections>
-  <ajaxControlToolkit useStaticResources="true" renderStyleLinks="false" htmlSanitizer="AjaxControlToolkit.HtmlEditor.Sanitizer.DefaultHtmlSanitizer, AjaxControlToolkit.HtmlEditor.Sanitizer"/>
+  <ajaxControlToolkit useStaticResources="true" renderStyleLinks="false" htmlSanitizer="AjaxControlToolkit.HtmlEditor.Sanitizer.DefaultHtmlSanitizer, AjaxControlToolkit.HtmlEditor.Sanitizer" />
  <businessObjects>
    <crystalReports>
      <rptBuildProvider>
-        <add embedRptInResource="true"/>
+        <add embedRptInResource="true" />
      </rptBuildProvider>
      <crystalReportViewer>
-        <add key="ResourceUri" value="/aspnet_client/system_web/4_0_30319/crystalreportviewers"/>
+        <add key="ResourceUri" value="/aspnet_client/system_web/4_0_30319/crystalreportviewers" />
      </crystalReportViewer>
    </crystalReports>
  </businessObjects>
  <system.webServer>
+
    <staticContent>
-      <remove fileExtension=".woff"/>
-      <remove fileExtension=".woff2"/>
-      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff"/>
-      <mimeMap fileExtension=".woff2" mimeType="application/font-woff2"/>
+      <remove fileExtension=".woff" />
+      <remove fileExtension=".woff2" />
+      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
+      <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
    </staticContent>
    <handlers>
-      <remove name="ChartImageHandler"/>
-      <add name="AspMap.Web.ImageHandler" path="MapImageHandler.axd" verb="*" type="AspMap.Web.ImageHandler, AspMapNET" preCondition="integratedMode"/>
-      <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-      <add name="CrystalImageHandler.aspx_GET" verb="GET" path="CrystalImageHandler.aspx" type="CrystalDecisions.Web.CrystalImageHandler, CrystalDecisions.Web, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" preCondition="integratedMode"/>
-      <add name="ReportViewerWebControlHandler" preCondition="integratedMode" verb="*" path="Reserved.ReportViewerWebControl.axd" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
-      <add name="AjaxFileUploadHandler" verb="*" path="AjaxFileUploadHandler.axd" type="AjaxControlToolkit.AjaxFileUploadHandler, AjaxControlToolkit"/>
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
-      <remove name="OPTIONSVerbHandler"/>
-      <remove name="TRACEVerbHandler"/>
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
+      <remove name="ChartImageHandler" />
+      <add name="AspMap.Web.ImageHandler" path="MapImageHandler.axd" verb="*" type="AspMap.Web.ImageHandler, AspMapNET" preCondition="integratedMode" />
+      <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <add name="CrystalImageHandler.aspx_GET" verb="GET" path="CrystalImageHandler.aspx" type="CrystalDecisions.Web.CrystalImageHandler, CrystalDecisions.Web, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" preCondition="integratedMode" />
+      <add name="AjaxFileUploadHandler" verb="*" path="AjaxFileUploadHandler.axd" type="AjaxControlToolkit.AjaxFileUploadHandler, AjaxControlToolkit" />
+      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
+      <remove name="OPTIONSVerbHandler" />
+      <remove name="TRACEVerbHandler" />
+      <add name="ReportViewerWebControlHandler" preCondition="integratedMode" verb="*" path="Reserved.ReportViewerWebControl.axd" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
+      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
    </handlers>
    <defaultDocument>
      <files>
-        <add value="Inicio.aspx"/>
+        <add value="Inicio.aspx" />
      </files>
    </defaultDocument>
-    <validation validateIntegratedModeConfiguration="false"/>
+    <validation validateIntegratedModeConfiguration="false" />
+    <modules runAllManagedModulesForAllRequests="true" />
  </system.webServer>
  <!-- BLOQUEO, NO es accesible a todos los usuarios -->
  <location path="Empresas">
    <system.web>
      <authorization>
-        <deny users="*"/>
+        <deny users="*" />
      </authorization>
    </system.web>
  </location>
@@ -66,170 +68,193 @@
  <location path="Portal">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="PortalGPS">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="Proveedores">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="bundles">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="Scripts">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="Content">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="Metronic">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="AIMMGM">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="Ashx">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="Asmx">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="Loginx.aspx">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="Login2.aspx">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="OC/CotizacionEnLinea.aspx">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="ZDG/WhatsApp.aspx">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="ZDG/MensajeAutomatico.aspx">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="Sistemas/WsRespaldos.asmx">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="Sistemas/NotificacionesEnlinea.aspx">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="Politicas.aspx">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <location path="ScriptResource.axd">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
-  <location path="PortalGPS/ServiciosGPS.aspx">
+  <location path="api">
    <system.web>
      <authorization>
-        <allow users="*"/>
+        <allow users="*" />
+      </authorization>
+    </system.web>
+  </location>
+  <location path="api/SIGVentas">
+    <system.web>
+      <authorization>
+        <allow users="*" />
+      </authorization>
+    </system.web>
+  </location>
+  <location path="Ventas/RepVentaDetalle.aspx">
+    <system.web>
+      <httpRuntime executionTimeout="200" maxRequestLength="1550000" targetFramework="3.5" />
+      <authorization>
+        <allow users="*" />
      </authorization>
    </system.web>
  </location>
  <appSettings>
-    <add key="ChartImageHandler" value="storage=file;timeout=5;dir=C:\inetpub\wwwVentas\Temp;"/>
-    <add key="CrystalImageCleaner-AutoStart" value="true"/>
-    <add key="CrystalImageCleaner-Sleep" value="60000"/>
-    <add key="CrystalImageCleaner-Age" value="120000"/>
-    <add key="ValidationSettings:UnobtrusiveValidationMode" value="None"/>
-    <add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
-    <add key="ContPAQDescargas" value="D:\Compac\Empresas\"/>
-    <add key="RespaldosArchivos" value="\\WIN-80TBS47AVIU\Compac\Empresas\"/>
-    <add key="UrlSitio" value="http://sig.adsistemas.mx/"/>
-    <add key="UrlDirecciones" value="https://addr.signalsgps.com/"/>
-    <add key="EsProduccion" value="1"/>
+    <add key="ChartImageHandler" value="storage=file;timeout=5;dir=C:\inetpub\wwwVentas\Temp;" />
+    <add key="CrystalImageCleaner-AutoStart" value="true" />
+    <add key="CrystalImageCleaner-Sleep" value="60000" />
+    <add key="CrystalImageCleaner-Age" value="120000" />
+    <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
+    <add key="aspnet:MaxHttpCollectionKeys" value="50000" />
+    <add key="ContPAQDescargas" value="D:\Compac\Empresas\" />
+    <add key="RespaldosArchivos" value="\\WIN-80TBS47AVIU\Compac\Empresas\" />
+    <add key="DirectorioBaseEmpresas" value="D:\ADSistemas\Proyectos\SIG\WEB\" />
+    <add key="UrlSitio" value="http://sig.adsistemas.mx/" />
+    <add key="UrlDirecciones" value="https://addr.signalsgps.com/" />
+    <add key="EsProduccion" value="0" />
+    <add key="urlcerrarSession" value="http://localhost:85/Inicio.aspx?logout=1" />
  </appSettings>
  <connectionStrings>
-    
-    <add name="Conexion1" connectionString="Data Source=192.168.1.3\server2017,1533;Initial Catalog=SIG_Resp_Today;User Id=Usuario;Password=Desarrollo2017;pooling=True; Min Pool Size=10;Application Name=SIGJLC;"/>
-    <add name="Conexion2" connectionString="Data Source=192.168.10.111\server2017,1533;Initial Catalog=SIG_Resp_Pepper;User Id=Usuario;Password=Desarrollo2017;pooling=True; Min Pool Size=10;Application Name=SIGJLC;"/>
-    <add name="ConexionJLC" connectionString="Data Source=192.168.10.111\server2017,1533;Initial Catalog=SIG_Resp_JLC;User Id=Usuario;Password=Desarrollo2017;pooling=True; Min Pool Size=10;Application Name=SIGJLC;"/>
-    <add name="ConexionH" connectionString="Data Source=192.168.10.111\server2017,1533;Initial Catalog=SIG_Resp_Pepper;User Id=Usuario;Password=Desarrollo2017;pooling=True; Min Pool Size=10;Application Name=SIGJLC;"/>
-    <add name="Conexion" connectionString="Data Source=192.168.10.111\server2017,1533;Initial Catalog=SIG_Resp_Today;User Id=Usuario;Password=Desarrollo2017;pooling=True; Min Pool Size=10;Application Name=SIGJLC;"/>
-    <add name="Conexionjlc2" connectionString="Data Source=192.168.10.111\server2017,1533;Initial Catalog=SIG_Resp_JLC2;User Id=Usuario;Password=Desarrollo2017;pooling=True; Min Pool Size=10;Application Name=SIGJLC;"/>
-    <add name="ConexionProductivo" connectionString="Data Source=192.168.0.2;Initial Catalog=Ventas;User Id=JCaudillo;Password=JCau127*953;pooling=True; Min Pool Size=10;Application Name=SIG;"/>
-    <add name="Conexion6" connectionString="Data Source=Caudillo\Cauditronic;Initial Catalog=Ventas2;User Id=sa;Password=JCau127*953;pooling=True; Min Pool Size=10;Application Name=SIG;"/>
-    <add name="Conexionkjfhhjfjfk" connectionString="Data Source=Caudillo\Cauditronic;Initial Catalog=Ventas;User Id=sa;Password=JCau127*953;pooling=True; Min Pool Size=10;Application Name=SIG;"/>
-    <add name="Conexion8" connectionString="Data Source=(local);Initial Catalog=Ventas;User Id=RMolina;Password=RMol156.321;pooling=True; Min Pool Size=10;Application Name=SIG;"/>
-    <add name="ConexionContPAQi" connectionString="Data Source=192.168.0.2\COMPAC,1430;User Id=RMolina;Password=Rene2013;"/>
-    <add name="ConexionDG" connectionString="Data Source=192.168.0.2;Initial Catalog=DG2016;User Id=IPina;Password=IsrPin2708*987;pooling=True; Min Pool Size=10;Application Name=SIG;"/>
+    <add name="ConexionXD" connectionString="Data Source=192.168.10.111;Initial Catalog=SIG_Resp_Today;User Id=Usuario;Password=Desarrollo2019;pooling=True; Min Pool Size=10;Application Name=SIGJLC;" />
+    <add name="Conexion" connectionString="Data Source=192.168.0.2;Initial Catalog=Ventas;User Id=JCaudillo;Password=JCau127*953;pooling=True; Min Pool Size=10;Application Name=SIGJLC;" />
+    <add name="Conexionlllll" connectionString="Data Source=CAUDILLO;Initial Catalog=SIG_Resp_JLC;User Id=JCaudillo;Password=JCau127*953;pooling=True; Min Pool Size=10;Application Name=SIGJLC;" />
+    <add name="Conexionberahapy" connectionString="Data Source=192.168.10.111;Initial Catalog=SIG_Resp_Happy;User Id=Usuario;Password=Desarrollo2019;pooling=True; Min Pool Size=10;Application Name=SIGJLC;" />
+    <add name="Conexiondesarollolocal" connectionString="Data Source=localhost;Initial Catalog=SIG_Resp_JLC;User Id=JCaudillo;Password=JCau127*953;pooling=True; Min Pool Size=10;Application Name=SIGJLC;" />
+    <add name="Conexionbera" connectionString="Data Source=192.168.10.111;Initial Catalog=SIG_Resp_JLC;User Id=Usuario;Password=Desarrollo2019;pooling=True; Min Pool Size=10;Application Name=SIGJLC;" />
+    <add name="Conexionz" connectionString="Data Source=192.168.10.111;Initial Catalog=Ventas20190424;User Id=Usuario;Password=Desarrollo2019;pooling=True; Min Pool Size=10;Application Name=SIGJLC;" />
+    <add name="Conexiozg" connectionString="Data Source=192.168.10.111\server2017,1533;Initial Catalog=SIG_Resp_JLC;User Id=Usuario;Password=Desarrollo2017;pooling=True; Min Pool Size=10;Application Name=SIGJLC;" />
+    <add name="Conexionpepper" connectionString="Data Source=192.168.10.111\server2017,1533;Initial Catalog=SIG_Resp_Pepper;User Id=Usuario;Password=Desarrollo2017;pooling=True; Min Pool Size=10;Application Name=SIGJLC;" />
+    <add name="Conexiongdfg" connectionString="Data Source=192.168.10.111\server2017,1533;Initial Catalog=SIG_Resp_JLC;User Id=Usuario;Password=Desarrollo2017;pooling=True; Min Pool Size=10;Application Name=SIGJLC;" />
+    <add name="Conexionn" connectionString="Data Source=192.168.10.111\server2017,1533;Initial Catalog=SIG_Resp_Pepper;User Id=Usuario;Password=Desarrollo2017;pooling=True; Min Pool Size=10;Application Name=SIGJLC;" />
+    <add name="Conexionoscafr" connectionString="Data Source=192.168.10.111\server2017,1533;Initial Catalog=SIG_Resp_OIC;User Id=Usuario;Password=Desarrollo2017;pooling=True; Min Pool Size=10;Application Name=SIGJLC;" />
+    <add name="ConexionJLC2" connectionString="Data Source=192.168.10.111\server2017,1533;Initial Catalog=SIG_Resp_JLC2;User Id=Usuario;Password=Desarrollo2017;pooling=True; Min Pool Size=10;Application Name=SIGJLC;" />
+    <add name="Conexionprodon" connectionString="Data Source=192.168.0.2;Initial Catalog=Ventas;User Id=JCaudillo;Password=JCau127*953;pooling=True; Min Pool Size=10;Application Name=SIG;" />
+    <add name="Conexionzxyu" connectionString="Data Source=Caudillo\Cauditronic;Initial Catalog=Ventas2;User Id=sa;Password=JCau127*953;pooling=True; Min Pool Size=10;Application Name=SIG;" />
+    <add name="Conexionlocall6" connectionString="Data Source=Caudillo\Cauditronic;Initial Catalog=Ventas3;User Id=sa;Password=JCau127*953;pooling=True; Min Pool Size=10;Application Name=SIG;" />
+    <add name="Conexion8" connectionString="Data Source=(local);Initial Catalog=Ventas;User Id=RMolina;Password=RMol156.321;pooling=True; Min Pool Size=10;Application Name=SIG;" />
+    <add name="ConexionContPAQi" connectionString="Data Source=192.168.0.2\COMPAC,1430;User Id=RMolina;Password=Rene2013;" />
+    <add name="ConexionDG" connectionString="Data Source=192.168.0.2;Initial Catalog=DG2016;User Id=IPina;Password=IsrPin2708*987;pooling=True; Min Pool Size=10;Application Name=SIG;" />
  </connectionStrings>
  <system.web>
    <!-- 
@@ -239,26 +264,28 @@
            during development.
        -->
    <httpHandlers>
-      <add path="ChartImg.axd" verb="GET,HEAD,POST" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
-      <add path="MapImageHandler.axd" verb="*" type="AspMap.Web.ImageHandler, AspMapNET"/>
-      <add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" validate="false"/>
-      <add verb="GET" path="CrystalImageHandler.aspx" type="CrystalDecisions.Web.CrystalImageHandler, CrystalDecisions.Web, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304"/>
-      <add verb="*" path="AjaxFileUploadHandler.axd" type="AjaxControlToolkit.AjaxFileUploadHandler, AjaxControlToolkit"/>
+      <add path="ChartImg.axd" verb="GET,HEAD,POST" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false" />
+      <add path="MapImageHandler.axd" verb="*" type="AspMap.Web.ImageHandler, AspMapNET" />
+      <add verb="GET" path="CrystalImageHandler.aspx" type="CrystalDecisions.Web.CrystalImageHandler, CrystalDecisions.Web, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" />
+      <add verb="*" path="AjaxFileUploadHandler.axd" type="AjaxControlToolkit.AjaxFileUploadHandler, AjaxControlToolkit" />
+      <add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" validate="false" />
    </httpHandlers>
    <pages>
      <controls>
        <add assembly="Microsoft.AspNet.Web.Optimization.WebForms" namespace="Microsoft.AspNet.Web.Optimization.WebForms" tagPrefix="webopt" />
-        <add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-        <add tagPrefix="ADS" namespace="ADServerControl" assembly="ADServerControl"/>
-        <add tagPrefix="ajax" namespace="AjaxControlToolkit" assembly="AjaxControlToolkit"/>
-        <add tagPrefix="CR" namespace="CrystalDecisions.Web" assembly="CrystalDecisions.Web, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304"/>
-        <add tagPrefix="rvweb" namespace="Microsoft.Reporting.WebForms" assembly="Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
-        <add tagPrefix="telerik" namespace="Telerik.Web.UI" assembly="Telerik.Web.UI"/>
+        <add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+        <add tagPrefix="ADS" namespace="ADServerControl" assembly="ADServerControl" />
+        <add tagPrefix="ajax" namespace="AjaxControlToolkit" assembly="AjaxControlToolkit" />
+        <add tagPrefix="CR" namespace="CrystalDecisions.Web" assembly="CrystalDecisions.Web, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" />
+        <add tagPrefix="rvweb" namespace="Microsoft.Reporting.WebForms" assembly="Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
+        <add tagPrefix="telerik" namespace="Telerik.Web.UI" assembly="Telerik.Web.UI" />
+        <add tagPrefix="UserControl" src="~/UserControl/TareaNueva.ascx" tagName="TareaNueva" />
      </controls>
    </pages>
-    <globalization culture="es-MX" uiCulture="es-MX"/>
-    <httpRuntime executionTimeout="200" maxRequestLength="1550000" targetFramework="4.5"/>
+    <globalization culture="es-MX" uiCulture="es-MX" />
+    <httpRuntime executionTimeout="200" maxRequestLength="1550000" targetFramework="4.5" />
    <compilation debug="true" strict="true" explicit="true" targetFramework="4.5">
+
      <assemblies>
        <!--<add assembly="Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
        <add assembly="Microsoft.ReportViewer.Common, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>-->
@@ -267,34 +294,39 @@
        <add assembly="CrystalDecisions.Shared, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304"/>
        <add assembly="CrystalDecisions.Web, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304"/>
        <add assembly="CrystalDecisions.ReportAppServer.ClientDoc, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304"/>-->
-        <add assembly="Microsoft.SqlServer.Types, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91"/>
-        <add assembly="Microsoft.ReportViewer.Common, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91"/>
-        <add assembly="Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91"/>
-        <!--<add assembly="Microsoft.ReportViewer.Common, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" />
-        <add assembly="Microsoft.ReportViewer.ProcessingObjectModel, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" />-->
+        <add assembly="Microsoft.SqlServer.Types, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" />
+        <add assembly="Microsoft.ReportViewer.Common, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" />
+        <add assembly="Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" />
        <!--<add assembly="CrystalDecisions.CrystalReports.Engine, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>
        <add assembly="CrystalDecisions.Web, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>
        <add assembly="CrystalDecisions.ReportSource, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>
        <add assembly="CrystalDecisions.Shared, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304"/>
         <add assembly="CrystalDecisions.ReportAppServer.ClientDoc, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304"/>-->
-        <add assembly="System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-        <add assembly="System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-        <add assembly="Stimulsoft.Report, Version=2017.1.10, Culture=neutral, PublicKeyToken=EBE6666CBA19647A"/>
-        <add assembly="Stimulsoft.Report.Web, Version=2017.1.10, Culture=neutral, PublicKeyToken=EBE6666CBA19647A"/>
-        <add assembly="Stimulsoft.Report.WebDesign, Version=2017.1.10, Culture=neutral, PublicKeyToken=EBE6666CBA19647A"/>
-        <add assembly="Stimulsoft.Base, Version=2017.1.10, Culture=neutral, PublicKeyToken=EBE6666CBA19647A"/>
-        <add assembly="Stimulsoft.Report.MobileDesign, Version=2017.1.10, Culture=neutral, PublicKeyToken=EBE6666CBA19647A"/>
-        <add assembly="Stimulsoft.Report.Mobile, Version=2017.1.10, Culture=neutral, PublicKeyToken=EBE6666CBA19647A"/>
-        <add assembly="Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
-        <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
-        <add assembly="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
-        <add assembly="CrystalDecisions.CrystalReports.Engine, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>
-        <add assembly="CrystalDecisions.Shared, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>
-        <add assembly="CrystalDecisions.ReportSource, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/>
+        <add assembly="System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+        <add assembly="System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+        <add assembly="Stimulsoft.Report, Version=2017.1.10, Culture=neutral, PublicKeyToken=EBE6666CBA19647A" />
+        <add assembly="Stimulsoft.Report.Web, Version=2017.1.10, Culture=neutral, PublicKeyToken=EBE6666CBA19647A" />
+        <add assembly="Stimulsoft.Report.WebDesign, Version=2017.1.10, Culture=neutral, PublicKeyToken=EBE6666CBA19647A" />
+        <add assembly="Stimulsoft.Base, Version=2017.1.10, Culture=neutral, PublicKeyToken=EBE6666CBA19647A" />
+        <add assembly="Stimulsoft.Report.MobileDesign, Version=2017.1.10, Culture=neutral, PublicKeyToken=EBE6666CBA19647A" />
+        <add assembly="Stimulsoft.Report.Mobile, Version=2017.1.10, Culture=neutral, PublicKeyToken=EBE6666CBA19647A" />
+        <add assembly="Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+        <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+        <add assembly="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+        <add assembly="CrystalDecisions.CrystalReports.Engine, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304" />
+        <add assembly="CrystalDecisions.Shared, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304" />
+        <add assembly="CrystalDecisions.ReportSource, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304" />
+        <add assembly="CrystalDecisions.Web, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304" />
+        <!--<add assembly="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304"/> -->
+        <add assembly="CrystalDecisions.ReportAppServer.Controllers, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304" />
+        <add assembly="CrystalDecisions.ReportAppServer.DataDefModel, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692FBEA5521E1304" />
+        <add assembly="System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+        <add assembly="CrystalDecisions.ReportAppServer.ClientDoc, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" />
+        <add assembly="Microsoft.ReportViewer.ProcessingObjectModel, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" />
      </assemblies>
      <buildProviders>
-        <add extension=".rdlc" type="Microsoft.Reporting.RdlBuildProvider, Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
-        <add extension=".rpt" type="CrystalDecisions.Web.Compilation.RptBuildProvider, CrystalDecisions.Web, Version=13.0.2000.0, Culture=neutral, PublicKeyToken=692fbea5521e1304"/>
+        <!--<add extension=".rdlc" type="Microsoft.Reporting.RdlBuildProvider, Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
+        <add extension=".rpt" type="CrystalDecisions.Web.Compilation.RptBuildProvider, CrystalDecisions.Web, Version=13.0.3500.0, Culture=neutral, PublicKeyToken=692fbea5521e1304" />-->
      </buildProviders>
    </compilation>
    <!--
@@ -303,13 +335,13 @@
          ASP.NET to identify an incoming user. 
        -->
    <authentication mode="Forms">
-      <forms loginUrl="LogIn.aspx" protection="All" timeout="90" name=".ASPXSIG" path="/" requireSSL="false" slidingExpiration="true" defaultUrl="Inicio.aspx" cookieless="UseDeviceProfile" enableCrossAppRedirects="false"/>
+      <forms loginUrl="LogIn.aspx" protection="All" timeout="90" name=".ASPXSIG" path="/" requireSSL="false" slidingExpiration="true" defaultUrl="Inicio.aspx" cookieless="UseDeviceProfile" enableCrossAppRedirects="false" />
    </authentication>
    <authorization>
-      <deny users="?"/>
+      <deny users="?" />
    </authorization>
-    <customErrors mode="Off"/>
-    <machineKey validationKey="729966AC958271629627612BB77B2B02A3F24EE20B16FBE6F3E62E4029CE2B11E24CA9EEFDC4B22406550B3C58691B765B093D2C90C15E08AF147B6DBB962F6B" decryptionKey="F73E5A8FB4ED7CB9D5EC4DEE876FEDAD4F5E6829FCB1B590670A8112F8EB7D8F" validation="SHA1" decryption="AES"/>
+    <customErrors mode="Off" />
+    <machineKey validationKey="729966AC958271629627612BB77B2B02A3F24EE20B16FBE6F3E62E4029CE2B11E24CA9EEFDC4B22406550B3C58691B765B093D2C90C15E08AF147B6DBB962F6B" decryptionKey="F73E5A8FB4ED7CB9D5EC4DEE876FEDAD4F5E6829FCB1B590670A8112F8EB7D8F" validation="SHA1" decryption="AES" />
    <!-- <sessionState mode="InProc" regenerateExpiredSessionId="true" timeout="60" compressionEnabled="false" />
    
           The <customErrors> section enables configuration 
@@ -325,7 +357,7 @@
            -->
    <sessionState cookieless="UseCookies" customProvider="NCacheSessionProvider" mode="InProc" regenerateExpiredSessionId="true" timeout="120">
      <providers>
-        <add name="NCacheSessionProvider" type="Alachisoft.NCache.Web.SessionState.NSessionStoreProvider" sessionAppId="WebF1" cacheName="locCache" writeExceptionsToEventLog="false" asyncSession="false" enableLogs="false"/>
+        <add name="NCacheSessionProvider" type="Alachisoft.NCache.Web.SessionState.NSessionStoreProvider" sessionAppId="WebF1" cacheName="locCache" writeExceptionsToEventLog="false" asyncSession="false" enableLogs="false" />
      </providers>
    </sessionState>
    <!--<machineKey validationKey="A01D6E0D1A5D2A22E0854CA612FE5C5EC4AECF24" decryptionKey="ACD8EBF87C4C8937" validation="SHA1" />-->
@@ -345,32 +377,25 @@
  <system.serviceModel>
    <bindings>
      <basicHttpBinding>
-        <binding name="DgieWSPortSoapBinding"/>
-        <binding name="Service1Soap"/>
-        <binding name="Service1Soap1"/>
-      <binding name="Timbrado33Soap" closeTimeout="00:01:00" openTimeout="00:01:00"
-          receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false"
-          bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-          maxBufferPoolSize="524288" maxBufferSize="5242880" maxReceivedMessageSize="5242880"
-          textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true"
-          messageEncoding="Text">
-        <readerQuotas maxDepth="32" maxStringContentLength="5242880"
-          maxArrayLength="32768" maxBytesPerRead="4096" maxNameTableCharCount="32768" />
-        <security mode="Transport">
-          <transport clientCredentialType="None" proxyCredentialType="None"
-            realm="" />
-          <message clientCredentialType="UserName" algorithmSuite="Default" />
-        </security>
-      </binding>
+        <binding name="DgieWSPortSoapBinding" />
+        <binding name="Service1Soap" />
+        <binding name="Service1Soap1" />
+        <binding name="Timbrado33Soap" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="5242880" maxReceivedMessageSize="5242880" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
+          <readerQuotas maxDepth="32" maxStringContentLength="5242880" maxArrayLength="32768" maxBytesPerRead="4096" maxNameTableCharCount="32768" />
+          <security mode="Transport">
+            <transport clientCredentialType="None" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+        <binding name="WebServiceSoap" maxBufferPoolSize="52428800" maxBufferSize="52428800" maxReceivedMessageSize="52428800" />
      </basicHttpBinding>
-
-      
    </bindings>
    <client>
-      <endpoint address="http://www.banxico.org.mx/DgieWSWeb/DgieWS" binding="basicHttpBinding" bindingConfiguration="DgieWSPortSoapBinding" contract="WSBancoMexico.DgieWSPort" name="DgieWSPort"/>
-      <endpoint address="http://generacfdi.com.mx/wsconsultas/service1.asmx" binding="basicHttpBinding" bindingConfiguration="Service1Soap" contract="WSRVConsultas.Service1Soap" name="Service1Soap"/>
-      <endpoint address="http://192.168.0.2:8080/ADSistemas/Timbrado.asmx" binding="basicHttpBinding" bindingConfiguration="Service1Soap1" contract="WSGF.Service1Soap" name="Service1Soap1"/>
+      <endpoint address="http://www.banxico.org.mx/DgieWSWeb/DgieWS" binding="basicHttpBinding" bindingConfiguration="DgieWSPortSoapBinding" contract="WSBancoMexico.DgieWSPort" name="DgieWSPort" />
+      <endpoint address="http://generacfdi.com.mx/wsconsultas/service1.asmx" binding="basicHttpBinding" bindingConfiguration="Service1Soap" contract="WSRVConsultas.Service1Soap" name="Service1Soap" />
+      <endpoint address="http://192.168.0.2:8080/ADSistemas/Timbrado.asmx" binding="basicHttpBinding" bindingConfiguration="Service1Soap1" contract="WSGF.Service1Soap" name="Service1Soap1" />
      <endpoint address="https://cfdi33-pruebas.buzoncfdi.mx:1443/Timbrado.asmx" binding="basicHttpBinding" bindingConfiguration="Timbrado33Soap" contract="wsReference33.TimbradoSoap" name="Timbrado33SoapPruebas" />
+      <endpoint address="http://192.168.10.111:7999/WebService.asmx" binding="basicHttpBinding" bindingConfiguration="WebServiceSoap" contract="WSRDLC.WebServiceSoap" name="WebServiceSoap" />
    </client>
  </system.serviceModel>
  <!--  <runtime>
@@ -384,47 +409,59 @@
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
-        <assemblyIdentity name="WebGrease" culture="neutral" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
+        <assemblyIdentity name="WebGrease" culture="neutral" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
      </dependentAssembly>
      <dependentAssembly>
-        <assemblyIdentity name="EntityFramework" publicKeyToken="b77a5c561934e089"/>
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
+        <assemblyIdentity name="EntityFramework" publicKeyToken="b77a5c561934e089" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" culture="neutral" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0"/>
+        <assemblyIdentity name="Microsoft.Owin" culture="neutral" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
      </dependentAssembly>
      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" culture="neutral" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0"/>
+        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" culture="neutral" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
      </dependentAssembly>
      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" culture="neutral" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0"/>
+        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" culture="neutral" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security" culture="neutral" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0"/>
+        <assemblyIdentity name="Microsoft.Owin.Security" culture="neutral" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
      </dependentAssembly>
      <dependentAssembly>
-        <assemblyIdentity name="AjaxControlToolkit" publicKeyToken="28f01b0e84b6d53e" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-15.1.4.0" newVersion="15.1.4.0"/>
+        <assemblyIdentity name="AjaxControlToolkit" publicKeyToken="28f01b0e84b6d53e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.1.4.0" newVersion="15.1.4.0" />
      </dependentAssembly>
      <dependentAssembly>
-        <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.4.6.0" newVersion="1.4.6.0"/>
+        <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.6.0" newVersion="1.4.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.ReportViewer.WebForms" publicKeyToken="89845dcd8080cc91" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.ReportViewer.DataVisualization" publicKeyToken="89845dcd8080cc91" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.ReportViewer.Common" publicKeyToken="89845dcd8080cc91" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <system.codedom>
    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701"/>
-      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
    </compilers>
  </system.codedom>
 </configuration>
--- a/vwd.webinfo
+++ b/vwd.webinfo
@@ -194,6 +194,10 @@
    
  
    
+  
+    
+  
+