From d1b3308bfa9ec5daaaa854206f417db2f95f26c5 Mon Sep 17 00:00:00 2001 From: janeth arvizu Date: Mon, 14 Oct 2019 11:37:29 -0700 Subject: [PATCH 1/2] =?UTF-8?q?Cancelar=20Remisi=C3=B3n=20de=20Nota=20de?= =?UTF-8?q?=20cr=C3=A9dito?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App_Code/Modelos.vb | 4 ++-- Ventas/Ventas.aspx.vb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb index d1ecd1e37..cf6f124e3 100644 --- a/App_Code/Modelos.vb +++ b/App_Code/Modelos.vb @@ -3950,7 +3950,7 @@ Namespace Modelos If CveEstatusFacturaAsignado <= 0 Then Try If ObjFactura.FolioFiscal <> "" Then - If ObjFactura.TipoDocto.Contiene("Ing", "Ant", "Dev", "Egs") Then + If ObjFactura.TipoDocto.Contiene("Ing", "Ant", "Dev", "Egs", "RNC") Then Dim Vigencia = Timbrado.VerificarVigenciaSAT(FolioFiscal, UsuarioActual.Empresa.RFC, RFCReceptor, TotalT.ToString(), UsuarioActual.Empresa.FacturaProduccion) @@ -4096,7 +4096,7 @@ Namespace Modelos Try If ObjFactura.TipoDocto.Contiene("Egs", "Dev") Then CvePlantillaPoliza = 7 - ElseIf ObjFactura.TipoDocto.Contiene("Ing", "Rem", "Ant") Then + ElseIf ObjFactura.TipoDocto.Contiene("Ing", "Rem", "Ant", "RNC") Then CvePlantillaPoliza = 4 Else CvePlantillaPoliza = 4 diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index a6871aff3..c58e67a7c 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -3442,7 +3442,7 @@ Partial Class Ventas LblAlertRefacInv.Visible = True End If - If DdlTipoComprobante.SelectedValue.Contiene("Egs", "Ing", "Ant", "Dev", "Rem", "DPe") AndAlso Not CveEstatus.Contiene(4, 5, 12, 13, 20) Then + If DdlTipoComprobante.SelectedValue.Contiene("Egs", "Ing", "Ant", "Dev", "Rem", "DPe", "RNC") AndAlso Not CveEstatus.Contiene(4, 5, 12, 13, 20) Then If UsuarioActual.TienePermisoProceso(159) Then Dim TienePermiso As String = GlobalDTSubProyectosUsuarios(UsuarioActual.CveUsuario, -1, UsuarioActual.CveEmpresa, -1, -1).FiltroPrimeroValor("CveSubProyecto", String.Format("CveSubProyecto = {0}", DbRowVenta("CveSubProyecto"))) If TienePermiso <> "" Then @@ -17673,7 +17673,7 @@ Partial Class Ventas 'End If - If DdlTipoComprobante.SelectedValue.Contiene("Ing", "Ant", "Dev", "Egs") Then + If DdlTipoComprobante.SelectedValue.Contiene("Ing", "Ant", "Dev", "Egs", "RNC") Then Dim sb As New StringBuilder() sb.Append("La factura se encuentra en el siguiente estatus del SAT:
") From cf8072440214cd4d310e5b5aebcaa32bf2c4cdb1 Mon Sep 17 00:00:00 2001 From: janeth arvizu Date: Mon, 14 Oct 2019 14:06:05 -0700 Subject: [PATCH 2/2] Agregar BCI --- App_Code/ClsGenerales.vb | 61 ++++++++++++++++++++++++++++++++++++++++ Ventas/PV.aspx | 30 ++++++++++++-------- Ventas/PV.aspx.vb | 11 ++++++++ 3 files changed, 90 insertions(+), 12 deletions(-) diff --git a/App_Code/ClsGenerales.vb b/App_Code/ClsGenerales.vb index 86122f871..23bdee732 100644 --- a/App_Code/ClsGenerales.vb +++ b/App_Code/ClsGenerales.vb @@ -2926,5 +2926,66 @@ Public Class ClsGenerales End Sub #End Region +#Region " P O L I Z A V I R T U A L " + Public Function ModelosAutosGet(CveEmpresa As Integer) As Boolean + Dim Retorno As Boolean = False + DataAdapter("PA_Gral_ModelosAutosGet") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener los Modelos de Autos.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + Return Retorno + End Function + + Public Function MarcasAutosGet(CveEmpresa As Integer) As Boolean + Dim Retorno As Boolean = False + DataAdapter("PA_Gral_MarcasAutosGet") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener las Marcas de Autos.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + Return Retorno + End Function + + Public Function MarcasUsadoGet(CveEmpresa As Integer) As Boolean + Dim Retorno As Boolean = False + DataAdapter("PA_Gral_MarcasUsadoGet") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener las Marcas de Usados.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + Return Retorno + End Function + + Public Function BCIUsadoGet(CveEmpresa As Integer) As Boolean + Dim Retorno As Boolean = False + DataAdapter("PA_Gral_BCIUsadoGet") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener los BCI de Usados.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + Return Retorno + End Function +#End Region End Class diff --git a/Ventas/PV.aspx b/Ventas/PV.aspx index 423ebafff..e30c6fe9b 100644 --- a/Ventas/PV.aspx +++ b/Ventas/PV.aspx @@ -2659,12 +2659,12 @@
- - + @@ -2674,6 +2674,17 @@
+ +
+
+
+ +
+ + +
+
+
@@ -3134,8 +3145,7 @@ $("#DivAnticipos").show(); $("#DivAnticipos").center(); } - catch (e) - { alert(e); } + catch (e) { alert(e); } } @@ -3144,8 +3154,7 @@ $("#ModalOtrosConceptos").show(); $("#ModalOtrosConceptos").center(); } - catch (e) - { alert(e); } + catch (e) { alert(e); } } @@ -3155,8 +3164,7 @@ $("#DivEstadoCaja").show(); $("#DivEstadoCaja").center(); } - catch (e) - { alert(e); } + catch (e) { alert(e); } } @@ -3169,8 +3177,7 @@ return false; } - catch (e) - { alert(e); } + catch (e) { alert(e); } } @@ -3189,8 +3196,7 @@ $get("HdnTipoMovimiento").value = "1"; } } - catch (e) - { alert(e); } + catch (e) { alert(e); } } diff --git a/Ventas/PV.aspx.vb b/Ventas/PV.aspx.vb index d2cadd606..b23c44a76 100644 --- a/Ventas/PV.aspx.vb +++ b/Ventas/PV.aspx.vb @@ -3598,6 +3598,7 @@ Partial Class PV Private Sub CargaAgregar() Modalidad = "A" LnkAgregarPS.Text = "Agregar" + CargaBCI() LimpiaAgregar() LimpiaAjuste() ModalidadAjuste = "A" @@ -3606,6 +3607,16 @@ Partial Class PV UpVenta.Update() RegistraScript(String.Format("$('#{0}').modal('show');", "DivAddVenta")) End Sub + Private Sub CargaBCI() + Dim ObjGral As New ClsGenerales + + If ObjGral.BCIUsadoGet(UsuarioActual.CveEmpresa) Then + DdlBCIUsado.DataSource = ObjGral.DtResultados + End If + DdlBCIUsado.Items.Insert(0, New ListItem("Seleccione", "-1")) + DdlBCIUsado.SelectedValueExist(-1) + DdlBCIUsado.DataBind() + End Sub Public Sub Edit_Click(sender As Object, e As EventArgs) Dim GvRow As GridViewRow = DirectCast(DirectCast(sender, LinkButton).NamingContainer, GridViewRow) Modalidad = "U"