From 0acd2774f99398170315755df8c88bc99c3cca00 Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Thu, 21 Sep 2023 07:59:27 -0700
Subject: [PATCH] -- mejora

---
 Compras/Compras.aspx    | 2 +-
 Compras/Compras.aspx.vb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Compras/Compras.aspx b/Compras/Compras.aspx
index 9104bd152..5180079d9 100644
--- a/Compras/Compras.aspx
+++ b/Compras/Compras.aspx
@@ -5254,7 +5254,7 @@
                                                     AcceptNegative="None"
                                                     ErrorTooltipEnabled="True" />
                                              
-                                                <asp:RegularExpressionValidator ID="regexTxtPedimento" runat="server" ControlToValidate="TxtPedimento"  Display="None"   ValidationGroup="GrpGuardar" ErrorMessage="Formato no valido, el formato correcto es 99--99--9999--9999999" ForeColor="Red" 
+                                                <asp:RegularExpressionValidator ID="regexTxtPedimento" runat="server" ControlToValidate="TxtPedimento"  Display="None" ValidationGroup="VGMCrearFleteImportacion" ErrorMessage="Formato no valido, el formato correcto es 99--99--9999--9999999" ForeColor="Red" 
                                                     ValidationExpression="^[0-9 ]{2}--[0-9 ]{2}--[0-9 ]{4}--[0-9 ]{7}$" ></asp:RegularExpressionValidator>
 
                                                 <ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender11" runat="server" HighlightCssClass="vco" TargetControlID="regexTxtPedimento" Width="300px"></ajax:ValidatorCalloutExtender>
diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb
index 3cdd07a55..009e83339 100644
--- a/Compras/Compras.aspx.vb
+++ b/Compras/Compras.aspx.vb
@@ -4636,7 +4636,7 @@ Partial Class Compras_Compras
                             ' deducible tiene 2 valores 1. totalmente no deducible, 2. parcialmente no deducible
                             Dim tNoDeducible As Integer = If(ChkEsNoDeducible.Checked, 1, 0)
                             If (tNoDeducible > 0) Then
-                                tNoDeducible = If(TmpDT.MIN("NoDeducible") = "False", 2, 1)
+                                tNoDeducible = If(TmpDT.MIN("NoDeducible", "IVA > 0") = "False", 2, 1)
                             End If
                             If ObjCompras.AddCompra(DdlTipoComprobante.SelectedValue, TxtDescripcion.Text.Trim, TxtSerie.Text.Trim, TxtFolio.Text.Trim, TxtFolioSecundario.Text.Trim, CveProveedor, TxtSubTotal.Text.ToDecimal, TxtDescuento.Text.ToDecimal,
                                                     LblAmortizacion.Text.ToDecimal, TxtIVA.Text.ToDecimal, TxtRetIVA.Text.ToDecimal, TxtRetISR.Text.ToDecimal, TxtIEPS.Text.ToDecimal, TxtOtrosImpuestos.Text.ToDecimal,
@@ -8232,7 +8232,7 @@ Partial Class Compras_Compras
                 Dim TmpCveRetISRConcepto As Integer = If(CveRetISRConceptoOriginal <> DdlRetISRConcepto.SelectedValue.ToEntero, DdlRetISRConcepto.SelectedValue.ToEntero, -1)
                 Dim tNoDeducible As Integer = If(ChkEsNoDeducible.Checked, 1, 0)
                 If (tNoDeducible > 0) Then
-                    tNoDeducible = If(TmpDT.MIN("NoDeducible") = "False", 2, 1)
+                    tNoDeducible = If(TmpDT.MIN("NoDeducible", "IVA > 0") = "False", 2, 1)
                 End If
 
                 If ObjCompra.UpdateCompra(TxtDescripcion.Text.Trim, TxtFolioSecundario.Text.Trim, TxtFechaPago.Text.ToDate, ChkAplicaNotaCredito.Checked, TxtObsFact.Text.Trim, CveEstatusFactura,