diff --git a/App_Code/ClsCompras.vb b/App_Code/ClsCompras.vb
index d52811978..67381324c 100644
--- a/App_Code/ClsCompras.vb
+++ b/App_Code/ClsCompras.vb
@@ -1683,7 +1683,7 @@ Public Class ClsCompras
#Region "F A C T U R A S "
- Public Function GetFacturas(CveFactura As Integer, Folio As String, FechaFacturaI As Date, FechaFacturaF As Date, RFC As String, Proveedor As String, FueValidado As Integer, CveResponsable As Integer, CveProveedorClasificacion As Integer, CveTipoProveedor As Integer, TipoComprobante As String, CveEmpresa As Integer) As Boolean
+ Public Function GetFacturas(CveFactura As Integer, Folio As String, FechaFacturaI As Date, FechaFacturaF As Date, RFC As String, Proveedor As String, FueValidado As Integer, CveResponsable As Integer, CveProveedorClasificacion As Integer, CveTipoProveedor As Integer, TipoComprobante As String, CveEmpresa As Integer, Optional Opcion As Integer = 1) As Boolean
Dim OnError As Boolean = False
'StrSQL.Clear()
@@ -1719,6 +1719,7 @@ Public Class ClsCompras
.Add("@CveProveedorClasificacion", SqlDbType.Int).Value = CveProveedorClasificacion
.Add("@CveTipoProveedor", SqlDbType.Int).Value = CveTipoProveedor
.Add("@TipoComprobante", SqlDbType.VarChar).Value = TipoComprobante
+ .Add("@Opcion", SqlDbType.Int).Value = Opcion
End With
Try
@@ -2412,6 +2413,47 @@ Public Class ClsCompras
End Function
+ Public Function AddComplementoTraslado(CveFactura As Integer, CveCompra As Integer, CveUsuario As Integer) As Boolean
+ Dim Retorno As Boolean = False
+ DataAdapter("PA_Comp_ComplementoTrasladoAdd")
+ With SqlAdapter.SelectCommand.Parameters
+
+ .Add("@CveFactura", SqlDbType.Int).Value = CveFactura
+ .Add("@CveCompra", SqlDbType.Int).Value = CveCompra
+ .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
+
+ End With
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = True
+ Catch ex As Exception
+ OnError("Ocurrió un error al vincular el traslado.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+ End Try
+ Return Retorno
+ End Function
+
+ Public Function RemoveComplementoTraslado(CveComplementoTraslado As Integer, CveEmpresa As Integer) As Boolean
+
+ Dim Retorno As Boolean = False
+ DataAdapter("PA_Comp_ComplementoTrasladoRemove")
+ With SqlAdapter.SelectCommand.Parameters
+
+ .Add("@CveComplementoTraslado", SqlDbType.Int).Value = CveComplementoTraslado
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+
+
+ End With
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = True
+ Catch ex As Exception
+ OnError("Ocurrió un error al vincular el traslado.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+ End Try
+ Return Retorno
+
+
+ End Function
+
Public Function AddVincularPago(CveFactura As Integer) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_Comp_VincularPagoAdd")
diff --git a/Compras/PopUpBuscarFolioC.aspx b/Compras/PopUpBuscarFolioC.aspx
index 77b5be834..10a09fc85 100644
--- a/Compras/PopUpBuscarFolioC.aspx
+++ b/Compras/PopUpBuscarFolioC.aspx
@@ -187,6 +187,14 @@
}
+
+ function Ir5(CveCompra,FolioCompra) {
+ window.opener.CargaVinculacionTraslado(CveCompra, FolioCompra);
+ window.close();
+ parent.$('#ajax').modal('hide');
+
+ }
+
//$(document).ready(function () {
// $("#TxtFolioFiscal").mask("********-****-****-****-************");
//});
diff --git a/Compras/PopUpBuscarFolioC.aspx.vb b/Compras/PopUpBuscarFolioC.aspx.vb
index 3b95e36c9..40c5d023f 100644
--- a/Compras/PopUpBuscarFolioC.aspx.vb
+++ b/Compras/PopUpBuscarFolioC.aspx.vb
@@ -11,6 +11,15 @@ Partial Class Compras_PopUpBuscarFolioC
End Get
End Property
+ Private Property Opcion As String
+ Get
+ Return ViewState("Opcion").ToString
+ End Get
+ Set(value As String)
+ ViewState("Opcion") = value
+ End Set
+ End Property
+
Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load
If Not IsPostBack Then
CType(Me.Master, BaseMasterPage).EsPopup = True
@@ -24,9 +33,15 @@ Partial Class Compras_PopUpBuscarFolioC
If Request("Opt") = "Fact" Then
ViewState("Opt") = "MandaCveCompra"
+
+ ElseIf Request("Opt") = "ComplementosTraslado" Then
+ ViewState("Opt") = "ComplementosTraslado"
Else
ViewState("Opt") = "RecargaCompra"
End If
+
+
+
End If
End Sub
@@ -91,6 +106,8 @@ Partial Class Compras_PopUpBuscarFolioC
Liga = String.Format("", e.Row.DBCampo("CveCompra"))
Case "FactFlete"
Liga = String.Format("", e.Row.DBCampo("CveCompra"))
+ Case "ComplementosTraslado"
+ Liga = String.Format("", e.Row.DBCampo("CveCompra"), e.Row.DBCampo("SerieFolio"))
Case Else
Liga = String.Format("", e.Row.DBCampo("CveCompra"))
End Select
diff --git a/Compras/eFacturas.aspx b/Compras/eFacturas.aspx
index 9b2594e88..5e0ac6e38 100644
--- a/Compras/eFacturas.aspx
+++ b/Compras/eFacturas.aspx
@@ -393,7 +393,7 @@
-
+
@@ -409,6 +409,124 @@
+
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+ <%--No Recibidas--%>
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -776,6 +894,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Folio Compra:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+