Merge branch 'master' of http://agonzalez@192.168.10.111:8383/SIG.git
This commit is contained in:
539
.gitignore
vendored
539
.gitignore
vendored
@@ -1,270 +1,269 @@
|
||||
## Ignore Visual Studio temporary files, build results, and
|
||||
## files generated by popular Visual Studio add-ons.
|
||||
web.config
|
||||
Log.txt
|
||||
LogMail.txt
|
||||
LogPenske.txt
|
||||
LogTimbrado.txt
|
||||
[Mm]enu/
|
||||
[Tt]emp/
|
||||
[Ee]mpresas/
|
||||
# User-specific files
|
||||
*.suo
|
||||
*.user
|
||||
*.userosscache
|
||||
*.sln.docstates
|
||||
|
||||
# User-specific files (MonoDevelop/Xamarin Studio)
|
||||
*.userprefs
|
||||
|
||||
# Build results
|
||||
[Dd]ebug/
|
||||
[Dd]ebugPublic/
|
||||
[Rr]elease/
|
||||
[Rr]eleases/
|
||||
x64/
|
||||
x86/
|
||||
bld/
|
||||
[Bb]in/
|
||||
[Oo]bj/
|
||||
[Ll]og/
|
||||
|
||||
# Visual Studio 2015 cache/options directory
|
||||
.vs/
|
||||
# Uncomment if you have tasks that create the project's static files in wwwroot
|
||||
#wwwroot/
|
||||
|
||||
# MSTest test Results
|
||||
[Tt]est[Rr]esult*/
|
||||
[Bb]uild[Ll]og.*
|
||||
|
||||
# NUNIT
|
||||
*.VisualState.xml
|
||||
TestResult.xml
|
||||
|
||||
# Build Results of an ATL Project
|
||||
[Dd]ebugPS/
|
||||
[Rr]eleasePS/
|
||||
dlldata.c
|
||||
|
||||
# DNX
|
||||
project.lock.json
|
||||
project.fragment.lock.json
|
||||
artifacts/
|
||||
|
||||
*_i.c
|
||||
*_p.c
|
||||
*_i.h
|
||||
*.ilk
|
||||
*.meta
|
||||
*.obj
|
||||
*.pch
|
||||
*.pdb
|
||||
*.pgc
|
||||
*.pgd
|
||||
*.rsp
|
||||
*.sbr
|
||||
*.tlb
|
||||
*.tli
|
||||
*.tlh
|
||||
*.tmp
|
||||
*.tmp_proj
|
||||
*.log
|
||||
*.vspscc
|
||||
*.vssscc
|
||||
.builds
|
||||
*.pidb
|
||||
*.svclog
|
||||
*.scc
|
||||
|
||||
# Chutzpah Test files
|
||||
_Chutzpah*
|
||||
|
||||
# Visual C++ cache files
|
||||
ipch/
|
||||
*.aps
|
||||
*.ncb
|
||||
*.opendb
|
||||
*.opensdf
|
||||
*.sdf
|
||||
*.cachefile
|
||||
*.VC.db
|
||||
*.VC.VC.opendb
|
||||
|
||||
# Visual Studio profiler
|
||||
*.psess
|
||||
*.vsp
|
||||
*.vspx
|
||||
*.sap
|
||||
|
||||
# TFS 2012 Local Workspace
|
||||
$tf/
|
||||
|
||||
# Guidance Automation Toolkit
|
||||
*.gpState
|
||||
|
||||
# ReSharper is a .NET coding add-in
|
||||
_ReSharper*/
|
||||
*.[Rr]e[Ss]harper
|
||||
*.DotSettings.user
|
||||
|
||||
# JustCode is a .NET coding add-in
|
||||
.JustCode
|
||||
|
||||
# TeamCity is a build add-in
|
||||
_TeamCity*
|
||||
|
||||
# DotCover is a Code Coverage Tool
|
||||
*.dotCover
|
||||
|
||||
# NCrunch
|
||||
_NCrunch_*
|
||||
.*crunch*.local.xml
|
||||
nCrunchTemp_*
|
||||
|
||||
# MightyMoose
|
||||
*.mm.*
|
||||
AutoTest.Net/
|
||||
|
||||
# Web workbench (sass)
|
||||
.sass-cache/
|
||||
|
||||
# Installshield output folder
|
||||
[Ee]xpress/
|
||||
|
||||
# DocProject is a documentation generator add-in
|
||||
DocProject/buildhelp/
|
||||
DocProject/Help/*.HxT
|
||||
DocProject/Help/*.HxC
|
||||
DocProject/Help/*.hhc
|
||||
DocProject/Help/*.hhk
|
||||
DocProject/Help/*.hhp
|
||||
DocProject/Help/Html2
|
||||
DocProject/Help/html
|
||||
|
||||
# Click-Once directory
|
||||
publish/
|
||||
|
||||
# Publish Web Output
|
||||
*.[Pp]ublish.xml
|
||||
*.azurePubxml
|
||||
# TODO: Comment the next line if you want to checkin your web deploy settings
|
||||
# but database connection strings (with potential passwords) will be unencrypted
|
||||
#*.pubxml
|
||||
*.publishproj
|
||||
|
||||
# Microsoft Azure Web App publish settings. Comment the next line if you want to
|
||||
# checkin your Azure Web App publish settings, but sensitive information contained
|
||||
# in these scripts will be unencrypted
|
||||
PublishScripts/
|
||||
|
||||
# NuGet Packages
|
||||
*.nupkg
|
||||
# The packages folder can be ignored because of Package Restore
|
||||
**/packages/*
|
||||
# except build/, which is used as an MSBuild target.
|
||||
!**/packages/build/
|
||||
# Uncomment if necessary however generally it will be regenerated when needed
|
||||
#!**/packages/repositories.config
|
||||
# NuGet v3's project.json files produces more ignoreable files
|
||||
*.nuget.props
|
||||
*.nuget.targets
|
||||
|
||||
# Microsoft Azure Build Output
|
||||
csx/
|
||||
*.build.csdef
|
||||
|
||||
# Microsoft Azure Emulator
|
||||
ecf/
|
||||
rcf/
|
||||
|
||||
# Windows Store app package directories and files
|
||||
AppPackages/
|
||||
BundleArtifacts/
|
||||
Package.StoreAssociation.xml
|
||||
_pkginfo.txt
|
||||
|
||||
# Visual Studio cache files
|
||||
# files ending in .cache can be ignored
|
||||
*.[Cc]ache
|
||||
# but keep track of directories ending in .cache
|
||||
!*.[Cc]ache/
|
||||
|
||||
# Others
|
||||
ClientBin/
|
||||
~$*
|
||||
*~
|
||||
*.dbmdl
|
||||
*.dbproj.schemaview
|
||||
*.jfm
|
||||
*.pfx
|
||||
*.publishsettings
|
||||
node_modules/
|
||||
orleans.codegen.cs
|
||||
|
||||
# Since there are multiple workflows, uncomment next line to ignore bower_components
|
||||
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
|
||||
#bower_components/
|
||||
|
||||
# RIA/Silverlight projects
|
||||
Generated_Code/
|
||||
|
||||
# Backup & report files from converting an old project file
|
||||
# to a newer Visual Studio version. Backup files are not needed,
|
||||
# because we have git ;-)
|
||||
_UpgradeReport_Files/
|
||||
Backup*/
|
||||
UpgradeLog*.XML
|
||||
UpgradeLog*.htm
|
||||
|
||||
# SQL Server files
|
||||
*.mdf
|
||||
*.ldf
|
||||
|
||||
# Business Intelligence projects
|
||||
*.rdl.data
|
||||
*.bim.layout
|
||||
*.bim_*.settings
|
||||
|
||||
# Microsoft Fakes
|
||||
FakesAssemblies/
|
||||
|
||||
# GhostDoc plugin setting file
|
||||
*.GhostDoc.xml
|
||||
|
||||
# Node.js Tools for Visual Studio
|
||||
.ntvs_analysis.dat
|
||||
|
||||
# Visual Studio 6 build log
|
||||
*.plg
|
||||
|
||||
# Visual Studio 6 workspace options file
|
||||
*.opt
|
||||
|
||||
# Visual Studio LightSwitch build output
|
||||
**/*.HTMLClient/GeneratedArtifacts
|
||||
**/*.DesktopClient/GeneratedArtifacts
|
||||
**/*.DesktopClient/ModelManifest.xml
|
||||
**/*.Server/GeneratedArtifacts
|
||||
**/*.Server/ModelManifest.xml
|
||||
_Pvt_Extensions
|
||||
|
||||
# Paket dependency manager
|
||||
.paket/paket.exe
|
||||
paket-files/
|
||||
|
||||
# FAKE - F# Make
|
||||
.fake/
|
||||
|
||||
# JetBrains Rider
|
||||
.idea/
|
||||
*.sln.iml
|
||||
*.sln.iml
|
||||
|
||||
# CodeRush
|
||||
.cr/
|
||||
|
||||
# Python Tools for Visual Studio (PTVS)
|
||||
__pycache__/
|
||||
*.pyc
|
||||
/SIGGIT.sln
|
||||
## Ignore Visual Studio temporary files, build results, and
|
||||
## files generated by popular Visual Studio add-ons.
|
||||
web.config
|
||||
Log.txt
|
||||
LogMail.txt
|
||||
LogPenske.txt
|
||||
LogTimbrado.txt
|
||||
[Mm]enu/
|
||||
[Tt]emp/
|
||||
[Ee]mpresas/
|
||||
# User-specific files
|
||||
*.suo
|
||||
*.user
|
||||
*.userosscache
|
||||
*.sln.docstates
|
||||
|
||||
# User-specific files (MonoDevelop/Xamarin Studio)
|
||||
*.userprefs
|
||||
|
||||
# Build results
|
||||
[Dd]ebug/
|
||||
[Dd]ebugPublic/
|
||||
[Rr]elease/
|
||||
[Rr]eleases/
|
||||
x64/
|
||||
x86/
|
||||
bld/
|
||||
[Bb]in/
|
||||
[Oo]bj/
|
||||
[Ll]og/
|
||||
|
||||
# Visual Studio 2015 cache/options directory
|
||||
.vs/
|
||||
# Uncomment if you have tasks that create the project's static files in wwwroot
|
||||
#wwwroot/
|
||||
|
||||
# MSTest test Results
|
||||
[Tt]est[Rr]esult*/
|
||||
[Bb]uild[Ll]og.*
|
||||
|
||||
# NUNIT
|
||||
*.VisualState.xml
|
||||
TestResult.xml
|
||||
|
||||
# Build Results of an ATL Project
|
||||
[Dd]ebugPS/
|
||||
[Rr]eleasePS/
|
||||
dlldata.c
|
||||
|
||||
# DNX
|
||||
project.lock.json
|
||||
project.fragment.lock.json
|
||||
artifacts/
|
||||
|
||||
*_i.c
|
||||
*_p.c
|
||||
*_i.h
|
||||
*.ilk
|
||||
*.meta
|
||||
*.obj
|
||||
*.pch
|
||||
*.pdb
|
||||
*.pgc
|
||||
*.pgd
|
||||
*.rsp
|
||||
*.sbr
|
||||
*.tlb
|
||||
*.tli
|
||||
*.tlh
|
||||
*.tmp
|
||||
*.tmp_proj
|
||||
*.log
|
||||
*.vspscc
|
||||
*.vssscc
|
||||
.builds
|
||||
*.pidb
|
||||
*.svclog
|
||||
*.scc
|
||||
|
||||
# Chutzpah Test files
|
||||
_Chutzpah*
|
||||
|
||||
# Visual C++ cache files
|
||||
ipch/
|
||||
*.aps
|
||||
*.ncb
|
||||
*.opendb
|
||||
*.opensdf
|
||||
*.sdf
|
||||
*.cachefile
|
||||
*.VC.db
|
||||
*.VC.VC.opendb
|
||||
|
||||
# Visual Studio profiler
|
||||
*.psess
|
||||
*.vsp
|
||||
*.vspx
|
||||
*.sap
|
||||
|
||||
# TFS 2012 Local Workspace
|
||||
$tf/
|
||||
|
||||
# Guidance Automation Toolkit
|
||||
*.gpState
|
||||
|
||||
# ReSharper is a .NET coding add-in
|
||||
_ReSharper*/
|
||||
*.[Rr]e[Ss]harper
|
||||
*.DotSettings.user
|
||||
|
||||
# JustCode is a .NET coding add-in
|
||||
.JustCode
|
||||
|
||||
# TeamCity is a build add-in
|
||||
_TeamCity*
|
||||
|
||||
# DotCover is a Code Coverage Tool
|
||||
*.dotCover
|
||||
|
||||
# NCrunch
|
||||
_NCrunch_*
|
||||
.*crunch*.local.xml
|
||||
nCrunchTemp_*
|
||||
|
||||
# MightyMoose
|
||||
*.mm.*
|
||||
AutoTest.Net/
|
||||
|
||||
# Web workbench (sass)
|
||||
.sass-cache/
|
||||
|
||||
# Installshield output folder
|
||||
[Ee]xpress/
|
||||
|
||||
# DocProject is a documentation generator add-in
|
||||
DocProject/buildhelp/
|
||||
DocProject/Help/*.HxT
|
||||
DocProject/Help/*.HxC
|
||||
DocProject/Help/*.hhc
|
||||
DocProject/Help/*.hhk
|
||||
DocProject/Help/*.hhp
|
||||
DocProject/Help/Html2
|
||||
DocProject/Help/html
|
||||
|
||||
# Click-Once directory
|
||||
publish/
|
||||
|
||||
# Publish Web Output
|
||||
*.[Pp]ublish.xml
|
||||
*.azurePubxml
|
||||
# TODO: Comment the next line if you want to checkin your web deploy settings
|
||||
# but database connection strings (with potential passwords) will be unencrypted
|
||||
#*.pubxml
|
||||
*.publishproj
|
||||
|
||||
# Microsoft Azure Web App publish settings. Comment the next line if you want to
|
||||
# checkin your Azure Web App publish settings, but sensitive information contained
|
||||
# in these scripts will be unencrypted
|
||||
PublishScripts/
|
||||
|
||||
# NuGet Packages
|
||||
*.nupkg
|
||||
# The packages folder can be ignored because of Package Restore
|
||||
**/packages/*
|
||||
# except build/, which is used as an MSBuild target.
|
||||
!**/packages/build/
|
||||
# Uncomment if necessary however generally it will be regenerated when needed
|
||||
#!**/packages/repositories.config
|
||||
# NuGet v3's project.json files produces more ignoreable files
|
||||
*.nuget.props
|
||||
*.nuget.targets
|
||||
|
||||
# Microsoft Azure Build Output
|
||||
csx/
|
||||
*.build.csdef
|
||||
|
||||
# Microsoft Azure Emulator
|
||||
ecf/
|
||||
rcf/
|
||||
|
||||
# Windows Store app package directories and files
|
||||
AppPackages/
|
||||
BundleArtifacts/
|
||||
Package.StoreAssociation.xml
|
||||
_pkginfo.txt
|
||||
|
||||
# Visual Studio cache files
|
||||
# files ending in .cache can be ignored
|
||||
*.[Cc]ache
|
||||
# but keep track of directories ending in .cache
|
||||
!*.[Cc]ache/
|
||||
|
||||
# Others
|
||||
ClientBin/
|
||||
~$*
|
||||
*~
|
||||
*.dbmdl
|
||||
*.dbproj.schemaview
|
||||
*.jfm
|
||||
*.pfx
|
||||
*.publishsettings
|
||||
node_modules/
|
||||
orleans.codegen.cs
|
||||
|
||||
# Since there are multiple workflows, uncomment next line to ignore bower_components
|
||||
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
|
||||
#bower_components/
|
||||
|
||||
# RIA/Silverlight projects
|
||||
Generated_Code/
|
||||
|
||||
# Backup & report files from converting an old project file
|
||||
# to a newer Visual Studio version. Backup files are not needed,
|
||||
# because we have git ;-)
|
||||
_UpgradeReport_Files/
|
||||
Backup*/
|
||||
UpgradeLog*.XML
|
||||
UpgradeLog*.htm
|
||||
|
||||
# SQL Server files
|
||||
*.mdf
|
||||
*.ldf
|
||||
|
||||
# Business Intelligence projects
|
||||
*.rdl.data
|
||||
*.bim.layout
|
||||
*.bim_*.settings
|
||||
|
||||
# Microsoft Fakes
|
||||
FakesAssemblies/
|
||||
|
||||
# GhostDoc plugin setting file
|
||||
*.GhostDoc.xml
|
||||
|
||||
# Node.js Tools for Visual Studio
|
||||
.ntvs_analysis.dat
|
||||
|
||||
# Visual Studio 6 build log
|
||||
*.plg
|
||||
|
||||
# Visual Studio 6 workspace options file
|
||||
*.opt
|
||||
|
||||
# Visual Studio LightSwitch build output
|
||||
**/*.HTMLClient/GeneratedArtifacts
|
||||
**/*.DesktopClient/GeneratedArtifacts
|
||||
**/*.DesktopClient/ModelManifest.xml
|
||||
**/*.Server/GeneratedArtifacts
|
||||
**/*.Server/ModelManifest.xml
|
||||
_Pvt_Extensions
|
||||
|
||||
# Paket dependency manager
|
||||
.paket/paket.exe
|
||||
paket-files/
|
||||
|
||||
# FAKE - F# Make
|
||||
.fake/
|
||||
|
||||
# JetBrains Rider
|
||||
.idea/
|
||||
*.sln.iml
|
||||
|
||||
# CodeRush
|
||||
.cr/
|
||||
|
||||
# Python Tools for Visual Studio (PTVS)
|
||||
__pycache__/
|
||||
*.pyc
|
||||
/Utilerias
|
||||
|
||||
@@ -389,7 +389,17 @@ Public Class ClsPaginas
|
||||
|
||||
Property GlobalDTPSATUM() As DataTable
|
||||
Get
|
||||
GlobalDTPSATUM = DirectCast(Application("GlobalDTPSATUM"), DataTable)
|
||||
|
||||
'System.Data.EnumerableRowCollection
|
||||
If Not IsNothing(Application("GlobalDTPSATUM")) Then
|
||||
If Application("GlobalDTPSATUM").GetType().IsSubclassOf(GetType(EnumerableRowCollection)) Then
|
||||
Return DirectCast(Application("GlobalDTPSATUM"), EnumerableRowCollection(Of DataRow)).CopyToDataTable()
|
||||
Else
|
||||
Return DirectCast(Application("GlobalDTPSATUM"), DataTable)
|
||||
End If
|
||||
Else
|
||||
Return Nothing
|
||||
End If
|
||||
End Get
|
||||
Set(value As DataTable)
|
||||
Application("GlobalDTPSATUM") = value
|
||||
@@ -3308,9 +3318,6 @@ Public Class ClsPaginas
|
||||
|
||||
|
||||
|
||||
'Protected Overridable Sub Page_PreRender(sender As Object, e As EventArgs) Handles Me.PreRender
|
||||
|
||||
'End Sub
|
||||
Private Function Obt_ClavePagina(Pagina As String) As Integer
|
||||
Dim Retorno As Integer
|
||||
|
||||
@@ -3320,7 +3327,7 @@ Public Class ClsPaginas
|
||||
PaginaDict = New System.Collections.Hashtable
|
||||
|
||||
PaginaDict.Add("/Inicio.aspx".ToUpper(), -1)
|
||||
|
||||
PaginaDict.Add("/Ventas/RepConciliacionEmitidosSat.aspx".ToUpper(), -1)
|
||||
|
||||
PaginaDict.Add("/Nomina/CatConceptos2.aspx".ToUpper(), -1)
|
||||
PaginaDict.Add("/Nomina/Aguinaldo.aspx".ToUpper(), -1)
|
||||
@@ -4661,11 +4668,14 @@ Public Class ClsPaginas
|
||||
Mensaje.Alert(Mensaje, pOpcion, JSBtnAceptar, TimeoutToast:=timeout)
|
||||
End If
|
||||
End Sub
|
||||
Protected Overrides Sub SavePageStateToPersistenceMedium(pviewState As Object)
|
||||
Protected Overridable Sub Page_PreRender(sender As Object, e As EventArgs) Handles Me.PreRender
|
||||
If Not IsNothing(ViewState("strToastMsglargonoreplace")) AndAlso ViewState("strToastMsglargonoreplace").ToString.Length > 0 Then
|
||||
RegistraScript(ViewState("strToastMsglargonoreplace").ToString(), "esteseraunticklargoparaquenosesobrescribaconotro")
|
||||
ViewState("strToastMsglargonoreplace") = Nothing
|
||||
End If
|
||||
|
||||
End Sub
|
||||
Protected Overrides Sub SavePageStateToPersistenceMedium(pviewState As Object)
|
||||
'If Request.Form("__VIEWSTATE_KEY") IsNot Nothing Then Cache.Remove(Request.Form("__VIEWSTATE_KEY")) 'elimino la cachado anteriormente
|
||||
Dim VSKey As String = String.Format("VIEWSTATE_{0}_{1}_{2}", Session.SessionID, Request.Path, Date.Now.Ticks)
|
||||
'Cache.Add(VSKey, pviewState, Nothing, Date.Now.AddMinutes(60), Cache.NoSlidingExpiration, CacheItemPriority.Default, Nothing) 'Store the ViewState on Cache
|
||||
|
||||
@@ -2376,13 +2376,18 @@ Partial Class Bancos_IE
|
||||
|
||||
'valida prepoliza
|
||||
If CvePrePoliza > 0 Then
|
||||
Dim Conc As String = If(TxtObservaciones.Text = "", TxtFolio.Text, TxtObservaciones.Text)
|
||||
Dim Ref As String = If(TxtObservaciones.Text = "", TxtFolio.Text, TxtObservaciones.Text)
|
||||
|
||||
Dim Folio As String = ""
|
||||
|
||||
CveIE = ObjIE.AddBancos_IE(DdlCuenta.SelectedValue.ToEntero, DdlTipoTransaccion.SelectedValue.ToEntero, TxtFechaDocumento.Text.Trim.ToDate, TxtFolio.Text.Trim, PagueseA, TxtImporte.Text.Trim.ToDouble, DdlMoneda.SelectedValue.ToEntero,
|
||||
TxtTipoCambio.Text.Trim.ToDouble, TxtObservaciones.Text.Trim, TxtNotificarA.Text.Trim, ChkAbonoCuenta.Checked, ChkAplicaImpuestos.Checked, -1, CvePrePoliza, Comprobante, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveCuentaDeposito:=CveCuentaDeposito, CveEstatusIE:=DdlEstatusIE.SelectedValue.ToString.ToEntero, Referencia:=If(TxtReferenciaCIE.Visible, TxtReferenciaCIE.Text, "-1"), CveCuentaTarjeta:=If(DivTarjeta.Visible, DdlTarjeta.SelectedValue.ToEntero, -1))
|
||||
|
||||
If ObjIE.GetBancosIE(CveIE, UsuarioActual.CveEmpresa) Then
|
||||
Folio = ObjIE.Folio
|
||||
End If
|
||||
|
||||
Dim Conc As String = If(TxtObservaciones.Text = "", Folio, TxtObservaciones.Text)
|
||||
Dim Ref As String = If(TxtObservaciones.Text = "", Folio, TxtObservaciones.Text)
|
||||
|
||||
If CveIE > 0 Then
|
||||
|
||||
If Comprobante <> "" Then
|
||||
@@ -2562,7 +2567,7 @@ Partial Class Bancos_IE
|
||||
Dim ImporteAplicar = 0.0D
|
||||
Dim ImporteAplicarMN = 0.0D
|
||||
Dim ImporteAplicarME = 0.0D
|
||||
Dim ReferenciaAplicar = TxtFolio.Text
|
||||
Dim ReferenciaAplicar = Folio
|
||||
Dim ConceptoAplicar = $"Devolución al cliente {PagueseA} {TxtImporte.Text} NC:{SerieFolioDevDin}"
|
||||
|
||||
ImporteAplicar = TxtImporte.Text.ToDecimal
|
||||
@@ -2643,7 +2648,7 @@ Partial Class Bancos_IE
|
||||
Dim ImporteAplicar = 0.0D
|
||||
Dim ImporteAplicarMN = 0.0D
|
||||
Dim ImporteAplicarME = 0.0D
|
||||
Dim ReferenciaAplicar = TxtFolio.Text
|
||||
Dim ReferenciaAplicar = Folio
|
||||
|
||||
Dim ConceptoAplicar = $"Devolución de Proveedor {PagueseA} {TxtImporte.Text} NC:{SerieFolioDeCDin}"
|
||||
|
||||
@@ -3038,11 +3043,11 @@ Partial Class Bancos_IE
|
||||
If DdlTipoTransaccion.SelectedValue = "1" Then TipoChq = "CHQ"
|
||||
ConceptoRenglon = String.Format("Anticipo {0}", PagueseA)
|
||||
|
||||
IDPoliza = Conta.AddPoliza(2, ConceptoRenglon, Total, Total, UsuarioActual.CveUsuario, Fecha, TxtFolio.Text, TipoChq)
|
||||
IDPoliza = Conta.AddPoliza(2, ConceptoRenglon, Total, Total, UsuarioActual.CveUsuario, Fecha, Folio, TipoChq)
|
||||
|
||||
If IDPoliza > 0 Then
|
||||
FolioPoliza = Conta.Folio
|
||||
Referencia = TxtFolio.Text
|
||||
Referencia = Folio
|
||||
ConceptoRenglon = String.Format("Anticipo {0} {1}", PagueseA, TxtObservaciones.Text)
|
||||
|
||||
Total = TxtImporte.Text.ToDouble
|
||||
|
||||
@@ -589,6 +589,8 @@
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<asp:DropDownList ID="Ddlcliente" OnSelectedIndexChanged="Ddlcliente_SelectedIndexChanged" AppendDataBoundItems="true" AutoPostBack="true" CssClass="select2me" Width="100%" DataTextField="Nombre" DataValueField="CveCliente" runat="server"></asp:DropDownList>
|
||||
<%-- <asp:RangeValidator ID="RVCliente" CssClass="form-control" runat="server" ControlToValidate="Ddlcliente" Display="None" Type="Integer" MinimumValue="1" MaximumValue="2147483647" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Cliente''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpGuardar"></asp:RangeValidator>
|
||||
<ajax:ValidatorCalloutExtender ID="VCECliente" runat="server" HighlightCssClass="vco" TargetControlID="RVCliente" Width="300px"></ajax:ValidatorCalloutExtender>--%>
|
||||
</div>
|
||||
<div class="col-md-1" style="max-width: 75px;">
|
||||
Vendedor:
|
||||
|
||||
@@ -2219,6 +2219,12 @@ Partial Class OC
|
||||
End Function
|
||||
Protected Sub BtnGuardar_Click(sender As Object, e As EventArgs) Handles BtnGuardar.Click
|
||||
|
||||
'Entrega Directa requiere Cliente y Vendedor
|
||||
If ChkEntregaDirecta.Checked And Ddlcliente.SelectedValue.ToEntero <= 0 Then
|
||||
Alert("Al ser una Entrega Directa es necesario seleccionar un cliente, por favor seleccione uno.")
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
'VALIDACIONES PARA GUARDAR
|
||||
If ValidaGuardar() Then Exit Sub
|
||||
|
||||
|
||||
@@ -15,14 +15,14 @@ Partial Class SessionesActivas
|
||||
End Set
|
||||
End Property
|
||||
Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
If Not IsPostBack Then
|
||||
|
||||
' Dim listacve As New List(Of String)
|
||||
' listacve.Add("1815")
|
||||
' Notificaciones.AlertaVentana("notificacion", listacve, timeoutseconds:=0)
|
||||
|
||||
' RCveUsuario = "0"
|
||||
'ClsSisNotificaciones.SendNotificacionERP(100, "Titulo", "Hola Mundo", 1)
|
||||
If Not IsPostBack Then
|
||||
|
||||
' Dim listacve As New List(Of String)
|
||||
' listacve.Add("1815")
|
||||
' Notificaciones.AlertaVentana("notificacion", listacve, timeoutseconds:=0)
|
||||
|
||||
' RCveUsuario = "0"
|
||||
'ClsSisNotificaciones.SendNotificacionERP(100, "Titulo", "Hola Mundo", 1)
|
||||
CargaDatos("")
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -98,10 +98,11 @@
|
||||
<ItemTemplate>
|
||||
<%--<asp:Label ID="lblrutaXml" runat="server" Text='<%# Eval("RutaXml")%>'> </asp:Label>--%>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="">
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton ID="LnkRegistrar" runat="server" data-toggle="tooltip" ToolTip="Registrar" CssClass="btn btn-circle btn-sm blue" OnClick="LnkRegistrar_Click"><i class="fa fa-plus"></i></asp:LinkButton>
|
||||
<asp:HyperLink runat="server" NavigateUrl='<%# Eval("CveVenta","/Ventas/Ventas.aspx?CveVenta={0}") %>' CssClass="btn btn-circle btn-sm btn-success" Visible='<%# (Eval("CveVenta").ToString() =="" ? false :true) %>' ><i class="fa fa-info"></i>r</asp:HyperLink>
|
||||
<asp:LinkButton ID="LnkRegistrar" Visible='<%# Eval("CveVenta").ToString() =="" %>' runat="server" data-toggle="tooltip" ToolTip="Registrar" CssClass="btn btn-circle btn-sm blue" OnClick="LnkRegistrar_Click"><i class="fa fa-plus"></i></asp:LinkButton>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
|
||||
@@ -24,6 +24,7 @@ public partial class Ventas_RepConciliacionEmitidosSat : ClsPaginas
|
||||
DdlSubProyectoDatos.DataSource = get_GlobalDTSubProyectosUsuarios(UsuarioActual.CveUsuario, -1, UsuarioActual.CveEmpresa, -1, 1).FiltraParametros("EsSucursal = True ");
|
||||
DdlSubProyectoDatos.DataBind();
|
||||
DdlClasificacion.DataSource = get_GlobalDTClasificaciones(UsuarioActual.CveEmpresa, UsoClasificacion: 1).FiltraParametros(" Codigo = '' OR Codigo IS NULL ", Orderby: "Clasificacion");
|
||||
|
||||
DdlClasificacion.DataBind();
|
||||
|
||||
|
||||
@@ -43,98 +44,184 @@ public partial class Ventas_RepConciliacionEmitidosSat : ClsPaginas
|
||||
DdlPS.setEsWebService(false);
|
||||
DdlPS.ddl.DataSource = get_GlobalDTPSSimplificado(UsuarioActual.CveEmpresa, CveClasificacion: CveClasificacion, Estatus: 1, AplicaParaVenta: 1);
|
||||
DdlPS.ddl.DataBind();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
protected void CargaConciliacionemitidasSATGet()
|
||||
{
|
||||
ClsVentas ObjV = new ClsVentas();
|
||||
ObjV.ConciliacionemitidasSATGet(UsuarioActual.CveEmpresa);
|
||||
GVConciliacionemitidasSAT.DataSource = ObjV.DtResultados;
|
||||
GVConciliacionemitidasSAT.DataSource = ObjV.DtResultados.FiltraParametros("", "CveVenta");
|
||||
ObjV.Dispose();
|
||||
GVConciliacionemitidasSAT.DataBind();
|
||||
UpDatosReporte.Update();
|
||||
|
||||
}
|
||||
private void registrarventa(GridViewRow gvrow)
|
||||
{
|
||||
|
||||
{
|
||||
|
||||
string ruta = gvrow.DataKey("RutaXml");
|
||||
strErrores = new StringBuilder();
|
||||
XmlSatCFDI objxml = null;
|
||||
Modelos.Factura objfact = null;
|
||||
bool continuar = true;
|
||||
objxml = XmlSatCFDI.readXML(ruta);
|
||||
continuar = continuar && (objxml != null);
|
||||
if (continuar)
|
||||
{
|
||||
|
||||
objfact = GetFacturaFromXML(objxml);
|
||||
}
|
||||
continuar = continuar && (objfact != null);
|
||||
if (continuar)
|
||||
{
|
||||
|
||||
// Dim As New (ObjVentas.IniciaTransacSQL())
|
||||
// Dim As = Nothing
|
||||
// Dim MensajeAlert = New StringBuilder
|
||||
ClsVentas ObjVentas = new ClsVentas();
|
||||
ClsInventarios ObjInventario = new ClsInventarios(ObjVentas.IniciaTransacSQL());
|
||||
ClsContabilidad ObjConta = new ClsContabilidad(ObjVentas.IniciaTransacSQL());
|
||||
ClsContratos ObjContr = new ClsContratos(ObjVentas.IniciaTransacSQL());
|
||||
ClsOS ObjOS = new ClsOS(ObjVentas.IniciaTransacSQL());
|
||||
ClsBancos ObjBancos = new ClsBancos(ObjVentas.IniciaTransacSQL());
|
||||
ClsClientes ObjClientes = new ClsClientes(ObjVentas.IniciaTransacSQL());
|
||||
ClsOIEventos ObjEventos = new ClsOIEventos(ObjVentas.IniciaTransacSQL());
|
||||
ClsCGame ObjCGame = new ClsCGame(ObjVentas.IniciaTransacSQL());
|
||||
ClsEdocumentacion ObjDocCliente = new ClsEdocumentacion(ObjVentas.IniciaTransacSQL());
|
||||
ClsAcumuladores ObjAcum = new ClsAcumuladores(ObjVentas.IniciaTransacSQL());
|
||||
ClsContPAQi ObjContPaq = null;
|
||||
//StringBuilder MensajeAlert = new StringBuilder() ;
|
||||
try
|
||||
{
|
||||
objfact.GuardarVenta(ref objfact, ref ObjVentas, ref ObjConta, ref ObjInventario, ref ObjContr, ref objfact.DtDetalle, objfact.CveNCaVincular, ref ObjContPaq, ref ObjBancos, ref ObjOS, ref ObjEventos, ref ObjCGame, ref ObjClientes, ObjAcum: ObjAcum);
|
||||
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
objfact.CveVenta = -1;
|
||||
}
|
||||
if (ObjVentas.UpdateEstatusFactura(3, objxml.complemento.UUID, "", DateTime.ParseExact(objxml.comprobante.Fecha.Replace("T", " "), "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture), ObjVentas.CveVenta, CvePAC: 4))
|
||||
if (objfact.CveVenta > 0 && objfact.ErrorList.Count == 0)
|
||||
{
|
||||
ObjVentas.Commit();
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (string item in objfact.ErrorList)
|
||||
{
|
||||
strErrores.AppendLine("<br/>");
|
||||
strErrores.AppendLine(item);
|
||||
}
|
||||
objfact.CveVenta = -1;
|
||||
ObjVentas.RollBack();
|
||||
}
|
||||
ObjVentas.Dispose();
|
||||
ObjConta.Dispose();
|
||||
ObjInventario.Dispose();
|
||||
ObjCGame.Dispose();
|
||||
ObjContr.Dispose();
|
||||
ObjDocCliente.Dispose();
|
||||
ObjClientes.Dispose();
|
||||
ObjAcum.Dispose();
|
||||
|
||||
}
|
||||
if (objfact != null && objfact.CveVenta > 0)
|
||||
{
|
||||
CargaConciliacionemitidasSATGet();
|
||||
Alert($"se ha agregado la factura correctamente.<br/> <a href=\"/Ventas/Ventas.aspx?CveVenta={objfact.CveVenta}\" > Ver Factura </a>", ModExtensiones.TipoMensaje.ToastInformacion, timeout: 25);
|
||||
}
|
||||
else { continuar = false; }
|
||||
if (!continuar)
|
||||
{
|
||||
Alert($"no se pudo agregar la factura {strErrores.ToString()}", ModExtensiones.TipoMensaje.MsgAdvertencia);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected void LnkRegistrar_Click(object sender, EventArgs e)
|
||||
{
|
||||
GridViewRow gvrow = (GridViewRow)(((LinkButton)sender).NamingContainer);
|
||||
string ruta = gvrow.DataKey("RutaXml");
|
||||
strErrores = new StringBuilder();
|
||||
XmlSatCFDI objxml = null;
|
||||
Modelos.Factura objfact = null;
|
||||
bool continuar = true;
|
||||
objxml = XmlSatCFDI.readXML(ruta);
|
||||
continuar = continuar && (objxml != null);
|
||||
if (continuar)
|
||||
{
|
||||
registrarventa(gvrow);
|
||||
//string ruta = gvrow.DataKey("RutaXml");
|
||||
//strErrores = new StringBuilder();
|
||||
//XmlSatCFDI objxml = null;
|
||||
//Modelos.Factura objfact = null;
|
||||
//bool continuar = true;
|
||||
//objxml = XmlSatCFDI.readXML(ruta);
|
||||
//continuar = continuar && (objxml != null);
|
||||
//if (continuar)
|
||||
//{
|
||||
|
||||
objfact = GetFacturaFromXML(objxml);
|
||||
}
|
||||
continuar = continuar && (objfact != null);
|
||||
if (continuar)
|
||||
{
|
||||
// objfact = GetFacturaFromXML(objxml);
|
||||
//}
|
||||
//continuar = continuar && (objfact != null);
|
||||
//if (continuar)
|
||||
//{
|
||||
|
||||
// Dim As New (ObjVentas.IniciaTransacSQL())
|
||||
// Dim As = Nothing
|
||||
// Dim MensajeAlert = New StringBuilder
|
||||
ClsVentas ObjVentas = new ClsVentas();
|
||||
ClsInventarios ObjInventario = new ClsInventarios(ObjVentas.IniciaTransacSQL());
|
||||
ClsContabilidad ObjConta = new ClsContabilidad(ObjVentas.IniciaTransacSQL());
|
||||
ClsContratos ObjContr = new ClsContratos(ObjVentas.IniciaTransacSQL());
|
||||
ClsOS ObjOS = new ClsOS(ObjVentas.IniciaTransacSQL());
|
||||
ClsBancos ObjBancos = new ClsBancos(ObjVentas.IniciaTransacSQL());
|
||||
ClsClientes ObjClientes = new ClsClientes(ObjVentas.IniciaTransacSQL());
|
||||
ClsOIEventos ObjEventos = new ClsOIEventos(ObjVentas.IniciaTransacSQL());
|
||||
ClsCGame ObjCGame = new ClsCGame(ObjVentas.IniciaTransacSQL());
|
||||
ClsEdocumentacion ObjDocCliente = new ClsEdocumentacion(ObjVentas.IniciaTransacSQL());
|
||||
ClsAcumuladores ObjAcum = new ClsAcumuladores(ObjVentas.IniciaTransacSQL());
|
||||
ClsContPAQi ObjContPaq = null;
|
||||
//StringBuilder MensajeAlert = new StringBuilder() ;
|
||||
try
|
||||
{
|
||||
objfact.GuardarVenta(ref objfact, ref ObjVentas, ref ObjConta, ref ObjInventario, ref ObjContr, ref objfact.DtDetalle, objfact.CveNCaVincular, ref ObjContPaq, ref ObjBancos, ref ObjOS, ref ObjEventos, ref ObjCGame, ref ObjClientes, ObjAcum: ObjAcum);
|
||||
// // Dim As New (ObjVentas.IniciaTransacSQL())
|
||||
// // Dim As = Nothing
|
||||
// // Dim MensajeAlert = New StringBuilder
|
||||
// ClsVentas ObjVentas = new ClsVentas();
|
||||
// ClsInventarios ObjInventario = new ClsInventarios(ObjVentas.IniciaTransacSQL());
|
||||
// ClsContabilidad ObjConta = new ClsContabilidad(ObjVentas.IniciaTransacSQL());
|
||||
// ClsContratos ObjContr = new ClsContratos(ObjVentas.IniciaTransacSQL());
|
||||
// ClsOS ObjOS = new ClsOS(ObjVentas.IniciaTransacSQL());
|
||||
// ClsBancos ObjBancos = new ClsBancos(ObjVentas.IniciaTransacSQL());
|
||||
// ClsClientes ObjClientes = new ClsClientes(ObjVentas.IniciaTransacSQL());
|
||||
// ClsOIEventos ObjEventos = new ClsOIEventos(ObjVentas.IniciaTransacSQL());
|
||||
// ClsCGame ObjCGame = new ClsCGame(ObjVentas.IniciaTransacSQL());
|
||||
// ClsEdocumentacion ObjDocCliente = new ClsEdocumentacion(ObjVentas.IniciaTransacSQL());
|
||||
// ClsAcumuladores ObjAcum = new ClsAcumuladores(ObjVentas.IniciaTransacSQL());
|
||||
// ClsContPAQi ObjContPaq = null;
|
||||
// //StringBuilder MensajeAlert = new StringBuilder() ;
|
||||
// try
|
||||
// {
|
||||
// objfact.GuardarVenta(ref objfact, ref ObjVentas, ref ObjConta, ref ObjInventario, ref ObjContr, ref objfact.DtDetalle, objfact.CveNCaVincular, ref ObjContPaq, ref ObjBancos, ref ObjOS, ref ObjEventos, ref ObjCGame, ref ObjClientes, ObjAcum: ObjAcum);
|
||||
|
||||
}
|
||||
catch (Exception )
|
||||
{
|
||||
objfact.CveVenta = -1;
|
||||
}
|
||||
if (ObjVentas.UpdateEstatusFactura(3, objxml.complemento.UUID, "", DateTime.ParseExact(objxml.comprobante.Fecha.Replace("T", " "), "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture), ObjVentas.CveVenta, CvePAC: 4))
|
||||
if (objfact.CveVenta > 0 && objfact.ErrorList.Count == 0)
|
||||
{
|
||||
ObjVentas.Commit();
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (string item in objfact.ErrorList)
|
||||
{
|
||||
strErrores.AppendLine("<br/>");
|
||||
strErrores.AppendLine(item);
|
||||
}
|
||||
objfact.CveVenta = -1;
|
||||
ObjVentas.RollBack();
|
||||
}
|
||||
ObjVentas.Dispose();
|
||||
ObjConta.Dispose();
|
||||
ObjInventario.Dispose();
|
||||
ObjCGame.Dispose();
|
||||
ObjContr.Dispose();
|
||||
ObjDocCliente.Dispose();
|
||||
ObjClientes.Dispose();
|
||||
ObjAcum.Dispose();
|
||||
// }
|
||||
// catch (Exception )
|
||||
// {
|
||||
// objfact.CveVenta = -1;
|
||||
// }
|
||||
// if (ObjVentas.UpdateEstatusFactura(3, objxml.complemento.UUID, "", DateTime.ParseExact(objxml.comprobante.Fecha.Replace("T", " "), "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture), ObjVentas.CveVenta, CvePAC: 4))
|
||||
// if (objfact.CveVenta > 0 && objfact.ErrorList.Count == 0)
|
||||
// {
|
||||
// ObjVentas.Commit();
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// foreach (string item in objfact.ErrorList)
|
||||
// {
|
||||
// strErrores.AppendLine("<br/>");
|
||||
// strErrores.AppendLine(item);
|
||||
// }
|
||||
// objfact.CveVenta = -1;
|
||||
// ObjVentas.RollBack();
|
||||
// }
|
||||
// ObjVentas.Dispose();
|
||||
// ObjConta.Dispose();
|
||||
// ObjInventario.Dispose();
|
||||
// ObjCGame.Dispose();
|
||||
// ObjContr.Dispose();
|
||||
// ObjDocCliente.Dispose();
|
||||
// ObjClientes.Dispose();
|
||||
// ObjAcum.Dispose();
|
||||
|
||||
}
|
||||
if (objfact != null && objfact.CveVenta > 0)
|
||||
{
|
||||
CargaConciliacionemitidasSATGet();
|
||||
Alert($"se ha agregado la factura correctamente.<br/> <a href=\"/Ventas/Ventas.aspx?CveVenta={objfact.CveVenta}\" > Ver Factura </a>", ModExtensiones.TipoMensaje.MsgInformacion);
|
||||
}
|
||||
else { continuar = false; }
|
||||
if (!continuar)
|
||||
{
|
||||
Alert($"no se pudo agregar la factura {strErrores.ToString()}", ModExtensiones.TipoMensaje.MsgAdvertencia);
|
||||
}
|
||||
//}
|
||||
//if (objfact != null && objfact.CveVenta > 0)
|
||||
//{
|
||||
// CargaConciliacionemitidasSATGet();
|
||||
// Alert($"se ha agregado la factura correctamente.<br/> <a href=\"/Ventas/Ventas.aspx?CveVenta={objfact.CveVenta}\" > Ver Factura </a>", ModExtensiones.TipoMensaje.ToastInformacion,timeout:25);
|
||||
//}
|
||||
//else { continuar = false; }
|
||||
//if (!continuar)
|
||||
//{
|
||||
// Alert($"no se pudo agregar la factura {strErrores.ToString()}", ModExtensiones.TipoMensaje.MsgAdvertencia);
|
||||
//}
|
||||
}
|
||||
|
||||
protected Modelos.Factura GetFacturaFromXML(XmlSatCFDI objxml)
|
||||
@@ -388,11 +475,17 @@ public partial class Ventas_RepConciliacionEmitidosSat : ClsPaginas
|
||||
Row["CveTipoPS"] = DrPS["CveTipoPS"];
|
||||
Row["CveTipoInvPS"] = DrPS["Inv_CveMetodoInventario"];
|
||||
Row["CveTamaño"] = DrPS["CveTamaño"];
|
||||
ADSistemaLibrary.SatXml.CFDIConceptoImpuesto impuesto = item.Impuestos.FirstOrDefault(x => x.Impuesto == "002" && x.Impuesto == "Traslado");
|
||||
ADSistemaLibrary.SatXml.CFDIConceptoImpuesto impuesto = item.Impuestos.FirstOrDefault(x => x.Impuesto == "002" && x.Tipo == "Traslado");
|
||||
decimal sumaimpuesto=0;
|
||||
decimal PorcentajeIVA = 0;
|
||||
if (impuesto != null)
|
||||
{
|
||||
Row["PorcentajeIVA"] = impuesto.TasaOCuota;
|
||||
Row["ImporteIVA"] = impuesto.Importe;
|
||||
decimal decimpuesto = 0;
|
||||
decimal.TryParse(impuesto.TasaOCuota, out decimpuesto);
|
||||
PorcentajeIVA = decimpuesto/100;
|
||||
Row["PorcentajeIVA"] = decimpuesto / 100;
|
||||
Row["ImporteIVA"] = decimpuesto / 100;// impuesto.Importe;//Math.Round(item.Importe * (decimpuesto/100), 2);
|
||||
sumaimpuesto += impuesto.Importe;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -400,12 +493,15 @@ public partial class Ventas_RepConciliacionEmitidosSat : ClsPaginas
|
||||
Row["ImporteIVA"] = 0;
|
||||
}
|
||||
Row["IVA"] = Row["PorcentajeIVA"];
|
||||
impuesto = item.Impuestos.FirstOrDefault(x => x.Impuesto == "003" && x.Impuesto == "Traslado");
|
||||
impuesto = item.Impuestos.FirstOrDefault(x => x.Impuesto == "003" && x.Tipo == "Traslado");
|
||||
if (impuesto != null)
|
||||
{
|
||||
Row["PorcentajeIEPS"] = impuesto.TasaOCuota;
|
||||
decimal decimpuesto = 0;
|
||||
decimal.TryParse(impuesto.TasaOCuota, out decimpuesto);
|
||||
Row["PorcentajeIEPS"] = decimpuesto / 100;
|
||||
Row["ImporteIEPS"] = impuesto.Importe;
|
||||
Row["IEPS"] = impuesto.Importe;
|
||||
sumaimpuesto += impuesto.Importe;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -413,22 +509,28 @@ public partial class Ventas_RepConciliacionEmitidosSat : ClsPaginas
|
||||
Row["ImporteIEPS"] = 0;
|
||||
Row["IEPS"] = 0;
|
||||
}
|
||||
impuesto = item.Impuestos.FirstOrDefault(x => x.Impuesto == "001" && x.Impuesto == "Retencion");
|
||||
impuesto = item.Impuestos.FirstOrDefault(x => x.Impuesto == "001" && x.Tipo == "Retencion");
|
||||
if (impuesto != null)
|
||||
{
|
||||
decimal decimpuesto = 0;
|
||||
decimal.TryParse(impuesto.TasaOCuota, out decimpuesto);
|
||||
Row["PorcentajeRetISR"] = decimpuesto / 100;
|
||||
Row["ImporteRetISR"] = impuesto.Importe;
|
||||
Row["PorcentajeRetISR"] = impuesto.TasaOCuota;
|
||||
sumaimpuesto -= impuesto.Importe;
|
||||
}
|
||||
else
|
||||
{
|
||||
Row["ImporteRetISR"] = 0;
|
||||
Row["PorcentajeRetISR"] = 0;
|
||||
}
|
||||
impuesto = item.Impuestos.FirstOrDefault(x => x.Impuesto == "002" && x.Impuesto == "Retencion");
|
||||
impuesto = item.Impuestos.FirstOrDefault(x => x.Impuesto == "002" && x.Tipo == "Retencion");
|
||||
if (impuesto != null)
|
||||
{
|
||||
decimal decimpuesto = 0;
|
||||
decimal.TryParse(impuesto.TasaOCuota, out decimpuesto);
|
||||
Row["PorcentajeRetIVA"] = decimpuesto / 100;
|
||||
Row["ImporteRetIVA"] = impuesto.Importe;
|
||||
Row["PorcentajeRetIVA"] = impuesto.TasaOCuota;
|
||||
sumaimpuesto -= impuesto.Importe;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -438,7 +540,8 @@ public partial class Ventas_RepConciliacionEmitidosSat : ClsPaginas
|
||||
Row["Descuento"] = item.Descuento;
|
||||
Row["TipoDescuento"] = "2";
|
||||
|
||||
Row["Total"] = item.Importe;
|
||||
//Row["Total"] = item.Importe - sumaimpuesto;
|
||||
Row["Total"] = item.Importe /(1+ PorcentajeIVA);
|
||||
Row["TotalImporte"] = item.Importe;
|
||||
|
||||
Row["SATClaveProdServ"] = item.ClaveProdServ;
|
||||
@@ -468,6 +571,11 @@ public partial class Ventas_RepConciliacionEmitidosSat : ClsPaginas
|
||||
protected void LnkAceptarDefault_Click(object sender, EventArgs e)
|
||||
{
|
||||
RegistraScript("$('#DModalDefaults').modal('hide');");
|
||||
//foreach (GridViewRow gvrow in GVConciliacionemitidasSAT.Rows)
|
||||
//{
|
||||
|
||||
// registrarventa(gvrow);
|
||||
//}
|
||||
}
|
||||
}
|
||||
/*
|
||||
|
||||
45
localhost.sln
Normal file
45
localhost.sln
Normal file
@@ -0,0 +1,45 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.25420.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "http://localhost", "http://localhost", "{82D0C8D1-3CF5-471D-92AF-71A9AE4B4335}"
|
||||
ProjectSection(WebsiteProperties) = preProject
|
||||
SccProjectName = ""$/localhost", CAAAAAAA"
|
||||
SccAuxPath = ""
|
||||
SccLocalPath = "."
|
||||
SccProvider = "MSSCCI:Microsoft Visual SourceSafe"
|
||||
UseIISExpress = "false"
|
||||
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.6"
|
||||
Debug.AspNetCompiler.VirtualPath = "/localhost"
|
||||
Debug.AspNetCompiler.PhysicalPath = "..\SIGIT\"
|
||||
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost\"
|
||||
Debug.AspNetCompiler.Updateable = "true"
|
||||
Debug.AspNetCompiler.ForceOverwrite = "true"
|
||||
Debug.AspNetCompiler.FixedNames = "false"
|
||||
Debug.AspNetCompiler.Debug = "True"
|
||||
Release.AspNetCompiler.VirtualPath = "/localhost"
|
||||
Release.AspNetCompiler.PhysicalPath = "..\SIGIT\"
|
||||
Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost\"
|
||||
Release.AspNetCompiler.Updateable = "true"
|
||||
Release.AspNetCompiler.ForceOverwrite = "true"
|
||||
Release.AspNetCompiler.FixedNames = "false"
|
||||
Release.AspNetCompiler.Debug = "False"
|
||||
SlnRelativePath = "..\SIGIT\"
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{82D0C8D1-3CF5-471D-92AF-71A9AE4B4335}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{82D0C8D1-3CF5-471D-92AF-71A9AE4B4335}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {B4590109-7BF9-411C-A1AE-792C02707CE6}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
Reference in New Issue
Block a user