From f4aa0951153bfcaac57ff8d0cd693cf12689adcb Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Sat, 4 Jun 2022 17:24:05 -0700
Subject: [PATCH 1/4] -- quitar ligas de pdf pyme

---
 Ventas/Ventas.aspx.vb | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index 05f4bff20..8e83b3ff2 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -14808,21 +14808,7 @@ Partial Class Ventas
             Exit Sub
         End If
 
-        If UsuarioActual.Empresa.CvePlataforma = 2 Then
-            PdfFacturaPyME(ObjFactura, TmpDT, False)
-        Else
-
-            'REINICIA VALORES DE CONVERSION DE MONEDA
-            'If Not ObjFactura.ConvertirPesos And ChkConvertirDoctoPesos.Checked Then
-            '    For Each Row As DataRow In TmpDT.Rows
-            '        Row("PU") = Row("PU").ToString().ToDouble / TxtTipoCambio.Text.Trim.ToDecimal
-            '        Row("Total") = Row("Cantidad").ToString().ToDouble / Row("PU").ToString().ToDouble
-            '        Row("Descuento") = Row("Descuento").ToString().ToDouble / TxtTipoCambio.Text.Trim.ToDecimal
-            '        Row("IEPS") = Row("IEPS").ToString().ToDouble / TxtTipoCambio.Text.Trim.ToDecimal
-            '    Next
-            'End If
-
-            Select Case ConversionRemision
+        Select Case ConversionRemision
                 Case "*"
                     For Each Row As DataRow In TmpDT.Rows
                         Row("PU") = Math.Round(Row("PU").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
@@ -14904,8 +14890,6 @@ Partial Class Ventas
 
             End Select
 
-            'PdfFacturaPyME(ObjFactura, TmpDT)
-        End If
     End Sub
 
 #End Region

From a612cc246f28630b8ee5b722f2cddce0c3aa8dbf Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Sat, 4 Jun 2022 17:31:22 -0700
Subject: [PATCH 2/4] -- DESCUUENTO DE ALCALINAS

---
 Ventas/PV.aspx.vb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Ventas/PV.aspx.vb b/Ventas/PV.aspx.vb
index 62feae247..36cbced6f 100644
--- a/Ventas/PV.aspx.vb
+++ b/Ventas/PV.aspx.vb
@@ -697,7 +697,8 @@ Partial Class PV
         Get
             Return New Dictionary(Of Integer, Decimal) From {
                  {20516, 0.21D}, 'Descuento para lubricantes LTH
-                 {20515, 0.25D}  'Descuento para filtros LTH
+                 {20515, 0.25D},  'Descuento para filtros LTH
+                 {20518, 0.183D}  'Descuento para pilas alcalinas -- segun 
             }
         End Get
     End Property
@@ -4392,7 +4393,10 @@ Partial Class PV
                 End If
             End If
         Else
-            If DrPS("CveClasificacion").ToString.ToEntero.Contiene(20516, 20515) Then
+            If CveMarcaPS = 1092 Then ' E140 - alcalinas LTH
+                Descuento = ((Cantidad * PU) * 0.183D).RoundSQL(2)
+            End If
+            If DrPS("CveClasificacion").ToString.ToEntero.Contiene(20516, 20515, 20518) Then
                 Descuento = ((Cantidad * PU) * ClasificacionesDescuentos(DrPS("CveClasificacion").ToString.ToEntero)).RoundSQL(2)
             End If
         End If

From 4b22afeaa674bd51e55becb40437db9ae8fd8022 Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Sun, 5 Jun 2022 07:37:18 -0700
Subject: [PATCH 3/4] =?UTF-8?q?--=20liberaci=C3=B3n=20cambio=20timbrado=20?=
 =?UTF-8?q?v4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App_Code/Timbrado.vb |   1 +
 Bin/GoCfdi.dll       | Bin 551936 -> 551936 bytes
 2 files changed, 1 insertion(+)

diff --git a/App_Code/Timbrado.vb b/App_Code/Timbrado.vb
index abc5e5d60..1b4b48413 100644
--- a/App_Code/Timbrado.vb
+++ b/App_Code/Timbrado.vb
@@ -5037,6 +5037,7 @@ Public Class Timbrado
                 cfdi.CartaPorteMercancias(Carta.Mercancias.PesoBrutoTotal, Carta.Mercancias.UnidadPeso, Carta.Mercancias.PesoNetoTotal, Carta.Mercancias.NumTotalMercancias, Carta.Mercancias.CargoporTasacion)
                 If Carta.Mercancias IsNot Nothing AndAlso Carta.Mercancias.Mercancias.Count > 0 Then
                     For Each concep As CFDICartaPorteMercancia In Carta.Mercancias.Mercancias
+                        If concep.ValorMercancia <= 0 Then concep.Moneda = ""
                         cfdi.CartaPorteMercancia(concep.BienesTransp, concep.ClaveSTCC, concep.Descripción, concep.Cantidad, concep.ClaveUnidad, concep.Unidad, concep.Dimensiones, concep.MaterialPeligroso, concep.ClaveMaterialPeligroso, If(concep.ClaveMaterialPeligroso <> "", concep.Embalaje, ""), If(concep.ClaveMaterialPeligroso <> "", concep.DescripEmbalaje, ""), concep.PesoenKg, concep.ValorMercancia, concep.Moneda, concep.FraccionArrancelaria, concep.UUIDComercioExt)
                         For Each transp In concep.MercanciasCantidadTransporta
                             cfdi.CartaPorteCantidadTransporta(transp.Cantidad, transp.IDOrigen, transp.IDDestino, transp.CvesTransportes)
diff --git a/Bin/GoCfdi.dll b/Bin/GoCfdi.dll
index ef9ad67caba499316e71be1d60ef3ee2e8f3c56f..8375b7d16f033cc02a05a42a7caf06629f53613f 100644
GIT binary patch
delta 12964
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
R(%y)DT_0!H>4tFq{{d%i^Kk$G

delta 12921
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


From 169fd4e9a5a159e21b0ac1956dea4e5c235de1a3 Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Sun, 5 Jun 2022 07:37:57 -0700
Subject: [PATCH 4/4] =?UTF-8?q?--=20correcci=C3=B3n=20a=20decimal,=20en=20?=
 =?UTF-8?q?carta=20porte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ventas/Ventas.aspx.vb | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index 9e0b5b06b..57beb0ade 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -34256,7 +34256,6 @@ Partial Class Ventas
                 DdlUnidadCamion.DataSource = ObjInv.DtResultados
             End If
 
-
             If ObjInv.GetCamiones(-1, UsuarioActual.CveEmpresa, 2, Estatus:=1) Then
                 DdlRemolque1.DataSource = ObjInv.DtResultados
             End If
@@ -34266,7 +34265,6 @@ Partial Class Ventas
         DdlUnidadCamion.DataBind()
         DdlUnidadCamion.Items.Insert(0, New ListItem("Seleccione Uno", "-1"))
 
-
         DdlRemolque1.DataBind()
         DdlRemolque1.Items.Insert(0, New ListItem("Seleccione Uno", "-1"))
 
@@ -34304,7 +34302,7 @@ Partial Class Ventas
     End Sub
 
     Protected Sub DdlConfigAuto_SelectedIndexChanged(sender As Object, e As EventArgs)
-        ValidaConfiguracionVeiculo()
+        ValidaConfiguracionVehiculo()
     End Sub
     Public Sub CargaVentaCortePorte(CveVenta As Integer)
         TxtFechaEntregaCP.Enabled = False
@@ -34333,7 +34331,7 @@ Partial Class Ventas
         DdlUnidadCamion.Enabled = False
     End Sub
 
-    Private Sub ValidaConfiguracionVeiculo()
+    Private Sub ValidaConfiguracionVehiculo()
         DvRemolque1.Visible = False
         DvRemolque2.Visible = False
 
@@ -34346,7 +34344,6 @@ Partial Class Ventas
                 If ObjGrales.GetCartaPorteConfigAutoTransportes() Then
                     Dim Remolque As String = ObjGrales.DtResultados.FiltroPrimeroValor("Remolque", $" CveConfigAutoTransporte ='{DdlConfigAuto.SelectedValue}'")
 
-
                     If Remolque = "1" Then
                         RequiereRemolque = True
                         MostrarRemolques = True
@@ -34369,7 +34366,6 @@ Partial Class Ventas
             MostrarRemolques = False
         End If
 
-
         If RequiereRemolque Or MostrarRemolques Then
             DvRemolque1.Visible = True
         End If
@@ -34380,7 +34376,6 @@ Partial Class Ventas
             DvConfiguracionVeiculo.Visible = True
         End If
 
-
         UpEmitirTransitorio.Update()
     End Sub
     Protected Sub DdlRemolque1_SelectedIndexChanged(sender As Object, e As EventArgs)
@@ -34397,14 +34392,11 @@ Partial Class Ventas
             End Using
 
             DdlRemolque2.DataBind()
-
-
         Else
             DvRemolque2.Visible = False
         End If
 
         DdlRemolque2.Items.Insert(0, New ListItem("Seleccione uno", "-1"))
-
         UpEmitirTransitorio.Update()
 
     End Sub
@@ -34441,7 +34433,7 @@ Partial Class Ventas
             If CveEntregaAlmacen > 0 Then
 
                 For Each RowPS As DataRow In ObjFactura.DtMercancias.Rows
-                    If Not ObjGral.AddEntregaAlmacenRutaDetalle(CveEntregaAlmacen, RowPS("CvePS").ToString().ToEntero, RowPS("Cantidad").ToString().ToEntero, RowPS("CveUM").ToString().ToEntero, UsuarioActual.CveUsuario) Then
+                    If Not ObjGral.AddEntregaAlmacenRutaDetalle(CveEntregaAlmacen, RowPS("CvePS").ToString().ToEntero, RowPS("Cantidad").ToString().ToDecimal, RowPS("CveUM").ToString().ToEntero, UsuarioActual.CveUsuario) Then
                         ErrorProceso = True
                         Exit For
                     End If