diff --git a/AF/RepDepreciacion.aspx.vb b/AF/RepDepreciacion.aspx.vb index c78d0f4e3..7f54bd884 100644 --- a/AF/RepDepreciacion.aspx.vb +++ b/AF/RepDepreciacion.aspx.vb @@ -4,6 +4,9 @@ Option Strict On Imports System.Data Imports Microsoft.Reporting.WebForms Imports Extensiones +Imports DocumentFormat.OpenXml.Wordprocessing +Imports System + Partial Class AF_RepDepreciacion Inherits ClsPaginas @@ -13,7 +16,7 @@ Partial Class AF_RepDepreciacion #End Region Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load If Not Page.IsPostBack Then - txtFechaI.Text = New Date(Now.Year, Now.Month + 1, 1).AddDays(-1).ToString("dd/MM/yyyy") + txtFechaI.Text = DateTime.Now.AddMonths(1).AddDays(-1).ToString("dd/MM/yyyy") End If End Sub diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index a8393d12b..8d16938a6 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -2021,7 +2021,7 @@ Public Class ClsNominas End Function Public Function AddPeriodo(CveTipoPeriodo As Integer, Ejercicio As Integer, Mes As Integer, Numero As Integer, FechaInicio As Date, FechaFin As Date, - EsInicioMes As Boolean, EsFinMes As Boolean, EsInicioSS As Boolean, EsFinSS As Boolean, EsInicioAño As Boolean, EsFinAño As Boolean, CveUsuario As Integer, CveEmpresa As Integer, CveTurno As Integer) As Boolean + EsInicioMes As Boolean, EsFinMes As Boolean, EsInicioSS As Boolean, EsFinSS As Boolean, EsInicioAño As Boolean, EsFinAño As Boolean, CveUsuario As Integer, CveEmpresa As Integer, CveTurno As Integer, Estatus As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Nom_PeriodosAdd") @@ -2039,7 +2039,7 @@ Public Class ClsNominas .Add("@EsFinSS", SqlDbType.Bit).Value = EsFinSS .Add("@EsInicioAño", SqlDbType.Bit).Value = EsInicioAño .Add("@EsFinAño", SqlDbType.Bit).Value = EsFinAño - .Add("@FueCalculado", SqlDbType.Bit).Value = FueCalculado + .Add("@FueCalculado", SqlDbType.Bit).Value = 0 .Add("@Estatus", SqlDbType.SmallInt).Value = Estatus .Add("@CveTurno", SqlDbType.Int).Value = CveTurno .Add("@CveUsuario", SqlDbType.VarChar).Value = CveUsuario diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb index 21e8ecf2f..fe67d1191 100644 --- a/App_Code/Modelos.vb +++ b/App_Code/Modelos.vb @@ -2572,37 +2572,17 @@ Namespace Modelos Else CveMovimientoReferencia = CveMovimiento End If + If Not ObjConta.AddPrePolizasDetalle(ObjFactura.CvePrePoliza, TipoMovto68, 0, Referencia, 68, Concepto, FechaMovimiento, 0, -1, CveVenta:=CveVenta, CveMovimientoAlmacen:=CveMovimientoReferencia, ImporteMX:=0, Contabilizable:=False) Then + ErrorPrepoliza = True + End If + End If - If ObjInventario.GetMovimientosDetalle(CveMovimientoReferencia, UsuarioActual.CveEmpresa) Then - Dim Importe68 As Decimal = ObjInventario.DtResultados.SUMD("Total").RoundSQL * ValorMultiplicador - - Dim IdCtaContable68 = GlobalDTAlmacen(UsuarioActual.CveEmpresa).FiltroPrimeroValor("IdCtaContable", $"CveAlmacen={CveAlmacen}").ToEntero - - If Not ObjConta.AddPrePolizasDetalle(ObjFactura.CvePrePoliza, TipoMovto68, Importe68, Referencia, 68, Concepto, FechaMovimiento, IdCtaContable68, -1, CveVenta:=CveVenta, CveMovimientoAlmacen:=CveMovimientoReferencia, ImporteMX:=Importe68, Contabilizable:=False) Then - ErrorPrepoliza = True - End If - - Dim Importe318 As Decimal = (Math.Abs(importeMovimiento) - Math.Abs(Importe68)) * ValorMultiplicador - - If Not ObjConta.AddPrePolizasDetalle(ObjFactura.CvePrePoliza, TipoMovimiento, Importe318, Referencia, 318, Concepto, FechaMovimiento, IdCtaContable, -1, CveVenta:=ObjFactura.CveVenta, CveCliente:=ObjFactura.CveCliente, CveIE:=CveIE, ImporteMX:=Importe318, ImporteME:=If(tipoCambio = 1, 0, importeMovimiento), Contabilizable:=False, CveSubProyecto:=CveSubProyectoContabilizar) Then - ErrorPrepoliza = True - End If - - If Not ObjConta.AddPrePolizasDetalle(ObjFactura.CvePrePoliza, Not TipoMovimiento, importeMovimiento, Referencia, 277, Concepto, FechaMovimiento, IdCtaContable, -1, CveVenta:=ObjFactura.CveVenta, CveCliente:=ObjFactura.CveCliente, CveIE:=CveIE, ImporteMX:=importeMX, ImporteME:=If(tipoCambio = 1, 0, importeMovimiento), Contabilizable:=False, CveSubProyecto:=CveSubProyectoContabilizar) Then - ErrorPrepoliza = True - End If - - Else + If ObjConta.AddPrePolizasDetalle(ObjFactura.CvePrePoliza, TipoMovimiento, importeMovimiento, Referencia, 277, Concepto, FechaMovimiento, IdCtaContable, -1, CveVenta:=ObjFactura.CveVenta, CveCliente:=ObjFactura.CveCliente, CveIE:=CveIE, ImporteMX:=importeMX, ImporteME:=If(tipoCambio = 1, 0, importeMovimiento), Contabilizable:=False, CveSubProyecto:=CveSubProyectoContabilizar) Then + If Not ObjConta.AddPrePolizasDetalle(ObjFactura.CvePrePoliza, Not TipoMovimiento, importeMovimiento, Referencia, 278, Concepto, FechaMovimiento, IdCtaContable, -1, CveVenta:=ObjFactura.CveVenta, CveCliente:=ObjFactura.CveCliente, CveIE:=CveIE, ImporteMX:=importeMX, ImporteME:=If(tipoCambio = 1, 0, importeMovimiento), Contabilizable:=False, CveSubProyecto:=CveSubProyectoContabilizar) Then ErrorPrepoliza = True End If Else - If ObjConta.AddPrePolizasDetalle(ObjFactura.CvePrePoliza, TipoMovimiento, importeMovimiento, Referencia, 277, Concepto, FechaMovimiento, IdCtaContable, -1, CveVenta:=ObjFactura.CveVenta, CveCliente:=ObjFactura.CveCliente, CveIE:=CveIE, ImporteMX:=importeMX, ImporteME:=If(tipoCambio = 1, 0, importeMovimiento), Contabilizable:=False, CveSubProyecto:=CveSubProyectoContabilizar) Then - If Not ObjConta.AddPrePolizasDetalle(ObjFactura.CvePrePoliza, Not TipoMovimiento, importeMovimiento, Referencia, 278, Concepto, FechaMovimiento, IdCtaContable, -1, CveVenta:=ObjFactura.CveVenta, CveCliente:=ObjFactura.CveCliente, CveIE:=CveIE, ImporteMX:=importeMX, ImporteME:=If(tipoCambio = 1, 0, importeMovimiento), Contabilizable:=False, CveSubProyecto:=CveSubProyectoContabilizar) Then - ErrorPrepoliza = True - End If - Else - ErrorPrepoliza = True - End If + ErrorPrepoliza = True End If importeMovimiento = 0 @@ -6874,6 +6854,8 @@ Namespace Modelos Public Property Version As String = "" Public Property Serie As String = "" Public Property Folio As Integer + Public Property CveMesa As Integer + Public ReadOnly Property SerieFolio As String Get diff --git a/Bin/AjaxControlToolkit.StaticResources.dll.refresh b/Bin/AjaxControlToolkit.StaticResources.dll.refresh deleted file mode 100644 index c88057f8c..000000000 --- a/Bin/AjaxControlToolkit.StaticResources.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\AjaxControlToolkit.StaticResources.15.1.4.0\lib\net40\AjaxControlToolkit.StaticResources.dll \ No newline at end of file diff --git a/Bin/AjaxControlToolkit.dll b/Bin/AjaxControlToolkit.dll index 1b01e4d55..85110dce9 100644 Binary files a/Bin/AjaxControlToolkit.dll and b/Bin/AjaxControlToolkit.dll differ diff --git a/Bin/AjaxControlToolkit.dll.refresh b/Bin/AjaxControlToolkit.dll.refresh deleted file mode 100644 index 2455d273e..000000000 --- a/Bin/AjaxControlToolkit.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\AjaxControlToolkit.15.1.4.0\lib\net40\AjaxControlToolkit.dll \ No newline at end of file diff --git a/Bin/Antlr3.Runtime.dll.refresh b/Bin/Antlr3.Runtime.dll.refresh deleted file mode 100644 index 19eeed0e7..000000000 --- a/Bin/Antlr3.Runtime.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll \ No newline at end of file diff --git a/Bin/BarcodeStandard.dll.refresh b/Bin/BarcodeStandard.dll.refresh deleted file mode 100644 index 9235a5c00..000000000 --- a/Bin/BarcodeStandard.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\BarcodeLib.2.4.0\lib\netstandard2.0\BarcodeStandard.dll \ No newline at end of file diff --git a/Bin/BouncyCastle.Crypto.dll.refresh b/Bin/BouncyCastle.Crypto.dll.refresh deleted file mode 100644 index 53b094274..000000000 --- a/Bin/BouncyCastle.Crypto.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll \ No newline at end of file diff --git a/Bin/ClosedXML.dll.refresh b/Bin/ClosedXML.dll.refresh deleted file mode 100644 index 78fbcefb8..000000000 --- a/Bin/ClosedXML.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll \ No newline at end of file diff --git a/Bin/DocumentFormat.OpenXml.dll.refresh b/Bin/DocumentFormat.OpenXml.dll.refresh deleted file mode 100644 index 4675428f8..000000000 --- a/Bin/DocumentFormat.OpenXml.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll \ No newline at end of file diff --git a/Bin/ExcelNumberFormat.dll.refresh b/Bin/ExcelNumberFormat.dll.refresh deleted file mode 100644 index 0b5d0ce84..000000000 --- a/Bin/ExcelNumberFormat.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\ExcelNumberFormat.1.0.10\lib\net20\ExcelNumberFormat.dll \ No newline at end of file diff --git a/Bin/Microsoft.AspNet.SignalR.Core.dll.refresh b/Bin/Microsoft.AspNet.SignalR.Core.dll.refresh deleted file mode 100644 index cf7d47794..000000000 --- a/Bin/Microsoft.AspNet.SignalR.Core.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.AspNet.SignalR.Core.2.4.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll \ No newline at end of file diff --git a/Bin/Microsoft.AspNet.SignalR.SystemWeb.dll.refresh b/Bin/Microsoft.AspNet.SignalR.SystemWeb.dll.refresh deleted file mode 100644 index c347a9e72..000000000 --- a/Bin/Microsoft.AspNet.SignalR.SystemWeb.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.AspNet.SignalR.SystemWeb.2.4.1\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll \ No newline at end of file diff --git a/Bin/Microsoft.Bcl.AsyncInterfaces.dll.refresh b/Bin/Microsoft.Bcl.AsyncInterfaces.dll.refresh deleted file mode 100644 index 524ccd272..000000000 --- a/Bin/Microsoft.Bcl.AsyncInterfaces.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll \ No newline at end of file diff --git a/Bin/Microsoft.Bcl.HashCode.dll.refresh b/Bin/Microsoft.Bcl.HashCode.dll.refresh deleted file mode 100644 index 634b57d51..000000000 --- a/Bin/Microsoft.Bcl.HashCode.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll \ No newline at end of file diff --git a/Bin/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll.refresh b/Bin/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll.refresh deleted file mode 100644 index c3f502635..000000000 --- a/Bin/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll \ No newline at end of file diff --git a/Bin/Microsoft.EntityFrameworkCore.Abstractions.dll.refresh b/Bin/Microsoft.EntityFrameworkCore.Abstractions.dll.refresh deleted file mode 100644 index 9558c5989..000000000 --- a/Bin/Microsoft.EntityFrameworkCore.Abstractions.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.14\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll \ No newline at end of file diff --git a/Bin/Microsoft.EntityFrameworkCore.dll.refresh b/Bin/Microsoft.EntityFrameworkCore.dll.refresh deleted file mode 100644 index dfd8adade..000000000 --- a/Bin/Microsoft.EntityFrameworkCore.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.EntityFrameworkCore.3.1.14\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll \ No newline at end of file diff --git a/Bin/Microsoft.Extensions.Caching.Abstractions.dll.refresh b/Bin/Microsoft.Extensions.Caching.Abstractions.dll.refresh deleted file mode 100644 index 5d1477708..000000000 --- a/Bin/Microsoft.Extensions.Caching.Abstractions.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.14\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll \ No newline at end of file diff --git a/Bin/Microsoft.Extensions.Caching.Memory.dll.refresh b/Bin/Microsoft.Extensions.Caching.Memory.dll.refresh deleted file mode 100644 index 93b833c21..000000000 --- a/Bin/Microsoft.Extensions.Caching.Memory.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Extensions.Caching.Memory.3.1.14\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll \ No newline at end of file diff --git a/Bin/Microsoft.Extensions.Configuration.Abstractions.dll.refresh b/Bin/Microsoft.Extensions.Configuration.Abstractions.dll.refresh deleted file mode 100644 index ee156ad32..000000000 --- a/Bin/Microsoft.Extensions.Configuration.Abstractions.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.14\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll \ No newline at end of file diff --git a/Bin/Microsoft.Extensions.Configuration.Binder.dll.refresh b/Bin/Microsoft.Extensions.Configuration.Binder.dll.refresh deleted file mode 100644 index 10b084e6a..000000000 --- a/Bin/Microsoft.Extensions.Configuration.Binder.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Extensions.Configuration.Binder.3.1.14\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll \ No newline at end of file diff --git a/Bin/Microsoft.Extensions.Configuration.dll.refresh b/Bin/Microsoft.Extensions.Configuration.dll.refresh deleted file mode 100644 index b4f3176f4..000000000 --- a/Bin/Microsoft.Extensions.Configuration.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Extensions.Configuration.3.1.14\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll \ No newline at end of file diff --git a/Bin/Microsoft.Extensions.DependencyInjection.Abstractions.dll.refresh b/Bin/Microsoft.Extensions.DependencyInjection.Abstractions.dll.refresh deleted file mode 100644 index 56770f969..000000000 --- a/Bin/Microsoft.Extensions.DependencyInjection.Abstractions.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll \ No newline at end of file diff --git a/Bin/Microsoft.Extensions.DependencyInjection.dll.refresh b/Bin/Microsoft.Extensions.DependencyInjection.dll.refresh deleted file mode 100644 index a6205efe3..000000000 --- a/Bin/Microsoft.Extensions.DependencyInjection.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Extensions.DependencyInjection.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll \ No newline at end of file diff --git a/Bin/Microsoft.Extensions.Logging.Abstractions.dll.refresh b/Bin/Microsoft.Extensions.Logging.Abstractions.dll.refresh deleted file mode 100644 index 2aa20738b..000000000 --- a/Bin/Microsoft.Extensions.Logging.Abstractions.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Extensions.Logging.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll \ No newline at end of file diff --git a/Bin/Microsoft.Extensions.Logging.dll.refresh b/Bin/Microsoft.Extensions.Logging.dll.refresh deleted file mode 100644 index a024924f8..000000000 --- a/Bin/Microsoft.Extensions.Logging.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Extensions.Logging.5.0.0\lib\net461\Microsoft.Extensions.Logging.dll \ No newline at end of file diff --git a/Bin/Microsoft.Extensions.Options.dll.refresh b/Bin/Microsoft.Extensions.Options.dll.refresh deleted file mode 100644 index 0076e4755..000000000 --- a/Bin/Microsoft.Extensions.Options.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Extensions.Options.5.0.0\lib\net461\Microsoft.Extensions.Options.dll \ No newline at end of file diff --git a/Bin/Microsoft.Extensions.Primitives.dll.refresh b/Bin/Microsoft.Extensions.Primitives.dll.refresh deleted file mode 100644 index ca7bf2698..000000000 --- a/Bin/Microsoft.Extensions.Primitives.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll \ No newline at end of file diff --git a/Bin/Microsoft.IdentityModel.JsonWebTokens.dll.refresh b/Bin/Microsoft.IdentityModel.JsonWebTokens.dll.refresh deleted file mode 100644 index ef7c4972b..000000000 --- a/Bin/Microsoft.IdentityModel.JsonWebTokens.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.IdentityModel.JsonWebTokens.6.11.0\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll \ No newline at end of file diff --git a/Bin/Microsoft.IdentityModel.Logging.dll.refresh b/Bin/Microsoft.IdentityModel.Logging.dll.refresh deleted file mode 100644 index 4a54165fc..000000000 --- a/Bin/Microsoft.IdentityModel.Logging.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.IdentityModel.Logging.6.11.0\lib\net472\Microsoft.IdentityModel.Logging.dll \ No newline at end of file diff --git a/Bin/Microsoft.IdentityModel.Tokens.dll.refresh b/Bin/Microsoft.IdentityModel.Tokens.dll.refresh deleted file mode 100644 index f0ccf0ae9..000000000 --- a/Bin/Microsoft.IdentityModel.Tokens.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.IdentityModel.Tokens.6.11.0\lib\net472\Microsoft.IdentityModel.Tokens.dll \ No newline at end of file diff --git a/Bin/Microsoft.Office.Interop.Word.dll.refresh.exclude b/Bin/Microsoft.Office.Interop.Word.dll.refresh.exclude deleted file mode 100644 index 0b9e8f8be..000000000 Binary files a/Bin/Microsoft.Office.Interop.Word.dll.refresh.exclude and /dev/null differ diff --git a/Bin/Microsoft.Owin.Host.SystemWeb.dll.refresh b/Bin/Microsoft.Owin.Host.SystemWeb.dll.refresh deleted file mode 100644 index 48b7b97d7..000000000 --- a/Bin/Microsoft.Owin.Host.SystemWeb.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Owin.Host.SystemWeb.3.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll \ No newline at end of file diff --git a/Bin/Microsoft.Owin.Security.OAuth.dll.refresh b/Bin/Microsoft.Owin.Security.OAuth.dll.refresh deleted file mode 100644 index acdf32bec..000000000 --- a/Bin/Microsoft.Owin.Security.OAuth.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Owin.Security.OAuth.4.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll \ No newline at end of file diff --git a/Bin/Microsoft.Owin.Security.dll.refresh b/Bin/Microsoft.Owin.Security.dll.refresh deleted file mode 100644 index 711dbd43b..000000000 --- a/Bin/Microsoft.Owin.Security.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Owin.Security.4.2.0\lib\net45\Microsoft.Owin.Security.dll \ No newline at end of file diff --git a/Bin/Microsoft.Owin.dll.refresh b/Bin/Microsoft.Owin.dll.refresh deleted file mode 100644 index c02d06dc0..000000000 --- a/Bin/Microsoft.Owin.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Owin.4.2.0\lib\net45\Microsoft.Owin.dll \ No newline at end of file diff --git a/Bin/Microsoft.ReportViewer.Common.dll.refresh b/Bin/Microsoft.ReportViewer.Common.dll.refresh deleted file mode 100644 index 27d1e0807..000000000 --- a/Bin/Microsoft.ReportViewer.Common.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1537.0\lib\net40\Microsoft.ReportViewer.Common.dll \ No newline at end of file diff --git a/Bin/Microsoft.ReportViewer.DataVisualization.dll.refresh b/Bin/Microsoft.ReportViewer.DataVisualization.dll.refresh deleted file mode 100644 index 6b2e07bfd..000000000 --- a/Bin/Microsoft.ReportViewer.DataVisualization.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1537.0\lib\net40\Microsoft.ReportViewer.DataVisualization.dll \ No newline at end of file diff --git a/Bin/Microsoft.ReportViewer.Design.dll.refresh b/Bin/Microsoft.ReportViewer.Design.dll.refresh deleted file mode 100644 index 55e8fbe4f..000000000 --- a/Bin/Microsoft.ReportViewer.Design.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1537.0\lib\net40\Microsoft.ReportViewer.Design.dll \ No newline at end of file diff --git a/Bin/Microsoft.ReportViewer.ProcessingObjectModel.DLL.refresh b/Bin/Microsoft.ReportViewer.ProcessingObjectModel.DLL.refresh deleted file mode 100644 index f3a1722eb..000000000 --- a/Bin/Microsoft.ReportViewer.ProcessingObjectModel.DLL.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1537.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll \ No newline at end of file diff --git a/Bin/Microsoft.ReportViewer.WebDesign.dll.refresh b/Bin/Microsoft.ReportViewer.WebDesign.dll.refresh deleted file mode 100644 index bd0a4297e..000000000 --- a/Bin/Microsoft.ReportViewer.WebDesign.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1537.0\lib\net40\Microsoft.ReportViewer.WebDesign.dll \ No newline at end of file diff --git a/Bin/Microsoft.ReportViewer.WebForms.DLL.refresh b/Bin/Microsoft.ReportViewer.WebForms.DLL.refresh deleted file mode 100644 index 4aa22e826..000000000 --- a/Bin/Microsoft.ReportViewer.WebForms.DLL.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1537.0\lib\net40\Microsoft.ReportViewer.WebForms.dll \ No newline at end of file diff --git a/Bin/Microsoft.SqlServer.Types.dll.refresh b/Bin/Microsoft.SqlServer.Types.dll.refresh deleted file mode 100644 index 1e3b55bbf..000000000 --- a/Bin/Microsoft.SqlServer.Types.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.SqlServer.Types.14.0.1016.290\lib\net40\Microsoft.SqlServer.Types.dll \ No newline at end of file diff --git a/Bin/Microsoft.Threading.Tasks.Extensions.Desktop.dll.refresh b/Bin/Microsoft.Threading.Tasks.Extensions.Desktop.dll.refresh deleted file mode 100644 index 1b5ef6003..000000000 --- a/Bin/Microsoft.Threading.Tasks.Extensions.Desktop.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll \ No newline at end of file diff --git a/Bin/Microsoft.Threading.Tasks.Extensions.dll.refresh b/Bin/Microsoft.Threading.Tasks.Extensions.dll.refresh deleted file mode 100644 index 83d5f14df..000000000 --- a/Bin/Microsoft.Threading.Tasks.Extensions.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll \ No newline at end of file diff --git a/Bin/Microsoft.Threading.Tasks.dll.refresh b/Bin/Microsoft.Threading.Tasks.dll.refresh deleted file mode 100644 index f32d755b8..000000000 --- a/Bin/Microsoft.Threading.Tasks.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll \ No newline at end of file diff --git a/Bin/Microsoft.Web.Infrastructure.dll.refresh b/Bin/Microsoft.Web.Infrastructure.dll.refresh deleted file mode 100644 index d2d10e56b..000000000 --- a/Bin/Microsoft.Web.Infrastructure.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll \ No newline at end of file diff --git a/Bin/Microsoft.Web.XmlTransform.dll.refresh b/Bin/Microsoft.Web.XmlTransform.dll.refresh deleted file mode 100644 index 64b0f1543..000000000 --- a/Bin/Microsoft.Web.XmlTransform.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll \ No newline at end of file diff --git a/Bin/MoreLinq.dll.refresh b/Bin/MoreLinq.dll.refresh deleted file mode 100644 index 246d956ef..000000000 --- a/Bin/MoreLinq.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\morelinq.3.3.2\lib\net451\MoreLinq.dll \ No newline at end of file diff --git a/Bin/Newtonsoft.Json.dll.refresh b/Bin/Newtonsoft.Json.dll.refresh deleted file mode 100644 index 691ec7f5e..000000000 --- a/Bin/Newtonsoft.Json.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll \ No newline at end of file diff --git a/Bin/NuGet.Core.dll.refresh b/Bin/NuGet.Core.dll.refresh deleted file mode 100644 index 70f82bfe9..000000000 --- a/Bin/NuGet.Core.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll \ No newline at end of file diff --git a/Bin/Owin.dll.refresh b/Bin/Owin.dll.refresh deleted file mode 100644 index 607601f50..000000000 --- a/Bin/Owin.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Owin.1.0\lib\net40\Owin.dll \ No newline at end of file diff --git a/Bin/StackExchange.Redis.StrongName.dll.refresh b/Bin/StackExchange.Redis.StrongName.dll.refresh deleted file mode 100644 index fcd427412..000000000 --- a/Bin/StackExchange.Redis.StrongName.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\StackExchange.Redis.StrongName.1.0.488\lib\net45\StackExchange.Redis.StrongName.dll \ No newline at end of file diff --git a/Bin/System.Buffers.dll.refresh b/Bin/System.Buffers.dll.refresh deleted file mode 100644 index 1871422d2..000000000 --- a/Bin/System.Buffers.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll \ No newline at end of file diff --git a/Bin/System.Collections.Immutable.dll.refresh b/Bin/System.Collections.Immutable.dll.refresh deleted file mode 100644 index 22c1fa78e..000000000 --- a/Bin/System.Collections.Immutable.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll \ No newline at end of file diff --git a/Bin/System.ComponentModel.Annotations.dll.refresh b/Bin/System.ComponentModel.Annotations.dll.refresh deleted file mode 100644 index 114f530ce..000000000 --- a/Bin/System.ComponentModel.Annotations.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll \ No newline at end of file diff --git a/Bin/System.Data.SqlClient.dll.refresh b/Bin/System.Data.SqlClient.dll.refresh deleted file mode 100644 index 67b20e256..000000000 --- a/Bin/System.Data.SqlClient.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.Data.SqlClient.4.8.2\lib\net461\System.Data.SqlClient.dll \ No newline at end of file diff --git a/Bin/System.Diagnostics.DiagnosticSource.dll.refresh b/Bin/System.Diagnostics.DiagnosticSource.dll.refresh deleted file mode 100644 index 3e3caedc4..000000000 --- a/Bin/System.Diagnostics.DiagnosticSource.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.Diagnostics.DiagnosticSource.5.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll \ No newline at end of file diff --git a/Bin/System.Drawing.Common.dll.refresh b/Bin/System.Drawing.Common.dll.refresh deleted file mode 100644 index 601fb6b35..000000000 --- a/Bin/System.Drawing.Common.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.Drawing.Common.5.0.2\lib\net461\System.Drawing.Common.dll \ No newline at end of file diff --git a/Bin/System.IO.FileSystem.Primitives.dll.refresh b/Bin/System.IO.FileSystem.Primitives.dll.refresh deleted file mode 100644 index bfe322679..000000000 --- a/Bin/System.IO.FileSystem.Primitives.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll \ No newline at end of file diff --git a/Bin/System.IO.Packaging.dll.refresh b/Bin/System.IO.Packaging.dll.refresh deleted file mode 100644 index 8d2ee180d..000000000 --- a/Bin/System.IO.Packaging.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll \ No newline at end of file diff --git a/Bin/System.IdentityModel.Tokens.Jwt.dll.refresh b/Bin/System.IdentityModel.Tokens.Jwt.dll.refresh deleted file mode 100644 index 164b0c5ca..000000000 --- a/Bin/System.IdentityModel.Tokens.Jwt.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.IdentityModel.Tokens.Jwt.6.11.0\lib\net472\System.IdentityModel.Tokens.Jwt.dll \ No newline at end of file diff --git a/Bin/System.Memory.dll.refresh b/Bin/System.Memory.dll.refresh deleted file mode 100644 index b80f9aaea..000000000 --- a/Bin/System.Memory.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll \ No newline at end of file diff --git a/Bin/System.Net.Http.Formatting.dll.refresh b/Bin/System.Net.Http.Formatting.dll.refresh deleted file mode 100644 index ed212e82a..000000000 --- a/Bin/System.Net.Http.Formatting.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll \ No newline at end of file diff --git a/Bin/System.Numerics.Vectors.dll.refresh b/Bin/System.Numerics.Vectors.dll.refresh deleted file mode 100644 index 0d4de274a..000000000 --- a/Bin/System.Numerics.Vectors.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll \ No newline at end of file diff --git a/Bin/System.Runtime.CompilerServices.Unsafe.dll.refresh b/Bin/System.Runtime.CompilerServices.Unsafe.dll.refresh deleted file mode 100644 index 2c5b3b5fe..000000000 Binary files a/Bin/System.Runtime.CompilerServices.Unsafe.dll.refresh and /dev/null differ diff --git a/Bin/System.Text.Encodings.Web.dll.refresh b/Bin/System.Text.Encodings.Web.dll.refresh deleted file mode 100644 index e62151f5d..000000000 --- a/Bin/System.Text.Encodings.Web.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.Text.Encodings.Web.5.0.1\lib\net461\System.Text.Encodings.Web.dll \ No newline at end of file diff --git a/Bin/System.Text.Json.dll.refresh b/Bin/System.Text.Json.dll.refresh deleted file mode 100644 index b7f3e3136..000000000 --- a/Bin/System.Text.Json.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.Text.Json.5.0.2\lib\net461\System.Text.Json.dll \ No newline at end of file diff --git a/Bin/System.Threading.Tasks.Extensions.dll.refresh b/Bin/System.Threading.Tasks.Extensions.dll.refresh deleted file mode 100644 index 23f0d54fe..000000000 --- a/Bin/System.Threading.Tasks.Extensions.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll \ No newline at end of file diff --git a/Bin/System.ValueTuple.dll.refresh b/Bin/System.ValueTuple.dll.refresh deleted file mode 100644 index 1229cc4c7..000000000 --- a/Bin/System.ValueTuple.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll \ No newline at end of file diff --git a/Bin/System.Web.Http.WebHost.dll.refresh b/Bin/System.Web.Http.WebHost.dll.refresh deleted file mode 100644 index f4a655428..000000000 --- a/Bin/System.Web.Http.WebHost.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.4\lib\net45\System.Web.Http.WebHost.dll \ No newline at end of file diff --git a/Bin/System.Web.Http.dll.refresh b/Bin/System.Web.Http.dll.refresh deleted file mode 100644 index cd95f3fd9..000000000 --- a/Bin/System.Web.Http.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.AspNet.WebApi.Core.5.2.6\lib\net45\System.Web.Http.dll \ No newline at end of file diff --git a/Bin/System.Web.Optimization.dll.refresh b/Bin/System.Web.Optimization.dll.refresh deleted file mode 100644 index 29caf8d30..000000000 --- a/Bin/System.Web.Optimization.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll \ No newline at end of file diff --git a/Bin/WebGrease.dll.refresh b/Bin/WebGrease.dll.refresh deleted file mode 100644 index 817f68c04..000000000 --- a/Bin/WebGrease.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\WebGrease.1.6.0\lib\WebGrease.dll \ No newline at end of file diff --git a/Bin/itext.barcodes.dll.refresh b/Bin/itext.barcodes.dll.refresh deleted file mode 100644 index d90936fec..000000000 --- a/Bin/itext.barcodes.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\itext7.7.2.4\lib\net461\itext.barcodes.dll \ No newline at end of file diff --git a/Bin/itext.commons.dll.refresh b/Bin/itext.commons.dll.refresh deleted file mode 100644 index bad3ed214..000000000 --- a/Bin/itext.commons.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\itext7.commons.7.2.4\lib\net461\itext.commons.dll \ No newline at end of file diff --git a/Bin/itext.forms.dll.refresh b/Bin/itext.forms.dll.refresh deleted file mode 100644 index be61dbe65..000000000 --- a/Bin/itext.forms.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\itext7.7.2.4\lib\net461\itext.forms.dll \ No newline at end of file diff --git a/Bin/itext.html2pdf.dll.refresh b/Bin/itext.html2pdf.dll.refresh deleted file mode 100644 index b24042f19..000000000 --- a/Bin/itext.html2pdf.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\itext7.pdfhtml.4.0.4\lib\net461\itext.html2pdf.dll \ No newline at end of file diff --git a/Bin/itext.io.dll.refresh b/Bin/itext.io.dll.refresh deleted file mode 100644 index 01a8fcf66..000000000 --- a/Bin/itext.io.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\itext7.7.2.4\lib\net461\itext.io.dll \ No newline at end of file diff --git a/Bin/itext.kernel.dll.refresh b/Bin/itext.kernel.dll.refresh deleted file mode 100644 index c69a05e6b..000000000 --- a/Bin/itext.kernel.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\itext7.7.2.4\lib\net461\itext.kernel.dll \ No newline at end of file diff --git a/Bin/itext.layout.dll.refresh b/Bin/itext.layout.dll.refresh deleted file mode 100644 index cf4720230..000000000 --- a/Bin/itext.layout.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\itext7.7.2.4\lib\net461\itext.layout.dll \ No newline at end of file diff --git a/Bin/itext.pdfa.dll.refresh b/Bin/itext.pdfa.dll.refresh deleted file mode 100644 index e59bea482..000000000 --- a/Bin/itext.pdfa.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\itext7.7.2.4\lib\net461\itext.pdfa.dll \ No newline at end of file diff --git a/Bin/itext.sign.dll.refresh b/Bin/itext.sign.dll.refresh deleted file mode 100644 index 0f2e8a8c6..000000000 --- a/Bin/itext.sign.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\itext7.7.2.4\lib\net461\itext.sign.dll \ No newline at end of file diff --git a/Bin/itext.styledxmlparser.dll.refresh b/Bin/itext.styledxmlparser.dll.refresh deleted file mode 100644 index ecb8d6814..000000000 --- a/Bin/itext.styledxmlparser.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\itext7.7.2.4\lib\net461\itext.styledxmlparser.dll \ No newline at end of file diff --git a/Bin/itext.svg.dll.refresh b/Bin/itext.svg.dll.refresh deleted file mode 100644 index e6189ba7f..000000000 --- a/Bin/itext.svg.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\itext7.7.2.4\lib\net461\itext.svg.dll \ No newline at end of file diff --git a/Bin/itextsharp.dll.refresh b/Bin/itextsharp.dll.refresh deleted file mode 100644 index bdab5a750..000000000 --- a/Bin/itextsharp.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\iTextSharp.5.5.13.3\lib\itextsharp.dll \ No newline at end of file diff --git a/Bin/itextsharp.xtra.dll.refresh b/Bin/itextsharp.xtra.dll.refresh deleted file mode 100644 index 69e7bba61..000000000 --- a/Bin/itextsharp.xtra.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\itextsharp.xtra.5.5.13.3\lib\itextsharp.xtra.dll \ No newline at end of file diff --git a/Bin/log4net.dll.refresh b/Bin/log4net.dll.refresh deleted file mode 100644 index e973d8dfa..000000000 --- a/Bin/log4net.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\log4net.1.2.10\lib\2.0\log4net.dll \ No newline at end of file diff --git a/Bin/roslyn/Microsoft.Build.Tasks.CodeAnalysis.dll.refresh b/Bin/roslyn/Microsoft.Build.Tasks.CodeAnalysis.dll.refresh deleted file mode 100644 index 26a722141..000000000 --- a/Bin/roslyn/Microsoft.Build.Tasks.CodeAnalysis.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\Microsoft.Build.Tasks.CodeAnalysis.dll diff --git a/Bin/roslyn/Microsoft.CodeAnalysis.CSharp.Scripting.dll.refresh b/Bin/roslyn/Microsoft.CodeAnalysis.CSharp.Scripting.dll.refresh deleted file mode 100644 index fab8394ac..000000000 --- a/Bin/roslyn/Microsoft.CodeAnalysis.CSharp.Scripting.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\Microsoft.CodeAnalysis.CSharp.Scripting.dll diff --git a/Bin/roslyn/Microsoft.CodeAnalysis.CSharp.dll.refresh b/Bin/roslyn/Microsoft.CodeAnalysis.CSharp.dll.refresh deleted file mode 100644 index b481f8f1a..000000000 --- a/Bin/roslyn/Microsoft.CodeAnalysis.CSharp.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\Microsoft.CodeAnalysis.CSharp.dll diff --git a/Bin/roslyn/Microsoft.CodeAnalysis.Scripting.dll.refresh b/Bin/roslyn/Microsoft.CodeAnalysis.Scripting.dll.refresh deleted file mode 100644 index 6c06cf0cc..000000000 --- a/Bin/roslyn/Microsoft.CodeAnalysis.Scripting.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\Microsoft.CodeAnalysis.Scripting.dll diff --git a/Bin/roslyn/Microsoft.CodeAnalysis.VisualBasic.dll.refresh b/Bin/roslyn/Microsoft.CodeAnalysis.VisualBasic.dll.refresh deleted file mode 100644 index 05a46d359..000000000 --- a/Bin/roslyn/Microsoft.CodeAnalysis.VisualBasic.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\Microsoft.CodeAnalysis.VisualBasic.dll diff --git a/Bin/roslyn/Microsoft.CodeAnalysis.dll.refresh b/Bin/roslyn/Microsoft.CodeAnalysis.dll.refresh deleted file mode 100644 index e977e7765..000000000 --- a/Bin/roslyn/Microsoft.CodeAnalysis.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\Microsoft.CodeAnalysis.dll diff --git a/Bin/roslyn/Microsoft.DiaSymReader.Native.amd64.dll.refresh b/Bin/roslyn/Microsoft.DiaSymReader.Native.amd64.dll.refresh deleted file mode 100644 index eb4460abb..000000000 --- a/Bin/roslyn/Microsoft.DiaSymReader.Native.amd64.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\Microsoft.DiaSymReader.Native.amd64.dll diff --git a/Bin/roslyn/Microsoft.DiaSymReader.Native.x86.dll.refresh b/Bin/roslyn/Microsoft.DiaSymReader.Native.x86.dll.refresh deleted file mode 100644 index e1edd70bb..000000000 --- a/Bin/roslyn/Microsoft.DiaSymReader.Native.x86.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\Microsoft.DiaSymReader.Native.x86.dll diff --git a/Bin/roslyn/System.Buffers.dll.refresh b/Bin/roslyn/System.Buffers.dll.refresh deleted file mode 100644 index a6499ac74..000000000 --- a/Bin/roslyn/System.Buffers.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\System.Buffers.dll diff --git a/Bin/roslyn/System.Collections.Immutable.dll.refresh b/Bin/roslyn/System.Collections.Immutable.dll.refresh deleted file mode 100644 index c625fc585..000000000 --- a/Bin/roslyn/System.Collections.Immutable.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\System.Collections.Immutable.dll diff --git a/Bin/roslyn/System.Memory.dll.refresh b/Bin/roslyn/System.Memory.dll.refresh deleted file mode 100644 index 609eb0d91..000000000 --- a/Bin/roslyn/System.Memory.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\System.Memory.dll diff --git a/Bin/roslyn/System.Numerics.Vectors.dll.refresh b/Bin/roslyn/System.Numerics.Vectors.dll.refresh deleted file mode 100644 index b3b2a4584..000000000 --- a/Bin/roslyn/System.Numerics.Vectors.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\System.Numerics.Vectors.dll diff --git a/Bin/roslyn/System.Reflection.Metadata.dll.refresh b/Bin/roslyn/System.Reflection.Metadata.dll.refresh deleted file mode 100644 index f733fc71f..000000000 --- a/Bin/roslyn/System.Reflection.Metadata.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\System.Reflection.Metadata.dll diff --git a/Bin/roslyn/System.Runtime.CompilerServices.Unsafe.dll.refresh b/Bin/roslyn/System.Runtime.CompilerServices.Unsafe.dll.refresh deleted file mode 100644 index dfdd8ea9d..000000000 --- a/Bin/roslyn/System.Runtime.CompilerServices.Unsafe.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\System.Runtime.CompilerServices.Unsafe.dll diff --git a/Bin/roslyn/System.Text.Encoding.CodePages.dll.refresh b/Bin/roslyn/System.Text.Encoding.CodePages.dll.refresh deleted file mode 100644 index 414e9a775..000000000 --- a/Bin/roslyn/System.Text.Encoding.CodePages.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\System.Text.Encoding.CodePages.dll diff --git a/Bin/roslyn/System.Threading.Tasks.Extensions.dll.refresh b/Bin/roslyn/System.Threading.Tasks.Extensions.dll.refresh deleted file mode 100644 index d0e0e5752..000000000 --- a/Bin/roslyn/System.Threading.Tasks.Extensions.dll.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\System.Threading.Tasks.Extensions.dll diff --git a/Bin/roslyn/VBCSCompiler.exe.refresh b/Bin/roslyn/VBCSCompiler.exe.refresh deleted file mode 100644 index be7aee52b..000000000 --- a/Bin/roslyn/VBCSCompiler.exe.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\VBCSCompiler.exe diff --git a/Bin/roslyn/csc.exe.refresh b/Bin/roslyn/csc.exe.refresh deleted file mode 100644 index e083de2d5..000000000 --- a/Bin/roslyn/csc.exe.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\csc.exe diff --git a/Bin/roslyn/csi.exe.refresh b/Bin/roslyn/csi.exe.refresh deleted file mode 100644 index 94a597610..000000000 --- a/Bin/roslyn/csi.exe.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\csi.exe diff --git a/Bin/roslyn/vbc.exe.refresh b/Bin/roslyn/vbc.exe.refresh deleted file mode 100644 index d799cdda3..000000000 --- a/Bin/roslyn/vbc.exe.refresh +++ /dev/null @@ -1 +0,0 @@ -..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\roslyn472\vbc.exe diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb index f82113bc3..a406c8fa7 100644 --- a/Compras/PopUpVerFactura.aspx.vb +++ b/Compras/PopUpVerFactura.aspx.vb @@ -6843,7 +6843,7 @@ Partial Class PopUpVerFactura params.Add(New ReportParameter("LogoPath", "")) End If - ImprimirPDF("Empresas/Grales/Formatos/Ajuste.rdlc", DtDatos, params, "Reporte de Ajuste", "PDF", Content_Disposition:="inline") + ImprimirPDF("Empresas/Grales/Formatos/Ajuste.rdlc", DtDatos, params, "Reporte de Ajuste", "PDF") ', Content_Disposition:="inline") End Sub Private Sub ImprimirPDFAjuste(CvePSAjuste As Integer, CveCliente As Integer, CveClienteDistribuidor As Integer, Consec As String, FolioGarantia As String, FechaAjuste As DateTime, FechaReclamacion As DateTime, @@ -6980,7 +6980,7 @@ Partial Class PopUpVerFactura params.Add(New ReportParameter("LogoPath", "")) End If - ImprimirPDF("Empresas/Grales/Formatos/Ajuste.rdlc", DtDatos, params, "Reporte de Ajuste", "PDF", Content_Disposition:="inline") + ImprimirPDF("Empresas/Grales/Formatos/Ajuste.rdlc", DtDatos, params, "Reporte de Ajuste", "PDF") ', Content_Disposition:="inline") End Sub #End Region diff --git a/Contabilidad2/RepAnexoCatalogo.aspx b/Contabilidad2/RepAnexoCatalogo.aspx index 103b2fbd3..ed892e682 100644 --- a/Contabilidad2/RepAnexoCatalogo.aspx +++ b/Contabilidad2/RepAnexoCatalogo.aspx @@ -41,7 +41,7 @@
Cuenta
-
+
diff --git a/Nomina/Aguinaldo.aspx b/Nomina/Aguinaldo.aspx index 3ae3ad2d4..11e87c6bb 100644 --- a/Nomina/Aguinaldo.aspx +++ b/Nomina/Aguinaldo.aspx @@ -218,6 +218,13 @@ + + + + + + + Aguinaldo
completo diff --git a/Nomina/Aguinaldo.aspx.cs b/Nomina/Aguinaldo.aspx.cs index 8380ef03e..4b11f9b47 100644 --- a/Nomina/Aguinaldo.aspx.cs +++ b/Nomina/Aguinaldo.aspx.cs @@ -132,6 +132,7 @@ public partial class Nomina_Aguinaldo : ClsPaginas int ejercicio = DdlEjercicios.SelectedValue.ToEntero(); int CvePersonal; int CvePeriodo; + decimal importeAjuste = 0; decimal ImporteDescuento = 0; decimal ImporteISR = 0; decimal ImporteGravado = 0; @@ -202,7 +203,7 @@ public partial class Nomina_Aguinaldo : ClsPaginas ImporteGravado = gvrow.FCLabel("lblAguinaldoGravado").Text.ToDecimal(); ImporteExento = Importe - ImporteGravado; ImporteValor = gvrow.FCLabel("lbldiasAguinaldoprop").Text.ToEntero(); - + importeAjuste = gvrow.FCTextBox("TxtAjuste").Text.ToDecimal(); ImporteDescuento = gvrow.FCTextBox("TxtDescuento").Text.ToDecimal(); ImporteISR = gvrow.FCLabel("lblISRAguinaldo").Text.ToDecimal(); @@ -372,10 +373,12 @@ public partial class Nomina_Aguinaldo : ClsPaginas decimal Aguinaldoapagar = 0; decimal descuento = 0; + decimal ajuste =0; decimal aguinaldoSubproyeto = 0; decimal aguinaldogravadoSubproyeto = 0; decimal descuentoSubproyeto = 0; + decimal ajusteSubproyeto = 0; decimal ISRSubproyeto = 0; decimal AguinaldoapagarTotalSubproyeto = 0; @@ -383,6 +386,7 @@ public partial class Nomina_Aguinaldo : ClsPaginas decimal aguinaldoTotal = 0; decimal aguinaldogravadoTotal = 0; decimal descuentoTotal = 0; + decimal ajusteTotal = 0; decimal ISRTOTAL = 0; decimal AguinaldoapagarTotal = 0; @@ -403,6 +407,7 @@ public partial class Nomina_Aguinaldo : ClsPaginas diaslaborados = gvrow.FCLabel("TxtdiasLaborados").Text.ToDecimal(); diasaguinaldo = gvrow.FCLabel("TxtdiasAguinaldo").Text.ToDecimal(); descuento = gvrow.FCTextBox("TxtDescuento").Text.ToDecimal(); + ajuste = gvrow.FCTextBox("TxtAjuste").Text.ToDecimal(); //aguinaldoExcentoreg = gvrow.FCTextBox("TxtAguinaldoExento").Text.ToDecimal(); if (CvePersonal > 0) @@ -413,7 +418,7 @@ public partial class Nomina_Aguinaldo : ClsPaginas diasaguipago = (diaslaborados / diasanio) * diasaguinaldo; salariomensual = salariodiario * 30; - aguinaldo = diasaguipago * salarioAguinaldo; + aguinaldo = (diasaguipago * salarioAguinaldo)+ ajuste; /*if (gvrow.FCTextBox("TxtAguinaldoExento").Text.Length > 0) { aguinaldoexcento = (aguinaldoExcentoreg > aguinaldo ? aguinaldo : aguinaldoExcentoreg); @@ -463,6 +468,7 @@ public partial class Nomina_Aguinaldo : ClsPaginas aguinaldogravadoSubproyeto += aguinaldogravado; descuentoSubproyeto += descuento; + ajusteSubproyeto += ajuste; aguinaldoSubproyeto += aguinaldo; ISRSubproyeto += FraccionIV; AguinaldoapagarTotalSubproyeto += Aguinaldoapagar; @@ -471,6 +477,7 @@ public partial class Nomina_Aguinaldo : ClsPaginas aguinaldogravadoTotal += aguinaldogravado; descuentoTotal += descuento; + ajusteTotal += ajuste; ISRTOTAL += FraccionIV; aguinaldoTotal += aguinaldo; @@ -495,6 +502,7 @@ public partial class Nomina_Aguinaldo : ClsPaginas gvrowSubProyecto.FCLabel("lblISRAguinaldo").Text = string.Format("${0:N2}", ISRSubproyeto); gvrowSubProyecto.FCLabel("lblAguinaldoGravado").Text = string.Format("${0:N2}", aguinaldogravadoSubproyeto); gvrowSubProyecto.FCLabel("lblDescuento").Text = string.Format("${0:N2}", descuentoSubproyeto); + gvrowSubProyecto.FCLabel("lblAjuste").Text = string.Format("${0:N2}", ajusteSubproyeto); gvrowSubProyecto.FCLabel("lblsueldoAguinaldoCompleto").Text = string.Format("${0:N2}", aguinaldoSubproyeto); gvrowSubProyecto.FCLabel("lblAguinaldo").Text = string.Format("${0:N2}", AguinaldoapagarTotalSubproyeto); } @@ -511,7 +519,8 @@ public partial class Nomina_Aguinaldo : ClsPaginas aguinaldoSubproyeto = 0; AguinaldoapagarTotalSubproyeto = 0; descuentoSubproyeto = 0; - gvrow.CssClass = "Totales"; gvrow.FCTextBox("TxtDescuento").Visible = false; + ajusteSubproyeto = 0; + gvrow.CssClass = "Totales"; gvrow.FCTextBox("TxtDescuento").Visible = false; gvrow.FCTextBox("TxtAjuste").Visible = false; } } @@ -521,6 +530,7 @@ public partial class Nomina_Aguinaldo : ClsPaginas gvrowSubProyecto.FCLabel("lblISRAguinaldo").Text = string.Format("${0:N2}", ISRSubproyeto); gvrowSubProyecto.FCLabel("lblAguinaldoGravado").Text = string.Format("${0:N2}", aguinaldogravadoSubproyeto); gvrowSubProyecto.FCLabel("lblDescuento").Text = string.Format("${0:N2}", descuentoSubproyeto); + gvrowSubProyecto.FCLabel("lblAjuste").Text = string.Format("${0:N2}", ajusteSubproyeto); gvrowSubProyecto.FCLabel("lblsueldoAguinaldoCompleto").Text = string.Format("${0:N2}", aguinaldoSubproyeto); gvrowSubProyecto.FCLabel("lblAguinaldo").Text = string.Format("${0:N2}", AguinaldoapagarTotalSubproyeto); } @@ -529,6 +539,7 @@ public partial class Nomina_Aguinaldo : ClsPaginas gvrowTotal.FCLabel("lblISRAguinaldo").Text = string.Format("${0:N2}", ISRTOTAL); gvrowTotal.FCLabel("lblAguinaldoGravado").Text = string.Format("${0:N2}", aguinaldogravadoTotal); gvrowTotal.FCLabel("lblDescuento").Text = string.Format("${0:N2}", descuentoTotal); + gvrowTotal.FCLabel("lblAjuste").Text = string.Format("${0:N2}", ajusteTotal); gvrowTotal.FCLabel("lblsueldoAguinaldoCompleto").Text = string.Format("${0:N2}", aguinaldoTotal); gvrowTotal.FCLabel("lblAguinaldo").Text = string.Format("${0:N2}", AguinaldoapagarTotal); @@ -560,7 +571,8 @@ public partial class Nomina_Aguinaldo : ClsPaginas libro.Cell(fila, cxc++).Value = "Días Incapacidad";//lbldiasAguinaldoprop libro.Cell(fila, cxc++).Value = "Días base"; libro.Cell(fila, cxc++).Value = "Días aguinaldo";//lbldiasAguinaldoprop - libro.Cell(fila, cxc++).Value = "Aguinaldo completo"; + libro.Cell(fila, cxc++).Value = "Ajuste";//TxtAjuste + libro.Cell(fila, cxc++).Value = "Aguinaldo completo"; libro.Cell(fila, cxc++).Value = "Aguinaldo gravado"; libro.Cell(fila, cxc++).Value = "Aguinaldo exento"; libro.Cell(fila, cxc++).Value = "Fraccion I"; //lblFraccion1 @@ -603,6 +615,8 @@ public partial class Nomina_Aguinaldo : ClsPaginas libro.Cell(fila, cxc++).Value = gvrow.FCLabel("TxtdiasIncapacidad").Text.ToDecimal(); libro.Cell(fila, cxc++).Value = gvrow.FCLabel("TxtdiasAguinaldo").Text.ToDecimal(); libro.Cell(fila, cxc++).Value = gvrow.FCLabel("lbldiasAguinaldoprop").Text.ToDecimal(); + libro.Cell(fila, cxc++).Value = gvrow.FCTextBox("TxtAjuste").Text.ToDecimal(); + libro.Cell(fila, cxc++).Value = gvrow.FCLabel("lblsueldoAguinaldoCompleto").Text.ToDecimal(); libro.Cell(fila, cxc++).Value = gvrow.FCLabel("lblAguinaldoGravado").Text.ToDecimal(); libro.Cell(fila, cxc++).Value = gvrow.FCLabel("lblsueldoAguinaldoCompleto").Text.ToDecimal() - gvrow.FCLabel("lblAguinaldoGravado").Text.ToDecimal(); diff --git a/Nomina/CatPeriodos.aspx.vb b/Nomina/CatPeriodos.aspx.vb index 59330e05f..a5bda4d05 100644 --- a/Nomina/CatPeriodos.aspx.vb +++ b/Nomina/CatPeriodos.aspx.vb @@ -260,7 +260,7 @@ Partial Class Nomina_CatPeriodos Next If Comando = "Agregar" Then - If ObjNom_Periodos.AddPeriodo(CveTipoPeriodo, Ejercicio, Mes, Numero, FechaInicio, FechaFin, EsInicioMes, EsFinMes, EsInicioSS, EsFinSS, EsInicioAño, EsFinAño, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, DdlTurno.SelectedValue.ToEntero()) Then + If ObjNom_Periodos.AddPeriodo(CveTipoPeriodo, Ejercicio, Mes, Numero, FechaInicio, FechaFin, EsInicioMes, EsFinMes, EsInicioSS, EsFinSS, EsInicioAño, EsFinAño, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, DdlTurno.SelectedValue.ToEntero(), DdlEstatus.SelectedValue.ToEntero()) Then Alert("El nuevo Periodo se guardó correctamente.", TipoMensaje.MsgInformacion) UpDatos.Update() diff --git a/Sistemas/CatSesiones.aspx.vb b/Sistemas/CatSesiones.aspx.vb index 3700cf256..b75094412 100644 --- a/Sistemas/CatSesiones.aspx.vb +++ b/Sistemas/CatSesiones.aspx.vb @@ -233,6 +233,7 @@ Partial Class Sistemas_CatSesiones If ObjPS.GetMetodosInv() Then Application("GlobalDTInvMetodosInventario") = ObjPS.DtResultados Else Application("GlobalDTInvMetodosInventario") = Nothing 'If ObjPS.GetPSSimplificado(-1) Then Application("GlobalDTPSSimplificado") = ObjPS.DtResultados.AsEnumerable() Else Application("GlobalDTPSSimplificado") = Nothing ObjPS.Dispose() + GlobalDTClasificaciones(UsuarioActual.CveEmpresa) = Nothing GlobalDTPSSimplificado(UsuarioActual.CveEmpresa) = Nothing Using ObjVenta As New ClsVentas If ObjVenta.GetClasificacionDetalle(-1, CveClasificacion:=-1) Then @@ -602,6 +603,9 @@ Partial Class Sistemas_CatSesiones Private Sub Sistemas_CatSesiones_Load(sender As Object, e As EventArgs) Handles Me.Load Dim dominio As String = HttpContext.Current.Request.Url.GetLeftPart(UriPartial.Authority) + If Not Page.IsPostBack Then + GlobalDTRegimenesFiscales = Nothing + End If 'If Not dominio.Contains("gps.adsistemas") Then ' dominio = dominio.Replace("http", "https") ' Response.Redirect(dominio) diff --git a/packages.config b/packages.config index 2e3dd02b5..c3434bbfd 100644 --- a/packages.config +++ b/packages.config @@ -1,6 +1,6 @@  - +