From def824e6098c9ea30221d48cdbecb3c2a2f701f7 Mon Sep 17 00:00:00 2001 From: Raul Pimienta Date: Fri, 6 Sep 2019 09:33:49 -0700 Subject: [PATCH] Cambios en generar prepoliza en ntradas salidas --- Inventarios/EntradasSalidas.aspx.vb | 4 ++-- Ventas/Ventas.aspx.vb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Inventarios/EntradasSalidas.aspx.vb b/Inventarios/EntradasSalidas.aspx.vb index a48a53404..59ee002ea 100644 --- a/Inventarios/EntradasSalidas.aspx.vb +++ b/Inventarios/EntradasSalidas.aspx.vb @@ -3257,10 +3257,10 @@ Partial Class Inventarios_EntradasSalidas Dim tmpCostos As DataTable = DtCostos.FiltraParametros("", "", {"CveClasificacion"}) Dim DTOCs As DataTable = DtCostos.FiltraParametros("", "", {"CveOrdenCompraDetalle"}) Dim IdCtaContable As Integer = 0 - Dim ConceptoPoliza As String = String.Format("{0}-{1}", DdlConcepto.SelectedItem.Text, TxtFolio.Text) + Dim ConceptoPoliza As String = String.Format("{0}-{1}", DdlConcepto.SelectedItem.Text, If(DdlConcepto.SelectedValue.ToEntero.Contiene(3), HplVenta.Text, TxtFolio.Text)) If tmpCostos.Rows.Count > 0 Then - Dim Concepto As String = $" {TxtObservaciones.Text}" + Dim Concepto As String = If(TxtObservaciones.Text = "", ConceptoPoliza, $" {TxtObservaciones.Text}") Dim CvePrePoliza = ObjConta.AddPrePolizas("Inv_EntradaSalida", 74, DtCostos.SUM("Total"), DtCostos.SUM("Total"), 1, TxtFecha.Text.ToDate, ConceptoPoliza, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) If HdnCveOrdenCompra.Value.ToEntero > 0 Then diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index 0024ffe5c..b5b9b128c 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -11601,6 +11601,7 @@ Partial Class Ventas ErrorConta = True End If + End If End If importeMovimiento = 0