AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2022-06-14 12:05:37 -07:00
parent ead4a8bf57 1d3c44dd57
commit 505ab2a7c2
26 changed files with 6330 additions and 2338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Compras/Compras.aspx.vb
View File

@@ -2205,12 +2205,13 @@ Partial Class Compras_Compras
DdlRetIVAConcepto.Items.Add(New ListItem("Arrendamiento", "4"))
End If
If DIOTCveTipoOperacion = 3 Then ' 85 - Otros
If DIOTCveTipoOperacion.Contiene(0, 3) Then ' 85 - Otros
DdlRetIVAConcepto.Items.Insert(0, New ListItem("Honorarios/Serv. Prof.", "1"))
DdlRetIVAConcepto.Items.Add(New ListItem("Arrendamiento", "4"))
DdlRetIVAConcepto.Items.Insert(0, New ListItem("Fletes P.F.", "2"))
End If
ElseIf RFCProv.Length = 12 Then
If DIOTCveTipoOperacion = 1 Then '03 - Prestación de Servicios Profesionales
DdlRetIVAConcepto.Items.Insert(0, New ListItem("Honorarios/Serv. Prof.", "1"))
@@ -2220,12 +2221,14 @@ Partial Class Compras_Compras
DdlRetIVAConcepto.Items.Add(New ListItem("Arrendamiento", "4"))
End If
If DIOTCveTipoOperacion = 3 Then ' 85 - Otros
If DIOTCveTipoOperacion.Contiene(0, 3) Then ' 85 - Otros
DdlRetIVAConcepto.Items.Insert(0, New ListItem("Honorarios/Serv. Prof.", "1"))
DdlRetIVAConcepto.Items.Add(New ListItem("Arrendamiento", "4"))
DdlRetIVAConcepto.Items.Insert(0, New ListItem("Fletes P.F.", "2"))
End If
End If
End If
@@ -2251,12 +2254,14 @@ Partial Class Compras_Compras
DdlRetISRConcepto.Items.Insert(1, New ListItem("Resico", "3"))
End If
If DIOTCveTipoOperacion = 3 Then ' 85 - Otros
If DIOTCveTipoOperacion.Contiene(0, 3) Then ' 85 - Otros
DdlRetISRConcepto.Items.Insert(0, New ListItem("Honorarios", "1"))
DdlRetISRConcepto.Items.Insert(1, New ListItem("Arrendamiento", "2"))
DdlRetISRConcepto.Items.Insert(1, New ListItem("Resico", "3"))
End If
End If
UpPS.Update()
End Sub

6
Compras/PopUpVerFactura.aspx.vb
View File

@@ -2047,6 +2047,7 @@ Partial Class PopUpVerFactura
For Each parametro As ReportParameter In params
retorno.Parametros.Add(New ReportParameter($"SRP_{parametro.Name}", parametro.Values.Item(0)))
Next
retorno.Parametros.Add(New ReportParameter($"TieneCartaPorte", "True"))
Else
retorno.Parametros.AddRange(params)
End If
@@ -2690,7 +2691,7 @@ Partial Class PopUpVerFactura
Dim CveTimbreCartaPorteVenta As Integer = -1
Dim CartaPorte As Modelos.MSubReportData = Nothing
If Vta.TipoDocto = "Ing" Then
If UsuarioActual.CveEmpresa = 13 AndAlso Vta.TipoDocto = "Ing" Then
Using ObjGral As New ClsGenerales
If ObjGral.GetGralTimbre(-1, "Ing", MinFecha, MaxFecha, 0, UsuarioActual.CveEmpresa, -1, CveVenta:=CveVenta) AndAlso ObjGral.DtResultados.Rows.Count > 0 Then
Dim RowCP As DataRow = ObjGral.DtResultados.Rows(0)
@@ -2713,6 +2714,9 @@ Partial Class PopUpVerFactura
'CartaPorte.DataSources.Add(New ReportDataSource() With {.Name = "DataSet1", .Value = dt})
CartaPorte = PreParaImpresionCartaPorte(CveTimbreCartaPorteVenta, AplicaSubReporte:=True)
Else
CartaPorte = New Modelos.MSubReportData()
CartaPorte.Parametros.Add(New ReportParameter($"TieneCartaPorte", "False"))
End If
End If

6
Compras/Proveedores.aspx.vb
View File

@@ -750,9 +750,11 @@ Partial Class Compras_Proveedores
TxtNombreComercial.Text = HttpUtility.HtmlDecode(ValorXml(node, "Nombre"))
ChkEstado.Checked = True
If Version = "4.0" Then
Dim CodigoRegimenFiscal As String = ValorXml(node, "RegimenFiscal")
If Version = "4.0" Or CodigoRegimenFiscal.Trim.Length > 0 Then
Dim CodigoRegimenFiscal As String = ValorXml(node, "RegimenFiscal")
Dim CveRegimenFiscal As Integer = GlobalDTRegimenesFiscales(-1).FiltroPrimeroValor("CveRegimenFiscal", $" CodigoRegimenFiscal = '{ CodigoRegimenFiscal }'").ToEntero
DdlRegimenFiscal.SelectedValueExist(CveRegimenFiscal)