From 0d8410fde2bdd3e7f59376db39ed8382d0405c26 Mon Sep 17 00:00:00 2001
From: Jonathan Alexis Perez Morales <jonathan.perez@adssistemas.mx>
Date: Thu, 9 Jun 2022 19:09:20 -0700
Subject: [PATCH 1/7] E13. Formato de carta porte en 1 sola hoja

---
 Compras/PopUpVerFactura.aspx.vb              |   6 +-
 Empresas/13/Formatos/CartaPorteTimbrado.rdlc | 563 +++++++-------
 Empresas/13/Formatos/Factura.rdlc            | 724 +++++++++----------
 3 files changed, 634 insertions(+), 659 deletions(-)

diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb
index 2486ed8af..f54ffac71 100644
--- a/Compras/PopUpVerFactura.aspx.vb
+++ b/Compras/PopUpVerFactura.aspx.vb
@@ -2047,6 +2047,7 @@ Partial Class PopUpVerFactura
                         For Each parametro As ReportParameter In params
                             retorno.Parametros.Add(New ReportParameter($"SRP_{parametro.Name}", parametro.Values.Item(0)))
                         Next
+                        retorno.Parametros.Add(New ReportParameter($"TieneCartaPorte", "True"))
                     Else
                         retorno.Parametros.AddRange(params)
                     End If
@@ -2690,7 +2691,7 @@ Partial Class PopUpVerFactura
         Dim CveTimbreCartaPorteVenta As Integer = -1
         Dim CartaPorte As Modelos.MSubReportData = Nothing
 
-        If Vta.TipoDocto = "Ing" Then
+        If UsuarioActual.CveEmpresa = 13 AndAlso Vta.TipoDocto = "Ing" Then
             Using ObjGral As New ClsGenerales
                 If ObjGral.GetGralTimbre(-1, "Ing", MinFecha, MaxFecha, 0, UsuarioActual.CveEmpresa, -1, CveVenta:=CveVenta) AndAlso ObjGral.DtResultados.Rows.Count > 0 Then
                     Dim RowCP As DataRow = ObjGral.DtResultados.Rows(0)
@@ -2713,6 +2714,9 @@ Partial Class PopUpVerFactura
                 'CartaPorte.DataSources.Add(New ReportDataSource() With {.Name = "DataSet1", .Value = dt})
 
                 CartaPorte = PreParaImpresionCartaPorte(CveTimbreCartaPorteVenta, AplicaSubReporte:=True)
+            Else
+                CartaPorte = New Modelos.MSubReportData()
+                CartaPorte.Parametros.Add(New ReportParameter($"TieneCartaPorte", "False"))
             End If
         End If
 
diff --git a/Empresas/13/Formatos/CartaPorteTimbrado.rdlc b/Empresas/13/Formatos/CartaPorteTimbrado.rdlc
index 970407272..3bf625808 100644
--- a/Empresas/13/Formatos/CartaPorteTimbrado.rdlc
+++ b/Empresas/13/Formatos/CartaPorteTimbrado.rdlc
@@ -18,7 +18,7 @@
                             <Value>Cantidad</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -64,7 +64,7 @@
           </TablixColumns>
           <TablixRows>
             <TablixRow>
-              <Height>0.6cm</Height>
+              <Height>0.36188cm</Height>
               <TablixCells>
                 <TablixCell>
                   <CellContents>
@@ -78,7 +78,7 @@
                               <Value>=Fields!UnidadMedida.Value</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>8pt</FontSize>
+                                <FontSize>7pt</FontSize>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -112,7 +112,7 @@
                               <Value>=Fields!Descripcion.Value</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>8pt</FontSize>
+                                <FontSize>7pt</FontSize>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -146,7 +146,7 @@
                               <Value>=Fields!CveMaterialPeligroso.Value</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>8pt</FontSize>
+                                <FontSize>7pt</FontSize>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -180,7 +180,7 @@
                               <Value>=Fields!Embalaje.Value</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>8pt</FontSize>
+                                <FontSize>7pt</FontSize>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -214,7 +214,7 @@
                               <Value>=Fields!PesoEnKg.Value</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>8pt</FontSize>
+                                <FontSize>7pt</FontSize>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -244,7 +244,7 @@
           <TablixMembers>
             <TablixMember>
               <TablixHeader>
-                <Size>0.52062cm</Size>
+                <Size>0.36187cm</Size>
                 <CellContents>
                   <Textbox Name="Textbox41">
                     <CanGrow>true</CanGrow>
@@ -256,7 +256,7 @@
                             <Value>Unidad</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -282,7 +282,7 @@
             </TablixMember>
             <TablixMember>
               <TablixHeader>
-                <Size>0.52062cm</Size>
+                <Size>0.36187cm</Size>
                 <CellContents>
                   <Textbox Name="Textbox32">
                     <CanGrow>true</CanGrow>
@@ -294,7 +294,7 @@
                             <Value>Producto</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -320,7 +320,7 @@
             </TablixMember>
             <TablixMember>
               <TablixHeader>
-                <Size>0.52062cm</Size>
+                <Size>0.36187cm</Size>
                 <CellContents>
                   <Textbox Name="Textbox37">
                     <CanGrow>true</CanGrow>
@@ -329,21 +329,13 @@
                       <Paragraph>
                         <TextRuns>
                           <TextRun>
-                            <Value>Cod. Material </Value>
+                            <Value>Cod. Material Peligroso</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
-                          <TextRun>
-                            <Value>Peligroso</Value>
-                            <Style>
-                              <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
-                              <Color>White</Color>
-                            </Style>
-                          </TextRun>
                         </TextRuns>
                         <Style>
                           <TextAlign>Center</TextAlign>
@@ -366,7 +358,7 @@
             </TablixMember>
             <TablixMember>
               <TablixHeader>
-                <Size>0.52062cm</Size>
+                <Size>0.36187cm</Size>
                 <CellContents>
                   <Textbox Name="Textbox40">
                     <CanGrow>true</CanGrow>
@@ -378,7 +370,7 @@
                             <Value>Embalaje</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -404,7 +396,7 @@
             </TablixMember>
             <TablixMember>
               <TablixHeader>
-                <Size>0.52062cm</Size>
+                <Size>0.36187cm</Size>
                 <CellContents>
                   <Textbox Name="Textbox64">
                     <CanGrow>true</CanGrow>
@@ -416,7 +408,7 @@
                             <Value>Peso (KG)</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -459,7 +451,7 @@
                             <Value>=Fields!Cantidad.Value</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <Format>#,0</Format>
                             </Style>
                           </TextRun>
@@ -488,9 +480,9 @@
         <RepeatColumnHeaders>true</RepeatColumnHeaders>
         <FixedColumnHeaders>true</FixedColumnHeaders>
         <DataSetName>DataSet3</DataSetName>
-        <Top>6.6164cm</Top>
+        <Top>4.93365cm</Top>
         <Left>0.06623cm</Left>
-        <Height>1.12062cm</Height>
+        <Height>0.72375cm</Height>
         <Width>20.36729cm</Width>
         <Style>
           <Border>
@@ -509,7 +501,7 @@
                 <Value>DETALLE MERCANCIAS</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>DimGray</Color>
                 </Style>
@@ -521,8 +513,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox3</rd:DefaultName>
-        <Top>6.1004cm</Top>
-        <Left>0.06623cm</Left>
+        <Top>4.4494cm</Top>
+        <Left>0.0927cm</Left>
         <Height>0.50189cm</Height>
         <Width>8.01543in</Width>
         <ZIndex>1</ZIndex>
@@ -553,7 +545,7 @@
                             <Value>Distancia</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -601,7 +593,7 @@
           </TablixColumns>
           <TablixRows>
             <TablixRow>
-              <Height>0.6cm</Height>
+              <Height>0.46771cm</Height>
               <TablixCells>
                 <TablixCell>
                   <CellContents>
@@ -615,7 +607,7 @@
                               <Value>=Fields!TipoUbicacion.Value</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>8pt</FontSize>
+                                <FontSize>7pt</FontSize>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -663,7 +655,7 @@
                               <Value>=Fields!RFC.Value</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>8pt</FontSize>
+                                <FontSize>7pt</FontSize>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -711,7 +703,7 @@
                               <Value>=Fields!Nombre.Value</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>8pt</FontSize>
+                                <FontSize>7pt</FontSize>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -751,7 +743,7 @@
                               <Value>=Fields!FechaHoraSalida.Value</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>8pt</FontSize>
+                                <FontSize>7pt</FontSize>
                                 <Format>dd/MM/yyy HH:mm</Format>
                               </Style>
                             </TextRun>
@@ -792,7 +784,7 @@
                               <Value>=Fields!Direccion.Value</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>8pt</FontSize>
+                                <FontSize>7pt</FontSize>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -832,7 +824,7 @@
           <TablixMembers>
             <TablixMember>
               <TablixHeader>
-                <Size>0.52062cm</Size>
+                <Size>0.44125cm</Size>
                 <CellContents>
                   <Textbox Name="Textbox28">
                     <CanGrow>true</CanGrow>
@@ -844,7 +836,7 @@
                             <Value>Ubicación</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -872,7 +864,7 @@
             </TablixMember>
             <TablixMember>
               <TablixHeader>
-                <Size>0.52062cm</Size>
+                <Size>0.44125cm</Size>
                 <CellContents>
                   <Textbox Name="Textbox43">
                     <CanGrow>true</CanGrow>
@@ -884,7 +876,7 @@
                             <Value>RFC</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -912,7 +904,7 @@
             </TablixMember>
             <TablixMember>
               <TablixHeader>
-                <Size>0.52062cm</Size>
+                <Size>0.44125cm</Size>
                 <CellContents>
                   <Textbox Name="Textbox36">
                     <CanGrow>true</CanGrow>
@@ -924,7 +916,7 @@
                             <Value>Nombre</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -952,7 +944,7 @@
             </TablixMember>
             <TablixMember>
               <TablixHeader>
-                <Size>0.52062cm</Size>
+                <Size>0.44125cm</Size>
                 <CellContents>
                   <Textbox Name="Textbox66">
                     <CanGrow>true</CanGrow>
@@ -964,7 +956,7 @@
                             <Value>Fecha</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -992,7 +984,7 @@
             </TablixMember>
             <TablixMember>
               <TablixHeader>
-                <Size>0.52062cm</Size>
+                <Size>0.44125cm</Size>
                 <CellContents>
                   <Textbox Name="Textbox1">
                     <CanGrow>true</CanGrow>
@@ -1004,7 +996,7 @@
                             <Value>Dirección</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -1049,7 +1041,7 @@
                             <Value>=Fields!Distancia.Value</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <Format>#,0</Format>
                             </Style>
                           </TextRun>
@@ -1092,9 +1084,9 @@
         <RepeatColumnHeaders>true</RepeatColumnHeaders>
         <FixedColumnHeaders>true</FixedColumnHeaders>
         <DataSetName>DataSet2</DataSetName>
-        <Top>9.1543cm</Top>
+        <Top>6.1698cm</Top>
         <Left>0.06623cm</Left>
-        <Height>1.12062cm</Height>
+        <Height>0.90895cm</Height>
         <Width>20.38566cm</Width>
         <ZIndex>2</ZIndex>
         <Style>
@@ -1113,7 +1105,7 @@
                 <Value>ORIGEN  / DESTINO</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>DimGray</Color>
                 </Style>
@@ -1125,9 +1117,9 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox3</rd:DefaultName>
-        <Top>8.56422cm</Top>
+        <Top>5.77022cm</Top>
         <Left>0.06623cm</Left>
-        <Height>0.5cm</Height>
+        <Height>0.41369cm</Height>
         <Width>8.01861in</Width>
         <ZIndex>3</ZIndex>
         <Style>
@@ -1157,7 +1149,7 @@
                             <Value>RFC</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -1196,7 +1188,7 @@
           </TablixColumns>
           <TablixRows>
             <TablixRow>
-              <Height>0.6cm</Height>
+              <Height>0.41479cm</Height>
               <TablixCells>
                 <TablixCell>
                   <CellContents>
@@ -1210,7 +1202,7 @@
                               <Value>=Fields!NumLicencia.Value</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>8pt</FontSize>
+                                <FontSize>7pt</FontSize>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -1258,7 +1250,7 @@
                               <Value>=Fields!NombreOperador.Value</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>8pt</FontSize>
+                                <FontSize>7pt</FontSize>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -1298,7 +1290,7 @@
           <TablixMembers>
             <TablixMember>
               <TablixHeader>
-                <Size>0.52062cm</Size>
+                <Size>0.41479cm</Size>
                 <CellContents>
                   <Textbox Name="Textbox48">
                     <CanGrow>true</CanGrow>
@@ -1310,7 +1302,7 @@
                             <Value>LICENCIA</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -1338,7 +1330,7 @@
             </TablixMember>
             <TablixMember>
               <TablixHeader>
-                <Size>0.52062cm</Size>
+                <Size>0.41479cm</Size>
                 <CellContents>
                   <Textbox Name="Textbox49">
                     <CanGrow>true</CanGrow>
@@ -1350,7 +1342,7 @@
                             <Value>NOMBRE OPERADOR</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                             </Style>
                           </TextRun>
@@ -1395,7 +1387,7 @@
                             <Value>=Fields!RFC.Value</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>8pt</FontSize>
+                              <FontSize>7pt</FontSize>
                               <Format>#,0</Format>
                             </Style>
                           </TextRun>
@@ -1438,9 +1430,9 @@
         <RepeatColumnHeaders>true</RepeatColumnHeaders>
         <FixedColumnHeaders>true</FixedColumnHeaders>
         <DataSetName>DataSet4</DataSetName>
-        <Top>11.8213cm</Top>
+        <Top>7.59855cm</Top>
         <Left>0.06623cm</Left>
-        <Height>1.12062cm</Height>
+        <Height>0.82958cm</Height>
         <Width>20.36724cm</Width>
         <ZIndex>4</ZIndex>
         <Style>
@@ -1459,7 +1451,7 @@
                 <Value>FIGURAS DE TRANSPORTE</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>DimGray</Color>
                 </Style>
@@ -1471,9 +1463,9 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox3</rd:DefaultName>
-        <Top>11.23122cm</Top>
+        <Top>7.18459cm</Top>
         <Left>0.06623cm</Left>
-        <Height>0.5cm</Height>
+        <Height>0.41396cm</Height>
         <Width>8.01861in</Width>
         <ZIndex>5</ZIndex>
         <Style>
@@ -1494,18 +1486,10 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value>Medio de transporte</Value>
+                <Value>Medio de transporte: </Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
-                  <FontWeight>SemiBold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value>: </Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>SemiBold</FontWeight>
                 </Style>
               </TextRun>
@@ -1513,7 +1497,7 @@
                 <Value>=Parameters!MedioTransporte.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>Normal</FontWeight>
                 </Style>
               </TextRun>
@@ -1528,7 +1512,7 @@
                 <Value>Transporte Internacional: </Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>SemiBold</FontWeight>
                 </Style>
               </TextRun>
@@ -1536,7 +1520,7 @@
                 <Value>=Parameters!TransporteInternacional.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>Normal</FontWeight>
                 </Style>
               </TextRun>
@@ -1551,7 +1535,7 @@
                 <Value>Permiso SCT:</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>SemiBold</FontWeight>
                 </Style>
               </TextRun>
@@ -1559,7 +1543,7 @@
                 <Value xml:space="preserve"> </Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
@@ -1567,7 +1551,7 @@
                 <Value>=Parameters!PermisoSTCC.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>Normal</FontWeight>
                 </Style>
               </TextRun>
@@ -1579,83 +1563,13 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value>Numero de Permiso</Value>
+                <Value />
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>SemiBold</FontWeight>
                 </Style>
               </TextRun>
-              <TextRun>
-                <Value>: </Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>SemiBold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value>=Parameters!NumPermiso.Value</Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>Normal</FontWeight>
-                </Style>
-              </TextRun>
-            </TextRuns>
-            <Style>
-              <TextAlign>Left</TextAlign>
-            </Style>
-          </Paragraph>
-          <Paragraph>
-            <TextRuns>
-              <TextRun>
-                <Value>Placa:</Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
-                  <FontWeight>SemiBold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value>=Parameters!PlacaVM.Value</Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>Normal</FontWeight>
-                </Style>
-              </TextRun>
-            </TextRuns>
-            <Style>
-              <TextAlign>Left</TextAlign>
-            </Style>
-          </Paragraph>
-          <Paragraph>
-            <TextRuns>
-              <TextRun>
-                <Value>Año:</Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
-                  <FontWeight>SemiBold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value>=Parameters!AnioVM.Value</Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>Normal</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value xml:space="preserve"> </Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>Normal</FontWeight>
-                </Style>
-              </TextRun>
             </TextRuns>
             <Style>
               <TextAlign>Left</TextAlign>
@@ -1665,8 +1579,8 @@
         <rd:DefaultName>Textbox2</rd:DefaultName>
         <Top>1.09361in</Top>
         <Left>0.06623cm</Left>
-        <Height>0.95951in</Height>
-        <Width>3.78787in</Width>
+        <Height>0.47409in</Height>
+        <Width>2.12282in</Width>
         <ZIndex>6</ZIndex>
         <Style>
           <Border>
@@ -1688,7 +1602,7 @@
                 <Value>DETALLE TRANSPORTE</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>DimGray</Color>
                 </Style>
@@ -1719,75 +1633,6 @@
         <CanGrow>true</CanGrow>
         <KeepTogether>true</KeepTogether>
         <Paragraphs>
-          <Paragraph>
-            <TextRuns>
-              <TextRun>
-                <Value>Aseguradora Responsabilidad Civil: </Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>7pt</FontSize>
-                  <FontWeight>SemiBold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value>=Parameters!Aseguradora.Value</Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>7pt</FontSize>
-                  <FontWeight>Normal</FontWeight>
-                </Style>
-              </TextRun>
-            </TextRuns>
-            <Style>
-              <TextAlign>Left</TextAlign>
-            </Style>
-          </Paragraph>
-          <Paragraph>
-            <TextRuns>
-              <TextRun>
-                <Value>Número de Póliza:</Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>7pt</FontSize>
-                  <FontWeight>SemiBold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value>=Parameters!NumPoliza.Value</Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>7pt</FontSize>
-                  <FontWeight>Normal</FontWeight>
-                </Style>
-              </TextRun>
-            </TextRuns>
-            <Style>
-              <TextAlign>Left</TextAlign>
-            </Style>
-          </Paragraph>
-          <Paragraph>
-            <TextRuns>
-              <TextRun>
-                <Value>Aseguradora Medio Ambiente:</Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>7pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value>=Parameters!NombreAseguradoraMedioAmbiente.Value</Value>
-                <Style>
-                  <FontFamily>Calibri</FontFamily>
-                  <FontSize>7pt</FontSize>
-                  <FontWeight>Normal</FontWeight>
-                </Style>
-              </TextRun>
-            </TextRuns>
-            <Style>
-              <TextAlign>Left</TextAlign>
-            </Style>
-          </Paragraph>
           <Paragraph>
             <TextRuns>
               <TextRun>
@@ -1874,10 +1719,10 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>1.09361in</Top>
-        <Left>9.72269cm</Left>
-        <Height>0.95951in</Height>
-        <Width>4.21685in</Width>
+        <Top>1.07972in</Top>
+        <Left>14.61748cm</Left>
+        <Height>0.48798in</Height>
+        <Width>2.26893in</Width>
         <ZIndex>8</ZIndex>
         <Style>
           <Border>
@@ -1898,32 +1743,32 @@
               <TextRun>
                 <Value>Remolque 1</Value>
                 <Style>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value> Placa: </Value>
                 <Style>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>=Parameters!RemolquePlaca1.Value</Value>
                 <Style>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>  Tipo Rem: </Value>
                 <Style>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>=Parameters!RemolqueSubtimo1.Value</Value>
                 <Style>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -1931,9 +1776,9 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox38</rd:DefaultName>
-        <Top>5.28548cm</Top>
+        <Top>4.01548cm</Top>
         <Left>0.06623cm</Left>
-        <Height>0.45862cm</Height>
+        <Height>0.35631cm</Height>
         <Width>9.62118cm</Width>
         <ZIndex>9</ZIndex>
         <Visibility>
@@ -1958,32 +1803,32 @@
               <TextRun>
                 <Value>Remolque 2</Value>
                 <Style>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value> Placa: </Value>
                 <Style>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>=Parameters!RemolquePlaca2.Value</Value>
                 <Style>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>   Tipo Rem: </Value>
                 <Style>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>=Parameters!RemolqueSubtimo2.Value</Value>
                 <Style>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -1991,9 +1836,9 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox38</rd:DefaultName>
-        <Top>5.28548cm</Top>
+        <Top>4.01548cm</Top>
         <Left>9.72269cm</Left>
-        <Height>0.45862cm</Height>
+        <Height>0.35631cm</Height>
         <Width>10.7292cm</Width>
         <ZIndex>10</ZIndex>
         <Visibility>
@@ -2381,7 +2226,7 @@
           </Textbox>
         </ReportItems>
         <KeepTogether>true</KeepTogether>
-        <Top>13.15006cm</Top>
+        <Top>8.48281cm</Top>
         <Left>0.06623cm</Left>
         <Height>1.78092cm</Height>
         <Width>20.36726cm</Width>
@@ -3585,7 +3430,7 @@
           </Textbox>
         </ReportItems>
         <KeepTogether>true</KeepTogether>
-        <Top>15.01212cm</Top>
+        <Top>10.34487cm</Top>
         <Left>0.0743cm</Left>
         <Height>7.44771cm</Height>
         <Width>20.42542cm</Width>
@@ -3609,14 +3454,14 @@
                 <Value>Pesto Neto Total (KG):</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>=Parameters!PesoNetoTotal.Value</Value>
                 <Style>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -3624,9 +3469,9 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox46</rd:DefaultName>
-        <Top>7.86463cm</Top>
-        <Left>0.10048cm</Left>
-        <Height>0.56201cm</Height>
+        <Top>5.70563cm</Top>
+        <Left>0.06623cm</Left>
+        <Height>0.3768cm</Height>
         <Width>8.87863cm</Width>
         <ZIndex>14</ZIndex>
         <Style>
@@ -3649,14 +3494,14 @@
                 <Value>Distancia Total:</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>=Parameters!DistanciaTotal.Value</Value>
                 <Style>
-                  <FontSize>8pt</FontSize>
+                  <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -3664,10 +3509,10 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox46</rd:DefaultName>
-        <Top>10.43366cm</Top>
+        <Top>7.18459cm</Top>
         <Left>0.0743cm</Left>
-        <Height>0.6cm</Height>
-        <Width>8.90481cm</Width>
+        <Height>0.37869cm</Height>
+        <Width>6.32091cm</Width>
         <ZIndex>15</ZIndex>
         <Style>
           <Border>
@@ -3679,8 +3524,192 @@
           <PaddingBottom>2pt</PaddingBottom>
         </Style>
       </Textbox>
+      <Textbox Name="Textbox53">
+        <CanGrow>true</CanGrow>
+        <KeepTogether>true</KeepTogether>
+        <Paragraphs>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>Numero de Permiso: </Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>7pt</FontSize>
+                  <FontWeight>SemiBold</FontWeight>
+                </Style>
+              </TextRun>
+              <TextRun>
+                <Value>=Parameters!NumPermiso.Value</Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>7pt</FontSize>
+                  <FontWeight>Normal</FontWeight>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style />
+          </Paragraph>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>Placa:</Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>7pt</FontSize>
+                  <FontWeight>SemiBold</FontWeight>
+                </Style>
+              </TextRun>
+              <TextRun>
+                <Value>=Parameters!PlacaVM.Value</Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>7pt</FontSize>
+                  <FontWeight>Normal</FontWeight>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Left</TextAlign>
+            </Style>
+          </Paragraph>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>Año:</Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>7pt</FontSize>
+                  <FontWeight>SemiBold</FontWeight>
+                </Style>
+              </TextRun>
+              <TextRun>
+                <Value>=Parameters!AnioVM.Value</Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>7pt</FontSize>
+                  <FontWeight>Normal</FontWeight>
+                </Style>
+              </TextRun>
+              <TextRun>
+                <Value xml:space="preserve"> </Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>7pt</FontSize>
+                  <FontWeight>Normal</FontWeight>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Left</TextAlign>
+            </Style>
+          </Paragraph>
+        </Paragraphs>
+        <rd:DefaultName>Textbox53</rd:DefaultName>
+        <Top>2.77933cm</Top>
+        <Left>5.36787cm</Left>
+        <Height>1.20263cm</Height>
+        <Width>3.86975cm</Width>
+        <ZIndex>16</ZIndex>
+        <Style>
+          <Border>
+            <Style>None</Style>
+          </Border>
+          <PaddingLeft>2pt</PaddingLeft>
+          <PaddingRight>2pt</PaddingRight>
+          <PaddingTop>2pt</PaddingTop>
+          <PaddingBottom>2pt</PaddingBottom>
+        </Style>
+      </Textbox>
+      <Textbox Name="Textbox57">
+        <CanGrow>true</CanGrow>
+        <KeepTogether>true</KeepTogether>
+        <Paragraphs>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>Aseguradora Responsabilidad Civil: </Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>7pt</FontSize>
+                  <FontWeight>SemiBold</FontWeight>
+                </Style>
+              </TextRun>
+              <TextRun>
+                <Value>=Parameters!Aseguradora.Value</Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>7pt</FontSize>
+                  <FontWeight>Normal</FontWeight>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style />
+          </Paragraph>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>Número de Póliza:</Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>7pt</FontSize>
+                  <FontWeight>SemiBold</FontWeight>
+                </Style>
+              </TextRun>
+              <TextRun>
+                <Value>=Parameters!NumPoliza.Value</Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>7pt</FontSize>
+                  <FontWeight>Normal</FontWeight>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Left</TextAlign>
+            </Style>
+          </Paragraph>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>Aseguradora Medio Ambiente:</Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>7pt</FontSize>
+                  <FontWeight>Bold</FontWeight>
+                </Style>
+              </TextRun>
+              <TextRun>
+                <Value>=Parameters!NombreAseguradoraMedioAmbiente.Value</Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>7pt</FontSize>
+                  <FontWeight>Normal</FontWeight>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Left</TextAlign>
+            </Style>
+          </Paragraph>
+        </Paragraphs>
+        <rd:DefaultName>Textbox57</rd:DefaultName>
+        <Top>2.77778cm</Top>
+        <Left>9.30817cm</Left>
+        <Height>1.20419cm</Height>
+        <Width>5.25306cm</Width>
+        <ZIndex>17</ZIndex>
+        <Style>
+          <Border>
+            <Style>None</Style>
+          </Border>
+          <PaddingLeft>2pt</PaddingLeft>
+          <PaddingRight>2pt</PaddingRight>
+          <PaddingTop>2pt</PaddingTop>
+          <PaddingBottom>2pt</PaddingBottom>
+        </Style>
+      </Textbox>
     </ReportItems>
-    <Height>8.84245in</Height>
+    <Height>7.00495in</Height>
     <Style />
   </Body>
   <Width>20.51303cm</Width>
@@ -3930,7 +3959,7 @@
       <PrintOnLastPage>true</PrintOnLastPage>
       <ReportItems>
         <Line Name="Line1">
-          <Top>0.03524cm</Top>
+          <Top>0.03523cm</Top>
           <Left>0.06623cm</Left>
           <Height>0cm</Height>
           <Width>20.38566cm</Width>
@@ -3960,7 +3989,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox13</rd:DefaultName>
-          <Top>0.14107cm</Top>
+          <Top>0.14106cm</Top>
           <Left>0.71425cm</Left>
           <Height>0.54708cm</Height>
           <Width>1.55632cm</Width>
@@ -3994,7 +4023,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox14</rd:DefaultName>
-          <Top>0.14107cm</Top>
+          <Top>0.14106cm</Top>
           <Left>2.27057cm</Left>
           <Height>0.54708cm</Height>
           <Width>4.96223cm</Width>
@@ -4029,7 +4058,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox13</rd:DefaultName>
-          <Top>0.14107cm</Top>
+          <Top>0.14106cm</Top>
           <Left>7.33864cm</Left>
           <Height>0.54708cm</Height>
           <Width>2.84562cm</Width>
@@ -4064,7 +4093,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox14</rd:DefaultName>
-          <Top>0.14107cm</Top>
+          <Top>0.14106cm</Top>
           <Left>10.18425cm</Left>
           <Height>0.54708cm</Height>
           <Width>4.68641cm</Width>
@@ -4098,7 +4127,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox14</rd:DefaultName>
-          <Top>0.1446cm</Top>
+          <Top>0.14459cm</Top>
           <Left>14.99343cm</Left>
           <Height>0.54708cm</Height>
           <Width>4.04906cm</Width>
@@ -4130,7 +4159,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox14</rd:DefaultName>
-          <Top>0.68815cm</Top>
+          <Top>0.68814cm</Top>
           <Left>0.71425cm</Left>
           <Height>0.54708cm</Height>
           <Width>6.21751cm</Width>
diff --git a/Empresas/13/Formatos/Factura.rdlc b/Empresas/13/Formatos/Factura.rdlc
index e2a9d6c67..0d9fdd708 100644
--- a/Empresas/13/Formatos/Factura.rdlc
+++ b/Empresas/13/Formatos/Factura.rdlc
@@ -8,26 +8,10 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value>EXPLORACIONES MINERAS DEL DESIERTO S.A. </Value>
-                <Style>
-                  <FontStyle>Normal</FontStyle>
-                  <FontSize>12pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                  <TextDecoration>None</TextDecoration>
-                  <Color>#000000</Color>
-                </Style>
-              </TextRun>
-            </TextRuns>
-            <Style>
-              <TextAlign>Center</TextAlign>
-            </Style>
-          </Paragraph>
-          <Paragraph>
-            <TextRuns>
-              <TextRun>
-                <Value>DE C.V. RFC: EMD950206SRA </Value>
+                <Value>EXPLORACIONES MINERAS DEL DESIERTO S.A. DE C.V. RFC: EMD950206SRA </Value>
                 <Style>
                   <FontStyle>Normal</FontStyle>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <TextDecoration>None</TextDecoration>
                   <Color>#000000</Color>
@@ -44,6 +28,7 @@
                 <Value>Tipo de Comprobante: I - Ingreso </Value>
                 <Style>
                   <FontStyle>Normal</FontStyle>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <TextDecoration>None</TextDecoration>
                   <Color>#000000</Color>
@@ -60,6 +45,7 @@
                 <Value>Del Cobre No. 95 Col. Parque Industrial Hermosillo, Sonora. México, C.P. 83299 </Value>
                 <Style>
                   <FontStyle>Normal</FontStyle>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>Normal</FontWeight>
                   <TextDecoration>None</TextDecoration>
                   <Color>#000000</Color>
@@ -76,6 +62,7 @@
                 <Value>Tel. 6622510249 </Value>
                 <Style>
                   <FontStyle>Normal</FontStyle>
+                  <FontSize>7pt</FontSize>
                   <FontWeight>Normal</FontWeight>
                   <TextDecoration>None</TextDecoration>
                   <Color>#000000</Color>
@@ -92,6 +79,7 @@
                 <Value>Régimen Fiscal: 601 - General de Ley Personas Morales</Value>
                 <Style>
                   <FontStyle>Normal</FontStyle>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <TextDecoration>None</TextDecoration>
                   <Color>#000000</Color>
@@ -104,9 +92,9 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox4</rd:DefaultName>
-        <Left>1.94795in</Left>
-        <Height>1.12067in</Height>
-        <Width>5.98809in</Width>
+        <Left>1.67497in</Left>
+        <Height>0.75237in</Height>
+        <Width>6.31315in</Width>
         <Style>
           <Border>
             <Style>None</Style>
@@ -121,9 +109,9 @@
         <Source>Embedded</Source>
         <Value>Logo1</Value>
         <Sizing>FitProportional</Sizing>
-        <Left>0.92917cm</Left>
-        <Height>2.88998cm</Height>
-        <Width>3.84225cm</Width>
+        <Left>1.06146cm</Left>
+        <Height>1.91102cm</Height>
+        <Width>2.76081cm</Width>
         <ZIndex>1</ZIndex>
         <Style>
           <Border>
@@ -141,7 +129,7 @@
                 <Value>Nombre:</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
@@ -150,8 +138,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>1.88777in</Top>
-        <Left>0.1441cm</Left>
+        <Top>1.43777in</Top>
+        <Left>0.27639cm</Left>
         <Height>0.17222in</Height>
         <Width>0.81128in</Width>
         <ZIndex>2</ZIndex>
@@ -191,10 +179,10 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>1.88777in</Top>
-        <Left>0.86801in</Left>
+        <Top>1.43777in</Top>
+        <Left>0.93398in</Left>
         <Height>0.17222in</Height>
-        <Width>4.18029in</Width>
+        <Width>3.24868in</Width>
         <ZIndex>3</ZIndex>
         <Style>
           <Border>
@@ -246,7 +234,7 @@
           </TablixColumns>
           <TablixRows>
             <TablixRow>
-              <Height>0.74994cm</Height>
+              <Height>0.48536cm</Height>
               <TablixCells>
                 <TablixCell>
                   <CellContents>
@@ -259,7 +247,7 @@
                               <Value>Cantidad</Value>
                               <Style>
                                 <FontFamily>calibri</FontFamily>
-                                <FontSize>9pt</FontSize>
+                                <FontSize>8pt</FontSize>
                                 <FontWeight>Bold</FontWeight>
                                 <Color>SteelBlue</Color>
                               </Style>
@@ -305,7 +293,7 @@
                               <Value>Codigo</Value>
                               <Style>
                                 <FontFamily>calibri</FontFamily>
-                                <FontSize>9pt</FontSize>
+                                <FontSize>8pt</FontSize>
                                 <FontWeight>Bold</FontWeight>
                                 <Color>SteelBlue</Color>
                               </Style>
@@ -351,7 +339,7 @@
                               <Value>C.U. SAT</Value>
                               <Style>
                                 <FontFamily>calibri</FontFamily>
-                                <FontSize>9pt</FontSize>
+                                <FontSize>8pt</FontSize>
                                 <FontWeight>Bold</FontWeight>
                                 <Color>SteelBlue</Color>
                               </Style>
@@ -394,26 +382,10 @@
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>Clave </Value>
+                              <Value>Clave Prod.</Value>
                               <Style>
                                 <FontFamily>calibri</FontFamily>
-                                <FontSize>9pt</FontSize>
-                                <FontWeight>Bold</FontWeight>
-                                <Color>SteelBlue</Color>
-                              </Style>
-                            </TextRun>
-                          </TextRuns>
-                          <Style>
-                            <TextAlign>Center</TextAlign>
-                          </Style>
-                        </Paragraph>
-                        <Paragraph>
-                          <TextRuns>
-                            <TextRun>
-                              <Value>Producto</Value>
-                              <Style>
-                                <FontFamily>calibri</FontFamily>
-                                <FontSize>9pt</FontSize>
+                                <FontSize>8pt</FontSize>
                                 <FontWeight>Bold</FontWeight>
                                 <Color>SteelBlue</Color>
                               </Style>
@@ -458,7 +430,7 @@
                               <Value>Descripción</Value>
                               <Style>
                                 <FontFamily>calibri</FontFamily>
-                                <FontSize>9pt</FontSize>
+                                <FontSize>8pt</FontSize>
                                 <FontWeight>Bold</FontWeight>
                                 <Color>SteelBlue</Color>
                               </Style>
@@ -503,7 +475,7 @@
                               <Value>P.U.</Value>
                               <Style>
                                 <FontFamily>calibri</FontFamily>
-                                <FontSize>9pt</FontSize>
+                                <FontSize>8pt</FontSize>
                                 <FontWeight>Bold</FontWeight>
                                 <Color>SteelBlue</Color>
                               </Style>
@@ -549,7 +521,7 @@
                               <Value>Impuestos</Value>
                               <Style>
                                 <FontFamily>calibri</FontFamily>
-                                <FontSize>9pt</FontSize>
+                                <FontSize>8pt</FontSize>
                                 <FontWeight>Bold</FontWeight>
                                 <Color>SteelBlue</Color>
                               </Style>
@@ -594,7 +566,7 @@
                               <Value>Importe</Value>
                               <Style>
                                 <FontFamily>calibri</FontFamily>
-                                <FontSize>9pt</FontSize>
+                                <FontSize>8pt</FontSize>
                                 <FontWeight>Bold</FontWeight>
                                 <Color>SteelBlue</Color>
                               </Style>
@@ -973,15 +945,16 @@
           </TablixMembers>
         </TablixRowHierarchy>
         <DataSetName>DsOC</DataSetName>
-        <Top>6.28717cm</Top>
-        <Left>0.08756cm</Left>
-        <Height>1.2353cm</Height>
+        <Top>4.63617cm</Top>
+        <Left>0.21985cm</Left>
+        <Height>0.97072cm</Height>
         <Width>20.06999cm</Width>
         <ZIndex>4</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
           </Border>
+          <FontSize>8pt</FontSize>
         </Style>
       </Tablix>
       <Textbox Name="Textbox1">
@@ -1002,8 +975,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox1</rd:DefaultName>
-        <Top>8.59672cm</Top>
-        <Left>14.50693cm</Left>
+        <Top>7.70772cm</Top>
+        <Left>14.63922cm</Left>
         <Height>0.54708cm</Height>
         <Width>5.65062cm</Width>
         <ZIndex>5</ZIndex>
@@ -1040,7 +1013,7 @@
                               <Value>=Fields!Importe.Value</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>9pt</FontSize>
+                                <FontSize>8pt</FontSize>
                                 <Format>'$'#,0.00;('$'#,0.00)</Format>
                               </Style>
                             </TextRun>
@@ -1082,7 +1055,7 @@
                               <Value>=Replace(Parameters!Moneda.Value,"Pesos","Peso mexicano")</Value>
                               <Style>
                                 <FontFamily>Calibri</FontFamily>
-                                <FontSize>9pt</FontSize>
+                                <FontSize>8pt</FontSize>
                               </Style>
                             </TextRun>
                           </TextRuns>
@@ -1135,7 +1108,7 @@
                             <Value>=Fields!ImpuestoLocal.Value</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>9pt</FontSize>
+                              <FontSize>8pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                               <Color>SteelBlue</Color>
                             </Style>
@@ -1174,7 +1147,7 @@
                             <Value>Moneda</Value>
                             <Style>
                               <FontFamily>Calibri</FontFamily>
-                              <FontSize>9pt</FontSize>
+                              <FontSize>8pt</FontSize>
                               <FontWeight>Bold</FontWeight>
                               <Color>SteelBlue</Color>
                             </Style>
@@ -1203,8 +1176,8 @@
           </TablixMembers>
         </TablixRowHierarchy>
         <DataSetName>DataSet1</DataSetName>
-        <Top>7.71422cm</Top>
-        <Left>14.47478cm</Left>
+        <Top>7.14272cm</Top>
+        <Left>14.60707cm</Left>
         <Height>0.65551cm</Height>
         <Width>5.68277cm</Width>
         <ZIndex>6</ZIndex>
@@ -1224,7 +1197,7 @@
                 <Value>Folio Factura</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -1234,8 +1207,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>2.79612cm</Top>
-        <Left>14.15252cm</Left>
+        <Top>1.84362cm</Top>
+        <Left>14.28481cm</Left>
         <Height>0.41303cm</Height>
         <Width>2.08346cm</Width>
         <ZIndex>7</ZIndex>
@@ -1259,7 +1232,7 @@
                 <Value>=IIF(Parameters!Serie.Value.ToString="",Parameters!Folio.Value,Parameters!Serie.Value &amp; "-" &amp;Parameters!Folio.Value)</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -1269,8 +1242,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox3</rd:DefaultName>
-        <Top>2.79612cm</Top>
-        <Left>17.03869cm</Left>
+        <Top>1.84362cm</Top>
+        <Left>17.17098cm</Left>
         <Height>0.41303cm</Height>
         <Width>3.066cm</Width>
         <ZIndex>8</ZIndex>
@@ -1294,7 +1267,7 @@
                 <Value>Fecha</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -1304,8 +1277,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>3.22326cm</Top>
-        <Left>14.15252cm</Left>
+        <Top>2.27076cm</Top>
+        <Left>14.28481cm</Left>
         <Height>0.42714cm</Height>
         <Width>2.08346cm</Width>
         <ZIndex>9</ZIndex>
@@ -1329,7 +1302,7 @@
                 <Value>=Parameters!Fecha.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -1339,8 +1312,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox12</rd:DefaultName>
-        <Top>3.22326cm</Top>
-        <Left>17.03869cm</Left>
+        <Top>2.27076cm</Top>
+        <Left>17.17098cm</Left>
         <Height>0.42714cm</Height>
         <Width>3.066cm</Width>
         <ZIndex>10</ZIndex>
@@ -1364,7 +1337,7 @@
                 <Value>Lugar de Expedición</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -1374,8 +1347,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>3.75976cm</Top>
-        <Left>14.14208cm</Left>
+        <Top>2.77551cm</Top>
+        <Left>14.27437cm</Left>
         <Height>0.46681cm</Height>
         <Width>2.86133cm</Width>
         <ZIndex>11</ZIndex>
@@ -1400,6 +1373,7 @@
                 <Style>
                   <FontStyle>Normal</FontStyle>
                   <FontFamily>Calibri</FontFamily>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Normal</FontWeight>
                   <TextDecoration>None</TextDecoration>
                   <Color>#000000</Color>
@@ -1412,8 +1386,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox55</rd:DefaultName>
-        <Top>3.75976cm</Top>
-        <Left>17.03869cm</Left>
+        <Top>2.77551cm</Top>
+        <Left>17.17098cm</Left>
         <Height>0.46681cm</Height>
         <Width>3.05452cm</Width>
         <ZIndex>12</ZIndex>
@@ -1437,7 +1411,7 @@
                 <Value>Forma de Pago</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -1447,8 +1421,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>3.0229cm</Top>
-        <Left>0.1441cm</Left>
+        <Top>1.8799cm</Top>
+        <Left>0.27639cm</Left>
         <Height>0.42944cm</Height>
         <Width>3.80164cm</Width>
         <ZIndex>13</ZIndex>
@@ -1472,7 +1446,7 @@
                 <Value>=Parameters!FormaPago.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -1482,8 +1456,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox3</rd:DefaultName>
-        <Top>3.0229cm</Top>
-        <Left>4.12213cm</Left>
+        <Top>1.8799cm</Top>
+        <Left>4.25442cm</Left>
         <Height>0.42944cm</Height>
         <Width>6.76133cm</Width>
         <ZIndex>14</ZIndex>
@@ -1507,7 +1481,7 @@
                 <Value>Método de Pago</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -1517,8 +1491,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>3.46293cm</Top>
-        <Left>0.1441cm</Left>
+        <Top>2.28818cm</Top>
+        <Left>0.27639cm</Left>
         <Height>0.40122cm</Height>
         <Width>3.80164cm</Width>
         <ZIndex>15</ZIndex>
@@ -1542,7 +1516,7 @@
                 <Value>=IIF(Parameters!MetodoPago.Value.ToString="","No Identificado",Parameters!MetodoPago.Value)</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -1552,8 +1526,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox3</rd:DefaultName>
-        <Top>3.46998cm</Top>
-        <Left>4.12213cm</Left>
+        <Top>2.29523cm</Top>
+        <Left>4.25442cm</Left>
         <Height>0.40122cm</Height>
         <Width>6.76133cm</Width>
         <ZIndex>16</ZIndex>
@@ -1577,7 +1551,7 @@
                 <Value>Moneda</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -1587,8 +1561,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>3.94529cm</Top>
-        <Left>0.17938cm</Left>
+        <Top>2.73879cm</Top>
+        <Left>0.27639cm</Left>
         <Height>0.39417cm</Height>
         <Width>3.80164cm</Width>
         <ZIndex>17</ZIndex>
@@ -1612,21 +1586,21 @@
                 <Value>=Parameters!Moneda.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value xml:space="preserve">  </Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>Tipo de Cambio</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -1635,21 +1609,21 @@
                 <Value xml:space="preserve"> </Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>=Parameters!TipoCambio.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value xml:space="preserve"> </Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -1659,8 +1633,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox3</rd:DefaultName>
-        <Top>3.95234cm</Top>
-        <Left>4.12213cm</Left>
+        <Top>2.74584cm</Top>
+        <Left>4.25442cm</Left>
         <Height>0.43297cm</Height>
         <Width>6.76133cm</Width>
         <ZIndex>18</ZIndex>
@@ -1684,7 +1658,7 @@
                 <Value>Datos del Cliente</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -1694,8 +1668,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>4.41707cm</Top>
-        <Left>0.1441cm</Left>
+        <Top>3.14707cm</Top>
+        <Left>0.27639cm</Left>
         <Height>0.44708cm</Height>
         <Width>3.80164cm</Width>
         <ZIndex>19</ZIndex>
@@ -1719,7 +1693,7 @@
                 <Value>R.F.C.:</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
@@ -1728,10 +1702,10 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>2.05999in</Top>
-        <Left>0.1441cm</Left>
-        <Height>0.19861in</Height>
-        <Width>0.81128in</Width>
+        <Top>1.43777in</Top>
+        <Left>10.65925cm</Left>
+        <Height>0.1875in</Height>
+        <Width>0.36336in</Width>
         <ZIndex>20</ZIndex>
         <Style>
           <Border>
@@ -1770,10 +1744,10 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>2.03638in</Top>
-        <Left>0.86801in</Left>
+        <Top>1.43916in</Top>
+        <Left>4.55379in</Left>
         <Height>0.18472in</Height>
-        <Width>1.74279in</Width>
+        <Width>1.12758in</Width>
         <ZIndex>21</ZIndex>
         <Style>
           <Border>
@@ -1804,7 +1778,7 @@
               <TextRun>
                 <Value>Uso CFDI:</Value>
                 <Style>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
@@ -1813,10 +1787,10 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>2.03499in</Top>
-        <Left>6.65114cm</Left>
-        <Height>0.19861in</Height>
-        <Width>0.81128in</Width>
+        <Top>1.43777in</Top>
+        <Left>14.44108cm</Left>
+        <Height>0.17222in</Height>
+        <Width>0.63582in</Width>
         <ZIndex>22</ZIndex>
         <Style>
           <Border>
@@ -1855,10 +1829,10 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>2.03638in</Top>
-        <Left>3.44373in</Left>
-        <Height>0.18472in</Height>
-        <Width>1.60457in</Width>
+        <Top>1.43916in</Top>
+        <Left>6.36573in</Left>
+        <Height>0.17083in</Height>
+        <Width>1.55925in</Width>
         <ZIndex>23</ZIndex>
         <Style>
           <Border>
@@ -1890,7 +1864,7 @@
                 <Value>Domicilio:</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
@@ -1899,8 +1873,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>2.2586in</Top>
-        <Left>0.1441cm</Left>
+        <Top>1.62527in</Top>
+        <Left>0.27639cm</Left>
         <Height>0.15972in</Height>
         <Width>0.81128in</Width>
         <ZIndex>24</ZIndex>
@@ -1940,8 +1914,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>2.2586in</Top>
-        <Left>0.86801in</Left>
+        <Top>1.62527in</Top>
+        <Left>0.92009in</Left>
         <Height>0.15972in</Height>
         <Width>4.18029in</Width>
         <ZIndex>25</ZIndex>
@@ -1975,7 +1949,7 @@
                 <Value>OBSERVACIONES GENERALES:</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
@@ -1984,8 +1958,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>2.97039in</Top>
-        <Left>0.06399cm</Left>
+        <Top>2.77039in</Top>
+        <Left>0.19628cm</Left>
         <Height>0.17324in</Height>
         <Width>1.7828in</Width>
         <ZIndex>26</ZIndex>
@@ -2018,7 +1992,7 @@
                 <Value>=Parameters!Observaciones.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -2028,8 +2002,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox3</rd:DefaultName>
-        <Top>7.54478cm</Top>
-        <Left>4.69815cm</Left>
+        <Top>7.03678cm</Top>
+        <Left>4.83044cm</Left>
         <Height>0.44003cm</Height>
         <Width>9.60024cm</Width>
         <ZIndex>27</ZIndex>
@@ -2052,7 +2026,7 @@
                 <Value>=Parameters!ImporteLetra.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -2060,8 +2034,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>3.13113in</Top>
-        <Left>1.10063in</Left>
+        <Top>2.93113in</Top>
+        <Left>1.15271in</Left>
         <Height>0.44842cm</Height>
         <Width>4.52866in</Width>
         <ZIndex>28</ZIndex>
@@ -2095,7 +2069,7 @@
                 <Value>Importe Con Letra:</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -2105,8 +2079,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>7.95306cm</Top>
-        <Left>0.08756cm</Left>
+        <Top>7.44506cm</Top>
+        <Left>0.21985cm</Left>
         <Height>0.44842cm</Height>
         <Width>2.5581cm</Width>
         <ZIndex>29</ZIndex>
@@ -2124,10 +2098,10 @@
         <Source>External</Source>
         <Value>=Parameters!QR.Value</Value>
         <Sizing>FitProportional</Sizing>
-        <Top>3.40943in</Top>
-        <Left>0.08769in</Left>
-        <Height>1.14694in</Height>
-        <Width>1.34784in</Width>
+        <Top>3.05943in</Top>
+        <Left>0.13977in</Left>
+        <Height>0.68104in</Height>
+        <Width>0.78032in</Width>
         <ZIndex>30</ZIndex>
         <Style>
           <Border>
@@ -2145,7 +2119,7 @@
                 <Value>Serie del Certificado del Emisor</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -2155,8 +2129,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>9.29495cm</Top>
-        <Left>9.45782cm</Left>
+        <Top>7.89591cm</Top>
+        <Left>3.36322cm</Left>
         <Height>0.35889cm</Height>
         <Width>4.93935cm</Width>
         <ZIndex>31</ZIndex>
@@ -2180,7 +2154,7 @@
                 <Value>Folio Fiscal</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -2190,8 +2164,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>9.67148cm</Top>
-        <Left>9.45782cm</Left>
+        <Top>8.29008cm</Top>
+        <Left>3.36322cm</Left>
         <Height>0.40122cm</Height>
         <Width>4.93935cm</Width>
         <ZIndex>32</ZIndex>
@@ -2215,7 +2189,7 @@
                 <Value>No. de Serie del Certificado de l SAT</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -2225,8 +2199,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>10.05859cm</Top>
-        <Left>9.45782cm</Left>
+        <Top>8.72658cm</Top>
+        <Left>3.36322cm</Left>
         <Height>0.3536cm</Height>
         <Width>4.93935cm</Width>
         <ZIndex>33</ZIndex>
@@ -2250,7 +2224,7 @@
                 <Value>Fecha y Hora de Certificación</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -2260,8 +2234,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>10.41395cm</Top>
-        <Left>9.45782cm</Left>
+        <Top>9.12251cm</Top>
+        <Left>3.36322cm</Left>
         <Height>0.31479cm</Height>
         <Width>4.93935cm</Width>
         <ZIndex>34</ZIndex>
@@ -2285,7 +2259,7 @@
                 <Value>=Parameters!CertificadoContribuyente.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -2295,8 +2269,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>9.29495cm</Top>
-        <Left>14.46772cm</Left>
+        <Top>7.89591cm</Top>
+        <Left>8.37312cm</Left>
         <Height>0.35889cm</Height>
         <Width>5.62289cm</Width>
         <ZIndex>35</ZIndex>
@@ -2320,7 +2294,7 @@
                 <Value>=Parameters!FolioFiscal.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -2330,8 +2304,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>9.67148cm</Top>
-        <Left>14.46772cm</Left>
+        <Top>8.29008cm</Top>
+        <Left>8.37312cm</Left>
         <Height>0.40122cm</Height>
         <Width>5.62289cm</Width>
         <ZIndex>36</ZIndex>
@@ -2355,7 +2329,7 @@
                 <Value>=Parameters!SerieCertificadoSAT.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -2365,8 +2339,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>10.05859cm</Top>
-        <Left>14.46772cm</Left>
+        <Top>8.72658cm</Top>
+        <Left>8.37312cm</Left>
         <Height>0.3536cm</Height>
         <Width>5.62289cm</Width>
         <ZIndex>37</ZIndex>
@@ -2390,7 +2364,7 @@
                 <Value>=Parameters!FechaCertificacion.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                 </Style>
               </TextRun>
             </TextRuns>
@@ -2400,8 +2374,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>10.41395cm</Top>
-        <Left>14.46772cm</Left>
+        <Top>9.12251cm</Top>
+        <Left>8.37312cm</Left>
         <Height>0.31479cm</Height>
         <Width>5.62289cm</Width>
         <ZIndex>38</ZIndex>
@@ -2422,23 +2396,9 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value>Este documento es una representación impresa de un CFDI</Value>
+                <Value>Este documento es una representación impresa de un CFDI Version 3.3</Value>
                 <Style>
-                  <FontSize>9pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
-            </TextRuns>
-            <Style>
-              <TextAlign>Center</TextAlign>
-            </Style>
-          </Paragraph>
-          <Paragraph>
-            <TextRuns>
-              <TextRun>
-                <Value>Version 3.3</Value>
-                <Style>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
@@ -2449,10 +2409,10 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>4.27878in</Top>
-        <Left>9.45782cm</Left>
-        <Height>0.34009in</Height>
-        <Width>4.18614in</Width>
+        <Top>3.26381in</Top>
+        <Left>14.1724cm</Left>
+        <Height>0.47666in</Height>
+        <Width>2.40844in</Width>
         <ZIndex>39</ZIndex>
         <Style>
           <Border>
@@ -2492,10 +2452,10 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>4.78985in</Top>
-        <Left>0.06779in</Left>
+        <Top>3.91485in</Top>
+        <Left>0.10881in</Left>
         <Height>0.15694in</Height>
-        <Width>7.86825in</Width>
+        <Width>7.87931in</Width>
         <ZIndex>40</ZIndex>
         <Style>
           <Border>
@@ -2527,7 +2487,7 @@
                 <Value>Sello Digital del CFDI</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -2537,10 +2497,10 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>11.78131cm</Top>
-        <Left>0.10785cm</Left>
+        <Top>9.55881cm</Top>
+        <Left>0.25897cm</Left>
         <Height>0.44842cm</Height>
-        <Width>8.9127cm</Width>
+        <Width>8.89387cm</Width>
         <ZIndex>41</ZIndex>
         <Style>
           <Border>
@@ -2570,8 +2530,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>5.16778in</Top>
-        <Left>0.04987in</Left>
+        <Top>4.24278in</Top>
+        <Left>0.10195in</Left>
         <Height>0.1296in</Height>
         <Width>7.86825in</Width>
         <ZIndex>42</ZIndex>
@@ -2605,7 +2565,7 @@
                 <Value>Sello SAT</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -2615,8 +2575,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>12.74125cm</Top>
-        <Left>0.12668cm</Left>
+        <Top>10.4235cm</Top>
+        <Left>0.25897cm</Left>
         <Height>0.33552cm</Height>
         <Width>8.89387cm</Width>
         <ZIndex>43</ZIndex>
@@ -2648,8 +2608,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
-        <Top>5.57948in</Top>
-        <Left>0.05673in</Left>
+        <Top>4.55448in</Top>
+        <Left>0.09839in</Left>
         <Height>0.11805in</Height>
         <Width>7.86825in</Width>
         <ZIndex>44</ZIndex>
@@ -2683,7 +2643,7 @@
                 <Value>Cadena Original del Complemento del Certificación Digital del SAT</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
-                  <FontSize>9pt</FontSize>
+                  <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                   <Color>SteelBlue</Color>
                 </Style>
@@ -2693,8 +2653,8 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
-        <Top>13.72346cm</Top>
-        <Left>0.12669cm</Left>
+        <Top>11.157cm</Top>
+        <Left>0.20606cm</Left>
         <Height>0.34259cm</Height>
         <Width>8.89387cm</Width>
         <ZIndex>45</ZIndex>
@@ -3159,7 +3119,7 @@
           </Tablix>
         </ReportItems>
         <KeepTogether>true</KeepTogether>
-        <Top>14.54249cm</Top>
+        <Top>12.06599cm</Top>
         <Height>2.28935cm</Height>
         <Width>20.28984cm</Width>
         <ZIndex>46</ZIndex>
@@ -3172,203 +3132,167 @@
           </Border>
         </Style>
       </Rectangle>
-      <Rectangle Name="Rectangle1">
+      <Rectangle Name="Rectangle2">
         <ReportItems>
-          <Textbox Name="Textbox6">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>CARTA PORTE - TRASLADO</Value>
-                    <Style>
-                      <FontFamily>Myriad Pro</FontFamily>
-                      <FontSize>11pt</FontSize>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Center</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <rd:DefaultName>Textbox6</rd:DefaultName>
-            <Top>0.12917cm</Top>
-            <Left>0.06399cm</Left>
-            <Height>0.6cm</Height>
-            <Width>20.02662cm</Width>
+          <Subreport Name="cartaporte">
+            <ReportName>CartaPorteTimbrado</ReportName>
+            <Parameters>
+              <Parameter Name="LogoPath">
+                <Value>=Parameters!SRP_LogoPath.Value</Value>
+              </Parameter>
+              <Parameter Name="RFC">
+                <Value>=Parameters!SRP_RFC.Value</Value>
+              </Parameter>
+              <Parameter Name="SerieFolio">
+                <Value>=Parameters!SRP_SerieFolio.Value</Value>
+              </Parameter>
+              <Parameter Name="DomicilioFiscal">
+                <Value>=Parameters!SRP_DomicilioFiscal.Value</Value>
+              </Parameter>
+              <Parameter Name="RegimenFiscal">
+                <Value>=Parameters!SRP_RegimenFiscal.Value</Value>
+              </Parameter>
+              <Parameter Name="DomicilioExpedicion">
+                <Value>=Parameters!SRP_DomicilioExpedicion.Value</Value>
+              </Parameter>
+              <Parameter Name="ClienteDireccion">
+                <Value>=Parameters!SRP_ClienteDireccion.Value</Value>
+              </Parameter>
+              <Parameter Name="ClienteNombre">
+                <Value>=Parameters!SRP_ClienteNombre.Value</Value>
+              </Parameter>
+              <Parameter Name="ClienteRFC">
+                <Value>=Parameters!SRP_ClienteRFC.Value</Value>
+              </Parameter>
+              <Parameter Name="MedioTransporte">
+                <Value>=Parameters!SRP_MedioTransporte.Value</Value>
+              </Parameter>
+              <Parameter Name="TransporteInternacional">
+                <Value>=Parameters!SRP_TransporteInternacional.Value</Value>
+              </Parameter>
+              <Parameter Name="FolioFiscal">
+                <Value>=Parameters!SRP_FolioFiscal.Value</Value>
+              </Parameter>
+              <Parameter Name="FechaCertificacion">
+                <Value>=Parameters!SRP_FechaCertificacion.Value</Value>
+              </Parameter>
+              <Parameter Name="CertificadoContribuyente">
+                <Value>=Parameters!SRP_CertificadoContribuyente.Value</Value>
+              </Parameter>
+              <Parameter Name="SerieCertificadoSAT">
+                <Value>=Parameters!SRP_SerieCertificadoSAT.Value</Value>
+              </Parameter>
+              <Parameter Name="SelloCFDI">
+                <Value>=Parameters!SRP_SelloCFDI.Value</Value>
+              </Parameter>
+              <Parameter Name="CadenaOriginal">
+                <Value>=Parameters!SRP_CadenaOriginal.Value</Value>
+              </Parameter>
+              <Parameter Name="SelloSAT">
+                <Value>=Parameters!SRP_SelloSAT.Value</Value>
+              </Parameter>
+              <Parameter Name="QR">
+                <Value>=Parameters!SRP_QR.Value</Value>
+              </Parameter>
+              <Parameter Name="PermisoSTCC">
+                <Value>=Parameters!SRP_PermisoSTCC.Value</Value>
+              </Parameter>
+              <Parameter Name="NumPermiso">
+                <Value>=Parameters!SRP_NumPermiso.Value</Value>
+              </Parameter>
+              <Parameter Name="Aseguradora">
+                <Value>=Parameters!SRP_Aseguradora.Value</Value>
+              </Parameter>
+              <Parameter Name="NumPoliza">
+                <Value>=Parameters!SRP_NumPoliza.Value</Value>
+              </Parameter>
+              <Parameter Name="PlacaVM">
+                <Value>=Parameters!SRP_PlacaVM.Value</Value>
+              </Parameter>
+              <Parameter Name="AnioVM">
+                <Value>=Parameters!SRP_AnioVM.Value</Value>
+              </Parameter>
+              <Parameter Name="TipoTI">
+                <Value>=Parameters!SRP_TipoTI.Value</Value>
+              </Parameter>
+              <Parameter Name="ViaTI">
+                <Value>=Parameters!SRP_ViaTI.Value</Value>
+              </Parameter>
+              <Parameter Name="UsoCFDi">
+                <Value>=Parameters!SRP_UsoCFDi.Value</Value>
+              </Parameter>
+              <Parameter Name="SubTotal">
+                <Value>=Parameters!SRP_SubTotal.Value</Value>
+              </Parameter>
+              <Parameter Name="Total">
+                <Value>=Parameters!SRP_Total.Value</Value>
+              </Parameter>
+              <Parameter Name="Descuentos">
+                <Value>=Parameters!SRP_Descuentos.Value</Value>
+              </Parameter>
+              <Parameter Name="NombreAseguradoraMedioAmbiente">
+                <Value>=Parameters!SRP_NombreAseguradoraMedioAmbiente.Value</Value>
+              </Parameter>
+              <Parameter Name="NumPolizaSeguroMedioAmbiente">
+                <Value>=Parameters!SRP_NumPolizaSeguroMedioAmbiente.Value</Value>
+              </Parameter>
+              <Parameter Name="NombreAseguradoraCarga">
+                <Value>=Parameters!SRP_NombreAseguradoraCarga.Value</Value>
+              </Parameter>
+              <Parameter Name="NumPolizaSeguroCarga">
+                <Value>=Parameters!SRP_NumPolizaSeguroCarga.Value</Value>
+              </Parameter>
+              <Parameter Name="RemolquePlaca1">
+                <Value>=Parameters!SRP_RemolquePlaca1.Value</Value>
+              </Parameter>
+              <Parameter Name="RemolqueSubtimo1">
+                <Value>=Parameters!SRP_RemolqueSubtimo1.Value</Value>
+              </Parameter>
+              <Parameter Name="RemolquePlaca2">
+                <Value>=Parameters!SRP_RemolquePlaca2.Value</Value>
+              </Parameter>
+              <Parameter Name="RemolqueSubtimo2">
+                <Value>=Parameters!SRP_RemolqueSubtimo2.Value</Value>
+              </Parameter>
+              <Parameter Name="EsSubReporte">
+                <Value>=True</Value>
+              </Parameter>
+              <Parameter Name="PesoNetoTotal">
+                <Value>=Parameters!SRP_PesoNetoTotal.Value</Value>
+              </Parameter>
+              <Parameter Name="DistanciaTotal">
+                <Value>=Parameters!SRP_DistanciaTotal.Value</Value>
+              </Parameter>
+            </Parameters>
+            <Top>0.06863cm</Top>
+            <Height>1.11461cm</Height>
+            <Width>20.12945cm</Width>
             <Style>
               <Border>
                 <Style>None</Style>
               </Border>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
             </Style>
-          </Textbox>
+          </Subreport>
         </ReportItems>
-        <PageBreak>
-          <BreakLocation>Start</BreakLocation>
-        </PageBreak>
         <KeepTogether>true</KeepTogether>
-        <Top>16.87906cm</Top>
-        <Height>0.80985cm</Height>
-        <Width>20.28984cm</Width>
+        <Top>5.71625cm</Top>
+        <Height>1.2341cm</Height>
+        <Width>20.2229cm</Width>
         <ZIndex>47</ZIndex>
+        <Visibility>
+          <Hidden>=Not Parameters!TieneCartaPorte.Value</Hidden>
+        </Visibility>
         <Style>
           <Border>
             <Style>None</Style>
           </Border>
         </Style>
       </Rectangle>
-      <Subreport Name="cartaporte">
-        <ReportName>CartaPorteTimbrado</ReportName>
-        <Parameters>
-          <Parameter Name="LogoPath">
-            <Value>=Parameters!SRP_LogoPath.Value</Value>
-          </Parameter>
-          <Parameter Name="RFC">
-            <Value>=Parameters!SRP_RFC.Value</Value>
-          </Parameter>
-          <Parameter Name="SerieFolio">
-            <Value>=Parameters!SRP_SerieFolio.Value</Value>
-          </Parameter>
-          <Parameter Name="DomicilioFiscal">
-            <Value>=Parameters!SRP_DomicilioFiscal.Value</Value>
-          </Parameter>
-          <Parameter Name="RegimenFiscal">
-            <Value>=Parameters!SRP_RegimenFiscal.Value</Value>
-          </Parameter>
-          <Parameter Name="DomicilioExpedicion">
-            <Value>=Parameters!SRP_DomicilioExpedicion.Value</Value>
-          </Parameter>
-          <Parameter Name="ClienteDireccion">
-            <Value>=Parameters!SRP_ClienteDireccion.Value</Value>
-          </Parameter>
-          <Parameter Name="ClienteNombre">
-            <Value>=Parameters!SRP_ClienteNombre.Value</Value>
-          </Parameter>
-          <Parameter Name="ClienteRFC">
-            <Value>=Parameters!SRP_ClienteRFC.Value</Value>
-          </Parameter>
-          <Parameter Name="MedioTransporte">
-            <Value>=Parameters!SRP_MedioTransporte.Value</Value>
-          </Parameter>
-          <Parameter Name="TransporteInternacional">
-            <Value>=Parameters!SRP_TransporteInternacional.Value</Value>
-          </Parameter>
-          <Parameter Name="FolioFiscal">
-            <Value>=Parameters!SRP_FolioFiscal.Value</Value>
-          </Parameter>
-          <Parameter Name="FechaCertificacion">
-            <Value>=Parameters!SRP_FechaCertificacion.Value</Value>
-          </Parameter>
-          <Parameter Name="CertificadoContribuyente">
-            <Value>=Parameters!SRP_CertificadoContribuyente.Value</Value>
-          </Parameter>
-          <Parameter Name="SerieCertificadoSAT">
-            <Value>=Parameters!SRP_SerieCertificadoSAT.Value</Value>
-          </Parameter>
-          <Parameter Name="SelloCFDI">
-            <Value>=Parameters!SRP_SelloCFDI.Value</Value>
-          </Parameter>
-          <Parameter Name="CadenaOriginal">
-            <Value>=Parameters!SRP_CadenaOriginal.Value</Value>
-          </Parameter>
-          <Parameter Name="SelloSAT">
-            <Value>=Parameters!SRP_SelloSAT.Value</Value>
-          </Parameter>
-          <Parameter Name="QR">
-            <Value>=Parameters!SRP_QR.Value</Value>
-          </Parameter>
-          <Parameter Name="PermisoSTCC">
-            <Value>=Parameters!SRP_PermisoSTCC.Value</Value>
-          </Parameter>
-          <Parameter Name="NumPermiso">
-            <Value>=Parameters!SRP_NumPermiso.Value</Value>
-          </Parameter>
-          <Parameter Name="Aseguradora">
-            <Value>=Parameters!SRP_Aseguradora.Value</Value>
-          </Parameter>
-          <Parameter Name="NumPoliza">
-            <Value>=Parameters!SRP_NumPoliza.Value</Value>
-          </Parameter>
-          <Parameter Name="PlacaVM">
-            <Value>=Parameters!SRP_PlacaVM.Value</Value>
-          </Parameter>
-          <Parameter Name="AnioVM">
-            <Value>=Parameters!SRP_AnioVM.Value</Value>
-          </Parameter>
-          <Parameter Name="TipoTI">
-            <Value>=Parameters!SRP_TipoTI.Value</Value>
-          </Parameter>
-          <Parameter Name="ViaTI">
-            <Value>=Parameters!SRP_ViaTI.Value</Value>
-          </Parameter>
-          <Parameter Name="UsoCFDi">
-            <Value>=Parameters!SRP_UsoCFDi.Value</Value>
-          </Parameter>
-          <Parameter Name="SubTotal">
-            <Value>=Parameters!SRP_SubTotal.Value</Value>
-          </Parameter>
-          <Parameter Name="Total">
-            <Value>=Parameters!SRP_Total.Value</Value>
-          </Parameter>
-          <Parameter Name="Descuentos">
-            <Value>=Parameters!SRP_Descuentos.Value</Value>
-          </Parameter>
-          <Parameter Name="NombreAseguradoraMedioAmbiente">
-            <Value>=Parameters!SRP_NombreAseguradoraMedioAmbiente.Value</Value>
-          </Parameter>
-          <Parameter Name="NumPolizaSeguroMedioAmbiente">
-            <Value>=Parameters!SRP_NumPolizaSeguroMedioAmbiente.Value</Value>
-          </Parameter>
-          <Parameter Name="NombreAseguradoraCarga">
-            <Value>=Parameters!SRP_NombreAseguradoraCarga.Value</Value>
-          </Parameter>
-          <Parameter Name="NumPolizaSeguroCarga">
-            <Value>=Parameters!SRP_NumPolizaSeguroCarga.Value</Value>
-          </Parameter>
-          <Parameter Name="RemolquePlaca1">
-            <Value>=Parameters!SRP_RemolquePlaca1.Value</Value>
-          </Parameter>
-          <Parameter Name="RemolqueSubtimo1">
-            <Value>=Parameters!SRP_RemolqueSubtimo1.Value</Value>
-          </Parameter>
-          <Parameter Name="RemolquePlaca2">
-            <Value>=Parameters!SRP_RemolquePlaca2.Value</Value>
-          </Parameter>
-          <Parameter Name="RemolqueSubtimo2">
-            <Value>=Parameters!SRP_RemolqueSubtimo2.Value</Value>
-          </Parameter>
-          <Parameter Name="EsSubReporte">
-            <Value>=True</Value>
-          </Parameter>
-          <Parameter Name="PesoNetoTotal">
-            <Value>=Parameters!SRP_PesoNetoTotal.Value</Value>
-          </Parameter>
-          <Parameter Name="DistanciaTotal">
-            <Value>=Parameters!SRP_DistanciaTotal.Value</Value>
-          </Parameter>
-        </Parameters>
-        <Top>17.78979cm</Top>
-        <Height>1.77607cm</Height>
-        <Width>20.12945cm</Width>
-        <ZIndex>48</ZIndex>
-        <Style>
-          <Border>
-            <Style>None</Style>
-          </Border>
-        </Style>
-      </Subreport>
     </ReportItems>
-    <Height>19.56586cm</Height>
+    <Height>14.35534cm</Height>
     <Style />
   </Body>
-  <Width>20.28984cm</Width>
+  <Width>20.42213cm</Width>
   <Page>
     <PageFooter>
       <Height>0.64232cm</Height>
@@ -3396,7 +3320,7 @@
           </Paragraphs>
           <rd:DefaultName>Textbox3</rd:DefaultName>
           <Top>0.04232cm</Top>
-          <Left>16.6252cm</Left>
+          <Left>16.75749cm</Left>
           <Height>0.6cm</Height>
           <Width>3.66464cm</Width>
           <Style>
@@ -3440,7 +3364,7 @@
           </Paragraphs>
           <rd:DefaultName>Textbox8</rd:DefaultName>
           <Top>0.10582cm</Top>
-          <Left>0.7791cm</Left>
+          <Left>0.91139cm</Left>
           <Height>0.46771cm</Height>
           <Width>6.86562cm</Width>
           <ZIndex>1</ZIndex>
@@ -4355,6 +4279,18 @@
       <AllowBlank>true</AllowBlank>
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
+    <ReportParameter Name="CFDIVersion">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
+    <ReportParameter Name="RegimenFiscalCodigo">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
     <ReportParameter Name="SRP_NombreEmpresa">
       <DataType>String</DataType>
       <Nullable>true</Nullable>
@@ -4367,6 +4303,12 @@
       <AllowBlank>true</AllowBlank>
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
+    <ReportParameter Name="TieneCartaPorte">
+      <DataType>Boolean</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
     <ReportParameter Name="SRP_LogoPath">
       <DataType>String</DataType>
       <Nullable>true</Nullable>

From a9cdc64af1c18f5ec33a5206f6fb137063717e80 Mon Sep 17 00:00:00 2001
From: Jonathan Alexis Perez Morales <jonathan.perez@adssistemas.mx>
Date: Thu, 9 Jun 2022 19:11:57 -0700
Subject: [PATCH 2/7] E13. Cambios en generacion de carta porte

---
 Ventas/ProductosServicios.aspx    |    2 +-
 Ventas/ProductosServicios.aspx.vb |    6 +
 Ventas/Ventas.aspx                | 1156 +++++++++++++++--------------
 Ventas/Ventas.aspx.vb             |  275 ++++---
 4 files changed, 773 insertions(+), 666 deletions(-)

diff --git a/Ventas/ProductosServicios.aspx b/Ventas/ProductosServicios.aspx
index 756088bb6..f8c4c5040 100644
--- a/Ventas/ProductosServicios.aspx
+++ b/Ventas/ProductosServicios.aspx
@@ -231,7 +231,7 @@
                                         <br />
                                         <div class="form-group form-md-line-input input-iconright" runat="server" id="DivPSAdicionalVigencia" visible="false">
                                             <ADS:Dropdownlost runat="server" ID="DdlPSAdicionalVigencia" CssStyle="width: 46%;" CssClass="form-control input-sm select2me" DataTextField="PSCodigo" DataValueField="CvePS"  />
-                                            <label for="<%= DdlPSAdicionalVigencia.ClientID.ToString()%>">Producto de vigencia:</label>
+                                            <label for="<%= DdlPSAdicionalVigencia.ClientID.ToString()%>"><asp:Literal runat="server" Text="Producto de vigencia:" ID="LtlPSAdicionalVigencia"></asp:Literal> </label>
                                             <i></i>
                                         </div>
                                         <br />
diff --git a/Ventas/ProductosServicios.aspx.vb b/Ventas/ProductosServicios.aspx.vb
index ebebe8f8b..f20729e3c 100644
--- a/Ventas/ProductosServicios.aspx.vb
+++ b/Ventas/ProductosServicios.aspx.vb
@@ -330,6 +330,12 @@ Partial Class ProductosyServicios
             CargaPSAdicionalesVigencias()
         End If
 
+        If UsuarioActual.CveEmpresa = 13 Then
+            DivPSAdicionalVigencia.Visible = True
+            LtlPSAdicionalVigencia.Text = "Producto Relacionado:"
+            CargaPSAdicionalesVigencias()
+        End If
+
         'Nuevo R: 26/09/2017
         CargaProveedores()
 
diff --git a/Ventas/Ventas.aspx b/Ventas/Ventas.aspx
index 64399efc7..e11a85891 100644
--- a/Ventas/Ventas.aspx
+++ b/Ventas/Ventas.aspx
@@ -4,7 +4,6 @@
 <%--Necesario para el modal que no se cierra--%>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="CP" runat="Server">
-
     <style>
         .btn-xs {
             padding: 0px 5px;
@@ -2221,6 +2220,356 @@
                             <ContentTemplate>
                                 <table border="0" cellpadding="0" cellspacing="0" class="TextTab" style="width: 100%">
                                     <tr valign="top">
+                                        <td rowspan="1" colspan="2">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <div id="DivCartaPorte" runat="server" visible="false" class="portlet light xspadding bordered whitoutcol" style="width: 100%">
+                                                        <div class="portlet-title">
+                                                            <div class="caption font-green">
+                                                                <i class="icon-pin font-green"></i>
+                                                                <span class="caption-subject bold uppercase">CARTA PORTE</span>
+                                                            </div>
+                                                            <div class="actions">
+                                                                <div class="btn-group">
+                                                                </div>
+                                                            </div>
+
+                                                            <div class="tools">
+                                                                <a href="javascript:;" class="collapse"></a>
+                                                            </div>
+                                                        </div>
+                                                        <div class="portlet-body ">
+                                                            <div class="rowpadding">
+                                                                <asp:UpdatePanel ID="UpEmitirTransitorio" runat="server" UpdateMode="Conditional">
+                                                                    <ContentTemplate>
+                                                                        <div class="row rowpadding">
+                                                                            <label class="col-md-2">Emitir:</label>
+                                                                            <div class="col-md-10">
+                                                                                <asp:CheckBox ID="ChkEmitirCartaPorte" runat="server" CssClass="chksino" Text=" " OnCheckedChanged="ChkEmitirCartaPorte_CheckedChanged" AutoPostBack="true" />
+                                                                            </div>
+                                                                        </div>
+                                                                        <br />
+                                                                        <div class="row rowpadding">
+                                                                            <label class="col-md-2">Origen:</label>
+                                                                            <div class="col-md-10">
+                                                                                <asp:DropDownList ID="DdlDireccionOrigen" runat="server" AutoPostBack="true" CssClass="form-control input-sm select2me" AppendDataBoundItems="true" DataTextField="SucursalClienteVentaDireccion" DataValueField="CveDireccionEnvio" Width="100%" OnSelectedIndexChanged="DdlDireccionOrigen_SelectedIndexChanged">
+                                                                                    <asp:ListItem Selected="true" Text="Seleccione" Value="-1"></asp:ListItem>
+                                                                                </asp:DropDownList>
+                                                                                <%--<asp:TextBox ID="TxtOrigenCP" runat="server" Enabled="false" Text="" CssClass="form-control input-sm"></asp:TextBox>--%>
+                                                                            </div>
+                                                                        </div>
+                                                                        <br />
+                                                                        <div class="row rowpadding">
+                                                                            <label class="col-md-2">Destino:</label>
+                                                                            <div class="col-md-10">
+                                                                                <asp:DropDownList ID="DdlDireccionDestino" runat="server" AutoPostBack="true" CssClass="form-control input-sm select2me" AppendDataBoundItems="true" DataTextField="SucursalClienteVentaDireccion" DataValueField="CveDireccionEnvio" Width="100%" OnSelectedIndexChanged="DdlDireccionDestino_SelectedIndexChanged">
+                                                                                    <asp:ListItem Selected="true" Text="Seleccione" Value="-1"></asp:ListItem>
+                                                                                </asp:DropDownList>
+                                                                                <%--<asp:TextBox ID="TxtDestinoCP" runat="server" Enabled="false" Text="" CssClass="form-control input-sm"></asp:TextBox>--%>
+                                                                            </div>
+                                                                        </div>
+                                                                        <br />
+                                                                        <div class="row rowpadding">
+                                                                            <label class="col-md-2">F. Llegada:</label>
+                                                                            <div class="col-md-4">
+                                                                                <ul class="list-inline" style="font-size: 12px; margin-top: -10px; margin-left: 0px; margin-bottom: 0px;">
+                                                                                    <li>
+                                                                                        <div class="input-group input-sm  date date-picker " data-date-format="dd/mm/yyyy hh:mm">
+                                                                                            <asp:TextBox ID="TxtFechaLlegadaCP" runat="server" CssClass="form-control input-sm ADDateTimePicker" CausesValidation="true" MaxLength="18" Width="132px "></asp:TextBox>
+                                                                                        </div>
+                                                                                    </li>
+                                                                                </ul>
+                                                                            </div>
+                                                                            <label class="col-md-2">F. Entrega:</label>
+                                                                            <div class="col-md-4">
+                                                                                <ul class="list-inline" style="font-size: 12px; margin-top: -10px; margin-left: 0px; margin-bottom: 0px;">
+                                                                                    <li>
+                                                                                        <div class="input-group input-sm  date date-picker " data-date-format="dd/mm/yyyy hh:mm">
+                                                                                            <asp:TextBox ID="TxtFechaEntregaCP" runat="server" CssClass="form-control input-sm ADDateTimePicker" CausesValidation="true" MaxLength="18" Width="132px "></asp:TextBox>
+                                                                                        </div>
+                                                                                    </li>
+                                                                                </ul>
+                                                                            </div>
+                                                                        </div>
+                                                                        <br />
+                                                                        <div class="row">
+                                                                            <div class="col-md-6">
+                                                                                <div class="row rowpadding">
+                                                                                    <label class="col-md-2">Unidad:</label>
+                                                                                    <div class="col-md-10">
+                                                                                        <asp:DropDownList runat="server" ID="DdlUnidadCamion" AutoPostBack="true" Width="100%" AppendDataBoundItems="true" CssClass="form-control input-sm select2me" DataValueField="CveCamion" DataTextField="CamionPlaca" OnSelectedIndexChanged="DdlUnidadCamionActivoFijo_SelectedIndexChanged"></asp:DropDownList>
+                                                                                        <asp:RequiredFieldValidator ID="RfvDdlUnidadCamion" runat="server" Enabled="false" ControlToValidate="DdlUnidadCamion" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Unidad''</b> es necesario, por favor seleccione uno." InitialValue="-1"></asp:RequiredFieldValidator>
+                                                                                        <ajax:ValidatorCalloutExtender ID="VceDdlUnidadCamion" runat="server" HighlightCssClass="vco" TargetControlID="RfvDdlUnidadCamion" Width="350px"></ajax:ValidatorCalloutExtender>
+                                                                                    </div>
+                                                                                </div>
+                                                                                <br />
+                                                                                <div class="row rowpadding" runat="server" id="DvConfiguracionVeiculo" visible="false">
+                                                                                    <label class="col-md-2">Configuración:</label>
+                                                                                    <div class="col-md-10">
+                                                                                        <asp:DropDownList ID="DdlConfigAuto" CssClass="form-control input-sm select2me" Width="100%" runat="server" AppendDataBoundItems="true" AutoPostBack="true" OnSelectedIndexChanged="DdlConfigAuto_SelectedIndexChanged" CausesValidation="true" DataTextField="ClaveConfigAutoTransporteDescripcion" DataValueField="CveConfigAutoTransporte" Style="padding: 0px">
+                                                                                        </asp:DropDownList>
+                                                                                        <asp:RequiredFieldValidator ID="RfvDdlConfigAuto" runat="server" Enabled="false" ControlToValidate="DdlConfigAuto" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Configuración Carta Porte''</b> es necesario, por favor seleccione uno." InitialValue="-1"></asp:RequiredFieldValidator>
+                                                                                        <ajax:ValidatorCalloutExtender ID="VCERfvDdlConfigAuto" runat="server" HighlightCssClass="vco" TargetControlID="RfvDdlConfigAuto" Width="350px"></ajax:ValidatorCalloutExtender>
+                                                                                    </div>
+                                                                                </div>
+                                                                                <br />
+                                                                                <div class="row rowpadding" runat="server" id="DvRemolque1" visible="false">
+                                                                                    <label class="col-md-2">Remolque 1:</label>
+                                                                                    <div class="col-md-10">
+                                                                                        <asp:DropDownList runat="server" ID="DdlRemolque1" AutoPostBack="true" Width="100%" AppendDataBoundItems="true" CssClass="form-control input-sm select2me" DataValueField="CveCamion" DataTextField="CamionPlaca" OnSelectedIndexChanged="DdlRemolque1_SelectedIndexChanged"></asp:DropDownList>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                            <div class="col-md-6">
+                                                                                <div class="row rowpadding">
+                                                                                    <label class="col-md-2">Chofer:</label>
+                                                                                    <div class="col-md-10">
+                                                                                        <asp:DropDownList ID="DdlChofer" runat="server" DataTextField="ChoferLicencia" DataValueField="CveChofer" CssClass="form-control input-sm select2me" Width="100%"></asp:DropDownList>
+                                                                                        <asp:RequiredFieldValidator ID="RfvDdlChofer" runat="server" Enabled="false" ControlToValidate="DdlChofer" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Chofer''</b> es necesario, por favor seleccione uno." InitialValue="-1"></asp:RequiredFieldValidator>
+                                                                                        <ajax:ValidatorCalloutExtender ID="VceDdlChofer" runat="server" HighlightCssClass="vco" TargetControlID="RfvDdlChofer" Width="350px"></ajax:ValidatorCalloutExtender>
+                                                                                    </div>
+                                                                                </div>
+                                                                                <br />
+                                                                                <div class="row rowpadding">
+                                                                                    <label class="col-md-2">Distancia:</label>
+                                                                                    <div class="col-md-10">
+                                                                                        <asp:TextBox ID="TxtDistancia" runat="server" CssClass="form-control input-sm" type="number"></asp:TextBox>
+                                                                                    </div>
+                                                                                </div>
+                                                                                <br />
+                                                                                <div class="row rowpadding" runat="server" id="DvRemolque2" visible="false">
+                                                                                    <label class="col-md-2">Remolque 2:</label>
+                                                                                    <div class="col-md-10">
+                                                                                        <asp:DropDownList runat="server" ID="DdlRemolque2" AutoPostBack="true" Width="100%" CssClass="form-control input-sm select2me" DataValueField="CveCamion" DataTextField="CamionPlaca"></asp:DropDownList>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                        <br />
+                                                                        <div class="row">
+                                                                            <div class="col-md-12">
+                                                                                <div class="portlet light xspadding bordered whitoutcol" style="width: 100%">
+                                                                                    <div class="portlet-title">
+                                                                                        <div class="caption font-green">
+                                                                                            <i class="icon-pin font-green"></i>
+                                                                                            <span class="caption-subject bold uppercase">Mercancias</span>
+                                                                                        </div>
+                                                                                        <div class="actions">
+                                                                                            <div class="btn-group">
+                                                                                                <asp:LinkButton ID="LnkAgregarMercancia" OnClick="LnkAgregarMercancia_Click" runat="server" data-toggle="tooltip" data-placement="right" title="Agregar Mercancía." CssClass="btn btn-circle btn-default" Text="<i class='fa fa-plus'></i> Agregar"></asp:LinkButton>
+                                                                                            </div>
+                                                                                        </div>
+                                                                                        <div class="tools">
+                                                                                            <a href="javascript:;" class="collapse"></a>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                    <div class="portlet-body ">
+                                                                                        <div class="rowpadding">
+                                                                                            <asp:GridView ID="GvMercanciasCP" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD mysmallbtn" Width="100%" data-sort="true" AutoGenerateColumns="False"
+                                                                                                EmptyDataText="No hay datos disponibles" DataKeyNames="Consec">
+                                                                                                <Columns>
+                                                                                                    <asp:TemplateField ItemStyle-Font-Size="6pt" HeaderText="#" ItemStyle-Width="10%">
+                                                                                                        <ItemTemplate>
+                                                                                                            <asp:Literal ID="LtlConsecutivo" runat="server" Text='<%# Eval("Consec", "{0:N0}") %>'></asp:Literal>&nbsp;
+                                                                                                        </ItemTemplate>
+                                                                                                    </asp:TemplateField>
+                                                                                                    <asp:BoundField DataField="Cantidad" HeaderText="Cantidad" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="20%" />
+                                                                                                    <asp:BoundField DataField="CodigoPS" HeaderText="Producto" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="60%" />
+                                                                                                    <asp:TemplateField ItemStyle-HorizontalAlign="Center" ItemStyle-Width="10%">
+                                                                                                        <ItemTemplate>
+                                                                                                            <asp:LinkButton ID="imgD" runat="server" AlternateText="Eliminar" CausesValidation="False" CommandName="Delete"
+                                                                                                                CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="Esta seguro de eliminar la mercancía?" data-btn-ok-label="si" />
+                                                                                                        </ItemTemplate>
+                                                                                                    </asp:TemplateField>
+                                                                                                </Columns>
+                                                                                            </asp:GridView>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </ContentTemplate>
+                                                                </asp:UpdatePanel>
+
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <div class="portlet light xspadding bordered whitoutcol" style="width: 100%;">
+                                                        <div class="portlet-title">
+                                                            <div class="caption font-green">
+                                                                <i class="icon-pin font-green"></i>
+                                                                <span class="caption-subject bold uppercase">COMERCIO EXTERIOR</span>
+                                                            </div>
+                                                            <div class="actions">
+                                                                <div class="btn-group">
+                                                                </div>
+                                                            </div>
+
+                                                            <div class="tools">
+                                                                <a href="javascript:;" onclick="CargaComercioExterior()" class="expand"></a>
+                                                            </div>
+                                                        </div>
+                                                        <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="padding: 10px 20px 10px 30px; display: none">
+                                                            <asp:UpdatePanel ID="UpComercioExterior" runat="server" UpdateMode="Conditional">
+                                                                <ContentTemplate>
+                                                                    <div class="form-body">
+                                                                        <div class="row">
+                                                                            <label class="col-md-2 form-group form-md-line-input">Tipo Operación:</label>
+                                                                            <div class="col-md-3 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                <asp:Label ID="LblTipoOperacion" runat="server"></asp:Label>
+                                                                                <%--<asp:DropDownList ID="DdlTipoOperacion" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATTipoOperacionDescripcion" DataValueField="CveTipoOperacion"></asp:DropDownList>--%>
+                                                                            </div>
+                                                                            <label class="col-md-2 form-group form-md-line-input" style="padding-left: 20px;">Clave Pedimento:</label>
+                                                                            <div class="col-md-5 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                <asp:Label ID="LblClavePedimento" runat="server"></asp:Label>
+                                                                                <%--<asp:TextBox ID="TxtClavePedimento" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>--%>
+                                                                            </div>
+                                                                        </div>
+                                                                        <div class="row">
+                                                                            <label class="col-md-2 form-group form-md-line-input">Incoterm:</label>
+                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                <asp:DropDownList ID="DdlIncoterm" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATIncotermDescripcion" DataValueField="CveIncoterm">
+                                                                                </asp:DropDownList>
+                                                                            </div>
+                                                                        </div>
+                                                                        <div class="row">
+                                                                            <label class="col-md-2 form-group form-md-line-input">Motivo Traslado:</label>
+                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                <asp:DropDownList ID="DdlSATMotivoTraslado" Width="100%" runat="server" CssClass="select2me" DataTextField="ClaveSATMotivoTrasladoDescripcion" DataValueField="CveMotivoTraslado"></asp:DropDownList>
+                                                                            </div>
+                                                                            <label class="col-md-2 form-group form-md-line-input" style="padding-left: 20px;">Num Reg IdTrib:</label>
+                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                <asp:TextBox ID="TxtNumRegIdTrib" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
+                                                                            </div>
+                                                                            <%--   <label class="col-md-1"></label>
+                                                                <div class="col-md-1">
+                                                                </div>--%>
+                                                                        </div>
+                                                                        <div class="row">
+                                                                            <div class="col-md-12">
+                                                                                <asp:UpdatePanel ID="UPPDestina" runat="server" UpdateMode="Conditional">
+                                                                                    <ContentTemplate>
+                                                                                        <div class="row">
+
+                                                                                            <div class="col-md-2  form-group form-md-line-input"><span>Nombre:</span></div>
+
+                                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                                <asp:TextBox ID="TxtDestinatarioNombre" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
+                                                                                            </div>
+
+                                                                                        </div>
+                                                                                        <div class="row">
+
+                                                                                            <div class="col-md-2  form-group form-md-line-input"><span>Calle:</span></div>
+
+                                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                                <asp:TextBox ID="TxtComExtCalle" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
+                                                                                            </div>
+                                                                                            <div class="col-md-1  form-group form-md-line-input"><span>Núm.</span></div>
+                                                                                            <div class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                                <asp:TextBox ID="TxtComExtNumero" CssClass="form-control input-sm" runat="server" Width="55px"></asp:TextBox>
+                                                                                            </div>
+                                                                                            <div class="col-md-1  form-group form-md-line-input"><span>CP.</span></div>
+                                                                                            <div class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                                <asp:TextBox ID="TxtComExtCP" CssClass="form-control input-sm" runat="server" Width="65px"></asp:TextBox>
+                                                                                            </div>
+                                                                                        </div>
+                                                                                        <div class="row">
+                                                                                            <div class="col-md-2  form-group form-md-line-input"><span>Pais:</span></div>
+
+                                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                                <asp:DropDownList ID="DdlComExtPais" AutoPostBack="true" OnSelectedIndexChanged="DdlPais_SelectedIndexChanged" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATPaisDescripcion" DataValueField="CvePais"></asp:DropDownList>
+                                                                                                <asp:TextBox ID="TxtComExtPais" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
+                                                                                            </div>
+
+
+                                                                                            <div class="col-md-2  form-group form-md-line-input" style="padding-left: 20px;"><span>Estado:</span></div>
+
+                                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                                <asp:DropDownList ID="DdlComExtEstado" AutoPostBack="true" OnSelectedIndexChanged="DdlEstado_SelectedIndexChanged" Visible="false" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATEstadoNombreEstado" DataValueField="CveEstado"></asp:DropDownList>
+                                                                                                <asp:TextBox ID="TxtComExtEstado" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
+                                                                                            </div>
+
+                                                                                        </div>
+                                                                                        <div class="row">
+                                                                                            <div class="col-md-2  form-group form-md-line-input"><span>Municipio:</span></div>
+
+                                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                                <asp:DropDownList ID="DdlComExtMunicipio" AutoPostBack="true" OnSelectedIndexChanged="DdlMunicipio_SelectedIndexChanged" Visible="false" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATMunicipioDescripcion" DataValueField="CveMunicipio"></asp:DropDownList>
+                                                                                                <asp:TextBox ID="TxtComExtMunicipio" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
+                                                                                            </div>
+
+                                                                                            <div class="col-md-2 form-group form-md-line-input" style="padding-left: 20px;"><span>Colonia:</span></div>
+
+                                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                                <asp:DropDownList ID="DdlComExtColonia" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" Visible="false" runat="server" DataTextField="ClaveSATColoniaNombreAsentamiento" DataValueField="CveColonia"></asp:DropDownList>
+                                                                                                <asp:TextBox ID="TxtComExtColonia" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
+                                                                                            </div>
+
+                                                                                        </div>
+
+                                                                                    </ContentTemplate>
+
+                                                                                </asp:UpdatePanel>
+
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="row">
+                                                                        <div class="col-md-12">
+                                                                            Convertir a unidad Aduana
+                                                                    <asp:TextBox ID="TxtComExtConvertir" runat="server" Width="60px"></asp:TextBox><asp:Button ID="BtnComExtConvertirUnidad" runat="server" Text="Convertir" />
+                                                                            <asp:GridView ID="GvComercioExterior" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD mysmallbtn" Width="100%" data-sort="true" AutoGenerateColumns="False"
+                                                                                EmptyDataText="No hay datos disponibles" DataKeyNames="Cantidad,Codigo,ClaveSATFraccionArancelaria,ClaveSATUnidadAduana" OnRowDataBound="GvComercioExterior_RowDataBound">
+                                                                                <Columns>
+                                                                                    <asp:TemplateField HeaderText="Cantidad">
+                                                                                        <ItemTemplate>
+                                                                                            <asp:TextBox ID="TxtCantidad" runat="server" Text='<%# Eval("Cantidad", "{0:#,##0.##}") %>' Width="50px"></asp:TextBox>
+                                                                                        </ItemTemplate>
+                                                                                    </asp:TemplateField>
+                                                                                    <asp:BoundField DataField="CodigoPS" HeaderText="Producto ó Servicio" />
+                                                                                    <asp:TemplateField HeaderText="Valor Unitario">
+                                                                                        <ItemTemplate>
+                                                                                            <asp:TextBox ID="TxtValorUnitario" runat="server" Text='<%# Eval("PU", "{0:N2}") %>' Width="60px"></asp:TextBox>
+                                                                                        </ItemTemplate>
+                                                                                    </asp:TemplateField>
+                                                                                    <asp:BoundField DataField="ClaveSATFraccionArancelariaDescripcion" HeaderText="Fracción Arancelaria" />
+                                                                                    <asp:BoundField DataField="ClaveSATUnidadAduanaDescripcion" HeaderText="Unidad Aduana" />
+                                                                                    <%--                                                                            <asp:TemplateField HeaderText="Unidad Aduana">
+                                                                                <ItemTemplate>
+                                                                                    <asp:DropDownList ID="DdlUnidadAduana" runat="server" AppendDataBoundItems="true" CssClass="select2me" DataTextField="ClaveSATUnidadAduanaDescripcion" DataValueField="CveUnidadAduana"></asp:DropDownList>
+                                                                                </ItemTemplate>
+                                                                            </asp:TemplateField>
+                                                                            <asp:TemplateField HeaderText="Fracción Arancelaria" ItemStyle-Width="40%">
+                                                                                <ItemTemplate>
+                                                                                    <ADS:Dropdownlost ID="DdlFraccionArancelaria" runat="server" CssClassDdl="selecthidden" CssStyle="width: 100%;" DataTextField="ClaveSATFraccionArancelariaDescripcion" DataValueField="CveFraccionArancelaria"></ADS:Dropdownlost>
+                                                                                </ItemTemplate>
+                                                                            </asp:TemplateField>--%>
+                                                                                    <asp:TemplateField HeaderText="Total USD">
+                                                                                        <ItemTemplate>
+                                                                                            <asp:Label ID="LblTotalUSD" Text='<%# (CDbl(Eval("Cantidad").ToString) * CDbl(Eval("PU").ToString)).ToString("N2") %>' runat="server"></asp:Label>
+                                                                                        </ItemTemplate>
+                                                                                    </asp:TemplateField>
+                                                                                    <asp:TemplateField HeaderText="Marca">
+                                                                                        <ItemTemplate>
+                                                                                            <asp:TextBox ID="TxtMarca" runat="server" Text="" Width="70px"></asp:TextBox>
+                                                                                        </ItemTemplate>
+                                                                                    </asp:TemplateField>
+                                                                                </Columns>
+                                                                            </asp:GridView>
+                                                                        </div>
+                                                                    </div>
+                                                                </ContentTemplate>
+                                                            </asp:UpdatePanel>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
                                         <td rowspan="2" colspan="1">
                                             <div class="portlet light xspadding bordered whitoutcol" style="width: 330px;">
                                                 <div class="portlet-title">
@@ -2235,17 +2584,17 @@
                                                     </div>
 
                                                     <div class="tools">
-                                                        <a href="javascript:;" class="collapse"></a>
+                                                        <a href="javascript:;" class="expand"></a>
                                                     </div>
                                                 </div>
 
-                                                <div class="portlet-body form-horizontal form-row-sepe formnombottom">
+                                                <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
                                                     <div class="form-body">
                                                         <table border="0">
                                                             <tr align="left">
                                                                 <td>Versión:&nbsp;</td>
                                                                 <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 50px">
+                                                                    <div class="form-group form-md-line-input" style="width: 90%">
                                                                         <asp:TextBox ID="TxtFEMSA_Version" CssClass="form-control input-sm" runat="server" CausesValidation="true" MaxLength="2" Text="1" ValidationGroup="GrpEmitirImprimir"></asp:TextBox><label></label><i></i>
                                                                     </div>
                                                                     <%--Validar--%>
@@ -2254,7 +2603,7 @@
                                                             <tr align="left">
                                                                 <td>Número de Sociedad:&nbsp;</td>
                                                                 <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 40px">
+                                                                    <div class="form-group form-md-line-input" style="width: 90%">
                                                                         <asp:TextBox ID="TxtFEMSA_NumSociedad" CssClass="form-control input-sm" runat="server" MaxLength="4"></asp:TextBox><label></label><i></i>
                                                                     </div>
                                                                 </td>
@@ -2262,7 +2611,7 @@
                                                             <tr align="left">
                                                                 <td>Número de Proveedor:&nbsp;</td>
                                                                 <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 80px">
+                                                                    <div class="form-group form-md-line-input" style="width: 90%">
                                                                         <asp:TextBox ID="TxtFEMSA_NumProveedor" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
                                                                     </div>
                                                                 </td>
@@ -2270,7 +2619,7 @@
                                                             <tr align="left">
                                                                 <td>Número de Pedido:&nbsp;</td>
                                                                 <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 80px">
+                                                                    <div class="form-group form-md-line-input" style="width: 90%">
                                                                         <asp:TextBox ID="TxtFEMSA_NumPedido" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
                                                                     </div>
                                                                 </td>
@@ -2278,7 +2627,7 @@
                                                             <tr align="left">
                                                                 <td>Número de Entrada:&nbsp;</td>
                                                                 <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 80px">
+                                                                    <div class="form-group form-md-line-input" style="width: 90%">
                                                                         <asp:TextBox ID="TxtFEMSA_NumEntrada" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
                                                                     </div>
                                                                     <%--Validar Numerico--%>
@@ -2287,7 +2636,7 @@
                                                             <tr align="left">
                                                                 <td>Número de Remisión:&nbsp;</td>
                                                                 <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 40px">
+                                                                    <div class="form-group form-md-line-input" style="width: 90%">
                                                                         <asp:TextBox ID="TxtFEMSA_NumRemision" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
                                                                     </div>
                                                                 </td>
@@ -2295,7 +2644,7 @@
                                                             <tr align="left">
                                                                 <td>Número de Socio:&nbsp;</td>
                                                                 <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 40px">
+                                                                    <div class="form-group form-md-line-input" style="width: 90%">
                                                                         <asp:TextBox ID="TxtFEMSA_NumSocio" CssClass="form-control input-sm" runat="server" MaxLength="5">  </asp:TextBox><label></label><i></i>
                                                                     </div>
                                                                 </td>
@@ -2303,7 +2652,7 @@
                                                             <tr align="left">
                                                                 <td>Centro de Costo:&nbsp;</td>
                                                                 <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 40px">
+                                                                    <div class="form-group form-md-line-input" style="width: 90%">
                                                                         <asp:TextBox ID="TxtFEMSA_CentroCosto" CssClass="form-control input-sm" runat="server" MaxLength="4"></asp:TextBox><label></label><i></i>
                                                                     </div>
                                                                 </td>
@@ -2311,7 +2660,7 @@
                                                             <tr align="left">
                                                                 <td>Inicio Periodo Liquidación:&nbsp;</td>
                                                                 <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 80px">
+                                                                    <div class="form-group form-md-line-input" style="width: 90%">
                                                                         <asp:TextBox ID="TxtFEMSA_IPeriodoLiquidacion" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
                                                                     </div>
                                                                 </td>
@@ -2319,7 +2668,7 @@
                                                             <tr align="left">
                                                                 <td>Fin Periodo Liquidación:&nbsp;</td>
                                                                 <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 80px">
+                                                                    <div class="form-group form-md-line-input" style="width: 90%">
                                                                         <asp:TextBox ID="TxtFEMSA_FPeriodoLiquidacion" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
                                                                     </div>
                                                                 </td>
@@ -2327,7 +2676,7 @@
                                                             <tr align="left">
                                                                 <td>Código Retención 1:&nbsp;</td>
                                                                 <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 190px">
+                                                                    <div class="form-group form-md-line-input" style="width: 90%">
                                                                         <asp:TextBox ID="TxtFEMSA_CodRetencion1" CssClass="form-control input-sm" runat="server" MaxLength="15"></asp:TextBox><label></label><i></i>
                                                                     </div>
                                                                 </td>
@@ -2335,7 +2684,7 @@
                                                             <tr align="left">
                                                                 <td>Código Retención 2:&nbsp;</td>
                                                                 <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 190px">
+                                                                    <div class="form-group form-md-line-input" style="width: 90%">
                                                                         <asp:TextBox ID="TxtFEMSA_CodRetencion2" CssClass="form-control input-sm" runat="server" MaxLength="15"></asp:TextBox><label></label><i></i>
                                                                     </div>
                                                                 </td>
@@ -2343,7 +2692,7 @@
                                                             <tr align="left">
                                                                 <td>Mail:&nbsp;</td>
                                                                 <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 190px">
+                                                                    <div class="form-group form-md-line-input" style="width: 90%">
                                                                         <asp:TextBox ID="TxtFEMSA_Mail" CssClass="form-control input-sm" runat="server" MaxLength="50"></asp:TextBox><label></label><i></i>
                                                                     </div>
                                                                 </td>
@@ -2352,274 +2701,6 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                        </td>
-                                        <td rowspan="1" colspan="1">
-                                            <div class="portlet light xspadding bordered whitoutcol" style="width: 330px;">
-                                                <div class="portlet-title">
-                                                    <div class="caption font-green">
-                                                        <i class="icon-pin font-green"></i>
-                                                        <span class="caption-subject bold uppercase">Detallista</span>
-
-                                                    </div>
-                                                    <div class="actions">
-                                                        <div class="btn-group">
-                                                        </div>
-                                                    </div>
-
-                                                    <div class="tools">
-                                                        <a href="javascript:;" class="collapse"></a>
-                                                    </div>
-                                                </div>
-
-                                                <div class="portlet-body form-horizontal form-row-sepe formnombottom">
-                                                    <div class="form-body">
-                                                        <table border="0">
-
-                                                            <tr align="left">
-                                                                <td>Orden de Compra:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 180px">
-                                                                        <asp:TextBox ID="TxtDet_OrdenCompra" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Fecha de Orden de Compra:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="input-group input-small date date-picker" data-date-format="dd/mm/yyyy">
-                                                                        <asp:TextBox ID="TxtDet_FechaOrdenCompra" CssClass="form-control" runat="server" CausesValidation="true" MaxLength="10"></asp:TextBox>
-                                                                        <span class="input-group-btn ">
-                                                                            <asp:HyperLink ID="ImgCalendarioOCDet" class="btn default" runat="server"><i class="fa fa-calendar"></i></asp:HyperLink>
-
-                                                                        </span>
-                                                                        <ajax:MaskedEditExtender ID="MEEFechaOCDet" runat="server" TargetControlID="TxtDet_FechaOrdenCompra" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
-                                                                        <ajax:CalendarExtender ID="CalendarioOCDet" runat="server" TargetControlID="TxtDet_FechaOrdenCompra" PopupButtonID="ImgCalendarioOCDet" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
-                                                                        <asp:CompareValidator ID="CVFechaOCDet" runat="server" ControlToValidate="TxtDet_FechaOrdenCompra" Display="None" ErrorMessage="El campo <b>''Fecha de Orden de Compra''</b> no tiene el formato correcto, por favor intente de nuevo con el siguiente formato: (dd/mm/yyyy)." Operator="DataTypeCheck" Type="Date" ValidationGroup="GrpEmitirImprimir"></asp:CompareValidator>
-                                                                        <ajax:ValidatorCalloutExtender ID="VCORFVOCDet2" runat="server" HighlightCssClass="vco" TargetControlID="CVFechaOCDet" Width="350px"></ajax:ValidatorCalloutExtender>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Contra Recibo:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 180px">
-                                                                        <asp:TextBox ID="TxtDet_ContraRecibo" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>GLN-Comprador:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 180px">
-                                                                        <asp:TextBox ID="TxtDet_GLNComprador" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Departamento:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 180px">
-                                                                        <asp:TextBox ID="TxtDet_Departamento" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>GLN-Vendedor:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 40px">
-                                                                        <asp:TextBox ID="TxtDet_GLNVendedor" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Número de Proveedor:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 40px">
-                                                                        <asp:TextBox ID="TxtDet_NumProv" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                        </table>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </td>
-                                        <td rowspan="1" colspan="2">
-                                            <div id="DivCartaPorte" runat="server" visible="false" class="portlet light xspadding bordered whitoutcol" style="width: 100%">
-                                                <div class="portlet-title">
-                                                    <div class="caption font-green">
-                                                        <i class="icon-pin font-green"></i>
-                                                        <span class="caption-subject bold uppercase">CARTA PORTE</span>
-                                                    </div>
-                                                    <div class="actions">
-                                                        <div class="btn-group">
-                                                        </div>
-                                                    </div>
-
-                                                    <div class="tools">
-                                                        <a href="javascript:;" class="collapse"></a>
-                                                    </div>
-                                                </div>
-                                                <div class="portlet-body ">
-                                                    <div class="rowpadding">
-                                                        <asp:UpdatePanel ID="UpEmitirTransitorio" runat="server" UpdateMode="Conditional">
-                                                            <ContentTemplate>
-                                                                <div class="row rowpadding">
-                                                                    <label class="col-md-2">Emitir:</label>
-                                                                    <div class="col-md-10">
-                                                                        <asp:CheckBox ID="ChkEmitirCartaPorte" runat="server" CssClass="chksino" Text=" " OnCheckedChanged="ChkEmitirCartaPorte_CheckedChanged" AutoPostBack="true" />
-                                                                    </div>
-                                                                </div>
-                                                                <br />
-                                                                <div class="row rowpadding">
-                                                                    <label class="col-md-2">Origen:</label>
-                                                                    <div class="col-md-10">
-                                                                        <asp:DropDownList ID="DdlDireccionOrigen" runat="server" AutoPostBack="true" CssClass="form-control input-sm select2me" AppendDataBoundItems="true" DataTextField="SucursalClienteVentaDireccion" DataValueField="CveDireccionEnvio" Width="100%" OnSelectedIndexChanged="DdlDireccionOrigen_SelectedIndexChanged">
-                                                                            <asp:ListItem Selected="true" Text="Seleccione" Value="-1"></asp:ListItem>
-                                                                        </asp:DropDownList>
-                                                                        <%--<asp:TextBox ID="TxtOrigenCP" runat="server" Enabled="false" Text="" CssClass="form-control input-sm"></asp:TextBox>--%>
-                                                                    </div>
-                                                                </div>
-                                                                <br />
-                                                                <div class="row rowpadding">
-                                                                    <label class="col-md-2">Destino:</label>
-                                                                    <div class="col-md-10">
-                                                                        <asp:DropDownList ID="DdlDireccionDestino" runat="server" AutoPostBack="true" CssClass="form-control input-sm select2me" AppendDataBoundItems="true" DataTextField="SucursalClienteVentaDireccion" DataValueField="CveDireccionEnvio" Width="100%" OnSelectedIndexChanged="DdlDireccionDestino_SelectedIndexChanged">
-                                                                            <asp:ListItem Selected="true" Text="Seleccione" Value="-1"></asp:ListItem>
-                                                                        </asp:DropDownList>
-                                                                        <%--<asp:TextBox ID="TxtDestinoCP" runat="server" Enabled="false" Text="" CssClass="form-control input-sm"></asp:TextBox>--%>
-                                                                    </div>
-                                                                </div>
-                                                                <br />
-                                                                <div class="row rowpadding">
-                                                                    <label class="col-md-2">Fecha Llegada:</label>
-                                                                    <div class="col-md-4">
-                                                                        <div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 117px !important; padding: 0px;">
-                                                                            <asp:TextBox ID="TxtFechaLlegadaCP" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="10"></asp:TextBox>
-                                                                            <span class="input-group-btn ">
-                                                                                <asp:LinkButton ID="ImgFechaSalidaCP" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
-                                                                            </span>
-                                                                            <ajax:MaskedEditExtender ID="MEEFechaSalidaCP" runat="server" TargetControlID="TxtFechaLlegadaCP" Mask="99/99/9999" MaskType="Date" DisplayMoney="Right" AcceptNegative="Left"></ajax:MaskedEditExtender>
-                                                                            <ajax:CalendarExtender runat="server" ID="CEFechaSalidaCP" TargetControlID="TxtFechaLlegadaCP" PopupButtonID="ImgFechaSalidaCP" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
-                                                                        </div>
-                                                                    </div>
-                                                                    <label class="col-md-2">Fecha Entrega:</label>
-                                                                    <div class="col-md-4">
-                                                                        <div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 117px !important; padding: 0px;">
-                                                                            <asp:TextBox ID="TxtFechaEntregaCP" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="10"></asp:TextBox>
-                                                                            <span class="input-group-btn ">
-                                                                                <asp:LinkButton ID="ImgFechaEntregaCP" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
-                                                                            </span>
-                                                                            <ajax:MaskedEditExtender ID="MEEFechaEntregaCP" runat="server" TargetControlID="TxtFechaEntregaCP" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
-                                                                            <ajax:CalendarExtender runat="server" ID="CEFEchaEntregaCP" TargetControlID="TxtFechaEntregaCP" PopupButtonID="ImgFechaEntregaCP" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-                                                                <br />
-                                                                <div class="row">
-                                                                    <div class="col-md-6">
-                                                                        <div class="row rowpadding">
-                                                                            <label class="col-md-2">Distancia:</label>
-                                                                            <div class="col-md-10">
-                                                                                <asp:TextBox ID="TxtDistancia" runat="server" CssClass="form-control input-sm" type="number"></asp:TextBox>
-                                                                            </div>
-                                                                        </div>
-                                                                        <br />
-                                                                        <div class="row rowpadding">
-                                                                            <label class="col-md-2">Chofer:</label>
-                                                                            <div class="col-md-10">
-                                                                                <asp:DropDownList ID="DdlChofer" runat="server" DataTextField="ChoferLicencia" DataValueField="CveChofer" CssClass="form-control input-sm select2me" Width="100%"></asp:DropDownList>
-                                                                                <asp:RequiredFieldValidator ID="RfvDdlChofer" runat="server" Enabled="false" ControlToValidate="DdlChofer" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Chofer''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
-                                                                                <ajax:ValidatorCalloutExtender ID="VceDdlChofer" runat="server" HighlightCssClass="vco" TargetControlID="RfvDdlChofer" Width="350px"></ajax:ValidatorCalloutExtender>
-                                                                            </div>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="col-md-6">
-                                                                        <div class="row rowpadding">
-                                                                            <label class="col-md-2">Unidad:</label>
-                                                                            <div class="col-md-10">
-                                                                                <asp:DropDownList runat="server" ID="DdlUnidadCamion" AutoPostBack="true" Width="100%" AppendDataBoundItems="true" CssClass="form-control input-sm select2me" DataValueField="CveCamion" DataTextField="CamionPlaca" OnSelectedIndexChanged="DdlUnidadCamionActivoFijo_SelectedIndexChanged"></asp:DropDownList>
-                                                                                <asp:RequiredFieldValidator ID="RfvDdlUnidadCamion" runat="server" Enabled="false" ControlToValidate="DdlUnidadCamion" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Unidad''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
-                                                                                <ajax:ValidatorCalloutExtender ID="VceDdlUnidadCamion" runat="server" HighlightCssClass="vco" TargetControlID="RfvDdlUnidadCamion" Width="350px"></ajax:ValidatorCalloutExtender>
-                                                                            </div>
-                                                                        </div>
-                                                                        <br />
-                                                                        <div class="row rowpadding" runat="server" id="DvConfiguracionVeiculo" visible="false">
-                                                                            <label class="col-md-2">Configuración:</label>
-                                                                            <div class="col-md-10">
-                                                                                <asp:DropDownList ID="DdlConfigAuto" CssClass="form-control input-sm select2me" Width="100%" runat="server" AppendDataBoundItems="true" AutoPostBack="true" OnSelectedIndexChanged="DdlConfigAuto_SelectedIndexChanged" CausesValidation="true" DataTextField="ClaveConfigAutoTransporteDescripcion" DataValueField="CveConfigAutoTransporte" Style="padding: 0px">
-                                                                                </asp:DropDownList>
-                                                                                <asp:RequiredFieldValidator ID="RfvDdlConfigAuto" runat="server" Enabled="false" ControlToValidate="DdlConfigAuto" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Configuración Carta Porte''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
-                                                                                <ajax:ValidatorCalloutExtender ID="VCERfvDdlConfigAuto" runat="server" HighlightCssClass="vco" TargetControlID="RfvDdlConfigAuto" Width="350px"></ajax:ValidatorCalloutExtender>
-                                                                            </div>
-                                                                        </div>
-                                                                        <div class="row rowpadding" runat="server" id="DvRemolque1" visible="false">
-                                                                            <label class="col-md-2">Remolque 1:</label>
-                                                                            <div class="col-md-10">
-                                                                                <asp:DropDownList runat="server" ID="DdlRemolque1" AutoPostBack="true" Width="100%" AppendDataBoundItems="true" CssClass="form-control input-sm select2me" DataValueField="CveCamion" DataTextField="CamionPlaca" OnSelectedIndexChanged="DdlRemolque1_SelectedIndexChanged"></asp:DropDownList>
-                                                                            </div>
-                                                                        </div>
-                                                                        <div class="row rowpadding" runat="server" id="DvRemolque2" visible="false">
-                                                                            <label class="col-md-2">Remolque 2:</label>
-                                                                            <div class="col-md-10">
-                                                                                <asp:DropDownList runat="server" ID="DdlRemolque2" AutoPostBack="true" Width="100%" CssClass="form-control input-sm select2me" DataValueField="CveCamion" DataTextField="CamionPlaca"></asp:DropDownList>
-                                                                            </div>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-                                                                <br />
-                                                                <div class="row">
-                                                                    <div class="col-md-12">
-                                                                        <div class="portlet light xspadding bordered whitoutcol" style="width: 100%">
-                                                                            <div class="portlet-title">
-                                                                                <div class="caption font-green">
-                                                                                    <i class="icon-pin font-green"></i>
-                                                                                    <span class="caption-subject bold uppercase">Mercancias</span>
-                                                                                </div>
-                                                                                <div class="actions">
-                                                                                    <div class="btn-group">
-                                                                                        <asp:LinkButton ID="LnkAgregarMercancia" OnClick="LnkAgregarMercancia_Click" runat="server" data-toggle="tooltip" data-placement="right" title="Agregar Mercancía." CssClass="btn btn-circle btn-default" Text="<i class='fa fa-plus'></i> Agregar"></asp:LinkButton>
-                                                                                    </div>
-                                                                                </div>
-                                                                                <div class="tools">
-                                                                                    <a href="javascript:;" class="collapse"></a>
-                                                                                </div>
-                                                                            </div>
-                                                                            <div class="portlet-body ">
-                                                                                <div class="rowpadding">
-                                                                                    <asp:GridView ID="GvMercanciasCP" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD mysmallbtn" Width="100%" data-sort="true" AutoGenerateColumns="False"
-                                                                                        EmptyDataText="No hay datos disponibles" DataKeyNames="Consec">
-                                                                                        <Columns>
-                                                                                            <asp:TemplateField ItemStyle-Font-Size="6pt" HeaderText="#" ItemStyle-Width="10%">
-                                                                                                <ItemTemplate>
-                                                                                                    <asp:Literal ID="LtlConsecutivo" runat="server" Text='<%# Eval("Consec", "{0:N0}") %>'></asp:Literal>&nbsp;
-                                                                                                </ItemTemplate>
-                                                                                            </asp:TemplateField>
-                                                                                            <asp:BoundField DataField="Cantidad" HeaderText="Cantidad" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="20%" />
-                                                                                            <asp:BoundField DataField="CodigoPS" HeaderText="Producto" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="60%" />
-                                                                                            <asp:TemplateField ItemStyle-HorizontalAlign="Center" ItemStyle-Width="10%">
-                                                                                                <ItemTemplate>
-                                                                                                    <asp:LinkButton ID="imgD" runat="server" AlternateText="Eliminar" CausesValidation="False" CommandName="Delete"
-                                                                                                        CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="Esta seguro de eliminar la mercancía?" data-btn-ok-label="si" />
-                                                                                                </ItemTemplate>
-                                                                                            </asp:TemplateField>
-                                                                                        </Columns>
-                                                                                    </asp:GridView>
-                                                                                </div>
-                                                                            </div>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-                                                            </ContentTemplate>
-                                                        </asp:UpdatePanel>
-
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr valign="top">
-                                        <td rowspan="1" colspan="1">
                                             <div class="row">
                                                 <div class="col-md-12">
                                                     <div class="row">
@@ -2637,10 +2718,10 @@
                                                                     </div>
 
                                                                     <div class="tools">
-                                                                        <a href="javascript:;" class="collapse"></a>
+                                                                        <a href="javascript:;" class="expand"></a>
                                                                     </div>
                                                                 </div>
-                                                                <div class="portlet-body form-horizontal form-row-sepe formnombottom">
+                                                                <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
                                                                     <div class="form-body">
                                                                         <table border="0">
                                                                             <tr align="left">
@@ -2691,11 +2772,11 @@
                                                                     </div>
 
                                                                     <div class="tools">
-                                                                        <a href="javascript:;" class="collapse"></a>
+                                                                        <a href="javascript:;" class="expand"></a>
                                                                     </div>
                                                                 </div>
 
-                                                                <div class="portlet-body form-horizontal form-row-sepe formnombottom">
+                                                                <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
                                                                     <div class="form-body">
                                                                         <table border="0">
                                                                             <tr align="left">
@@ -2749,281 +2830,211 @@
                                             </div>
                                         </td>
                                         <td rowspan="1" colspan="1">
-                                            <div class="portlet light xspadding bordered whitoutcol" style="width: 100%;">
-                                                <div class="portlet-title">
-                                                    <div class="caption font-green">
-                                                        <i class="icon-pin font-green"></i>
-                                                        <span class="caption-subject bold uppercase">COMERCIO EXTERIOR</span>
-                                                    </div>
-                                                    <div class="actions">
-                                                        <div class="btn-group">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <div class="portlet light xspadding bordered whitoutcol" style="width: 330px;">
+                                                        <div class="portlet-title">
+                                                            <div class="caption font-green">
+                                                                <i class="icon-pin font-green"></i>
+                                                                <span class="caption-subject bold uppercase">Detallista</span>
+
+                                                            </div>
+                                                            <div class="actions">
+                                                                <div class="btn-group">
+                                                                </div>
+                                                            </div>
+
+                                                            <div class="tools">
+                                                                <a href="javascript:;" class="expand"></a>
+                                                            </div>
+                                                        </div>
+
+                                                        <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
+                                                            <div class="form-body">
+                                                                <table border="0">
+
+                                                                    <tr align="left">
+                                                                        <td>Orden de Compra:&nbsp;</td>
+                                                                        <td>
+                                                                            <div class="form-group form-md-line-input" style="width: 90%">
+                                                                                <asp:TextBox ID="TxtDet_OrdenCompra" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
+                                                                            </div>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr align="left">
+                                                                        <td>Fecha de Orden de Compra:&nbsp;</td>
+                                                                        <td>
+                                                                            <div class="input-group input-small date date-picker" data-date-format="dd/mm/yyyy">
+                                                                                <asp:TextBox ID="TxtDet_FechaOrdenCompra" CssClass="form-control" runat="server" CausesValidation="true" MaxLength="10"></asp:TextBox>
+                                                                                <span class="input-group-btn ">
+                                                                                    <asp:HyperLink ID="ImgCalendarioOCDet" class="btn default" runat="server"><i class="fa fa-calendar"></i></asp:HyperLink>
+
+                                                                                </span>
+                                                                                <ajax:MaskedEditExtender ID="MEEFechaOCDet" runat="server" TargetControlID="TxtDet_FechaOrdenCompra" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
+                                                                                <ajax:CalendarExtender ID="CalendarioOCDet" runat="server" TargetControlID="TxtDet_FechaOrdenCompra" PopupButtonID="ImgCalendarioOCDet" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
+                                                                                <asp:CompareValidator ID="CVFechaOCDet" runat="server" ControlToValidate="TxtDet_FechaOrdenCompra" Display="None" ErrorMessage="El campo <b>''Fecha de Orden de Compra''</b> no tiene el formato correcto, por favor intente de nuevo con el siguiente formato: (dd/mm/yyyy)." Operator="DataTypeCheck" Type="Date" ValidationGroup="GrpEmitirImprimir"></asp:CompareValidator>
+                                                                                <ajax:ValidatorCalloutExtender ID="VCORFVOCDet2" runat="server" HighlightCssClass="vco" TargetControlID="CVFechaOCDet" Width="350px"></ajax:ValidatorCalloutExtender>
+                                                                            </div>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr align="left">
+                                                                        <td>Contra Recibo:&nbsp;</td>
+                                                                        <td>
+                                                                            <div class="form-group form-md-line-input" style="width: 90%">
+                                                                                <asp:TextBox ID="TxtDet_ContraRecibo" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
+                                                                            </div>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr align="left">
+                                                                        <td>GLN-Comprador:&nbsp;</td>
+                                                                        <td>
+                                                                            <div class="form-group form-md-line-input" style="width: 90%">
+                                                                                <asp:TextBox ID="TxtDet_GLNComprador" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
+                                                                            </div>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr align="left">
+                                                                        <td>Departamento:&nbsp;</td>
+                                                                        <td>
+                                                                            <div class="form-group form-md-line-input" style="width: 90%">
+                                                                                <asp:TextBox ID="TxtDet_Departamento" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
+                                                                            </div>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr align="left">
+                                                                        <td>GLN-Vendedor:&nbsp;</td>
+                                                                        <td>
+                                                                            <div class="form-group form-md-line-input" style="width: 90%">
+                                                                                <asp:TextBox ID="TxtDet_GLNVendedor" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
+                                                                            </div>
+                                                                        </td>
+                                                                    </tr>
+                                                                    <tr align="left">
+                                                                        <td>Número de Proveedor:&nbsp;</td>
+                                                                        <td>
+                                                                            <div class="form-group form-md-line-input" style="width: 90%">
+                                                                                <asp:TextBox ID="TxtDet_NumProv" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
+                                                                            </div>
+                                                                        </td>
+                                                                    </tr>
+                                                                </table>
+                                                            </div>
                                                         </div>
                                                     </div>
-
-                                                    <div class="tools">
-                                                        <a href="javascript:;" onclick="CargaComercioExterior()" class="expand"></a>
-                                                    </div>
                                                 </div>
-                                                <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="padding: 10px 20px 10px 30px">
-                                                    <asp:UpdatePanel ID="UpComercioExterior" runat="server" UpdateMode="Conditional">
-                                                        <ContentTemplate>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <div class="portlet light xspadding bordered whitoutcol" style="width: 450px;">
+                                                        <div class="portlet-title">
+                                                            <div class="caption font-green">
+                                                                <i class="icon-pin font-green"></i>
+                                                                <span class="caption-subject bold uppercase">Complementos INE</span>
+                                                            </div>
+                                                            <div class="actions">
+                                                                <div class="btn-group">
+                                                                </div>
+                                                            </div>
+                                                            <div class="tools">
+                                                                <a href="javascript:;" class="expand"></a>
+                                                            </div>
+                                                        </div>
+                                                        <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
                                                             <div class="form-body">
                                                                 <div class="row">
-                                                                    <label class="col-md-2 form-group form-md-line-input">Tipo Operación:</label>
-                                                                    <div class="col-md-3 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                        <asp:Label ID="LblTipoOperacion" runat="server"></asp:Label>
-                                                                        <%--<asp:DropDownList ID="DdlTipoOperacion" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATTipoOperacionDescripcion" DataValueField="CveTipoOperacion"></asp:DropDownList>--%>
-                                                                    </div>
-                                                                    <label class="col-md-2 form-group form-md-line-input" style="padding-left: 20px;">Clave Pedimento:</label>
-                                                                    <div class="col-md-5 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                        <asp:Label ID="LblClavePedimento" runat="server"></asp:Label>
-                                                                        <%--<asp:TextBox ID="TxtClavePedimento" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>--%>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="row">
-                                                                    <label class="col-md-2 form-group form-md-line-input">Incoterm:</label>
-                                                                    <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                        <asp:DropDownList ID="DdlIncoterm" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATIncotermDescripcion" DataValueField="CveIncoterm">
-                                                                        </asp:DropDownList>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="row">
-                                                                    <label class="col-md-2 form-group form-md-line-input">Motivo Traslado:</label>
-                                                                    <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                        <asp:DropDownList ID="DdlSATMotivoTraslado" Width="100%" runat="server" CssClass="select2me" DataTextField="ClaveSATMotivoTrasladoDescripcion" DataValueField="CveMotivoTraslado"></asp:DropDownList>
-                                                                    </div>
-                                                                    <label class="col-md-2 form-group form-md-line-input" style="padding-left: 20px;">Num Reg IdTrib:</label>
-                                                                    <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                        <asp:TextBox ID="TxtNumRegIdTrib" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
-                                                                    </div>
-                                                                    <%--   <label class="col-md-1"></label>
-                                                                <div class="col-md-1">
-                                                                </div>--%>
-                                                                </div>
-                                                                <div class="row">
-                                                                    <div class="col-md-12">
-                                                                        <asp:UpdatePanel ID="UPPDestina" runat="server" UpdateMode="Conditional">
+                                                                    <div class="modal-body col-md-6" style="border-right: 1px solid lightgray;">
+                                                                        <asp:UpdatePanel runat="server" ID="UpComplementos" UpdateMode="Conditional">
                                                                             <ContentTemplate>
-                                                                                <div class="row">
-
-                                                                                    <div class="col-md-2  form-group form-md-line-input"><span>Nombre:</span></div>
-
-                                                                                    <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                        <asp:TextBox ID="TxtDestinatarioNombre" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
-                                                                                    </div>
-
-                                                                                </div>
-                                                                                <div class="row">
-
-                                                                                    <div class="col-md-2  form-group form-md-line-input"><span>Calle:</span></div>
-
-                                                                                    <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                        <asp:TextBox ID="TxtComExtCalle" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
-                                                                                    </div>
-                                                                                    <div class="col-md-1  form-group form-md-line-input"><span>Núm.</span></div>
-                                                                                    <div class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                        <asp:TextBox ID="TxtComExtNumero" CssClass="form-control input-sm" runat="server" Width="55px"></asp:TextBox>
-                                                                                    </div>
-                                                                                    <div class="col-md-1  form-group form-md-line-input"><span>CP.</span></div>
-                                                                                    <div class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                        <asp:TextBox ID="TxtComExtCP" CssClass="form-control input-sm" runat="server" Width="65px"></asp:TextBox>
-                                                                                    </div>
-                                                                                </div>
-                                                                                <div class="row">
-                                                                                    <div class="col-md-2  form-group form-md-line-input"><span>Pais:</span></div>
-
-                                                                                    <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                        <asp:DropDownList ID="DdlComExtPais" AutoPostBack="true" OnSelectedIndexChanged="DdlPais_SelectedIndexChanged" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATPaisDescripcion" DataValueField="CvePais"></asp:DropDownList>
-                                                                                        <asp:TextBox ID="TxtComExtPais" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
-                                                                                    </div>
-
-
-                                                                                    <div class="col-md-2  form-group form-md-line-input" style="padding-left: 20px;"><span>Estado:</span></div>
-
-                                                                                    <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                        <asp:DropDownList ID="DdlComExtEstado" AutoPostBack="true" OnSelectedIndexChanged="DdlEstado_SelectedIndexChanged" Visible="false" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATEstadoNombreEstado" DataValueField="CveEstado"></asp:DropDownList>
-                                                                                        <asp:TextBox ID="TxtComExtEstado" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
-                                                                                    </div>
-
-                                                                                </div>
-                                                                                <div class="row">
-                                                                                    <div class="col-md-2  form-group form-md-line-input"><span>Municipio:</span></div>
-
-                                                                                    <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                        <asp:DropDownList ID="DdlComExtMunicipio" AutoPostBack="true" OnSelectedIndexChanged="DdlMunicipio_SelectedIndexChanged" Visible="false" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATMunicipioDescripcion" DataValueField="CveMunicipio"></asp:DropDownList>
-                                                                                        <asp:TextBox ID="TxtComExtMunicipio" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
-                                                                                    </div>
-
-                                                                                    <div class="col-md-2 form-group form-md-line-input" style="padding-left: 20px;"><span>Colonia:</span></div>
-
-                                                                                    <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                        <asp:DropDownList ID="DdlComExtColonia" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" Visible="false" runat="server" DataTextField="ClaveSATColoniaNombreAsentamiento" DataValueField="CveColonia"></asp:DropDownList>
-                                                                                        <asp:TextBox ID="TxtComExtColonia" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
-                                                                                    </div>
-
-                                                                                </div>
-
+                                                                                <asp:RadioButtonList ID="RblComplementos" runat="server" AutoPostBack="true" CssClass="rbl" DataValueField="CveVentaComplemento" DataTextField="VentaComplemento" RepeatLayout="Table">
+                                                                                </asp:RadioButtonList>
+                                                                            </ContentTemplate>
+                                                                        </asp:UpdatePanel>
+                                                                    </div>
+                                                                    <div class="modal-body col-md-6">
+                                                                        <asp:UpdatePanel runat="server" ID="UpDatosComplementos" UpdateMode="Conditional">
+                                                                            <ContentTemplate>
+                                                                                <table>
+                                                                                    <tr id="trTipoCampaña" runat="Server" visible="False">
+                                                                                        <td>Tipo Campaña:</td>
+                                                                                        <td>
+                                                                                            <asp:DropDownList CssClass="form-control input-sm select2me" ID="DdlTipoCampaña" runat="server">
+                                                                                                <asp:ListItem Text="Campaña" Value="Campaña" />
+                                                                                                <asp:ListItem Text="Precampaña" Value="Precampaña" />
+                                                                                            </asp:DropDownList>
+                                                                                        </td>
+                                                                                    </tr>
+                                                                                    <tr id="trAmbito" runat="Server" visible="False">
+                                                                                        <td>Ambito:</td>
+                                                                                        <td>
+                                                                                            <asp:DropDownList CssClass="form-control input-sm select2me" ID="DdlAmbitoComplemento" runat="server">
+                                                                                                <asp:ListItem Text="Local" Value="Local" />
+                                                                                                <asp:ListItem Text="Federal" Value="Federal" />
+                                                                                            </asp:DropDownList>
+                                                                                        </td>
+                                                                                    </tr>
+                                                                                    <tr id="trEntidad" runat="Server" visible="False">
+                                                                                        <td>Entidad:</td>
+                                                                                        <td>
+                                                                                            <asp:DropDownList CssClass="form-control input-sm select2me" ID="DdlINEEntidad" runat="server" AutoPostBack="true">
+                                                                                                <asp:ListItem Text="AGU" Value="AGU" />
+                                                                                                <asp:ListItem Text="BCN" Value="BCN" />
+                                                                                                <asp:ListItem Text="BCS" Value="BCS" />
+                                                                                                <asp:ListItem Text="CAM" Value="CAM" />
+                                                                                                <asp:ListItem Text="CHP" Value="CHP" />
+                                                                                                <asp:ListItem Text="CHH" Value="CHH" />
+                                                                                                <asp:ListItem Text="COA" Value="COA" />
+                                                                                                <asp:ListItem Text="COL" Value="COL" />
+                                                                                                <asp:ListItem Text="DIF" Value="DIF" />
+                                                                                                <asp:ListItem Text="DUR" Value="DUR" />
+                                                                                                <asp:ListItem Text="GUA" Value="GUA" />
+                                                                                                <asp:ListItem Text="GRO" Value="GRO" />
+                                                                                                <asp:ListItem Text="HID" Value="HID" />
+                                                                                                <asp:ListItem Text="JAL" Value="JAL" />
+                                                                                                <asp:ListItem Text="MEX" Value="MEX" />
+                                                                                                <asp:ListItem Text="MIC" Value="MIC" />
+                                                                                                <asp:ListItem Text="MOR" Value="MOR" />
+                                                                                                <asp:ListItem Text="NAY" Value="NAY" />
+                                                                                                <asp:ListItem Text="NLE" Value="NLE" />
+                                                                                                <asp:ListItem Text="OAX" Value="OAX" />
+                                                                                                <asp:ListItem Text="PUE" Value="PUE" />
+                                                                                                <asp:ListItem Text="QTO" Value="QTO" />
+                                                                                                <asp:ListItem Text="ROO" Value="ROO" />
+                                                                                                <asp:ListItem Text="SLP" Value="SLP" />
+                                                                                                <asp:ListItem Text="SIN" Value="SIN" />
+                                                                                                <asp:ListItem Text="SON" Value="SON" />
+                                                                                                <asp:ListItem Text="TAB" Value="TAB" />
+                                                                                                <asp:ListItem Text="TAM" Value="TAM" />
+                                                                                                <asp:ListItem Text="TLA" Value="TLA" />
+                                                                                                <asp:ListItem Text="VER" Value="VER" />
+                                                                                                <asp:ListItem Text="YUC" Value="YUC" />
+                                                                                                <asp:ListItem Text="ZAC" Value="ZAC" />
+                                                                                            </asp:DropDownList>
+                                                                                        </td>
+                                                                                    </tr>
+                                                                                    <tr id="trContaComplementos" runat="Server" visible="False">
+                                                                                        <td>Id Conta:</td>
+                                                                                        <td>
+                                                                                            <asp:TextBox ID="TxtIdConta" runat="server" MaxLength="6" Width="100px"></asp:TextBox>
+                                                                                            <asp:RegularExpressionValidator ID="REVIdConta" runat="server" ControlToValidate="TxtIdConta" Display="None" ErrorMessage="El campo <b>''Id Conta''</b> no tiene el formato correcto, por favor corrija e intente de nuevo (Solo formato numérico)." ValidationExpression="^([1-9]{1}[\d]{0,2}(\,[\d]{3})*(\.[\d]{0,4})?|[1-9]{1}[\d]{0,}(\.[\d]{0,4})?|0(\.[\d]{0,2})?|(\.[\d]{1,4})?)$" ValidationGroup="GrpComplementosTimbrado"></asp:RegularExpressionValidator>
+                                                                                            <ajax:ValidatorCalloutExtender ID="VCEIdConta" runat="server" HighlightCssClass="vco" TargetControlID="REVIdConta" Width="300px"></ajax:ValidatorCalloutExtender>
+                                                                                        </td>
+                                                                                    </tr>
+                                                                                </table>
                                                                             </ContentTemplate>
-
                                                                         </asp:UpdatePanel>
-
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                            <div class="row">
-                                                                <div class="col-md-12">
-                                                                    Convertir a unidad Aduana
-                                                                    <asp:TextBox ID="TxtComExtConvertir" runat="server" Width="60px"></asp:TextBox><asp:Button ID="BtnComExtConvertirUnidad" runat="server" Text="Convertir" />
-                                                                    <asp:GridView ID="GvComercioExterior" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD mysmallbtn" Width="100%" data-sort="true" AutoGenerateColumns="False"
-                                                                        EmptyDataText="No hay datos disponibles" DataKeyNames="Cantidad,Codigo,ClaveSATFraccionArancelaria,ClaveSATUnidadAduana" OnRowDataBound="GvComercioExterior_RowDataBound">
-                                                                        <Columns>
-                                                                            <asp:TemplateField HeaderText="Cantidad">
-                                                                                <ItemTemplate>
-                                                                                    <asp:TextBox ID="TxtCantidad" runat="server" Text='<%# Eval("Cantidad", "{0:#,##0.##}") %>' Width="50px"></asp:TextBox>
-                                                                                </ItemTemplate>
-                                                                            </asp:TemplateField>
-                                                                            <asp:BoundField DataField="CodigoPS" HeaderText="Producto ó Servicio" />
-                                                                            <asp:TemplateField HeaderText="Valor Unitario">
-                                                                                <ItemTemplate>
-                                                                                    <asp:TextBox ID="TxtValorUnitario" runat="server" Text='<%# Eval("PU", "{0:N2}") %>' Width="60px"></asp:TextBox>
-                                                                                </ItemTemplate>
-                                                                            </asp:TemplateField>
-                                                                            <asp:BoundField DataField="ClaveSATFraccionArancelariaDescripcion" HeaderText="Fracción Arancelaria" />
-                                                                            <asp:BoundField DataField="ClaveSATUnidadAduanaDescripcion" HeaderText="Unidad Aduana" />
-                                                                            <%--                                                                            <asp:TemplateField HeaderText="Unidad Aduana">
-                                                                                <ItemTemplate>
-                                                                                    <asp:DropDownList ID="DdlUnidadAduana" runat="server" AppendDataBoundItems="true" CssClass="select2me" DataTextField="ClaveSATUnidadAduanaDescripcion" DataValueField="CveUnidadAduana"></asp:DropDownList>
-                                                                                </ItemTemplate>
-                                                                            </asp:TemplateField>
-                                                                            <asp:TemplateField HeaderText="Fracción Arancelaria" ItemStyle-Width="40%">
-                                                                                <ItemTemplate>
-                                                                                    <ADS:Dropdownlost ID="DdlFraccionArancelaria" runat="server" CssClassDdl="selecthidden" CssStyle="width: 100%;" DataTextField="ClaveSATFraccionArancelariaDescripcion" DataValueField="CveFraccionArancelaria"></ADS:Dropdownlost>
-                                                                                </ItemTemplate>
-                                                                            </asp:TemplateField>--%>
-                                                                            <asp:TemplateField HeaderText="Total USD">
-                                                                                <ItemTemplate>
-                                                                                    <asp:Label ID="LblTotalUSD" Text='<%# (CDbl(Eval("Cantidad").ToString) * CDbl(Eval("PU").ToString)).ToString("N2") %>' runat="server"></asp:Label>
-                                                                                </ItemTemplate>
-                                                                            </asp:TemplateField>
-                                                                            <asp:TemplateField HeaderText="Marca">
-                                                                                <ItemTemplate>
-                                                                                    <asp:TextBox ID="TxtMarca" runat="server" Text="" Width="70px"></asp:TextBox>
-                                                                                </ItemTemplate>
-                                                                            </asp:TemplateField>
-                                                                        </Columns>
-                                                                    </asp:GridView>
-                                                                </div>
-                                                            </div>
-                                                        </ContentTemplate>
-                                                    </asp:UpdatePanel>
-                                                </div>
-                                            </div>
-                                        </td>
-                                        <td rowspan="1" colspan="1">
-                                            <div class="portlet light xspadding bordered whitoutcol" style="width: 450px;">
-                                                <div class="portlet-title">
-                                                    <div class="caption font-green">
-                                                        <i class="icon-pin font-green"></i>
-                                                        <span class="caption-subject bold uppercase">Complementos INE</span>
-                                                    </div>
-                                                    <div class="actions">
-                                                        <div class="btn-group">
-                                                        </div>
-                                                    </div>
-                                                    <div class="tools">
-                                                        <a href="javascript:;" class="collapse"></a>
-                                                    </div>
-                                                </div>
-                                                <div class="portlet-body form-horizontal form-row-sepe formnombottom">
-                                                    <div class="form-body">
-                                                        <div class="row">
-                                                            <div class="modal-body col-md-6" style="border-right: 1px solid lightgray;">
-                                                                <asp:UpdatePanel runat="server" ID="UpComplementos" UpdateMode="Conditional">
-                                                                    <ContentTemplate>
-                                                                        <asp:RadioButtonList ID="RblComplementos" runat="server" AutoPostBack="true" CssClass="rbl" DataValueField="CveVentaComplemento" DataTextField="VentaComplemento" RepeatLayout="Table">
-                                                                        </asp:RadioButtonList>
-                                                                    </ContentTemplate>
-                                                                </asp:UpdatePanel>
-                                                            </div>
-                                                            <div class="modal-body col-md-6">
-                                                                <asp:UpdatePanel runat="server" ID="UpDatosComplementos" UpdateMode="Conditional">
-                                                                    <ContentTemplate>
-                                                                        <table>
-                                                                            <tr id="trTipoCampaña" runat="Server" visible="False">
-                                                                                <td>Tipo Campaña:</td>
-                                                                                <td>
-                                                                                    <asp:DropDownList CssClass="form-control input-sm select2me" ID="DdlTipoCampaña" runat="server">
-                                                                                        <asp:ListItem Text="Campaña" Value="Campaña" />
-                                                                                        <asp:ListItem Text="Precampaña" Value="Precampaña" />
-                                                                                    </asp:DropDownList>
-                                                                                </td>
-                                                                            </tr>
-                                                                            <tr id="trAmbito" runat="Server" visible="False">
-                                                                                <td>Ambito:</td>
-                                                                                <td>
-                                                                                    <asp:DropDownList CssClass="form-control input-sm select2me" ID="DdlAmbitoComplemento" runat="server">
-                                                                                        <asp:ListItem Text="Local" Value="Local" />
-                                                                                        <asp:ListItem Text="Federal" Value="Federal" />
-                                                                                    </asp:DropDownList>
-                                                                                </td>
-                                                                            </tr>
-                                                                            <tr id="trEntidad" runat="Server" visible="False">
-                                                                                <td>Entidad:</td>
-                                                                                <td>
-                                                                                    <asp:DropDownList CssClass="form-control input-sm select2me" ID="DdlINEEntidad" runat="server" AutoPostBack="true">
-                                                                                        <asp:ListItem Text="AGU" Value="AGU" />
-                                                                                        <asp:ListItem Text="BCN" Value="BCN" />
-                                                                                        <asp:ListItem Text="BCS" Value="BCS" />
-                                                                                        <asp:ListItem Text="CAM" Value="CAM" />
-                                                                                        <asp:ListItem Text="CHP" Value="CHP" />
-                                                                                        <asp:ListItem Text="CHH" Value="CHH" />
-                                                                                        <asp:ListItem Text="COA" Value="COA" />
-                                                                                        <asp:ListItem Text="COL" Value="COL" />
-                                                                                        <asp:ListItem Text="DIF" Value="DIF" />
-                                                                                        <asp:ListItem Text="DUR" Value="DUR" />
-                                                                                        <asp:ListItem Text="GUA" Value="GUA" />
-                                                                                        <asp:ListItem Text="GRO" Value="GRO" />
-                                                                                        <asp:ListItem Text="HID" Value="HID" />
-                                                                                        <asp:ListItem Text="JAL" Value="JAL" />
-                                                                                        <asp:ListItem Text="MEX" Value="MEX" />
-                                                                                        <asp:ListItem Text="MIC" Value="MIC" />
-                                                                                        <asp:ListItem Text="MOR" Value="MOR" />
-                                                                                        <asp:ListItem Text="NAY" Value="NAY" />
-                                                                                        <asp:ListItem Text="NLE" Value="NLE" />
-                                                                                        <asp:ListItem Text="OAX" Value="OAX" />
-                                                                                        <asp:ListItem Text="PUE" Value="PUE" />
-                                                                                        <asp:ListItem Text="QTO" Value="QTO" />
-                                                                                        <asp:ListItem Text="ROO" Value="ROO" />
-                                                                                        <asp:ListItem Text="SLP" Value="SLP" />
-                                                                                        <asp:ListItem Text="SIN" Value="SIN" />
-                                                                                        <asp:ListItem Text="SON" Value="SON" />
-                                                                                        <asp:ListItem Text="TAB" Value="TAB" />
-                                                                                        <asp:ListItem Text="TAM" Value="TAM" />
-                                                                                        <asp:ListItem Text="TLA" Value="TLA" />
-                                                                                        <asp:ListItem Text="VER" Value="VER" />
-                                                                                        <asp:ListItem Text="YUC" Value="YUC" />
-                                                                                        <asp:ListItem Text="ZAC" Value="ZAC" />
-                                                                                    </asp:DropDownList>
-                                                                                </td>
-                                                                            </tr>
-                                                                            <tr id="trContaComplementos" runat="Server" visible="False">
-                                                                                <td>Id Conta:</td>
-                                                                                <td>
-                                                                                    <asp:TextBox ID="TxtIdConta" runat="server" MaxLength="6" Width="100px"></asp:TextBox>
-                                                                                    <asp:RegularExpressionValidator ID="REVIdConta" runat="server" ControlToValidate="TxtIdConta" Display="None" ErrorMessage="El campo <b>''Id Conta''</b> no tiene el formato correcto, por favor corrija e intente de nuevo (Solo formato numérico)." ValidationExpression="^([1-9]{1}[\d]{0,2}(\,[\d]{3})*(\.[\d]{0,4})?|[1-9]{1}[\d]{0,}(\.[\d]{0,4})?|0(\.[\d]{0,2})?|(\.[\d]{1,4})?)$" ValidationGroup="GrpComplementosTimbrado"></asp:RegularExpressionValidator>
-                                                                                    <ajax:ValidatorCalloutExtender ID="VCEIdConta" runat="server" HighlightCssClass="vco" TargetControlID="REVIdConta" Width="300px"></ajax:ValidatorCalloutExtender>
-                                                                                </td>
-                                                                            </tr>
-                                                                        </table>
-                                                                    </ContentTemplate>
-                                                                </asp:UpdatePanel>
-                                                            </div>
                                                         </div>
                                                     </div>
                                                 </div>
                                             </div>
                                         </td>
                                     </tr>
+                                    <tr valign="top">
+                                        <td rowspan="1" colspan="2"></td>
+                                        <td rowspan="1" colspan="1"></td>
+                                    </tr>
                                 </table>
                             </ContentTemplate>
                         </asp:UpdatePanel>
@@ -5965,12 +5976,9 @@
                         <div class="row">
                             <div class="col-md-12">
                                 <div class="row">
-                                    <label class="col-md-3 truncate" style="color: #888888; font-family: 'Open Sans', sans-serif; direction: ltr; font-size: 12px;">Agregar Flete:</label>
-                                </div>
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <asp:CheckBox ID="ChkAgregarFlete" runat="server" CssClass="chksino" Text=" " OnCheckedChanged="ChkAgregarFlete_CheckedChanged" Checked="true"
-                                            AutoPostBack="true" />
+                                    <label class="col-md-6 truncate" style="color: #888888; font-family: 'Open Sans', sans-serif; direction: ltr; font-size: 12px;">Limpiar Productos/Servicios:</label>
+                                    <div class="col-md-6">
+                                        <asp:CheckBox ID="ChkLimpiarPS" runat="server" CssClass="chksino" Text=" " Checked="true" Enabled="false" />
                                     </div>
                                 </div>
                             </div>
@@ -5980,7 +5988,7 @@
                                 <div class="row">
                                     <div class="col-md-12">
                                         <div class="form-group form-md-line-input input-iconright">
-                                            <label for="<%= DdlPSFlete.ClientID.ToString()%>">Servicio:</label>
+                                            <label for="<%= DdlPSFlete.ClientID.ToString()%>" style="color: #888888; font-family: 'Open Sans', sans-serif; direction: ltr; font-size: 12px;">Servicio:</label>
                                             <ADS:Dropdownlost runat="server" ID="DdlPSFlete" CssStyle="width: 100%;" CssClass=" form-control input-sm DdlPS" IncluyeTodos="false" CssClassDdl="select2me form-control" DataTextField="PSCodigo" DataValueField="CvePS" />
                                         </div>
                                     </div>
@@ -6002,7 +6010,7 @@
                         </div>
                         <br />
                         <div class="row">
-                            <div class="col-md-12">
+                            <div class="col-md-6">
                                 <div class="form-group form-md-line-input input-iconright">
                                     <asp:TextBox ID="TxtCantidadMercancia" runat="server" ClientIDMode="Static" CssClass="form-control" CausesValidation="true"></asp:TextBox>
                                     <ajax:FilteredTextBoxExtender ID="FTEMercancia" runat="server" TargetControlID="TxtCantidadMercancia" FilterType="Numbers, Custom" ValidChars="." />
@@ -6010,25 +6018,29 @@
                                     <label for="<%= TxtCantidadMercancia.ClientID.ToString()%>">Cantidad:</label>
                                 </div>
                             </div>
+                            <div class="col-md-6">
+                                <div class="form-group form-md-line-input input-iconright">
+                                    <asp:TextBox ID="TxtPrecioMercancia" inputmode="numeric" runat="server" onkeyup="Recalcula();" CausesValidation="true" lang="nb" ClientIDMode="Static" Text="0.00" MaxLength="12" ValidationGroup="GrpAddPSMercancia" CssClass="form-control "></asp:TextBox>
+                                    <ajax:FilteredTextBoxExtender ID="FTBPrecioMercancia" runat="server" TargetControlID="TxtPrecioMercancia" FilterType="Custom, Numbers" ValidChars="." />
+                                    <asp:RequiredFieldValidator ID="RFVPrecioMercancia" runat="server" ControlToValidate="TxtPrecioMercancia" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Precio''</b> es necesario, por favor ingréselo." ValidationGroup="GrpAddPSMercancia"></asp:RequiredFieldValidator>
+                                    <ajax:ValidatorCalloutExtender ID="VCEPrecioM1" runat="server" HighlightCssClass="vco" TargetControlID="RFVPrecioMercancia" Width="300px"></ajax:ValidatorCalloutExtender>
+                                    <asp:CustomValidator ID="CVPrecioMercancia" runat="server" ClientValidationFunction="ValidaDecimal6digits" ControlToValidate="TxtPrecioMercancia" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Precio''</b> no tiene el formato correcto. Por favor rectifique y vuelva a intentar." ValidateEmptyText="True" ValidationGroup="GrpAddPSMercancia"></asp:CustomValidator>
+                                    <ajax:ValidatorCalloutExtender ID="VCEPrecioM2" runat="server" HighlightCssClass="vco" TargetControlID="CVPrecioMercancia" Width="300px"></ajax:ValidatorCalloutExtender>
+                                    <label for="<%= TxtPrecioMercancia.ClientID.ToString()%>">Precio:</label>
+                                </div>
+                            </div>
                         </div>
                         <div class="row">
                             <div class="col-md-12">
                                 <div class="form-group form-md-line-input input-iconright">
-                                    <label for="<%= DdlPSMercancia.ClientID.ToString()%>">Producto/Servicio:</label>
+                                    <label for="<%= DdlPSMercancia.ClientID.ToString()%>" style="color: #888888; font-family: 'Open Sans', sans-serif; direction: ltr; font-size: 12px;">Mercancía:</label>
                                     <ADS:Dropdownlost runat="server" ID="DdlPSMercancia" CssStyle="width: 100%;" CssClass=" form-control input-sm DdlPS" IncluyeTodos="false" CssClassDdl="select2me form-control" DataTextField="PSCodigo" DataValueField="CvePS" />
                                 </div>
                             </div>
                         </div>
                         <br />
-                        <div class="form-group form-md-line-input input-iconright">
-                            <asp:TextBox ID="TxtPrecioMercancia" inputmode="numeric" runat="server" onkeyup="Recalcula();" CausesValidation="true" lang="nb" ClientIDMode="Static" Text="0.00" MaxLength="12" ValidationGroup="GrpAddPSMercancia" Width="200px" CssClass="form-control "></asp:TextBox>
-                            <ajax:FilteredTextBoxExtender ID="FTBPrecioMercancia" runat="server" TargetControlID="TxtPrecioMercancia" FilterType="Custom, Numbers" ValidChars="." />
-                            <asp:RequiredFieldValidator ID="RFVPrecioMercancia" runat="server" ControlToValidate="TxtPrecioMercancia" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Precio''</b> es necesario, por favor ingréselo." ValidationGroup="GrpAddPSMercancia"></asp:RequiredFieldValidator>
-                            <ajax:ValidatorCalloutExtender ID="VCEPrecioM1" runat="server" HighlightCssClass="vco" TargetControlID="RFVPrecioMercancia" Width="300px"></ajax:ValidatorCalloutExtender>
-                            <asp:CustomValidator ID="CVPrecioMercancia" runat="server" ClientValidationFunction="ValidaDecimal6digits" ControlToValidate="TxtPrecioMercancia" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Precio''</b> no tiene el formato correcto. Por favor rectifique y vuelva a intentar." ValidateEmptyText="True" ValidationGroup="GrpAddPSMercancia"></asp:CustomValidator>
-                            <ajax:ValidatorCalloutExtender ID="VCEPrecioM2" runat="server" HighlightCssClass="vco" TargetControlID="CVPrecioMercancia" Width="300px"></ajax:ValidatorCalloutExtender>
-                            <label for="<%= TxtPrecioMercancia.ClientID.ToString()%>">Precio:</label>
-                        </div>
+
+
                     </div>
                     <div class="modal-footer">
                         <asp:LinkButton ID="LnkAddPSMercancia" OnClick="LnkAddPSMercancia_Click" runat="server" CssClass="btn btn-success" Text="Agregar" ValidationGroup="GrpAddPSMercancia"></asp:LinkButton>
@@ -9421,6 +9433,21 @@
             });
 
             $('#<%= TxtTotal.ClientID %>').prop('readonly', DisabledTxtTotal);
+
+            $('#C_Tab_TabComplementos_TxtFechaLlegadaCP').datetimepicker({
+                dayOfWeekStart: 1,
+                lang: 'es',
+                format: 'd/m/Y H:i',
+                formatDate: 'd/m/Y H:i',
+                step: 30
+            });
+            $('#C_Tab_TabComplementos_TxtFechaEntregaCP').datetimepicker({
+                dayOfWeekStart: 1,
+                lang: 'es',
+                format: 'd/m/Y H:i',
+                formatDate: 'd/m/Y H:i',
+                step: 30
+            });
         }
 
 
@@ -9428,6 +9455,7 @@
             loadpage();
             Sys.Application.add_load(function (s, e) {
                 loadpage();
+
             });
         });
 
diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index 558d8b7a5..197a6147b 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -2351,7 +2351,7 @@ Partial Class Ventas
             UpFacturar.Update()
             'CargaTiposDocumentos()
             TrEmitir.Visible = False
-            If UsuarioActual.CveRol = 1 AndAlso UsuarioActual.CveEmpresa = 13 Then
+            If UsuarioActual.CveRol = 1 OrElse UsuarioActual.CveEmpresa.Contiene(13, 83) Then
                 DivCartaPorte.Visible = True
             End If
             ViewState("EstablecioFolio") = False
@@ -5818,10 +5818,11 @@ Partial Class Ventas
 
     End Sub
     Private Sub CargaFormaPago(CveMetodoPago As Integer)
-        'FACTURACION 3.3
-
-        'permiso para desbloquear la relación entre Método de pago y forma de pago
-        If UsuarioActual.TienePermisoProceso(282) Then CveMetodoPago = -1
+        'EN LA VERSION 4.0 NO PERMITE DESBLOEQUEAR RELACION METODO Y FOMA DE PAGO
+        If UsuarioActual.Empresa.Funcionalidad(350) <> "1" Then
+            'permiso para desbloquear la relación entre Método de pago y forma de pago
+            If UsuarioActual.TienePermisoProceso(282) Then CveMetodoPago = -1
+        End If
 
         Dim dtt As DataTable = Nothing
         If CveMetodoPago > 0 Then
@@ -7290,7 +7291,7 @@ Partial Class Ventas
         If Not UsuarioActual.Empresa.Funcionalidad(141).ToString() = "1" Then
             Objeto.ddl.Items.Clear()
             'Objeto.ddl.DataSource = GlobalDTProductosServicios(UsuarioActual.CveEmpresa, CveClasificacion:=CveClasificacion, AplicaParaVenta:=1, Estatus:=1)
-            Objeto.ddl.DataSource = GlobalDTPSSimplificado(UsuarioActual.CveEmpresa, CveClasificacion:=CveClasificacion, Estatus:=1, AplicaParaVenta:=1)
+            Objeto.ddl.DataSource = GlobalDTPSSimplificado(UsuarioActual.CveEmpresa, CveClasificacion:=CveClasificacion, Estatus:=1, AplicaParaVenta:=If(AplicaParaVenta, 1, -1))
             Objeto.ddl.DataBind()
             Objeto.ddl.Items.Insert(0, New ListItem("*** Actualizar listado de Productos o Servicios ***", "-2"))
             Objeto.ddl.Items.Insert(0, New ListItem("Seleccione el Producto", "-1"))
@@ -7307,9 +7308,9 @@ Partial Class Ventas
 
             Objeto.Attributes.Add("data-cvesubproyecto", cvesubproyecto)
             Objeto.ddlWS.Attributes.Add("data-cveclasificacion", CveClasificacion.ToString())
-            Objeto.ddlWS.Attributes.Add("data-pagina", "ventas/ventas")
             Objeto.ddlWS.Attributes.Add("data-Estatus", "1")
             If AplicaParaVenta Then
+                Objeto.ddlWS.Attributes.Add("data-pagina", "ventas/ventas")
                 Objeto.ddlWS.Attributes.Add("data-AplicaparaVenta", "1")
             End If
         End If
@@ -14855,47 +14856,54 @@ Partial Class Ventas
         End If
 
         Select Case ConversionRemision
-                Case "*"
-                    For Each Row As DataRow In TmpDT.Rows
-                        Row("PU") = Math.Round(Row("PU").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
-                        Row("Total") = Math.Round(Row("Cantidad").ToString().ToDouble * Row("PU").ToString().ToDouble, NumeroDecimales)
-                        Row("TotalImporte") = Math.Round(Row("Cantidad").ToString().ToDouble * Row("PU").ToString().ToDouble, NumeroDecimales)
-                        Row("Descuento") = Math.Round(Row("Descuento").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
-                        Row("ImporteIVA") = Math.Round(Row("ImporteIVA").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
-                        Row("ImporteIEPS") = Math.Round(Row("ImporteIEPS").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
-                        Row("ImporteRetIVA") = Math.Round(Row("ImporteRetIVA").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
-                        Row("ImporteRetISR") = Math.Round(Row("ImporteRetISR").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
-                    Next
+            Case "*"
+                For Each Row As DataRow In TmpDT.Rows
+                    Row("PU") = Math.Round(Row("PU").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
+                    Row("Total") = Math.Round(Row("Cantidad").ToString().ToDouble * Row("PU").ToString().ToDouble, NumeroDecimales)
+                    Row("TotalImporte") = Math.Round(Row("Cantidad").ToString().ToDouble * Row("PU").ToString().ToDouble, NumeroDecimales)
+                    Row("Descuento") = Math.Round(Row("Descuento").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
+                    Row("ImporteIVA") = Math.Round(Row("ImporteIVA").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
+                    Row("ImporteIEPS") = Math.Round(Row("ImporteIEPS").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
+                    Row("ImporteRetIVA") = Math.Round(Row("ImporteRetIVA").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
+                    Row("ImporteRetISR") = Math.Round(Row("ImporteRetISR").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
+                Next
 
-                    For Each gvr As GridViewRow In GvImpuestosLocales2.Rows
-                        If gvr.RowType = DataControlRowType.DataRow Then
-                            gvr.FCTextBox("TxtImpuestoLocalPS").Text = (Math.Round(gvr.FCTextBox("TxtImpuestoLocalPS").Text.ToDouble * TipoCambioRemision, NumeroDecimales)).FormatoNumero
-                        End If
-                    Next
-                Case "/"
-                    For Each Row As DataRow In TmpDT.Rows
-                        Row("PU") = Math.Round(Row("PU").ToString().ToDouble / TipoCambioRemision, NumeroDecimales)
-                        Row("Total") = Math.Round(Row("Cantidad").ToString().ToDouble * Row("PU").ToString().ToDouble, NumeroDecimales)
-                        Row("TotalImporte") = Math.Round(Row("Cantidad").ToString().ToDouble * Row("PU").ToString().ToDouble, NumeroDecimales)
-                        Row("Descuento") = Math.Round(Row("Descuento").ToString().ToDouble / TipoCambioRemision, NumeroDecimales)
-                        Row("ImporteIEPS") = Math.Round(Row("ImporteIEPS").ToString().ToDouble / TipoCambioRemision, NumeroDecimales)
-                        Row("ImporteIVA") = Math.Round(Row("ImporteIVA").ToString().ToDouble / TipoCambioRemision, NumeroDecimales)
-                        Row("ImporteRetIVA") = Math.Round(Row("ImporteRetIVA").ToString().ToDouble / TipoCambioRemision, NumeroDecimales)
-                        Row("ImporteRetISR") = Math.Round(Row("ImporteRetISR").ToString().ToDouble / TipoCambioRemision, NumeroDecimales)
-                    Next
+                For Each gvr As GridViewRow In GvImpuestosLocales2.Rows
+                    If gvr.RowType = DataControlRowType.DataRow Then
+                        gvr.FCTextBox("TxtImpuestoLocalPS").Text = (Math.Round(gvr.FCTextBox("TxtImpuestoLocalPS").Text.ToDouble * TipoCambioRemision, NumeroDecimales)).FormatoNumero
+                    End If
+                Next
+            Case "/"
+                For Each Row As DataRow In TmpDT.Rows
+                    Row("PU") = Math.Round(Row("PU").ToString().ToDouble / TipoCambioRemision, NumeroDecimales)
+                    Row("Total") = Math.Round(Row("Cantidad").ToString().ToDouble * Row("PU").ToString().ToDouble, NumeroDecimales)
+                    Row("TotalImporte") = Math.Round(Row("Cantidad").ToString().ToDouble * Row("PU").ToString().ToDouble, NumeroDecimales)
+                    Row("Descuento") = Math.Round(Row("Descuento").ToString().ToDouble / TipoCambioRemision, NumeroDecimales)
+                    Row("ImporteIEPS") = Math.Round(Row("ImporteIEPS").ToString().ToDouble / TipoCambioRemision, NumeroDecimales)
+                    Row("ImporteIVA") = Math.Round(Row("ImporteIVA").ToString().ToDouble / TipoCambioRemision, NumeroDecimales)
+                    Row("ImporteRetIVA") = Math.Round(Row("ImporteRetIVA").ToString().ToDouble / TipoCambioRemision, NumeroDecimales)
+                    Row("ImporteRetISR") = Math.Round(Row("ImporteRetISR").ToString().ToDouble / TipoCambioRemision, NumeroDecimales)
+                Next
 
-                    For Each gvr As GridViewRow In GvImpuestosLocales2.Rows
-                        If gvr.RowType = DataControlRowType.DataRow Then
-                            gvr.FCTextBox("TxtImpuestoLocalPS").Text = (Math.Round(gvr.FCTextBox("TxtImpuestoLocalPS").Text.ToDouble / TipoCambioRemision, NumeroDecimales)).FormatoNumero
-                        End If
-                    Next
-                Case Else
+                For Each gvr As GridViewRow In GvImpuestosLocales2.Rows
+                    If gvr.RowType = DataControlRowType.DataRow Then
+                        gvr.FCTextBox("TxtImpuestoLocalPS").Text = (Math.Round(gvr.FCTextBox("TxtImpuestoLocalPS").Text.ToDouble / TipoCambioRemision, NumeroDecimales)).FormatoNumero
+                    End If
+                Next
+            Case Else
 
-            End Select
+        End Select
 
-            ImprimirbytesPDF(PdfFactura(ObjFactura, Guardar:=False), "Factura", "PDF")
+        Dim CartaPorte As Modelos.MSubReportData = Nothing
 
-            Select Case ConversionRemision
+        If UsuarioActual.CveEmpresa = 13 Then
+            CartaPorte = New Modelos.MSubReportData()
+            CartaPorte.Parametros.Add(New ReportParameter($"TieneCartaPorte", "False"))
+        End If
+
+        ImprimirbytesPDF(PdfFactura(ObjFactura, Guardar:=False, SubReportData:=CartaPorte), "Factura", "PDF")
+
+        Select Case ConversionRemision
                 Case "*"
                     For Each Row As DataRow In TmpDT.Rows
                         Row("PU") = Math.Round(Row("PU").ToString().ToDouble * TipoCambioRemision, NumeroDecimales)
@@ -34203,8 +34211,8 @@ Partial Class Ventas
 
     Public Sub CargarCamiones()
 
-        TxtFechaEntregaCP.Text = Now.ToString("dd/MM/yyyy")
-        TxtFechaLlegadaCP.Text = Now.ToString("dd/MM/yyyy")
+        TxtFechaEntregaCP.Text = Now.Date.ToString("dd/MM/yyyy HH:mm")
+        TxtFechaLlegadaCP.Text = Now.Date.ToString("dd/MM/yyyy HH:mm") 'Now.Date.AddDays(1).AddMinutes(-1).ToString("dd/MM/yyyy HH:mm")
 
         DdlConfigAuto.Items.Clear()
         DdlUnidadCamion.Items.Clear()
@@ -34273,6 +34281,10 @@ Partial Class Ventas
         TxtFechaEntregaCP.Enabled = False
         TxtFechaLlegadaCP.Enabled = False
 
+        Dim CveEntregaAlmacen As Integer = -1
+        Dim CveDireccionOrigen As Integer = -1
+        Dim CveDireccionDestino As Integer = -1
+
         Using ObjGral As New ClsGenerales
             If ObjGral.GetGralTimbre(-1, "Ing", MinFecha, MaxFecha, 0, UsuarioActual.CveEmpresa, -1, CveVenta:=CveVenta) AndAlso ObjGral.DtResultados.Rows.Count > 0 Then
                 Dim RowCP As DataRow = ObjGral.DtResultados.Rows(0)
@@ -34281,19 +34293,58 @@ Partial Class Ventas
                 If CveTimbreCartaPorteVenta > 0 Then
                     ChkEmitirCartaPorte.Checked = True
                     ChkEmitirCartaPorte.Enabled = False
+
+
+                    CveEntregaAlmacen = RowCP("CveEntregaAlmacen").ToString().ToEntero()
+
+                    CveDireccionOrigen = RowCP("CveDireccionOrigen").ToString().ToEntero()
+                    CveDireccionDestino = RowCP("CveDireccionDestino").ToString().ToEntero()
+
+                    TxtFechaEntregaCP.Text = RowCP("FechaEntrega").ToString()
+                    TxtFechaLlegadaCP.Text = RowCP("FechaLlegada").ToString()
+                    TxtDistancia.Text = RowCP("Distancia").ToString()
+
+                    DdlChofer.SelectedValueExist(RowCP("CveChofer").ToString())
+                    DdlUnidadCamion.SelectedValueExist(RowCP("CveCamion").ToString())
                 End If
 
-                TxtFechaEntregaCP.Text = RowCP("FechaEntrega").ToString()
-                TxtFechaLlegadaCP.Text = RowCP("FechaLlegada").ToString()
-                TxtDistancia.Text = RowCP("Distancia").ToString()
-
-                DdlChofer.SelectedValueExist(RowCP("CveChofer").ToString())
-                DdlUnidadCamion.SelectedValueExist(RowCP("CveCamion").ToString())
             End If
+
+            If ChkEmitirCartaPorte.Checked AndAlso CveEntregaAlmacen > 0 AndAlso ObjGral.GetEntregaAlmacenRutaDetalle(CveEntregaAlmacen) Then
+                DtMercancias = ObjGral.DtResultados
+            End If
+
+
         End Using
 
+        If ChkEmitirCartaPorte.Checked AndAlso CveCliente > 0 Then
+            Dim ObjClientes As New ClsClientes
+            If ObjClientes.DireccionEnvioGet(-1, CveCliente, -1) Then
+                TmpDTDireccionCP = ObjClientes.DtResultados.FiltraParametros(String.Format("Estatus = 1"))
+            End If
+            ObjClientes.Dispose()
+
+            DdlDireccionOrigen.DataSource = TmpDTDireccionCP
+            DdlDireccionOrigen.DataBind()
+
+            DdlDireccionDestino.DataSource = TmpDTDireccionCP
+            DdlDireccionDestino.DataBind()
+
+            DdlDireccionOrigen.SelectedValueExist(CveDireccionOrigen.ToString())
+            DdlDireccionDestino.SelectedValueExist(CveDireccionDestino.ToString())
+
+            GvMercanciasCP.DataSource = DtMercancias
+            GvMercanciasCP.DataBind()
+        Else
+            TmpDTDireccionCP = Nothing
+        End If
+
         DdlChofer.Enabled = False
         DdlUnidadCamion.Enabled = False
+        DdlDireccionOrigen.Enabled = False
+        DdlDireccionDestino.Enabled = False
+
+        UpEmitirTransitorio.Update()
     End Sub
 
     Private Sub ValidaConfiguracionVehiculo()
@@ -34371,16 +34422,16 @@ Partial Class Ventas
         Dim CveTimbre As Integer = -1
         Try
 
-            Dim CveDireccionOrigen As Integer = -1
-            Dim CveDireccionDestino As Integer = -1
+            Dim CveDireccionOrigen As Integer = DdlDireccionOrigen.SelectedValue.ToEntero
+            Dim CveDireccionDestino As Integer = DdlDireccionDestino.SelectedValue.ToEntero
 
-            If SucursalOrigenCP IsNot Nothing Then
-                CveDireccionOrigen = ObjClientes.DireccionEnvioAdd(-1, SucursalOrigenCP.Direccion, SucursalOrigenCP.NoExt, SucursalOrigenCP.NoInt, SucursalOrigenCP.Colonia, SucursalOrigenCP.Municipio, SucursalOrigenCP.Estado, SucursalOrigenCP.CP.ToEntero(), "", UsuarioActual.CveUsuario, 1, -1, "", CveEstado:=SucursalOrigenCP.CveEstado, CvePais:=SucursalOrigenCP.CvePais, CveEmpresa:=UsuarioActual.CveEmpresa)
-            End If
+            'If SucursalOrigenCP IsNot Nothing Then
+            '    CveDireccionOrigen = ObjClientes.DireccionEnvioAdd(-1, SucursalOrigenCP.Direccion, SucursalOrigenCP.NoExt, SucursalOrigenCP.NoInt, SucursalOrigenCP.Colonia, SucursalOrigenCP.Municipio, SucursalOrigenCP.Estado, SucursalOrigenCP.CP.ToEntero(), "", UsuarioActual.CveUsuario, 1, -1, "", CveEstado:=SucursalOrigenCP.CveEstado, CvePais:=SucursalOrigenCP.CvePais, CveEmpresa:=UsuarioActual.CveEmpresa)
+            'End If
 
-            If SucursalDestinoCP IsNot Nothing Then
-                CveDireccionDestino = ObjClientes.DireccionEnvioAdd(-1, SucursalDestinoCP.Direccion, SucursalDestinoCP.NoExt, SucursalDestinoCP.NoInt, SucursalDestinoCP.Colonia, SucursalDestinoCP.Municipio, SucursalDestinoCP.Estado, SucursalDestinoCP.CP.ToEntero(), "", UsuarioActual.CveUsuario, 1, -1, "", CveEstado:=SucursalDestinoCP.CveEstado, CvePais:=SucursalDestinoCP.CvePais, CveEmpresa:=UsuarioActual.CveEmpresa)
-            End If
+            'If SucursalDestinoCP IsNot Nothing Then
+            '    CveDireccionDestino = ObjClientes.DireccionEnvioAdd(-1, SucursalDestinoCP.Direccion, SucursalDestinoCP.NoExt, SucursalDestinoCP.NoInt, SucursalDestinoCP.Colonia, SucursalDestinoCP.Municipio, SucursalDestinoCP.Estado, SucursalDestinoCP.CP.ToEntero(), "", UsuarioActual.CveUsuario, 1, -1, "", CveEstado:=SucursalDestinoCP.CveEstado, CvePais:=SucursalDestinoCP.CvePais, CveEmpresa:=UsuarioActual.CveEmpresa)
+            'End If
 
             If Not (CveDireccionOrigen > 0 And CveDireccionDestino > 0) Then
                 ErrorProceso = True
@@ -34398,7 +34449,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().ToDecimal, RowPS("CveUM").ToString().ToEntero, UsuarioActual.CveUsuario) Then
+                    If Not ObjGral.AddEntregaAlmacenRutaDetalle(CveEntregaAlmacen, RowPS("CvePS").ToString().ToEntero, RowPS("Cantidad").ToString().ToDecimal, RowPS("CveUnidadMedida").ToString().ToEntero, UsuarioActual.CveUsuario) Then
                         ErrorProceso = True
                         Exit For
                     End If
@@ -34650,20 +34701,24 @@ Partial Class Ventas
         UpAgregarMercancia.Update()
         RegistraScript("$('#DivAddMercancia').modal('show');", "M1")
     End Sub
+    Private Sub CreaDTMercancias()
+        DtMercancias = New DataTable()
+        DtMercancias.Columns.Add(New DataColumn("Consec", GetType(Integer)))
+        DtMercancias.Columns.Add(New DataColumn("Cantidad", GetType(Integer)))
+        DtMercancias.Columns.Add(New DataColumn("CvePS", GetType(Integer)))
+        DtMercancias.Columns.Add(New DataColumn("CveUnidadMedida", GetType(Integer)))
+        DtMercancias.Columns.Add(New DataColumn("CodigoPS", GetType(String)))
+    End Sub
     Protected Sub LnkAddPSMercancia_Click(sender As Object, e As EventArgs)
         If DtMercancias Is Nothing Then
-            DtMercancias = New DataTable()
-            DtMercancias.Columns.Add(New DataColumn("Consec", GetType(Integer)))
-            DtMercancias.Columns.Add(New DataColumn("Cantidad", GetType(Integer)))
-            DtMercancias.Columns.Add(New DataColumn("CvePS", GetType(Integer)))
-            DtMercancias.Columns.Add(New DataColumn("CveUM", GetType(Integer)))
-            DtMercancias.Columns.Add(New DataColumn("CodigoPS", GetType(String)))
+            CreaDTMercancias()
         End If
+
         Dim CvePS As Integer = DdlPSMercancia.SelectedValue.ToEntero()
 
         Dim DrPS As DataRow = GlobalDTPSSimplificado(CveEmpresa:=UsuarioActual.CveEmpresa, CvePS:=CvePS).FiltroPrimero("")
         If DrPS Is Nothing Then
-            Alert("No se encontró el producto/servicio", TipoMensaje.MsgAdvertencia)
+            Alert("No se encontró la mercancía", TipoMensaje.MsgAdvertencia)
             Exit Sub
         End If
 
@@ -34671,7 +34726,7 @@ Partial Class Ventas
         NewRow("Consec") = DtMercancias.MAX("Consec").ToEntero() + 1
         NewRow("Cantidad") = TxtCantidadMercancia.Text.ToDecimal()
         NewRow("CvePS") = DrPS("CvePS")
-        NewRow("CveUM") = DrPS("CveUnidadMedida")
+        NewRow("CveUnidadMedida") = DrPS("CveUnidadMedida")
         NewRow("CodigoPS") = DrPS("PSCodigo")
 
         DtMercancias.Rows.Add(NewRow)
@@ -34679,46 +34734,50 @@ Partial Class Ventas
         GvMercanciasCP.DataSource = DtMercancias
         GvMercanciasCP.DataBind()
 
-        If ChkAgregarFlete.Checked Then
-            Dim CvePSServicio As Integer = DdlPSFlete.SelectedValue.ToEntero()
-            If CvePSServicio > 0 Then
-                Dim Cantidad As Decimal = TxtCantidadMercancia.Text.ToDecimal
-                Dim PU As Decimal = TxtPrecioMercancia.Text.Trim.ToDecimal
-                Dim Descuento As Decimal = 0
-                Dim CveUM As Integer = -1
-                Dim UnidadMedida As String = ""
-                Dim CveClasificacion As Integer = -1
-                Dim Clasificacion As String = ""
+        If ChkLimpiarPS.Checked Then
+            If TmpDT IsNot Nothing Then
+                TmpDT.Rows.Clear()
+            End If
+        End If
 
-                Dim drPSFlete As DataRow = GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=CvePSServicio).FiltroPrimero("")
-                If DrPS IsNot Nothing Then
-                    CveUM = drPSFlete("CveUnidadMedida").ToString().ToEntero()
-                    CveClasificacion = drPSFlete("CveClasificacion").ToString().ToEntero()
-                End If
+        Dim CvePSServicio As Integer = DdlPSFlete.SelectedValue.ToEntero()
+        If CvePSServicio > 0 Then
+            Dim Cantidad As Decimal = TxtCantidadMercancia.Text.ToDecimal
+            Dim PU As Decimal = TxtPrecioMercancia.Text.Trim.ToDecimal
+            Dim Descuento As Decimal = 0
+            Dim CveUM As Integer = -1
+            Dim UnidadMedida As String = ""
+            Dim CveClasificacion As Integer = -1
+            Dim Clasificacion As String = ""
 
-                Dim CveSubProyecto As Integer = DdlSubProyectoDatos.SelectedValue.ToEntero()
-                    Dim CveProyecto = GlobalDTSubProyectos(-1, CveSubProyecto:=CveSubProyecto, CveEmpresa:=UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveProyecto", "").ToEntero()
+            Dim drPSFlete As DataRow = GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=CvePSServicio).FiltroPrimero("")
+            If DrPS IsNot Nothing Then
+                CveUM = drPSFlete("CveUnidadMedida").ToString().ToEntero()
+                CveClasificacion = drPSFlete("CveClasificacion").ToString().ToEntero()
+            End If
 
-                    Dim Proyecto As String = GlobalDTProyectosUsuarios(UsuarioActual.CveUsuario, CveProyecto, UsuarioActual.CveEmpresa, -1).FiltroPrimeroValor("Proyecto", "").ToString()
+            Dim CveSubProyecto As Integer = DdlSubProyectoDatos.SelectedValue.ToEntero()
+            Dim CveProyecto = GlobalDTSubProyectos(-1, CveSubProyecto:=CveSubProyecto, CveEmpresa:=UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveProyecto", "").ToEntero()
 
-                    AgregarProductoServicio(Cantidad, CveUM, UnidadMedida, CveClasificacion, Clasificacion,
+            Dim Proyecto As String = GlobalDTProyectosUsuarios(UsuarioActual.CveUsuario, CveProyecto, UsuarioActual.CveEmpresa, -1).FiltroPrimeroValor("Proyecto", "").ToString()
+
+            AgregarProductoServicio(Cantidad, CveUM, UnidadMedida, CveClasificacion, Clasificacion,
                                 CvePSServicio, "", TxtObservacionesMercancia.Text.Trim, PU, Descuento,
                                 CveProyecto, Proyecto, CveSubProyecto, DdlSubProyectoDatos.SelectedItem.Text,
                                 Serie:="", TiempoEntrega:="", CuentaPredial:="", RegeneraIEPS:=ClienteDesglosaIEPS, CvePromocionDetalle:=-1,
                                 ImporteProntoPago:=0)
 
-                    CalculaUsados()
-
-                    CalculaTotalesVenta()
-                Else
-                    Alert("No se agrego el servicio del flete", TipoMensaje.MsgAdvertencia)
-            End If
-
+            CalculaTotalesVenta()
+            Alert("Se agregó la mercancía correctamente")
+        Else
+            Alert("No se agregó el servicio", TipoMensaje.MsgAdvertencia)
         End If
 
         TxtCantidadMercancia.Text = ""
         TxtObservacionesMercancia.Text = ""
+        TxtPrecioMercancia.Text = ""
 
+        RegistraScript("$('#DivAddMercancia').modal('hide');", "A2")
         UpAgregarMercancia.Update()
         UpEmitirTransitorio.Update()
     End Sub
@@ -34797,19 +34856,31 @@ Partial Class Ventas
         DdlDireccionDestino.DataSource = TmpDTDireccionCP
         DdlDireccionDestino.DataBind()
     End Sub
-    Protected Sub ChkAgregarFlete_CheckedChanged(sender As Object, e As EventArgs)
+    'Protected Sub ChkAgregarFlete_CheckedChanged(sender As Object, e As EventArgs)
 
-        DivServicioFlete.Visible = ChkAgregarFlete.Checked
+    '    DivServicioFlete.Visible = ChkAgregarFlete.Checked
 
-        UpAgregarMercancia.Update()
-    End Sub
-    Protected Sub DdlPSMercancia_SelectedIndexChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles DdlPSMercancia.selectedindexchange
-        Dim CvePSParametro As Integer = DdlPSMercancia.SelectedValue.ToEntero()
+    '    UpAgregarMercancia.Update()
+    'End Sub
+    Protected Sub DdlPSFlete_SelectedIndexChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles DdlPSFlete.selectedindexchange
+        Dim CvePSParametro As Integer = DdlPSFlete.SelectedValue.ToEntero()
         If CvePSParametro > 0 Then
 
-            Dim drPS As DataRow = GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=DdlPSMercancia.SelectedValue.ToEntero()).FiltroPrimero("")
+            Dim drPS As DataRow = GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=CvePSParametro).FiltroPrimero("")
             If drPS IsNot Nothing Then
+                Dim CvePSMercancia As Integer = drPS("CvePSAdicionalVigencia").ToString().ToEntero()
                 Dim CveClasificacion As Integer = drPS("CveClasificacion").ToString().ToEntero()
+
+                If CvePSMercancia > 0 Then
+                    If UsuarioActual.Empresa.Funcionalidad(141).ToString() = "1" Then
+                        DdlPSMercancia.SelectedValue = CvePSMercancia.ToString()
+                        'DdlPSMercancia.SelectedText = TxtPS.Text.Trim
+                    Else
+                        'DdlPSMercancia.ddl.Items.Insert(2, New ListItem(TxtPS.Text.Trim, ObjProductosServicios.CvePS.ToString()))
+                        DdlPSMercancia.ddl.SelectedValueExist(CvePSMercancia.ToString())
+                    End If
+                End If
+
                 'SUGIERE PRECIO
                 Dim PrecioSugerido As Decimal = 0
                 Dim tPrecioSugerido As Decimal = 0
@@ -34883,6 +34954,8 @@ Partial Class Ventas
             End If
         End If
 
+        UpAgregarMercancia.Update()
+
     End Sub
 End Class
 

From 2eca6fb27479d43886e5aec12abe00cfb4d21104 Mon Sep 17 00:00:00 2001
From: Jonathan Alexis Perez Morales <jonathan.perez@adssistemas.mx>
Date: Thu, 9 Jun 2022 19:12:31 -0700
Subject: [PATCH 3/7] Cancelacion de complemento junto con el IE

---
 Bancos/IE.aspx    | 177 ++++++++++++++++++++++++++--------------------
 Bancos/IE.aspx.vb |  64 +++++++++--------
 2 files changed, 134 insertions(+), 107 deletions(-)

diff --git a/Bancos/IE.aspx b/Bancos/IE.aspx
index 768a9a830..53eb0a2b8 100644
--- a/Bancos/IE.aspx
+++ b/Bancos/IE.aspx
@@ -30,8 +30,8 @@
     <li>
         <asp:HyperLink ID="HLModalActualizarTC" NavigateUrl="#" runat="server" Visible="false" data-toggle="modal" data-target="#ModalActualizarTC" Style="color: #686868;"><i class="fa fa-usd" style="color:#686868;"></i> Actualizar Tipo Cambio</asp:HyperLink>
     </li>
-        <li>
-        <asp:HyperLink ID="HpLPrePoliza" NavigateUrl="#" runat="server" Visible="false"  Style="color: #686868;"><i class="" style="color:#686868;"></i> PrePoliza</asp:HyperLink>
+    <li>
+        <asp:HyperLink ID="HpLPrePoliza" NavigateUrl="#" runat="server" Visible="false" Style="color: #686868;"><i class="" style="color:#686868;"></i> PrePoliza</asp:HyperLink>
     </li>
 
     <%--     <li>
@@ -44,18 +44,18 @@
                 <asp:LinkButton ID="LnkChqDevuelto" runat="server" Visible="false" OnClick="LnkChqDevuelto_Click" Style="color: #686868;"><i class="fa fa-ban" style="color:#686868;"></i> Cheque Devuelto</asp:LinkButton>
             </li>
             <li>
-                <asp:LinkButton ID="LnkCancelar" runat="server" Visible="false" OnClick="LnkCancelar_Click" Style="color: #686868;" data-toggle="tooltip" data-placement="left" title="Cancelar Movimiento" ><i class="fa fa-ban" style="color:#686868;"></i> Cancelar Movimiento</asp:LinkButton>
+                <asp:LinkButton ID="LnkCancelar" runat="server" Visible="false" OnClick="LnkCancelar_Click" Style="color: #686868;" data-toggle="tooltip" data-placement="left" title="Cancelar Movimiento"><i class="fa fa-ban" style="color:#686868;"></i> Cancelar Movimiento</asp:LinkButton>
             </li>
             <li>
                 <asp:LinkButton ID="LnkEliminar" runat="server" Visible="false" OnClientClick="return confirm('¿Está seguro de eliminar el documento?');" Style="color: #686868;"><i class="fa fa-minus" style="color: #686868;"></i> Eliminar Movimiento</asp:LinkButton>
             </li>
-            
+
             <%--<li>
                 <asp:LinkButton ID="LnkCancelarComplemento" OnClick="LnkCancelarComplemento_Click" runat="server" Visible="false" Style="color: #686868;"><i class="fa fa-ban" style="color: #686868;"></i> Refacturar Complemento</asp:LinkButton>
             </li>--%>
 
             <li>
-                <asp:LinkButton ID="LnkCancelarComplementoImporte" OnClick="LnkCancelarComplementoImporte_Click" runat="server" Visible="false" data-btn-ok-label="si" Style="color: #686868;"  data-toggle="tooltip" data-placement="left" title="Cancelar Movimiento  y Complemento" > <i class="fa fa-pencil"></i> Cancelar Movimiento y Complemento</asp:LinkButton>
+                <%--<asp:LinkButton ID="LnkCancelarComplementoImporte" OnClick="LnkCancelarComplementoImporte_Click" runat="server" Visible="false" data-btn-ok-label="si" Style="color: #686868;"  data-toggle="tooltip" data-placement="left" title="Cancelar Movimiento  y Complemento" > <i class="fa fa-pencil"></i> Cancelar Movimiento y Complemento</asp:LinkButton>--%>
 
                 <%-- data-original-title="¿Está seguro que desea cancelar el documento?" data-btn-ok-label="si" Style="color: #686868;"><i class="fa fa-pencil"--%>
 
@@ -126,10 +126,10 @@
                                 </div>
 
 
-                                <asp:Label CssClass="col-md-1" Text="" ID="LbTipoMoneda" runat="server"   />
-                                <div class="col-md-2" id="DVPAgoEnPesos" runat="server"  visible ="false">
-                                    <asp:CheckBox Text="Pagar con pesos" TextAlign="Right" Visible="false" AutoPostBack="true" ID="ChkPagarPesos" OnCheckedChanged="ChkPagarPesos_CheckedChanged" runat="server" ClientIDMode="Static" />
-                                    <%--<asp:CheckBox Text="Pagar con dolares" TextAlign="Right" Visible="false" AutoPostBack="true" ID="ChkPagarDolares" runat="server" OnCheckedChanged="ChkPagarDolares_CheckedChanged" ClientIDMode="Static" />--%>
+                                <asp:Label CssClass="col-md-1" Text="" ID="LbTipoMoneda" runat="server" />
+                                <div class="col-md-2" id="DVPAgoEnPesos" runat="server" visible="false">
+                                    <asp:CheckBox Text="Pagar con pesos" TextAlign="Right" Visible="false" AutoPostBack="true" ID="ChkPagarPesos" OnCheckedChanged="ChkPagarPesos_CheckedChanged" runat="server" ClientIDMode="Static" />
+                                    <%--<asp:CheckBox Text="Pagar con dolares" TextAlign="Right" Visible="false" AutoPostBack="true" ID="ChkPagarDolares" runat="server" OnCheckedChanged="ChkPagarDolares_CheckedChanged" ClientIDMode="Static" />--%>
                                 </div>
 
 
@@ -147,24 +147,25 @@
                                     <asp:Label ID="LblEstatusIE" runat="server" Text="Activo" Visible="false"></asp:Label>
                                     <asp:DropDownList runat="server" CssClass="form-control input-sm select2me" ID="DdlEstatusIE" DataValueField="CveEstatusIE" DataTextField="EstatusIE" AutoPostBack="false"></asp:DropDownList>
                                 </div>
-                                
-                            <div class="col-md-2" runat="server" id="DivTC" visible="false">
+
+                                <div class="col-md-2" runat="server" id="DivTC" visible="false">
                                     T.C.:
-                                    <asp:TextBox ID="TxtTC" runat="server" Text="1" placeholder="Tipo de Cambio" CssClass="form-control input-sm" MaxLength="12" onblur="CambiaTCPagoOC();"  Width="70px" ClientIDMode="Static" Style="text-align: right; display: inline-block;" />
-                                    <asp:RequiredFieldValidator ID="RFVTC" Enabled="false" runat="server" ControlToValidate="TxtTC" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Tipo de Cambio''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
-                                    <ajax:ValidatorCalloutExtender ID="VCETC" runat="server" HighlightCssClass="vco" TargetControlID="RFVTC" Width="350px"></ajax:ValidatorCalloutExtender>
+                                   
+                                    <asp:TextBox ID="TxtTC" runat="server" Text="1" placeholder="Tipo de Cambio" CssClass="form-control input-sm" MaxLength="12" onblur="CambiaTCPagoOC();" Width="70px" ClientIDMode="Static" Style="text-align: right; display: inline-block;" />
+                                    <asp:RequiredFieldValidator ID="RFVTC" Enabled="false" runat="server" ControlToValidate="TxtTC" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Tipo de Cambio''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
+                                    <ajax:ValidatorCalloutExtender ID="VCETC" runat="server" HighlightCssClass="vco" TargetControlID="RFVTC" Width="350px"></ajax:ValidatorCalloutExtender>
                                     <asp:Label ID="LbImporteME" Text="" ClientIDMode="Static" runat="server" />
-                                <div style="display:none">
-                                    <asp:Button ID="LnkActualizaTCOC" ClientIDMode="Static"  runat="server" Text="Actaulziar" OnClick="LnkActualizaTCOC_Click" ></asp:Button>
+                                    <div style="display: none">
+                                        <asp:Button ID="LnkActualizaTCOC" ClientIDMode="Static" runat="server" Text="Actaulziar" OnClick="LnkActualizaTCOC_Click"></asp:Button>
+                                    </div>
+
                                 </div>
-
-                            </div>
-                            <div class="col-md-2" runat="server" id="DivTC2" visible="false">
+                                <div class="col-md-2" runat="server" id="DivTC2" visible="false">
                                     Dolares
-                                    <asp:TextBox ID="TxtImporteDolares" runat="server" Text="1" placeholder="Dolares" CssClass="form-control input-sm" MaxLength="12"   Width="70px" ClientIDMode="Static" Style="text-align: right; display: inline-block;" />                                                                        
+                                   
+                                    <asp:TextBox ID="TxtImporteDolares" runat="server" Text="1" placeholder="Dolares" CssClass="form-control input-sm" MaxLength="12" Width="70px" ClientIDMode="Static" Style="text-align: right; display: inline-block;" />
                                     <%--<asp:Label ID="Label1" Text="" ClientIDMode="Static" runat="server" />--%>
-
-                            </div>
+                                </div>
 
 
                             </div>
@@ -217,15 +218,15 @@
                                     <ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender2" runat="server" HighlightCssClass="vco" TargetControlID="RequiredFieldValidator1" Width="350px"></ajax:ValidatorCalloutExtender>
 
 
-                                    <div runat="server"  id="DvFolioACCondiciones" visible="false">
-                                        
-                                        <ajax:FilteredTextBoxExtender runat="server" ID="FTEFolio" TargetControlID="TxtFolio"  FilterType="Custom" ValidChars="0123456789" />                                                                                                      
-                                        <asp:RangeValidator ID="RvTxtFolio" runat="server" ControlToValidate="TxtFolio" Display="None" ErrorMessage="El Folio debe de tener un valor de entre 1 y 2147483647" Type="Integer" MinimumValue="1" MaximumValue="2147483647"   ValidationGroup="GrpGuardar"></asp:RangeValidator>
+                                    <div runat="server" id="DvFolioACCondiciones" visible="false">
+
+                                        <ajax:FilteredTextBoxExtender runat="server" ID="FTEFolio" TargetControlID="TxtFolio" FilterType="Custom" ValidChars="0123456789" />
+                                        <asp:RangeValidator ID="RvTxtFolio" runat="server" ControlToValidate="TxtFolio" Display="None" ErrorMessage="El Folio debe de tener un valor de entre 1 y 2147483647" Type="Integer" MinimumValue="1" MaximumValue="2147483647" ValidationGroup="GrpGuardar"></asp:RangeValidator>
                                         <ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender8" runat="server" HighlightCssClass="vco" TargetControlID="RvTxtFolio" Width="350px"></ajax:ValidatorCalloutExtender>
 
-                                    </div>  
+                                    </div>
+
 
-                                    
 
 
                                 </div>
@@ -280,8 +281,8 @@
                                             <ADS:Dropdownlost ID="DdlProveedores" runat="server" CssStyle="width: 100%;" DataTextField="RazonSocial" DataValueField="CveProveedor" Visible="false" Onselectedindexchange="DdlProveedores_selectedindexchange"></ADS:Dropdownlost>
                                             <asp:DropDownList ID="DdlPersonal" runat="server" AppendDataBoundItems="true" DataTextField="NombreCompleto" DataValueField="CvePersonal" CssClass="form-control input-sm input-medium select2me" Visible="false" Width="100%" OnSelectedIndexChanged="DdlPersonal_SelectedIndexChanged" AutoPostBack="true">
                                             </asp:DropDownList>
-                                            
-                                            <asp:Label runat="server"  ID="LblPagarA" Visible="false"></asp:Label>
+
+                                            <asp:Label runat="server" ID="LblPagarA" Visible="false"></asp:Label>
 
 
                                         </div>
@@ -294,13 +295,13 @@
                                     </ContentTemplate>
                                 </asp:UpdatePanel>
                             </asp:Panel>
-                             <div id="DivOtrosIngresosEgresos" runat="server" visible="false" class="row">
-                                                 
+                            <div id="DivOtrosIngresosEgresos" runat="server" visible="false" class="row">
+
                                 <label class="col-md-2 control-label ">Otros:</label>
                                 <div class="col-md-2 input-icon">
                                     <i style="margin: 0px;">$</i>
-                                    <asp:TextBox ID="TxtOtrosIngresosEgresos" runat="server" CssClass="form-control input-sm" ClientIDMode="Static" Style="text-align: right;"  AutoComplete="off"></asp:TextBox>
-                                    
+                                    <asp:TextBox ID="TxtOtrosIngresosEgresos" runat="server" CssClass="form-control input-sm" ClientIDMode="Static" Style="text-align: right;" AutoComplete="off"></asp:TextBox>
+
                                 </div>
                             </div>
                             <br />
@@ -433,7 +434,7 @@
                                         </div>
                                     </div>
                                     <div class="row" id="TrReferenciaCIE" runat="server" visible="False">
-                                        
+
                                         <label class="col-md-2 control-label">Referencia:</label>
                                         <div class="col-md-4">
                                             <asp:TextBox ID="TxtReferenciaCIE" Text="" runat="server" CssClass="form-control input-sm" Width="200px" MaxLength="20" />
@@ -441,12 +442,12 @@
                                             <ajax:ValidatorCalloutExtender ID="VCEReferenciaCIE" runat="server" HighlightCssClass="vco" TargetControlID="RFVReferenciaCIE" Width="300px"></ajax:ValidatorCalloutExtender>
                                         </div>
 
-                                    <label class="col-md-2 control-label">Concepto:</label>
-                                    <div class="col-md-4">
-                                        <asp:TextBox ID="TxtConceptoCIE" Text="" runat="server" CssClass="form-control input-sm" Width="200px" MaxLength="30" />
-                                        <%--<asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ControlToValidate="TxtReferenciaCIE" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Referencia''</b> es necesario, por favor ingréselo." ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
-                                        <ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender7" runat="server" HighlightCssClass="vco" TargetControlID="RFVReferenciaCIE" Width="300px"></ajax:ValidatorCalloutExtender>--%>
-                                    </div>
+                                        <label class="col-md-2 control-label">Concepto:</label>
+                                        <div class="col-md-4">
+                                            <asp:TextBox ID="TxtConceptoCIE" Text="" runat="server" CssClass="form-control input-sm" Width="200px" MaxLength="30" />
+                                            <%--<asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ControlToValidate="TxtReferenciaCIE" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Referencia''</b> es necesario, por favor ingréselo." ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>
+                                        <ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender7" runat="server" HighlightCssClass="vco" TargetControlID="RFVReferenciaCIE" Width="300px"></ajax:ValidatorCalloutExtender>--%>
+                                        </div>
 
                                     </div>
                                 </ContentTemplate>
@@ -493,7 +494,7 @@
 
 
 
-                 <div class="portlet light xspadding bordered " runat="server" id="DVDevolucion" visible="false">
+            <div class="portlet light xspadding bordered " runat="server" id="DVDevolucion" visible="false">
                 <div class="portlet-title">
                     <div class="caption font-green">
                         <i class="icon-pin font-green"></i>
@@ -887,7 +888,7 @@
                                                             <td>
                                                                 <asp:TextBox ID="TxtTipoCambio" runat="server" MaxLength="12" Width="80px"></asp:TextBox></td>
                                                         </tr>
-                                                    <asp:Button ID="BtnCambiaTipoMoneda" Text="" OnClick="BtnCambiaTipoMoneda_Click" ClientIDMode="Static" Style="display: none;" runat="server" />
+                                                        <asp:Button ID="BtnCambiaTipoMoneda" Text="" OnClick="BtnCambiaTipoMoneda_Click" ClientIDMode="Static" Style="display: none;" runat="server" />
                                                     </ContentTemplate>
                                                 </asp:UpdatePanel>
 
@@ -1029,8 +1030,8 @@
         </ContentTemplate>
     </asp:UpdatePanel>
 
-    
-       
+
+
 
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
         <tr>
@@ -1042,7 +1043,7 @@
                         <asp:Button ID="BtnCancelar" runat="server" Visible="false" Text="Volver" OnClientClick="javascript:window.location.href='/Bancos/CatBancosIE.aspx';return false;" class="btn btn-danger " />
                         <asp:Button ID="BtnImprimir" runat="server" Text="Imprimir" Visible="False" class="btn btn-primary " />
                         <asp:Button ID="BtnActualizar" runat="server" Text="Actualizar" ValidationGroup="GrpGuardar" Visible="False" class="btn btn-info " />
-                        <asp:Button Text="Editar" ID="BtnEditar" OnClick="BtnEditar_Click" CssClass="btn btn-primary"   runat="server" Visible ="false"   ValidationGroup="GrpGuardar" />
+                        <asp:Button Text="Editar" ID="BtnEditar" OnClick="BtnEditar_Click" CssClass="btn btn-primary" runat="server" Visible="false" ValidationGroup="GrpGuardar" />
                     </ContentTemplate>
                 </asp:UpdatePanel>
             </td>
@@ -1066,8 +1067,8 @@
                                 <i class="fa fa-commenting font-green"></i>
                                 <span class="caption-subject bold">Agregar</span>
                             </div>--%>
-                            <asp:HyperLink ID="ImgAddObs" CssClass="caption-subject bold" data-toggle="modal" data-target="#ModalBitacora" runat="server" Text=" <i class='fa fa-commenting font-green' ></i><span class='caption-subject bold'>Agregar</span>" Style="font-weight: 700 !important;cursor: pointer;" ToolTip="Observaciones"></asp:HyperLink><br />
-                            <asp:HyperLink ID="HlEvento" CssClass="thickbox caption-subject bold" runat="server" Text=" <i class='fa fa-calendar-plus-o font-green'  ></i>Agendar" Visible="false" Style="font-weight: 700 !important;cursor: pointer;" ToolTip="Agendar"></asp:HyperLink>
+                            <asp:HyperLink ID="ImgAddObs" CssClass="caption-subject bold" data-toggle="modal" data-target="#ModalBitacora" runat="server" Text=" <i class='fa fa-commenting font-green' ></i><span class='caption-subject bold'>Agregar</span>" Style="font-weight: 700 !important; cursor: pointer;" ToolTip="Observaciones"></asp:HyperLink><br />
+                            <asp:HyperLink ID="HlEvento" CssClass="thickbox caption-subject bold" runat="server" Text=" <i class='fa fa-calendar-plus-o font-green'  ></i>Agendar" Visible="false" Style="font-weight: 700 !important; cursor: pointer;" ToolTip="Agendar"></asp:HyperLink>
 
                         </div>
                     </div>
@@ -1252,8 +1253,39 @@
 
 
                         </div>
+                        <br />
+                        <div class="row" id="DivCancelarComplemento" runat="server" Visible="false">
+                            <div class="col-md-12">
+                                <div class="portlet light xspadding bordered whitoutcol" style="width: 100%">
+                                    <div class="portlet-title">
+                                        <div class="caption font-green">
+                                            <i class="icon-pin font-green"></i>
+                                            <span class="caption-subject bold uppercase">Cancelar Complemento</span>
+                                        </div>
+                                        <div class="actions">
+                                            <div class="btn-group">
+                                            </div>
+                                        </div>
+                                        <div class="tools">
+                                            <a href="javascript:;" class="collapse"></a>
+                                        </div>
+                                    </div>
+                                    <div class="portlet-body ">
+                                        <div class="row" style="align-items: center; vertical-align: middle;">
+                                             <label class="col-md-3" style="max-width: 155px;">Motivo de cancelación:</label>
+                                             <div class="col-md-9">
+                                                 <asp:DropDownList runat="server" id="DdlMotivoCancelacion" DataTextField="CodigoSATDescripcion" DataValueField="CveMotivoCancelacion" CssClass="select2me" Width="100%" >                                
+                                                 </asp:DropDownList>
+
+                                                <asp:RequiredFieldValidator ID="RfvDdlMotivoCancelacion" runat="server" ControlToValidate="DdlMotivoCancelacion" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Motivo de Cancelación''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpCancelarIE"></asp:RequiredFieldValidator>
+                                                <ajax:ValidatorCalloutExtender ID="VCERfvDdlMotivoCancelacion" runat="server" HighlightCssClass="vco" TargetControlID="RfvDdlMotivoCancelacion" Width="300px"></ajax:ValidatorCalloutExtender>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
 
-                  
                     </div>
                     <div class="modal-footer">
                         <asp:Button ID="BtnCancelarIE" OnClick="BtnCancelarIE_Click" runat="server" CssClass="btn btn-success" Text="Cancelar Movimiento" ValidationGroup="GrpCancelarIE" />
@@ -1384,29 +1416,28 @@
                                 </asp:TemplateField>
 
                                 <asp:TemplateField HeaderText="Motivo" Visible="true" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="30%">
-                                      <ItemTemplate>
-                                          <asp:DropDownList runat="server" id="DdlMotivoCancelacion" DataTextField="CodigoSATDescripcion" DataValueField="CveMotivoCancelacion" CssClass="form-control input-sm select2me" Visible ="false">
-                                          </asp:DropDownList>
-                                          <asp:Literal runat="server" ID="LtlMotivoCancelacion"  Text='<%# Eval("MotivoCancelacion") %>'>  </asp:Literal>
-                                       </ItemTemplate>
-                                    
+                                    <ItemTemplate>
+                                        <asp:DropDownList runat="server" ID="DdlMotivoCancelacion" DataTextField="CodigoSATDescripcion" DataValueField="CveMotivoCancelacion" CssClass="form-control input-sm select2me" Visible="false">
+                                        </asp:DropDownList>
+                                        <asp:Literal runat="server" ID="LtlMotivoCancelacion" Text='<%# Eval("MotivoCancelacion") %>'>  </asp:Literal>
+                                    </ItemTemplate>
+
                                 </asp:TemplateField>
 
                                 <asp:TemplateField HeaderText="Cancelar" Visible="true" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="15%">
                                     <ItemTemplate>
-                                        <asp:LinkButton ID="LnkCancelarComplemetno" OnClick="LnkCancelarComplemetno_Click" runat="server" AlternateText="Editar" CausesValidation="False" 
+                                        <asp:LinkButton ID="LnkCancelarComplemetno" OnClick="LnkCancelarComplemetno_Click" runat="server" AlternateText="Editar" CausesValidation="False"
                                             data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea cancelar el complemento?" data-btn-ok-label="si"
                                             CssClass="btn btn-circle btn-sm red" Text="<i class='fa fa-minus'></i>" />
                                     </ItemTemplate>
                                 </asp:TemplateField>
 
-                             <%--   <asp:TemplateField HeaderText="EstatusSAT" Visible="true" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="15%">
+                                <%--   <asp:TemplateField HeaderText="EstatusSAT" Visible="true" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="15%">
                                     <ItemTemplate>
                                         <asp:LinkButton ID="LnkEstatusSAT" OnClick="LnkEstatusSAT_Click" runat="server" AlternateText="Editar" CausesValidation="False"                                              
                                             CssClass="btn btn-circle btn-sm blue" Text="<i class='fa fa-question'></i>" />
                                     </ItemTemplate>
                                 </asp:TemplateField>--%>
-
                             </Columns>
                         </asp:GridView>
                     </div>
@@ -1448,7 +1479,7 @@
                     <div class="modal-footer">
                         <button id="CancelarActualizarTC" type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
                         <asp:Button Text="Actualizar" ID="BtnActualizarTC" OnClick="BtnActualizarTC_Click" CssClass="btn btn-primary" ValidationGroup="GrpModalActualizarTC" runat="server" />
-                        
+
                     </div>
                 </div>
             </ContentTemplate>
@@ -1547,7 +1578,7 @@
     </div>
 
 
-    <div id="ModalCancelarComplemetno" class="modal ADS fade" role="dialog">
+    <%--    <div id="ModalCancelarComplemetno" class="modal ADS fade" role="dialog">
         <div class="modal-dialog">
 
             <!-- Modal content-->
@@ -1563,13 +1594,6 @@
 
                             <div class="row">
 
-                              <%--  <p>¿Cual de  las siguientes acciones es la que desea  realizar?</p>
-
-                                <asp:RadioButtonList runat="server" ID="RdlCancelarComplemento" OnSelectedIndexChanged="RdlCancelarComplemento_SelectedIndexChanged" AutoPostBack="true" RepeatDirection="Horizontal">
-                                    <asp:ListItem Value="1" Selected="True">Cancelar Complemento</asp:ListItem>
-                                    <asp:ListItem Value="2">Cancelar Pago y Complemento</asp:ListItem>
-                                </asp:RadioButtonList>--%>
-
                             </div>
                             <div class="row" runat="server" id="DivFechaCancelación" visible="true">
 
@@ -1630,7 +1654,8 @@
                 </div>
             </div>
         </div>
-    </div>
+    </div>--%>
+
     <div id="DModalDesconciliar" class="modal ADS fade" role="dialog">
         <asp:UpdatePanel class="modal-dialog" runat="server" ID="UpDesconciliar" UpdateMode="Conditional">
             <ContentTemplate>
@@ -1800,7 +1825,7 @@
         function ValidarCantidad(t, c) {
             var Ot = 0.00;
             // considera importe de OT ingresos, para que se peuda exceder
-            if ($get('TxtOtrosIngresosEgresos')) { Ot = ToDouble($get('TxtOtrosIngresosEgresos').value);}
+            if ($get('TxtOtrosIngresosEgresos')) { Ot = ToDouble($get('TxtOtrosIngresosEgresos').value); }
             t.value = (ToDouble(t.value) > ToDouble(c) + Ot ? c : t.value)
         }
 
@@ -1814,10 +1839,10 @@
         }
 
 
-        function SelectorNotas(Chk) {           
+        function SelectorNotas(Chk) {
 
             $(`.CssSelector input[type=checkbox]`).each(function () {
-                $(this).prop('checked', Chk.checked);              
+                $(this).prop('checked', Chk.checked);
             });
 
             FCSumaTotalesNotas()
@@ -1830,7 +1855,7 @@
             $(`.CssSelector input[type=checkbox]`).each(function () {
                 if ($(this).is(":checked")) {
                     Total += parseFloat($(this).attr("data-saldo"));
-                }               
+                }
             });
 
 
@@ -1838,22 +1863,22 @@
 
                 $(`#TxtImporte`).val(Total);
 
-                FormatoMoneda( $get("TxtImporte"));
+                FormatoMoneda($get("TxtImporte"));
 
             } else {
                 $(`#TxtImporte`).val("");
-            } 
+            }
 
         }
 
 
-        function  DeshabilitarTxt(){
+        function DeshabilitarTxt() {
 
             return false;
         }
 
         function CambiaTCPagoOC() {
-             
+
             $("#LnkActualizaTCOC").click();
         }
 
diff --git a/Bancos/IE.aspx.vb b/Bancos/IE.aspx.vb
index e845a08e3..22d6a995d 100644
--- a/Bancos/IE.aspx.vb
+++ b/Bancos/IE.aspx.vb
@@ -1120,7 +1120,8 @@ Partial Class Bancos_IE
                 End If
 
                 'LnkCancelarComplemento.Visible = False
-                LnkCancelarComplementoImporte.Visible = False
+                'LnkCancelarComplementoImporte.Visible = False
+                DivCancelarComplemento.Visible = False
                 UppEliminarIE.Update()
 
 
@@ -1296,7 +1297,8 @@ Partial Class Bancos_IE
                     'LnkCancelar.Visible = False
 
                     'LnkCancelarComplemento.Visible = True
-                    LnkCancelarComplementoImporte.Visible = True
+                    'LnkCancelarComplementoImporte.Visible = True
+                    DivCancelarComplemento.Visible = True
 
                 End If
 
@@ -1304,7 +1306,8 @@ Partial Class Bancos_IE
             Else
                 BtnEditar.Visible = False
                 ' LnkCancelarComplemento.Visible = False
-                LnkCancelarComplementoImporte.Visible = False
+                'LnkCancelarComplementoImporte.Visible = False
+                DivCancelarComplemento.Visible = False
                 DVGenerarComplementoModal.Visible = False
             End If
 
@@ -4453,13 +4456,12 @@ Partial Class Bancos_IE
     Protected Sub BtnCancelarIE_Click(sender As Object, e As EventArgs)
         RegistraScript("$('#DivCancelarIE').modal('hide');")
         Dim ExistenComplementosVigentes As Boolean = VerificaComplementos(True)
-
-        If Not ExistenComplementosVigentes Then
-            CancelarIE()
-        Else
-            Alert("No se puede cancelar documento con complementos de pago vigentes", TipoMensaje.MsgError)
+        If ExistenComplementosVigentes AndAlso DdlMotivoCancelacion.SelectedValue.ToEntero() <= 0 Then
+            Alert("Debe seleccionar un motivo de cancelación", TipoMensaje.MsgError)
+            Exit Sub
         End If
 
+        CancelarIE(CancelarComplemento:=ExistenComplementosVigentes)
 
     End Sub
 
@@ -4681,23 +4683,23 @@ Partial Class Bancos_IE
                         Dim ObjCancelacion As New Timbrado
                         If EstatusSATCancelado(FolioFiscalCancelar, UsuarioActual.Empresa.RFC, RFCReceptorCancelar) Then
 
-                            If Banc.UpdateComplementoPago(CveComplementoPagoCancelar, "-1", -1, UsuarioActual.CveEmpresa, 2, CvePACCancelacion, FechaCancelacion:=Date.Now, SelloCancelacion:="") Then
-                                CargaComplementosPago()
-                                RegistraScript("$('#ModalCancelarComplemetno').modal('hide');")
-                                ErrorCancelarComplemento = False
-                                Alert("El complemento se cancelo correctamente.")
-                            End If
+                            'If Banc.UpdateComplementoPago(CveComplementoPagoCancelar, "-1", -1, UsuarioActual.CveEmpresa, 2, CvePACCancelacion, FechaCancelacion:=Date.Now, SelloCancelacion:="") Then
+                            '    CargaComplementosPago()
+                            '    RegistraScript("$('#ModalCancelarComplemetno').modal('hide');")
+                            '    ErrorCancelarComplemento = False
+                            '    Alert("El complemento se cancelo correctamente.")
+                            'End If
 
                         Else
                             Dim respCancelacion = ObjCancelacion.CFDICancelar(UsuarioActual.Empresa, FolioFiscalCancelar, 0, RFCReceptorCancelar, UsuarioActual.Empresa.RFC, CvePACCancelacion, CveSATMotivoCancelacion:=CveSATMotivoCancelacion)
                             If respCancelacion.Verificado Then
 
-                                If Banc.UpdateComplementoPago(CveComplementoPagoCancelar, "-1", -1, UsuarioActual.CveEmpresa, 2, CvePACCancelacion, FechaCancelacion:=ObjCancelacion.CancelacionFecha, SelloCancelacion:=ObjCancelacion.CancelacionAcuse, CveSATMotivoCancelacion:=CveSATMotivoCancelacion) Then
-                                    CargaComplementosPago()
-                                    RegistraScript("$('#ModalCancelarComplemetno').modal('hide');")
-                                    ErrorCancelarComplemento = False
-                                    Alert("El complemento se cancelo correctamente.")
-                                End If
+                                'If Banc.UpdateComplementoPago(CveComplementoPagoCancelar, "-1", -1, UsuarioActual.CveEmpresa, 2, CvePACCancelacion, FechaCancelacion:=ObjCancelacion.CancelacionFecha, SelloCancelacion:=ObjCancelacion.CancelacionAcuse, CveSATMotivoCancelacion:=CveSATMotivoCancelacion) Then
+                                '    CargaComplementosPago()
+                                '    RegistraScript("$('#ModalCancelarComplemetno').modal('hide');")
+                                '    ErrorCancelarComplemento = False
+                                '    Alert("El complemento se cancelo correctamente.")
+                                'End If
 
                             Else
                                 Alert("Se presento un error al cancelar el complemento.", TipoMensaje.MsgAdvertencia)
@@ -5937,7 +5939,7 @@ Partial Class Bancos_IE
                     End If
 
                     If ObjBancos.DtResultados.FiltraParametros(" Estatus IN (1,3) ").Rows.Count = 1 And Tipo.ToUpper = "CARGO" And CveCliente > 0 And CveEstatusIE <> 2 Then
-                        DVmotivoCancelacion.Visible = True
+                        DivCancelarComplemento.Visible = True
                     End If
 
 
@@ -6758,20 +6760,20 @@ Partial Class Bancos_IE
 
         If EstatusSATCancelado(FolioFiscalCancelar, UsuarioActual.Empresa.RFC, RFCReceptorCancelar) Then
 
-            If ObjBanco.UpdateComplementoPago(CveComplementoPagoCancelar, "-1", -1, UsuarioActual.CveEmpresa, 2, CvePACCancelacion, FechaCancelacion:=Date.Now, SelloCancelacion:="") Then
-                CargaComplementosPago()
-                Alert("El complemento se cancelo correctamente.")
-            End If
+            'If ObjBanco.UpdateComplementoPago(CveComplementoPagoCancelar, "-1", -1, UsuarioActual.CveEmpresa, 2, CvePACCancelacion, FechaCancelacion:=Date.Now, SelloCancelacion:="") Then
+            '    CargaComplementosPago()
+            '    Alert("El complemento se cancelo correctamente.")
+            'End If
 
         Else
 
             Dim resp = ObjCancelacion.CFDICancelar(UsuarioActual.Empresa, FolioFiscalCancelar, 0, RFCReceptorCancelar, UsuarioActual.Empresa.RFC, CvePACCancelacion, CveSATMotivoCancelacion:=CveSATMotivoCancelacion)
             If resp.Verificado Then
 
-                If ObjBanco.UpdateComplementoPago(CveComplementoPagoCancelar, "-1", -1, UsuarioActual.CveEmpresa, 2, CvePACCancelacion, FechaCancelacion:=ObjCancelacion.CancelacionFecha, SelloCancelacion:=ObjCancelacion.CancelacionAcuse, CveSATMotivoCancelacion:=CveSATMotivoCancelacion) Then
+                'If ObjBanco.UpdateComplementoPago(CveComplementoPagoCancelar, "-1", -1, UsuarioActual.CveEmpresa, 2, CvePACCancelacion, FechaCancelacion:=ObjCancelacion.CancelacionFecha, SelloCancelacion:=ObjCancelacion.CancelacionAcuse, CveSATMotivoCancelacion:=CveSATMotivoCancelacion) Then
 
-                    Alert("El complemento se cancelo correctamente.")
-                End If
+                '    Alert("El complemento se cancelo correctamente.")
+                'End If
             Else
                 Alert("Se presento un error al cancelar el complemento.", TipoMensaje.MsgError)
             End If
@@ -6791,7 +6793,7 @@ Partial Class Bancos_IE
             Exit Sub
         End If
 
-        TxtFechaCancelacion.Text = TxtFechaCancelarComplemento.Text
+        'TxtFechaCancelacion.Text = TxtFechaCancelarComplemento.Text
         CancelarIE(True)
 
     End Sub
@@ -6822,10 +6824,10 @@ Partial Class Bancos_IE
             CvePACCancelacion = DTComplementos.Rows(0)("CvePAC").ToString.ToEntero
 
             RegistraScript("$('#ModalCancelarComplemetno').modal('show');")
-            DivFechaCancelación.Visible = True
+            'DivFechaCancelación.Visible = True
             CargaComplementosPago()
 
-            UpModalCancelarComplemetno.Update()
+            'UpModalCancelarComplemetno.Update()
 
         Else
             If DTComplementos.Rows.Count = 0 Then

From e91ff2ad1fe183d0dd66c35fd9583c7ebb99363f Mon Sep 17 00:00:00 2001
From: rakcsle <rakcsle.rakcsle@gmail.com>
Date: Fri, 10 Jun 2022 08:45:09 -0700
Subject: [PATCH 4/7] ReciboDePago Detalles impuestos por documento relacionado

---
 App_Code/ClsClientes.vb                    |    8 +
 App_Code/ClsPaginas.vb                     |  153 +
 Bancos/PopIECompras.aspx.vb                |    9 +-
 Empresas/119/Formatos/ReciboDePago.rdlc    | 2975 +++++++++++++++++++-
 Empresas/Grales/Formatos/ReciboDePago.rdlc |  373 ++-
 5 files changed, 3481 insertions(+), 37 deletions(-)

diff --git a/App_Code/ClsClientes.vb b/App_Code/ClsClientes.vb
index 1b805eda7..5f3c30c86 100644
--- a/App_Code/ClsClientes.vb
+++ b/App_Code/ClsClientes.vb
@@ -172,6 +172,9 @@ Public Class ClsClientes
         End Get
     End Property
 
+    Public Property CodigoRegimenFiscal As String
+    Public Property RegimenFiscal As String
+
 #End Region
 
     Sub New(Optional TransaccionCompartida As SqlTransaction = Nothing)
@@ -426,6 +429,9 @@ Public Class ClsClientes
                 _BonificacionUsado = CBool(Data(0)("BonificacionUsado"))
                 _CveSATEstado = Data(0)("CveSATEstado").ToString.ToEntero
 
+                _RegimenFiscal = Data(0)("RegimenFiscal").ToString
+                _CodigoRegimenFiscal = Data(0)("CodigoRegimenFiscal").ToString
+
             End If
             Retorno = True
         Catch ex As Exception
@@ -435,6 +441,8 @@ Public Class ClsClientes
         Return Retorno
     End Function
 
+
+
     Public Function GetSiguienteCodigoCliente(CveEmpresa As Integer) As Integer
 
         Dim Codigo As Integer = 0
diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index b4a2ef02c..1d01c1666 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -8872,6 +8872,11 @@ Public Class ClsPaginas
         Dim TotalLetra = ""
 
         Dim FechaRecibo = ""
+        Dim RegimenFiscalCodigo As String = ""
+        Dim CFDIVersion As String = If(UsuarioActual.Empresa.Funcionalidad(350) = "1", "4.0", "3.3")
+
+
+
 
         'DT PAGO
         Dim DTConceptosPago As New DataTable
@@ -8896,6 +8901,47 @@ Public Class ClsPaginas
         DTConceptosPagoRelacionado.Columns.Add("TipoCambioDR", GetType(String))
         DTConceptosPagoRelacionado.Columns.Add("ObjetoImpDR", GetType(String))
 
+        DTConceptosPagoRelacionado.Columns.Add("Tra001ImpuestoDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Tra001TipoFactorDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Tra001TasaOCuotaDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Tra001ImporteDR", GetType(Decimal))
+
+        DTConceptosPagoRelacionado.Columns.Add("Tra002ImpuestoDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Tra002TipoFactorDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Tra002TasaOCuotaDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Tra002ImporteDR", GetType(Decimal))
+
+        DTConceptosPagoRelacionado.Columns.Add("Tra003ImpuestoDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Tra003TipoFactorDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Tra003TasaOCuotaDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Tra003ImporteDR", GetType(Decimal))
+
+
+        DTConceptosPagoRelacionado.Columns.Add("Ret001ImpuestoDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Ret001TipoFactorDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Ret001TasaOCuotaDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Ret001ImporteDR", GetType(Decimal))
+
+        DTConceptosPagoRelacionado.Columns.Add("Ret002ImpuestoDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Ret002TipoFactorDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Ret002TasaOCuotaDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Ret002ImporteDR", GetType(Decimal))
+
+        DTConceptosPagoRelacionado.Columns.Add("Ret003ImpuestoDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Ret003TipoFactorDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Ret003TasaOCuotaDR", GetType(String))
+        DTConceptosPagoRelacionado.Columns.Add("Ret003ImporteDR", GetType(Decimal))
+
+
+
+        '001 ISR
+        '002 IVA
+        '003 IEPS
+        'Impuetos
+        'Retenciones
+
+
+
         Dim ObjBancos As New ClsBancos
         If ObjBancos.GetComplementoPagos(CveComplementoPago, CveIE, CveVenta, UsuarioActual.CveEmpresa) Then
             Serie = ObjBancos.DtResultados.FiltroPrimeroValor("Serie")
@@ -8938,6 +8984,14 @@ Public Class ClsPaginas
             params.Add(New ReportParameter("ClienteEstado", ObjClientes.Estado))
             params.Add(New ReportParameter("ClienteCP", ObjClientes.CP))
             params.Add(New ReportParameter("ClienteRFC", ObjClientes.RFC))
+
+
+            If UsuarioActual.Empresa.Funcionalidad(350) = "1" Then
+                If ObjClientes.CodigoRegimenFiscal.ToString.Length > 0 Then
+                    RegimenFiscalCodigo = $"{ObjClientes.CodigoRegimenFiscal}-{ObjClientes.RegimenFiscal}"
+                End If
+            End If
+
         End If
 
         ObjClientes.Dispose()
@@ -8974,6 +9028,7 @@ Public Class ClsPaginas
 
             Dim validaElemento = XmlDoc.DocumentElement("cfdi:Complemento")
             Dim validaElementoPago = XmlDoc.DocumentElement("cfdi:Conceptos")
+
             If Version = "3.3" Then
                 cfdVer = "http://www.sat.gob.mx/cfd/3"
                 PagoVersion = "pago10"
@@ -8981,6 +9036,19 @@ Public Class ClsPaginas
                 cfdVer = "http://www.sat.gob.mx/cfd/4"
             End If
 
+
+            If Version = "4.0" Then
+
+                If UsuarioActual.Empresa.Funcionalidad(350) = "1" Then
+                    params.Add(New ReportParameter("CFDIVersion", Version))
+                    If ObjClientes.CodigoRegimenFiscal.ToString.Length > 0 Then
+                        params.Add(New ReportParameter("RegimenFiscalCodigo", RegimenFiscalCodigo))
+                    End If
+                End If
+            End If
+
+
+
             namespaces.AddNamespace(Prefijo, cfdVer)
             namespaces.AddNamespace("tfd", "http://www.sat.gob.mx/TimbreFiscalDigital")
             namespaces.AddNamespace("implocal", "http://www.sat.gob.mx/implocal")
@@ -9044,7 +9112,92 @@ Public Class ClsPaginas
                         If Version = "4.0" Then DrRelacionado("ObjetoImpDR") = Relacionado.Attributes("ObjetoImpDR").Value
 
                         DrRelacionado("MonedaDR") = Relacionado.Attributes("MonedaDR").Value
+
+
+                        If UsuarioActual.Empresa.Funcionalidad(350) = "1" AndAlso Version = "4.0" Then
+
+
+
+                            ' Relacionado.SelectSingleNode($"//{PagoVersion}:ImpuestosDR/{PagoVersion}:TrasladosDR/{PagoVersion}:TrasladoDR", namespaces)
+
+                            'Dim NodoImpuestosDR As XmlNode = Relacionado.SelectSingleNode($"{PagoVersion}:ImpuestosDR", namespaces)
+                            'Dim NodoTrasladosDR As XmlNode = NodoImpuestosDR.SelectSingleNode($"{PagoVersion}:TrasladosDR", namespaces)
+                            'Dim TrasladoDR As XmlNodeList = NodoTrasladosDR.ChildNodes
+
+                            Dim NodosTraslados = Relacionado.SelectNodes($"{PagoVersion}:ImpuestosDR/{PagoVersion}:TrasladosDR/{PagoVersion}:TrasladoDR", namespaces)
+                            For Each NodoTraslados As XmlNode In NodosTraslados
+
+                                Dim ImpuestoDR As String = ValorXML(NodoTraslados, "ImpuestoDR")  ' ImpuestoDR
+                                Dim TipoFactor As String = ValorXML(NodoTraslados, "TipoFactorDR")
+                                Dim TasaOCuotaDR As String = ValorXML(NodoTraslados, "TasaOCuotaDR")
+                                Dim ImporteDR As Decimal = ValorXML(NodoTraslados, "ImporteDR").ToDecimal
+
+
+                                If ImpuestoDR = "001" Then
+                                    DrRelacionado("Tra001ImpuestoDR") = ImpuestoDR
+                                    DrRelacionado("Tra001TipoFactorDR") = TipoFactor
+                                    DrRelacionado("Tra001TasaOCuotaDR") = TasaOCuotaDR
+                                    DrRelacionado("Tra001ImporteDR") = ImporteDR
+                                End If
+
+                                If ImpuestoDR = "002" Then
+                                    DrRelacionado("Tra002ImpuestoDR") = ImpuestoDR
+                                    DrRelacionado("Tra002TipoFactorDR") = TipoFactor
+                                    DrRelacionado("Tra002TasaOCuotaDR") = TasaOCuotaDR
+                                    DrRelacionado("Tra002ImporteDR") = ImporteDR
+                                End If
+
+                                If ImpuestoDR = "003" Then
+                                    DrRelacionado("Tra003ImpuestoDR") = ImpuestoDR
+                                    DrRelacionado("Tra003TipoFactorDR") = TipoFactor
+                                    DrRelacionado("Tra003TasaOCuotaDR") = TasaOCuotaDR
+                                    DrRelacionado("Tra003ImporteDR") = ImporteDR
+                                End If
+
+                            Next
+
+
+                            For Each NodoRetenciiones As XmlNode In Relacionado.SelectNodes($"{PagoVersion}:ImpuestosDR/{PagoVersion}:RetencionesDR/{PagoVersion}:RetencionDR", namespaces)
+
+
+                                Dim ImpuestoDR As String = ValorXML(NodoRetenciiones, "ImpuestoDR")  ' ImpuestoDR
+                                Dim TipoFactor As String = ValorXML(NodoRetenciiones, "TipoFactorDR")
+                                Dim TasaOCuotaDR As String = ValorXML(NodoRetenciiones, "TasaOCuotaDR")
+                                Dim ImporteDR As Decimal = ValorXML(NodoRetenciiones, "ImporteDR").ToDecimal
+
+
+                                If ImpuestoDR = "001" Then
+                                    DrRelacionado("Ret001ImpuestoDR") = ImpuestoDR
+                                    DrRelacionado("Ret001TipoFactorDR") = TipoFactor
+                                    DrRelacionado("Ret001TasaOCuotaDR") = TasaOCuotaDR
+                                    DrRelacionado("Ret001ImporteDR") = ImporteDR
+                                End If
+
+                                If ImpuestoDR = "002" Then
+                                    DrRelacionado("Ret002ImpuestoDR") = ImpuestoDR
+                                    DrRelacionado("Ret002TipoFactorDR") = TipoFactor
+                                    DrRelacionado("Ret002TasaOCuotaDR") = TasaOCuotaDR
+                                    DrRelacionado("Ret002ImporteDR") = ImporteDR
+                                End If
+
+                                If ImpuestoDR = "003" Then
+                                    DrRelacionado("Ret003ImpuestoDR") = ImpuestoDR
+                                    DrRelacionado("Ret003TipoFactorDR") = TipoFactor
+                                    DrRelacionado("Ret003TasaOCuotaDR") = TasaOCuotaDR
+                                    DrRelacionado("Ret003ImporteDR") = ImporteDR
+                                End If
+
+                            Next
+
+
+
+
+                        End If
+
                         DTConceptosPagoRelacionado.Rows.Add(DrRelacionado)
+
+
+
                     Next
 
                 End If
diff --git a/Bancos/PopIECompras.aspx.vb b/Bancos/PopIECompras.aspx.vb
index e0111b63a..7e0bae4ee 100644
--- a/Bancos/PopIECompras.aspx.vb
+++ b/Bancos/PopIECompras.aspx.vb
@@ -2581,7 +2581,7 @@ Partial Class Bancos_PopIECompras
                                                 TimpocambioGeneral = TCImpuestos
                                                 Dim tipoCambioCompraValuacion As Decimal = If(PagoMismoMes, tipoCambioCompra, TCUltimaFluctuacion)
                                                 '' si tiene funcionalidad de flucturación con ivas, tomar tipocambioCompra
-                                                If tipoCambioPago < tipoCambioCompra AndAlso CveMonedaCompra = 2 Then
+                                                If tipoCambioPago < tipoCambioCompra AndAlso CveMonedaCompra = 2 Or (CveMonedaCompra = 2 AndAlso UsuarioActual.CveEmpresa = 119 AndAlso PagoMismoMes = False AndAlso tipoCambioPago < TCUltimaFluctuacion) Then
                                                     ImporteMovimiento = ((MovimientoPagar.Total * PorcentajePago) * tipoCambioPago) - ((MovimientoPagar.Total * PorcentajePago) * tipoCambioCompraValuacion) 'Añadimos la diferencia de ganancia en la venta
                                                     ImporteMovimiento -= ((MovimientoPagar.IVA * PorcentajePago) * TCImpuestos) - ((MovimientoPagar.IVA * PorcentajePago) * tipoCambioCompra) 'Añadimos la diferencia de ganancia en el IVA
                                                     ImporteMovimiento += ((MovimientoPagar.RetIVA * PorcentajePago) * TCImpuestos) - ((MovimientoPagar.RetIVA * PorcentajePago) * tipoCambioCompra) 'Añadimos la diferencia de ganancia en el RetIVA
@@ -2604,9 +2604,10 @@ Partial Class Bancos_PopIECompras
                                             If CveMoneda <> 1 OrElse CveMonedaCompra <> 1 Then
                                                 IdCtaContable = UsuarioActual.Empresa.IdCuentaPerdidaCambiaria
                                                 Dim TCImpuestos As Decimal = If(FuncionalidadFluctuacionImpuestos, tipoCambioPago, tipoCambioCompra)
-                                                Dim tipoCambioCompraValuacion As Decimal = If(PagoMismoMes, tipoCambioCompra, TCUltimaFluctuacion)
-                                                '' si tiene funcionalidad de flucturación con ivas, tomar tipocambioCompra
-                                                If tipoCambioPago > tipoCambioCompra AndAlso CveMonedaCompra = 2 Then
+                                                Dim tipoCambioCompraValuacion As Decimal = If(PagoMismoMes, tipoCambioCompra, TCUltimaFluctuacion)
+                                                '' si tiene funcionalidad de flucturación con ivas, tomar tipocambioCompra
+
+                                                If tipoCambioPago > tipoCambioCompra AndAlso CveMonedaCompra = 2 Or (CveMonedaCompra = 2 AndAlso UsuarioActual.CveEmpresa = 119 AndAlso PagoMismoMes = False AndAlso tipoCambioPago > TCUltimaFluctuacion) Then
                                                     ImporteMovimiento = ((MovimientoPagar.Total * PorcentajePago) * tipoCambioCompraValuacion) - ((MovimientoPagar.Total * PorcentajePago) * tipoCambioPago) 'Añadimos la diferencia de perdida en la venta
                                                     ImporteMovimiento -= ((MovimientoPagar.IVA * PorcentajePago) * tipoCambioCompra) - ((MovimientoPagar.IVA * PorcentajePago) * TCImpuestos) 'Añadimos la diferencia de ganancia en el IVA
                                                     ImporteMovimiento += ((MovimientoPagar.RetIVA * PorcentajePago) * tipoCambioCompra) - ((MovimientoPagar.RetIVA * PorcentajePago) * TCImpuestos) 'Añadimos la diferencia de ganancia en el RetIVA
diff --git a/Empresas/119/Formatos/ReciboDePago.rdlc b/Empresas/119/Formatos/ReciboDePago.rdlc
index 21a9869ea..abf548d0c 100644
--- a/Empresas/119/Formatos/ReciboDePago.rdlc
+++ b/Empresas/119/Formatos/ReciboDePago.rdlc
@@ -416,7 +416,16 @@
         <TablixBody>
           <TablixColumns>
             <TablixColumn>
-              <Width>7.35332cm</Width>
+              <Width>2.13038cm</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>1.64459cm</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>1.80415cm</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>1.76995cm</Width>
             </TablixColumn>
             <TablixColumn>
               <Width>1.8cm</Width>
@@ -439,7 +448,7 @@
           </TablixColumns>
           <TablixRows>
             <TablixRow>
-              <Height>0.49cm</Height>
+              <Height>0.56938cm</Height>
               <TablixCells>
                 <TablixCell>
                   <CellContents>
@@ -474,8 +483,12 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
                     </Textbox>
+                    <ColSpan>4</ColSpan>
                   </CellContents>
                 </TablixCell>
+                <TablixCell />
+                <TablixCell />
+                <TablixCell />
                 <TablixCell>
                   <CellContents>
                     <Textbox Name="Textbox3">
@@ -689,7 +702,7 @@
               </TablixCells>
             </TablixRow>
             <TablixRow>
-              <Height>0.44125cm</Height>
+              <Height>0.54021cm</Height>
               <TablixCells>
                 <TablixCell>
                   <CellContents>
@@ -721,8 +734,12 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
                     </Textbox>
+                    <ColSpan>4</ColSpan>
                   </CellContents>
                 </TablixCell>
+                <TablixCell />
+                <TablixCell />
+                <TablixCell />
                 <TablixCell>
                   <CellContents>
                     <Textbox Name="Serie">
@@ -924,6 +941,2793 @@
                 </TablixCell>
               </TablixCells>
             </TablixRow>
+            <TablixRow>
+              <Height>0.07938cm</Height>
+              <TablixCells>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox108">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Impuesto</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox108</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 
+	OR Fields!Tra002ImporteDR.Value &gt; 0 
+	OR Fields!Tra003ImporteDR.Value &gt; 0 
+	OR Fields!Ret001ImporteDR.Value &gt; 0 
+	OR Fields!Ret002ImporteDR.Value &gt; 0 
+	OR Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox109">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Tipo</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox109</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 
+	OR Fields!Tra002ImporteDR.Value &gt; 0 
+	OR Fields!Tra003ImporteDR.Value &gt; 0 
+	OR Fields!Ret001ImporteDR.Value &gt; 0 
+	OR Fields!Ret002ImporteDR.Value &gt; 0 
+	OR Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox110">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Base</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox110</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 
+	OR Fields!Tra002ImporteDR.Value &gt; 0 
+	OR Fields!Tra003ImporteDR.Value &gt; 0 
+	OR Fields!Ret001ImporteDR.Value &gt; 0 
+	OR Fields!Ret002ImporteDR.Value &gt; 0 
+	OR Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox111">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Tipo Factor</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox111</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 
+	OR Fields!Tra002ImporteDR.Value &gt; 0 
+	OR Fields!Tra003ImporteDR.Value &gt; 0 
+	OR Fields!Ret001ImporteDR.Value &gt; 0 
+	OR Fields!Ret002ImporteDR.Value &gt; 0 
+	OR Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox112">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Tasa/Cuota</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox112</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 
+	OR Fields!Tra002ImporteDR.Value &gt; 0 
+	OR Fields!Tra003ImporteDR.Value &gt; 0 
+	OR Fields!Ret001ImporteDR.Value &gt; 0 
+	OR Fields!Ret002ImporteDR.Value &gt; 0 
+	OR Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox113">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Importe</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox113</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 
+	OR Fields!Tra002ImporteDR.Value &gt; 0 
+	OR Fields!Tra003ImporteDR.Value &gt; 0 
+	OR Fields!Ret001ImporteDR.Value &gt; 0 
+	OR Fields!Ret002ImporteDR.Value &gt; 0 
+	OR Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox114">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox114</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 
+	OR Fields!Tra002ImporteDR.Value &gt; 0 
+	OR Fields!Tra003ImporteDR.Value &gt; 0 
+	OR Fields!Ret001ImporteDR.Value &gt; 0 
+	OR Fields!Ret002ImporteDR.Value &gt; 0 
+	OR Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox115">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox115</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 
+	OR Fields!Tra002ImporteDR.Value &gt; 0 
+	OR Fields!Tra003ImporteDR.Value &gt; 0 
+	OR Fields!Ret001ImporteDR.Value &gt; 0 
+	OR Fields!Ret002ImporteDR.Value &gt; 0 
+	OR Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox116">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox116</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 
+	OR Fields!Tra002ImporteDR.Value &gt; 0 
+	OR Fields!Tra003ImporteDR.Value &gt; 0 
+	OR Fields!Ret001ImporteDR.Value &gt; 0 
+	OR Fields!Ret002ImporteDR.Value &gt; 0 
+	OR Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox117">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox117</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 
+	OR Fields!Tra002ImporteDR.Value &gt; 0 
+	OR Fields!Tra003ImporteDR.Value &gt; 0 
+	OR Fields!Ret001ImporteDR.Value &gt; 0 
+	OR Fields!Ret002ImporteDR.Value &gt; 0 
+	OR Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+              </TablixCells>
+            </TablixRow>
+            <TablixRow>
+              <Height>0.07938cm</Height>
+              <TablixCells>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox99">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>ISR</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox61</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox204">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Traslado</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox204</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado2">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!ImpPagado.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado8">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Tra001TipoFactorDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado14">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Tra001TasaOCuotaDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado20">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Tra001ImporteDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox4">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox4</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox13">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox13</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox17">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox17</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox18">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox18</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	   Fields!Tra001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+              </TablixCells>
+            </TablixRow>
+            <TablixRow>
+              <Height>0.07938cm</Height>
+              <TablixCells>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox61">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>IVA</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox61</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	  
+	 Fields!Tra002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox210">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Traslado</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox204</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	  
+	 Fields!Tra002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado3">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!ImpPagado.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	  
+	 Fields!Tra002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado9">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Tra002TipoFactorDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	  
+	 Fields!Tra002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado15">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Tra002TasaOCuotaDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	  
+	 Fields!Tra002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado21">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Tra002ImporteDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	  
+	 Fields!Tra002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox67">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox67</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	  
+	 Fields!Tra002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox68">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox68</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	  
+	 Fields!Tra002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox69">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox69</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	  
+	 Fields!Tra002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox70">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox70</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	  
+	 Fields!Tra002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+              </TablixCells>
+            </TablixRow>
+            <TablixRow>
+              <Height>0.07938cm</Height>
+              <TablixCells>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox62">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>IEPS</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox61</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	Fields!Tra003ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox205">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Traslado</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox204</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	Fields!Tra003ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado4">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!ImpPagado.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	Fields!Tra003ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado10">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Tra003TipoFactorDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	Fields!Tra003ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado16">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Tra003TasaOCuotaDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	Fields!Tra003ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado22">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Tra003ImporteDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	Fields!Tra003ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox51">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox51</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	Fields!Tra003ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox55">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox55</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	Fields!Tra003ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox56">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox56</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	Fields!Tra003ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox58">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox58</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 
+	Fields!Tra003ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+              </TablixCells>
+            </TablixRow>
+            <TablixRow>
+              <Height>0.07938cm</Height>
+              <TablixCells>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox106">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>ISR</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox61</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	   
+	Fields!Ret001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox207">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Retención</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox207</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	   
+	Fields!Ret001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado5">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!ImpPagado.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	   
+	Fields!Ret001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado11">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Ret001TipoFactorDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	   
+	Fields!Ret001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado17">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Ret001TasaOCuotaDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	   
+	Fields!Ret001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado23">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Ret001ImporteDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	   
+	Fields!Ret001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox75">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox75</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	   
+	Fields!Ret001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox76">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox76</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	   
+	Fields!Ret001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox77">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox77</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	   
+	Fields!Ret001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox78">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox78</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF( 	   
+	Fields!Ret001ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+              </TablixCells>
+            </TablixRow>
+            <TablixRow>
+              <Height>0.07938cm</Height>
+              <TablixCells>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox80">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>IVA</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox61</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox211">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Retención</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox207</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado6">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!ImpPagado.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado12">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Ret002TipoFactorDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado18">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Ret002TasaOCuotaDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado24">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Ret002ImporteDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox85">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox85</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox86">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox86</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox87">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox87</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox88">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox88</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret002ImporteDR.Value &gt; 0 	
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+              </TablixCells>
+            </TablixRow>
+            <TablixRow>
+              <Height>0.07938cm</Height>
+              <TablixCells>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox79">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>IEPS</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox59</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox208">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Retención</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox207</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado7">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!ImpPagado.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado13">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Ret003TipoFactorDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado19">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Ret003TasaOCuotaDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="ImpPagado25">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Ret003ImporteDR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>'$'#,0.00;-'$'#,0.00;'-'</Format>
+                                <rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>ImpPagado</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox95">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox95</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox96">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox96</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox97">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox97</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox98">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox98</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>= IIF(	  
+	Fields!Ret003ImporteDR.Value &gt; 0 
+	,False,True)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+              </TablixCells>
+            </TablixRow>
           </TablixRows>
         </TablixBody>
         <TablixColumnHierarchy>
@@ -935,6 +3739,9 @@
             <TablixMember />
             <TablixMember />
             <TablixMember />
+            <TablixMember />
+            <TablixMember />
+            <TablixMember />
           </TablixMembers>
         </TablixColumnHierarchy>
         <TablixRowHierarchy>
@@ -944,13 +3751,23 @@
             </TablixMember>
             <TablixMember>
               <Group Name="Detalles" />
+              <TablixMembers>
+                <TablixMember />
+                <TablixMember />
+                <TablixMember />
+                <TablixMember />
+                <TablixMember />
+                <TablixMember />
+                <TablixMember />
+                <TablixMember />
+              </TablixMembers>
             </TablixMember>
           </TablixMembers>
         </TablixRowHierarchy>
         <DataSetName>DataSet2</DataSetName>
         <Top>4.62704cm</Top>
-        <Height>0.93125cm</Height>
-        <Width>20.53564cm</Width>
+        <Height>1.66521cm</Height>
+        <Width>20.53139cm</Width>
         <ZIndex>1</ZIndex>
         <Style>
           <Border>
@@ -1625,7 +4442,7 @@
           </TablixMembers>
         </TablixRowHierarchy>
         <DataSetName>DataSet1</DataSetName>
-        <Top>5.84739cm</Top>
+        <Top>6.83164cm</Top>
         <Height>1.69cm</Height>
         <Width>20.5314cm</Width>
         <ZIndex>2</ZIndex>
@@ -1846,6 +4663,21 @@
               <TextAlign>Left</TextAlign>
             </Style>
           </Paragraph>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>=  IIF( Parameters!RegimenFiscalCodigo.Value &lt;&gt; "ND-", "&lt;b&gt;Reg. Fiscal:&lt;/b&gt; " &amp;  Parameters!RegimenFiscalCodigo.Value,"")</Value>
+                <Style>
+                  <FontFamily>Myriad Pro</FontFamily>
+                  <FontSize>9pt</FontSize>
+                  <FontWeight>Normal</FontWeight>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Left</TextAlign>
+            </Style>
+          </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
         <Top>0.03528cm</Top>
@@ -2060,7 +4892,7 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox45</rd:DefaultName>
-        <Top>7.94284cm</Top>
+        <Top>8.92709cm</Top>
         <Height>3.30199cm</Height>
         <Width>16.51971cm</Width>
         <ZIndex>5</ZIndex>
@@ -2089,7 +4921,7 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox5</rd:DefaultName>
-        <Top>7.67825cm</Top>
+        <Top>8.6625cm</Top>
         <Height>0.0882cm</Height>
         <Width>20.53564cm</Width>
         <ZIndex>6</ZIndex>
@@ -2108,7 +4940,7 @@
         <Source>External</Source>
         <Value>=Parameters!QR.Value</Value>
         <Sizing>FitProportional</Sizing>
-        <Top>3.1271in</Top>
+        <Top>3.5146in</Top>
         <Left>6.51771in</Left>
         <Height>1.3in</Height>
         <Width>1.5in</Width>
@@ -2134,7 +4966,7 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox5</rd:DefaultName>
-        <Top>11.36179cm</Top>
+        <Top>12.34604cm</Top>
         <Height>0.11466cm</Height>
         <Width>20.5314cm</Width>
         <ZIndex>8</ZIndex>
@@ -2150,7 +4982,7 @@
         </Style>
       </Textbox>
     </ReportItems>
-    <Height>11.47645cm</Height>
+    <Height>13.54549cm</Height>
     <Style />
   </Body>
   <Width>20.53564cm</Width>
@@ -2405,7 +5237,7 @@
       </Style>
     </PageHeader>
     <PageFooter>
-      <Height>0.41981cm</Height>
+      <Height>0.45509cm</Height>
       <PrintOnFirstPage>true</PrintOnFirstPage>
       <PrintOnLastPage>true</PrintOnLastPage>
       <ReportItems>
@@ -2429,6 +5261,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox35</rd:DefaultName>
+          <Top>0cm</Top>
           <Left>17.09769cm</Left>
           <Height>0.41981cm</Height>
           <Width>2.94979cm</Width>
@@ -2475,6 +5308,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox29</rd:DefaultName>
+          <Top>0.03528cm</Top>
           <Left>0.31132cm</Left>
           <Height>0.41981cm</Height>
           <Width>6.8491cm</Width>
@@ -2523,6 +5357,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox31</rd:DefaultName>
+          <Top>0cm</Top>
           <Left>9.1611cm</Left>
           <Height>0.41981cm</Height>
           <Width>6.02198cm</Width>
@@ -2657,6 +5492,110 @@
           <DataField>TipoCambioDR</DataField>
           <rd:TypeName>System.String</rd:TypeName>
         </Field>
+        <Field Name="RetIVA">
+          <DataField>RetIVA</DataField>
+          <rd:TypeName>System.Float</rd:TypeName>
+        </Field>
+        <Field Name="RetISR">
+          <DataField>RetISR</DataField>
+          <rd:TypeName>System.Float</rd:TypeName>
+        </Field>
+        <Field Name="Tra001ImpuestoDR">
+          <DataField>Tra001ImpuestoDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Tra001TipoFactorDR">
+          <DataField>Tra001TipoFactorDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Tra001TasaOCuotaDR">
+          <DataField>Tra001TasaOCuotaDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Tra001ImporteDR">
+          <DataField>Tra001ImporteDR</DataField>
+          <rd:TypeName>System.Float</rd:TypeName>
+        </Field>
+        <Field Name="Tra002ImpuestoDR">
+          <DataField>Tra002ImpuestoDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Tra002TipoFactorDR">
+          <DataField>Tra002TipoFactorDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Tra002TasaOCuotaDR">
+          <DataField>Tra002TasaOCuotaDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Tra002ImporteDR">
+          <DataField>Tra002ImporteDR</DataField>
+          <rd:TypeName>System.Float</rd:TypeName>
+        </Field>
+        <Field Name="Tra003ImpuestoDR">
+          <DataField>Tra003ImpuestoDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Tra003TipoFactorDR">
+          <DataField>Tra003TipoFactorDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Tra003TasaOCuotaDR">
+          <DataField>Tra003TasaOCuotaDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Tra003ImporteDR">
+          <DataField>Tra003ImporteDR</DataField>
+          <rd:TypeName>System.Float</rd:TypeName>
+        </Field>
+        <Field Name="Ret001ImpuestoDR">
+          <DataField>Ret001ImpuestoDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Ret001TipoFactorDR">
+          <DataField>Ret001TipoFactorDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Ret001TasaOCuotaDR">
+          <DataField>Ret001TasaOCuotaDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Ret001ImporteDR">
+          <DataField>Ret001ImporteDR</DataField>
+          <rd:TypeName>System.Float</rd:TypeName>
+        </Field>
+        <Field Name="Ret002ImpuestoDR">
+          <DataField>Ret002ImpuestoDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Ret002TipoFactorDR">
+          <DataField>Ret002TipoFactorDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Ret002TasaOCuotaDR">
+          <DataField>Ret002TasaOCuotaDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Ret002ImporteDR">
+          <DataField>Ret002ImporteDR</DataField>
+          <rd:TypeName>System.Float</rd:TypeName>
+        </Field>
+        <Field Name="Ret003ImpuestoDR">
+          <DataField>Ret003ImpuestoDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Ret003TipoFactorDR">
+          <DataField>Ret003TipoFactorDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Ret003TasaOCuotaDR">
+          <DataField>Ret003TasaOCuotaDR</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Ret003ImporteDR">
+          <DataField>Ret003ImporteDR</DataField>
+          <rd:TypeName>System.Float</rd:TypeName>
+        </Field>
       </Fields>
       <rd:DataSetInfo>
         <rd:DataSetName>DataSet</rd:DataSetName>
@@ -2963,6 +5902,18 @@
       <AllowBlank>true</AllowBlank>
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
+    <ReportParameter Name="CFDIVersion">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
+    <ReportParameter Name="RegimenFiscalCodigo">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
   </ReportParameters>
   <EmbeddedImages>
     <EmbeddedImage Name="jam3">
diff --git a/Empresas/Grales/Formatos/ReciboDePago.rdlc b/Empresas/Grales/Formatos/ReciboDePago.rdlc
index d38828fdb..b1728529d 100644
--- a/Empresas/Grales/Formatos/ReciboDePago.rdlc
+++ b/Empresas/Grales/Formatos/ReciboDePago.rdlc
@@ -398,7 +398,7 @@
           </TablixMembers>
         </TablixRowHierarchy>
         <DataSetName>DataSet2</DataSetName>
-        <Top>2.55889cm</Top>
+        <Top>2.78114cm</Top>
         <Left>0.30837cm</Left>
         <Height>1.09cm</Height>
         <Width>20.35756cm</Width>
@@ -715,7 +715,7 @@
               </TablixCells>
             </TablixRow>
             <TablixRow>
-              <Height>0.6cm</Height>
+              <Height>0.54708cm</Height>
               <TablixCells>
                 <TablixCell>
                   <CellContents>
@@ -979,6 +979,303 @@
                 </TablixCell>
               </TablixCells>
             </TablixRow>
+            <TablixRow>
+              <Height>0.46771cm</Height>
+              <TablixCells>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox2">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Ret IVA:</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox2</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>=IIF( Fields!RetIVA.Value &gt; 0  or Fields!RetISR.Value &gt; 0 , True,False)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox4">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!RetIVA.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>#,0.00</Format>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox4</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>=IIF( Fields!RetIVA.Value &gt; 0  or Fields!RetISR.Value &gt; 0 , True,False)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox7">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Ret. ISR:</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox7</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>=IIF( Fields!RetIVA.Value &gt; 0  or Fields!RetISR.Value &gt; 0 , True,False)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox15">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!RetISR.Value</Value>
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>#,0.00</Format>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox15</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>=IIF( Fields!RetIVA.Value &gt; 0  or Fields!RetISR.Value &gt; 0 , True,False)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox17">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox17</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>=IIF( Fields!RetIVA.Value &gt; 0  or Fields!RetISR.Value &gt; 0 , True,False)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox18">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox18</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>=IIF( Fields!RetIVA.Value &gt; 0  or Fields!RetISR.Value &gt; 0 , True,False)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox20">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox20</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>=IIF( Fields!RetIVA.Value &gt; 0  or Fields!RetISR.Value &gt; 0 , True,False)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox23">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value />
+                              <Style>
+                                <FontFamily>Myriad Pro</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox23</rd:DefaultName>
+                      <Visibility>
+                        <Hidden>=IIF( Fields!RetIVA.Value &gt; 0  or Fields!RetISR.Value &gt; 0 , True,False)</Hidden>
+                      </Visibility>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+              </TablixCells>
+            </TablixRow>
           </TablixRows>
         </TablixBody>
         <TablixColumnHierarchy>
@@ -1000,13 +1297,17 @@
             </TablixMember>
             <TablixMember>
               <Group Name="Detalles" />
+              <TablixMembers>
+                <TablixMember />
+                <TablixMember />
+              </TablixMembers>
             </TablixMember>
           </TablixMembers>
         </TablixRowHierarchy>
         <DataSetName>DataSet2</DataSetName>
-        <Top>4.59176cm</Top>
+        <Top>4.65526cm</Top>
         <Left>0.30837cm</Left>
-        <Height>1.09cm</Height>
+        <Height>1.50479cm</Height>
         <Width>20.32362cm</Width>
         <ZIndex>1</ZIndex>
         <Style>
@@ -1676,7 +1977,7 @@
           </TablixMembers>
         </TablixRowHierarchy>
         <DataSetName>DataSet1</DataSetName>
-        <Top>6.12961cm</Top>
+        <Top>6.44711cm</Top>
         <Left>0.31556cm</Left>
         <Height>1.69cm</Height>
         <Width>20.32067cm</Width>
@@ -1708,7 +2009,7 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox5</rd:DefaultName>
-        <Top>3.98116cm</Top>
+        <Top>4.04466cm</Top>
         <Left>0.30837cm</Left>
         <Height>0.49cm</Height>
         <Width>20.32362cm</Width>
@@ -1898,10 +2199,25 @@
               <TextAlign>Left</TextAlign>
             </Style>
           </Paragraph>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>=  IIF( Parameters!RegimenFiscalCodigo.Value &lt;&gt; "ND-", "&lt;b&gt;Reg. Fiscal:&lt;/b&gt; " &amp;  Parameters!RegimenFiscalCodigo.Value,"")</Value>
+                <Style>
+                  <FontFamily>Myriad Pro</FontFamily>
+                  <FontSize>9pt</FontSize>
+                  <FontWeight>Normal</FontWeight>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Left</TextAlign>
+            </Style>
+          </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox2</rd:DefaultName>
         <Left>0.30837cm</Left>
-        <Height>0.99355in</Height>
+        <Height>0.98591in</Height>
         <Width>5.35046in</Width>
         <ZIndex>4</ZIndex>
         <Style>
@@ -2099,11 +2415,6 @@
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
-            </TextRuns>
-            <Style />
-          </Paragraph>
-          <Paragraph>
-            <TextRuns>
               <TextRun>
                 <Value>=Parameters!UUIDPago.Value</Value>
                 <Style>
@@ -2117,10 +2428,10 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox45</rd:DefaultName>
-        <Top>8.41556cm</Top>
+        <Top>8.73306cm</Top>
         <Left>0.31556cm</Left>
-        <Height>3.43104cm</Height>
-        <Width>16.30472cm</Width>
+        <Height>2.98125cm</Height>
+        <Width>16.26945cm</Width>
         <ZIndex>5</ZIndex>
         <Style>
           <Border>
@@ -2147,7 +2458,7 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox5</rd:DefaultName>
-        <Top>8.15097cm</Top>
+        <Top>8.46847cm</Top>
         <Left>0.31261cm</Left>
         <Height>0.0882cm</Height>
         <Width>20.32362cm</Width>
@@ -2167,10 +2478,10 @@
         <Source>External</Source>
         <Value>=Parameters!QR.Value</Value>
         <Sizing>FitProportional</Sizing>
-        <Top>3.31321in</Top>
-        <Left>6.55731in</Left>
-        <Height>1.3in</Height>
-        <Width>1.5in</Width>
+        <Top>3.43821in</Top>
+        <Left>6.67189in</Left>
+        <Height>1.17372in</Height>
+        <Width>1.38542in</Width>
         <ZIndex>7</ZIndex>
         <Style>
           <Border>
@@ -2179,7 +2490,7 @@
         </Style>
       </Image>
     </ReportItems>
-    <Height>11.92271cm</Height>
+    <Height>11.71431cm</Height>
     <Style />
   </Body>
   <Width>20.71612cm</Width>
@@ -2694,6 +3005,14 @@
           <DataField>TipoCambioDR</DataField>
           <rd:TypeName>System.String</rd:TypeName>
         </Field>
+        <Field Name="RetIVA">
+          <DataField>RetIVA</DataField>
+          <rd:TypeName>System.Decimal</rd:TypeName>
+        </Field>
+        <Field Name="RetISR">
+          <DataField>RetISR</DataField>
+          <rd:TypeName>System.Decimal</rd:TypeName>
+        </Field>
       </Fields>
       <rd:DataSetInfo>
         <rd:DataSetName>DataSet</rd:DataSetName>
@@ -3000,6 +3319,18 @@
       <AllowBlank>true</AllowBlank>
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
+    <ReportParameter Name="CFDIVersion">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
+    <ReportParameter Name="RegimenFiscalCodigo">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
   </ReportParameters>
   <rd:ReportUnitType>Cm</rd:ReportUnitType>
   <rd:ReportID>ce050101-4530-4332-90ec-6ac094336e40</rd:ReportID>

From 0e3587de42f1c7366976e09e8443baa76a6d688e Mon Sep 17 00:00:00 2001
From: Jonathan Alexis Perez Morales <jonathan.perez@adssistemas.mx>
Date: Fri, 10 Jun 2022 14:40:43 -0700
Subject: [PATCH 5/7] Enviar datos del sub reporte al web service del rdlc

---
 App_Code/ClsPaginas.vb                        |  20 +-
 App_WebReferences/WSRDLC2/Reference.svcmap    |  31 ++
 App_WebReferences/WSRDLC2/WebService.disco    |   6 +
 App_WebReferences/WSRDLC2/WebService.wsdl     | 312 ++++++++++++++++++
 .../WSRDLC2/configuration.svcinfo             |  10 +
 .../WSRDLC2/configuration91.svcinfo           | 201 +++++++++++
 6 files changed, 573 insertions(+), 7 deletions(-)
 create mode 100644 App_WebReferences/WSRDLC2/Reference.svcmap
 create mode 100644 App_WebReferences/WSRDLC2/WebService.disco
 create mode 100644 App_WebReferences/WSRDLC2/WebService.wsdl
 create mode 100644 App_WebReferences/WSRDLC2/configuration.svcinfo
 create mode 100644 App_WebReferences/WSRDLC2/configuration91.svcinfo

diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index b4a2ef02c..8c2c21688 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -6012,11 +6012,17 @@ Public Class ClsPaginas
             RutaReporte = String.Format("{0}{1}", bdir, RutaReporte)
         End If
 
-        If EsProduccion AndAlso SubReportData Is Nothing Then
+        If EsProduccion Then
 
-            Dim wsreport As New WSRDLC.WebServiceSoapClient
-            Dim params As New List(Of WSRDLC.ReportParameter)
-            Dim reportobjects As New List(Of WSRDLC.ReportObjects)
+            Dim wsreport As New WSRDLC2.WebServiceSoapClient
+            Dim params As New List(Of WSRDLC2.ReportParameter)
+            Dim reportobjects As New List(Of WSRDLC2.ReportObjects)
+
+            Dim jsonData As String = Nothing
+
+            If SubReportData IsNot Nothing Then
+                jsonData = Newtonsoft.Json.JsonConvert.SerializeObject(SubReportData)
+            End If
 
             Dim ds As New DataSet
             For Each rpds As ReportDataSource In DataSource
@@ -6026,7 +6032,7 @@ Public Class ClsPaginas
                     dt.TableName = rpds.Name
                     ds.Tables.Add(dt)
                 Else
-                    Dim ojext As New WSRDLC.ReportObjects
+                    Dim ojext As New WSRDLC2.ReportObjects
                     ojext.Name = rpds.Name
                     ojext.Value = rpds.Value
                     reportobjects.Add(ojext)
@@ -6034,7 +6040,7 @@ Public Class ClsPaginas
             Next
 
             For Each rpds As ReportParameter In Parametros
-                Dim param As New WSRDLC.ReportParameter
+                Dim param As New WSRDLC2.ReportParameter
                 param.Name = rpds.Name
 
                 'SI ES TEXTO, QUITAR TABS Y OTROS ESPACIOS QUE DEN PROBLEMAS AL MANDAR LA PETICION
@@ -6047,7 +6053,7 @@ Public Class ClsPaginas
                 params.Add(param)
             Next
 
-            Bytes = wsreport.StreamNEWPDFBytes(RutaReporte, ds, reportobjects.ToArray(), params.ToArray(), NombreArchivo, Formato, CveEmpresa, CveUsuario)
+            Bytes = wsreport.StreamNEWPDFBytes(RutaReporte, ds, reportobjects.ToArray(), params.ToArray(), NombreArchivo, Formato, CveEmpresa, CveUsuario, jsonData)
             wsreport = Nothing
             params = Nothing
             ds.Dispose() : ds = Nothing
diff --git a/App_WebReferences/WSRDLC2/Reference.svcmap b/App_WebReferences/WSRDLC2/Reference.svcmap
new file mode 100644
index 000000000..070b96bcb
--- /dev/null
+++ b/App_WebReferences/WSRDLC2/Reference.svcmap
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ReferenceGroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ID="2105a997-fa03-4807-8d26-cbfb76ae1932" xmlns="urn:schemas-microsoft-com:xml-wcfservicemap">
+  <ClientOptions>
+    <GenerateAsynchronousMethods>false</GenerateAsynchronousMethods>
+    <EnableDataBinding>true</EnableDataBinding>
+    <ExcludedTypes />
+    <ImportXmlTypes>false</ImportXmlTypes>
+    <GenerateInternalTypes>false</GenerateInternalTypes>
+    <GenerateMessageContracts>false</GenerateMessageContracts>
+    <NamespaceMappings />
+    <CollectionMappings />
+    <GenerateSerializableTypes>true</GenerateSerializableTypes>
+    <Serializer>Auto</Serializer>
+    <UseSerializerForFaults>true</UseSerializerForFaults>
+    <ReferenceAllAssemblies>true</ReferenceAllAssemblies>
+    <ReferencedAssemblies />
+    <ReferencedDataContractTypes />
+    <ServiceContractMappings />
+  </ClientOptions>
+  <MetadataSources>
+    <MetadataSource Address="http://localhost:7999/WebService.asmx" Protocol="http" SourceId="1" />
+  </MetadataSources>
+  <Metadata>
+    <MetadataFile FileName="WebService.disco" MetadataType="Disco" ID="0abaa1a0-3fdc-4ecb-a1c7-88bc3c7f8fb7" SourceId="1" SourceUrl="http://localhost:7999/WebService.asmx?disco" />
+    <MetadataFile FileName="WebService.wsdl" MetadataType="Wsdl" ID="a3713287-032e-47a0-ad01-24b755d2f1e5" SourceId="1" SourceUrl="http://localhost:7999/WebService.asmx?wsdl" />
+  </Metadata>
+  <Extensions>
+    <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
+    <ExtensionFile FileName="configuration.svcinfo" Name="configuration.svcinfo" />
+  </Extensions>
+</ReferenceGroup>
\ No newline at end of file
diff --git a/App_WebReferences/WSRDLC2/WebService.disco b/App_WebReferences/WSRDLC2/WebService.disco
new file mode 100644
index 000000000..4b396211d
--- /dev/null
+++ b/App_WebReferences/WSRDLC2/WebService.disco
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
+  <contractRef ref="http://localhost:7999/WebService.asmx?wsdl" docRef="http://localhost:7999/WebService.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+  <soap address="http://localhost:7999/WebService.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <soap address="http://localhost:7999/WebService.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+</discovery>
\ No newline at end of file
diff --git a/App_WebReferences/WSRDLC2/WebService.wsdl b/App_WebReferences/WSRDLC2/WebService.wsdl
new file mode 100644
index 000000000..b23b74472
--- /dev/null
+++ b/App_WebReferences/WSRDLC2/WebService.wsdl
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://tempuri.org/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+    <s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/">
+      <s:element name="HelloWorld">
+        <s:complexType />
+      </s:element>
+      <s:element name="HelloWorldResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="HelloWorldResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="StreamPDF">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="RutaReporte" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="source">
+              <s:complexType>
+                <s:sequence>
+                  <s:element ref="s:schema" />
+                  <s:any />
+                </s:sequence>
+              </s:complexType>
+            </s:element>
+            <s:element minOccurs="0" maxOccurs="1" name="Parametros" type="tns:ArrayOfReportParameter" />
+            <s:element minOccurs="0" maxOccurs="1" name="NombreArchivo" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="Formato" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="CveEmpresa" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="CveUsuario" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfReportParameter">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="ReportParameter" nillable="true" type="tns:ReportParameter" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="ReportParameter">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="1" name="Name" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="Values" type="tns:ArrayOfString" />
+          <s:element minOccurs="1" maxOccurs="1" name="Visible" type="s:boolean" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="ArrayOfString">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="string" nillable="true" type="s:string" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="StreamPDFResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="StreamPDFResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="StreamPDFBytes">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="RutaReporte" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="source">
+              <s:complexType>
+                <s:sequence>
+                  <s:element ref="s:schema" />
+                  <s:any />
+                </s:sequence>
+              </s:complexType>
+            </s:element>
+            <s:element minOccurs="0" maxOccurs="1" name="Parametros" type="tns:ArrayOfReportParameter" />
+            <s:element minOccurs="0" maxOccurs="1" name="NombreArchivo" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="Formato" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="CveEmpresa" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="CveUsuario" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="StreamPDFBytesResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="StreamPDFBytesResult" type="s:base64Binary" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="StreamNEWPDF">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="RutaReporte" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="source">
+              <s:complexType>
+                <s:sequence>
+                  <s:element ref="s:schema" />
+                  <s:any />
+                </s:sequence>
+              </s:complexType>
+            </s:element>
+            <s:element minOccurs="0" maxOccurs="1" name="reportobjects" type="tns:ArrayOfReportObjects" />
+            <s:element minOccurs="0" maxOccurs="1" name="Parametros" type="tns:ArrayOfReportParameter" />
+            <s:element minOccurs="0" maxOccurs="1" name="NombreArchivo" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="Formato" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="CveEmpresa" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="CveUsuario" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfReportObjects">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="ReportObjects" nillable="true" type="tns:ReportObjects" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="ReportObjects">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="1" name="Name" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="Value" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="StreamNEWPDFResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="StreamNEWPDFResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="StreamNEWPDFBytes">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="RutaReporte" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="source">
+              <s:complexType>
+                <s:sequence>
+                  <s:element ref="s:schema" />
+                  <s:any />
+                </s:sequence>
+              </s:complexType>
+            </s:element>
+            <s:element minOccurs="0" maxOccurs="1" name="reportobjects" type="tns:ArrayOfReportObjects" />
+            <s:element minOccurs="0" maxOccurs="1" name="Parametros" type="tns:ArrayOfReportParameter" />
+            <s:element minOccurs="0" maxOccurs="1" name="NombreArchivo" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="Formato" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="CveEmpresa" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="CveUsuario" type="s:int" />
+            <s:element minOccurs="0" maxOccurs="1" name="JsonSubReportData" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="StreamNEWPDFBytesResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="StreamNEWPDFBytesResult" type="s:base64Binary" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+    </s:schema>
+  </wsdl:types>
+  <wsdl:message name="HelloWorldSoapIn">
+    <wsdl:part name="parameters" element="tns:HelloWorld" />
+  </wsdl:message>
+  <wsdl:message name="HelloWorldSoapOut">
+    <wsdl:part name="parameters" element="tns:HelloWorldResponse" />
+  </wsdl:message>
+  <wsdl:message name="StreamPDFSoapIn">
+    <wsdl:part name="parameters" element="tns:StreamPDF" />
+  </wsdl:message>
+  <wsdl:message name="StreamPDFSoapOut">
+    <wsdl:part name="parameters" element="tns:StreamPDFResponse" />
+  </wsdl:message>
+  <wsdl:message name="StreamPDFBytesSoapIn">
+    <wsdl:part name="parameters" element="tns:StreamPDFBytes" />
+  </wsdl:message>
+  <wsdl:message name="StreamPDFBytesSoapOut">
+    <wsdl:part name="parameters" element="tns:StreamPDFBytesResponse" />
+  </wsdl:message>
+  <wsdl:message name="StreamNEWPDFSoapIn">
+    <wsdl:part name="parameters" element="tns:StreamNEWPDF" />
+  </wsdl:message>
+  <wsdl:message name="StreamNEWPDFSoapOut">
+    <wsdl:part name="parameters" element="tns:StreamNEWPDFResponse" />
+  </wsdl:message>
+  <wsdl:message name="StreamNEWPDFBytesSoapIn">
+    <wsdl:part name="parameters" element="tns:StreamNEWPDFBytes" />
+  </wsdl:message>
+  <wsdl:message name="StreamNEWPDFBytesSoapOut">
+    <wsdl:part name="parameters" element="tns:StreamNEWPDFBytesResponse" />
+  </wsdl:message>
+  <wsdl:portType name="WebServiceSoap">
+    <wsdl:operation name="HelloWorld">
+      <wsdl:input message="tns:HelloWorldSoapIn" />
+      <wsdl:output message="tns:HelloWorldSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="StreamPDF">
+      <wsdl:input message="tns:StreamPDFSoapIn" />
+      <wsdl:output message="tns:StreamPDFSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="StreamPDFBytes">
+      <wsdl:input message="tns:StreamPDFBytesSoapIn" />
+      <wsdl:output message="tns:StreamPDFBytesSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="StreamNEWPDF">
+      <wsdl:input message="tns:StreamNEWPDFSoapIn" />
+      <wsdl:output message="tns:StreamNEWPDFSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="StreamNEWPDFBytes">
+      <wsdl:input message="tns:StreamNEWPDFBytesSoapIn" />
+      <wsdl:output message="tns:StreamNEWPDFBytesSoapOut" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="WebServiceSoap" type="tns:WebServiceSoap">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="HelloWorld">
+      <soap:operation soapAction="http://tempuri.org/HelloWorld" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="StreamPDF">
+      <soap:operation soapAction="http://tempuri.org/StreamPDF" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="StreamPDFBytes">
+      <soap:operation soapAction="http://tempuri.org/StreamPDFBytes" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="StreamNEWPDF">
+      <soap:operation soapAction="http://tempuri.org/StreamNEWPDF" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="StreamNEWPDFBytes">
+      <soap:operation soapAction="http://tempuri.org/StreamNEWPDFBytes" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="WebServiceSoap12" type="tns:WebServiceSoap">
+    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="HelloWorld">
+      <soap12:operation soapAction="http://tempuri.org/HelloWorld" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="StreamPDF">
+      <soap12:operation soapAction="http://tempuri.org/StreamPDF" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="StreamPDFBytes">
+      <soap12:operation soapAction="http://tempuri.org/StreamPDFBytes" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="StreamNEWPDF">
+      <soap12:operation soapAction="http://tempuri.org/StreamNEWPDF" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="StreamNEWPDFBytes">
+      <soap12:operation soapAction="http://tempuri.org/StreamNEWPDFBytes" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="WebService">
+    <wsdl:port name="WebServiceSoap" binding="tns:WebServiceSoap">
+      <soap:address location="http://localhost:7999/WebService.asmx" />
+    </wsdl:port>
+    <wsdl:port name="WebServiceSoap12" binding="tns:WebServiceSoap12">
+      <soap12:address location="http://localhost:7999/WebService.asmx" />
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/App_WebReferences/WSRDLC2/configuration.svcinfo b/App_WebReferences/WSRDLC2/configuration.svcinfo
new file mode 100644
index 000000000..23094d5e1
--- /dev/null
+++ b/App_WebReferences/WSRDLC2/configuration.svcinfo
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configurationSnapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
+  <behaviors />
+  <bindings>
+    <binding digest="System.ServiceModel.Configuration.BasicHttpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data name=&quot;WebServiceSoap1&quot; /&gt;" bindingType="basicHttpBinding" name="WebServiceSoap1" />
+  </bindings>
+  <endpoints>
+    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:7999/WebService.asmx&quot; binding=&quot;basicHttpBinding&quot; bindingConfiguration=&quot;WebServiceSoap1&quot; contract=&quot;WSRDLC2.WebServiceSoap&quot; name=&quot;WebServiceSoap1&quot; /&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:7999/WebService.asmx&quot; binding=&quot;basicHttpBinding&quot; bindingConfiguration=&quot;WebServiceSoap1&quot; contract=&quot;WSRDLC2.WebServiceSoap&quot; name=&quot;WebServiceSoap1&quot; /&gt;" contractName="WSRDLC2.WebServiceSoap" name="WebServiceSoap1" />
+  </endpoints>
+</configurationSnapshot>
\ No newline at end of file
diff --git a/App_WebReferences/WSRDLC2/configuration91.svcinfo b/App_WebReferences/WSRDLC2/configuration91.svcinfo
new file mode 100644
index 000000000..c794b474d
--- /dev/null
+++ b/App_WebReferences/WSRDLC2/configuration91.svcinfo
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="P0uAp1SH45jZSSsEEmhR5aLMvQQ=">
+  <bindingConfigurations>
+    <bindingConfiguration bindingType="basicHttpBinding" name="WebServiceSoap1">
+      <properties>
+        <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>WebServiceSoap1</serializedValue>
+        </property>
+        <property path="/closeTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/openTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/receiveTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/sendTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/allowCookies" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/bypassProxyOnLocal" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/hostNameComparisonMode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HostNameComparisonMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>StrongWildcard</serializedValue>
+        </property>
+        <property path="/maxBufferPoolSize" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int64, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/maxBufferSize" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>65536</serializedValue>
+        </property>
+        <property path="/maxReceivedMessageSize" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int64, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/proxyAddress" isComplexType="false" isExplicitlyDefined="false" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/readerQuotas" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement</serializedValue>
+        </property>
+        <property path="/readerQuotas/maxDepth" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>0</serializedValue>
+        </property>
+        <property path="/readerQuotas/maxStringContentLength" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>0</serializedValue>
+        </property>
+        <property path="/readerQuotas/maxArrayLength" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>0</serializedValue>
+        </property>
+        <property path="/readerQuotas/maxBytesPerRead" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>0</serializedValue>
+        </property>
+        <property path="/readerQuotas/maxNameTableCharCount" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>0</serializedValue>
+        </property>
+        <property path="/textEncoding" isComplexType="false" isExplicitlyDefined="false" clrType="System.Text.Encoding, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.Text.UTF8Encoding</serializedValue>
+        </property>
+        <property path="/transferMode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.TransferMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>Buffered</serializedValue>
+        </property>
+        <property path="/useDefaultWebProxy" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/messageEncoding" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.WSMessageEncoding, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>Text</serializedValue>
+        </property>
+        <property path="/security" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.BasicHttpSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.ServiceModel.Configuration.BasicHttpSecurityElement</serializedValue>
+        </property>
+        <property path="/security/mode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.BasicHttpSecurityMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>None</serializedValue>
+        </property>
+        <property path="/security/transport" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.HttpTransportSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.ServiceModel.Configuration.HttpTransportSecurityElement</serializedValue>
+        </property>
+        <property path="/security/transport/clientCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HttpClientCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>None</serializedValue>
+        </property>
+        <property path="/security/transport/proxyCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HttpProxyCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>None</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy/policyEnforcement" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.PolicyEnforcement, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>Never</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy/protectionScenario" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.ProtectionScenario, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>TransportSelected</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy/customServiceNames" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ServiceNameElementCollection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>(Collection)</serializedValue>
+        </property>
+        <property path="/security/transport/realm" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/security/message" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.BasicHttpMessageSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.ServiceModel.Configuration.BasicHttpMessageSecurityElement</serializedValue>
+        </property>
+        <property path="/security/message/clientCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.BasicHttpMessageCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>UserName</serializedValue>
+        </property>
+        <property path="/security/message/algorithmSuite" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.Security.SecurityAlgorithmSuite, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>Default</serializedValue>
+        </property>
+      </properties>
+    </bindingConfiguration>
+  </bindingConfigurations>
+  <endpoints>
+    <endpoint name="WebServiceSoap1" contract="WSRDLC2.WebServiceSoap" bindingType="basicHttpBinding" address="http://localhost:7999/WebService.asmx" bindingConfiguration="WebServiceSoap1">
+      <properties>
+        <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>http://localhost:7999/WebService.asmx</serializedValue>
+        </property>
+        <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/binding" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>basicHttpBinding</serializedValue>
+        </property>
+        <property path="/bindingConfiguration" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>WebServiceSoap1</serializedValue>
+        </property>
+        <property path="/contract" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>WSRDLC2.WebServiceSoap</serializedValue>
+        </property>
+        <property path="/headers" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.AddressHeaderCollectionElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.ServiceModel.Configuration.AddressHeaderCollectionElement</serializedValue>
+        </property>
+        <property path="/headers/headers" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.Channels.AddressHeaderCollection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>&lt;Header /&gt;</serializedValue>
+        </property>
+        <property path="/identity" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.IdentityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.ServiceModel.Configuration.IdentityElement</serializedValue>
+        </property>
+        <property path="/identity/userPrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.UserPrincipalNameElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.ServiceModel.Configuration.UserPrincipalNameElement</serializedValue>
+        </property>
+        <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/identity/servicePrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.ServicePrincipalNameElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.ServiceModel.Configuration.ServicePrincipalNameElement</serializedValue>
+        </property>
+        <property path="/identity/servicePrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/identity/dns" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.DnsElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.ServiceModel.Configuration.DnsElement</serializedValue>
+        </property>
+        <property path="/identity/dns/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/identity/rsa" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.RsaElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.ServiceModel.Configuration.RsaElement</serializedValue>
+        </property>
+        <property path="/identity/rsa/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/identity/certificate" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.ServiceModel.Configuration.CertificateElement</serializedValue>
+        </property>
+        <property path="/identity/certificate/encodedValue" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/identity/certificateReference" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateReferenceElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.ServiceModel.Configuration.CertificateReferenceElement</serializedValue>
+        </property>
+        <property path="/identity/certificateReference/storeName" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.StoreName, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>My</serializedValue>
+        </property>
+        <property path="/identity/certificateReference/storeLocation" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.StoreLocation, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>LocalMachine</serializedValue>
+        </property>
+        <property path="/identity/certificateReference/x509FindType" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.X509FindType, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>FindBySubjectDistinguishedName</serializedValue>
+        </property>
+        <property path="/identity/certificateReference/findValue" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/identity/certificateReference/isChainIncluded" isComplexType="false" isExplicitlyDefined="false" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>False</serializedValue>
+        </property>
+        <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>WebServiceSoap1</serializedValue>
+        </property>
+        <property path="/kind" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+        <property path="/endpointConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
+        </property>
+      </properties>
+    </endpoint>
+  </endpoints>
+</SavedWcfConfigurationInformation>
\ No newline at end of file

From 68aa589b9b4bf3b35846a66c8ac9fa21560b4b48 Mon Sep 17 00:00:00 2001
From: Jonathan Alexis Perez Morales <jonathan.perez@adssistemas.mx>
Date: Fri, 10 Jun 2022 14:41:50 -0700
Subject: [PATCH 6/7] CFDI4.0, uso cfdi y regimen fiscal sin obligaciones
 fiscales en RFC generico

---
 Ventas/Ventas.aspx.vb | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index e70410c16..363fd8033 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -6198,6 +6198,14 @@ Partial Class Ventas
                         DdlFormaPago33.SelectedValueExist(ObjCliente.CveFormaPago33)
                     End If
                     DdlUsoCFDI.SelectedValueExist(ObjCliente.CveUsoCFDI)
+                    'SI ES RFC GENERICO NO TIENE OBLIGACIONES FISCALES
+                    If UsuarioActual.Empresa.Funcionalidad(350).Contiene("1") AndAlso LblRFC.Text.Contiene("XAXX010101000", "XEXX010101000") Then
+                        'S01	Sin efectos fiscales.
+                        DdlUsoCFDI.SelectedValueExist("23")
+                        DdlUsoCFDI.Enabled = False
+                        RegimenFiscalCliente = "616"
+                        ClienteCodigoRegimenFiscal = "616"
+                    End If
 
                 End If
 
@@ -7150,6 +7158,15 @@ Partial Class Ventas
 
                         DdlFormaPago33.SelectedValueExist(ObjCliente.DtResultados.Rows(0)("CveFormaPago33").ToString())
                         DdlUsoCFDI.SelectedValueExist(ObjCliente.DtResultados.Rows(0)("CveUsoCFDI").ToString())
+                        'SI ES RFC GENERICO NO TIENE OBLIGACIONES FISCALES
+                        If UsuarioActual.Empresa.Funcionalidad(350).Contiene("1") AndAlso LblRFC.Text.Contiene("XAXX010101000", "XEXX010101000") Then
+                            'S01	Sin efectos fiscales.
+                            DdlUsoCFDI.SelectedValueExist("23")
+                            DdlUsoCFDI.Enabled = False
+                            RegimenFiscalCliente = "616"
+                            ClienteCodigoRegimenFiscal = "616"
+                        End If
+
                     End If
 
                     If CveVenta < 0 Then TxtAtencionA.Text = ObjCliente.DtResultados.Rows(0)("Contacto").ToString()
@@ -7183,6 +7200,15 @@ Partial Class Ventas
 
                         DdlFormaPago33.SelectedValueExist(ObjCliente.CveFormaPago33)
                         DdlUsoCFDI.SelectedValueExist(ObjCliente.CveUsoCFDI)
+                        'SI ES RFC GENERICO NO TIENE OBLIGACIONES FISCALES
+                        If UsuarioActual.Empresa.Funcionalidad(350).Contiene("1") AndAlso LblRFC.Text.Contiene("XAXX010101000", "XEXX010101000") Then
+                            'S01	Sin efectos fiscales.
+                            DdlUsoCFDI.SelectedValueExist("23")
+                            DdlUsoCFDI.Enabled = False
+                            RegimenFiscalCliente = "616"
+                            ClienteCodigoRegimenFiscal = "616"
+                        End If
+
                     End If
 
                 End If
@@ -34462,7 +34488,7 @@ Partial Class Ventas
     Private Sub CreaDTMercancias()
         DtMercancias = New DataTable()
         DtMercancias.Columns.Add(New DataColumn("Consec", GetType(Integer)))
-        DtMercancias.Columns.Add(New DataColumn("Cantidad", GetType(Integer)))
+        DtMercancias.Columns.Add(New DataColumn("Cantidad", GetType(Decimal)))
         DtMercancias.Columns.Add(New DataColumn("CvePS", GetType(Integer)))
         DtMercancias.Columns.Add(New DataColumn("CveUnidadMedida", GetType(Integer)))
         DtMercancias.Columns.Add(New DataColumn("CodigoPS", GetType(String)))

From 5d1d5e1d55e8555291341a2a75aa1681e6fc086b Mon Sep 17 00:00:00 2001
From: Jonathan Alexis Perez Morales <jonathan.perez@adssistemas.mx>
Date: Fri, 10 Jun 2022 14:42:18 -0700
Subject: [PATCH 7/7] E13. Bordes en formato de carta porte

---
 Empresas/13/Formatos/CartaPorteTimbrado.rdlc | 41 +++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/Empresas/13/Formatos/CartaPorteTimbrado.rdlc b/Empresas/13/Formatos/CartaPorteTimbrado.rdlc
index 3bf625808..9ed1afae5 100644
--- a/Empresas/13/Formatos/CartaPorteTimbrado.rdlc
+++ b/Empresas/13/Formatos/CartaPorteTimbrado.rdlc
@@ -92,6 +92,11 @@
                         <Border>
                           <Style>None</Style>
                         </Border>
+                        <BottomBorder>
+                          <Color>Black</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </BottomBorder>
                         <PaddingLeft>2pt</PaddingLeft>
                         <PaddingRight>2pt</PaddingRight>
                         <PaddingTop>2pt</PaddingTop>
@@ -126,6 +131,11 @@
                         <Border>
                           <Style>None</Style>
                         </Border>
+                        <BottomBorder>
+                          <Color>Black</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </BottomBorder>
                         <PaddingLeft>2pt</PaddingLeft>
                         <PaddingRight>2pt</PaddingRight>
                         <PaddingTop>2pt</PaddingTop>
@@ -160,6 +170,11 @@
                         <Border>
                           <Style>None</Style>
                         </Border>
+                        <BottomBorder>
+                          <Color>Black</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </BottomBorder>
                         <PaddingLeft>2pt</PaddingLeft>
                         <PaddingRight>2pt</PaddingRight>
                         <PaddingTop>2pt</PaddingTop>
@@ -194,6 +209,11 @@
                         <Border>
                           <Style>None</Style>
                         </Border>
+                        <BottomBorder>
+                          <Color>Black</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </BottomBorder>
                         <PaddingLeft>2pt</PaddingLeft>
                         <PaddingRight>2pt</PaddingRight>
                         <PaddingTop>2pt</PaddingTop>
@@ -228,6 +248,11 @@
                         <Border>
                           <Style>None</Style>
                         </Border>
+                        <BottomBorder>
+                          <Color>Black</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </BottomBorder>
                         <PaddingLeft>2pt</PaddingLeft>
                         <PaddingRight>2pt</PaddingRight>
                         <PaddingTop>2pt</PaddingTop>
@@ -466,6 +491,11 @@
                       <Border>
                         <Style>None</Style>
                       </Border>
+                      <BottomBorder>
+                        <Color>Black</Color>
+                        <Style>Solid</Style>
+                        <Width>1pt</Width>
+                      </BottomBorder>
                       <PaddingLeft>2pt</PaddingLeft>
                       <PaddingRight>2pt</PaddingRight>
                       <PaddingTop>2pt</PaddingTop>
@@ -627,6 +657,7 @@
                           <Style>None</Style>
                         </TopBorder>
                         <BottomBorder>
+                          <Color>Black</Color>
                           <Width>1pt</Width>
                         </BottomBorder>
                         <LeftBorder>
@@ -675,6 +706,7 @@
                           <Style>None</Style>
                         </TopBorder>
                         <BottomBorder>
+                          <Color>Black</Color>
                           <Width>1pt</Width>
                         </BottomBorder>
                         <LeftBorder>
@@ -720,6 +752,7 @@
                           <Width>5pt</Width>
                         </Border>
                         <BottomBorder>
+                          <Color>Black</Color>
                           <Style>Solid</Style>
                           <Width>1pt</Width>
                         </BottomBorder>
@@ -761,6 +794,7 @@
                           <Width>5pt</Width>
                         </Border>
                         <BottomBorder>
+                          <Color>Black</Color>
                           <Style>Solid</Style>
                           <Width>1pt</Width>
                         </BottomBorder>
@@ -801,6 +835,7 @@
                           <Width>5pt</Width>
                         </Border>
                         <BottomBorder>
+                          <Color>Black</Color>
                           <Style>Solid</Style>
                           <Width>1pt</Width>
                         </BottomBorder>
@@ -1062,6 +1097,7 @@
                         <Style>None</Style>
                       </TopBorder>
                       <BottomBorder>
+                        <Color>Black</Color>
                         <Width>1pt</Width>
                       </BottomBorder>
                       <LeftBorder>
@@ -1086,7 +1122,7 @@
         <DataSetName>DataSet2</DataSetName>
         <Top>6.1698cm</Top>
         <Left>0.06623cm</Left>
-        <Height>0.90895cm</Height>
+        <Height>0.90896cm</Height>
         <Width>20.38566cm</Width>
         <ZIndex>2</ZIndex>
         <Style>
@@ -1222,6 +1258,7 @@
                           <Style>None</Style>
                         </TopBorder>
                         <BottomBorder>
+                          <Color>Black</Color>
                           <Width>1pt</Width>
                         </BottomBorder>
                         <LeftBorder>
@@ -1267,6 +1304,7 @@
                           <Width>5pt</Width>
                         </Border>
                         <BottomBorder>
+                          <Color>Black</Color>
                           <Style>Solid</Style>
                           <Width>1pt</Width>
                         </BottomBorder>
@@ -1408,6 +1446,7 @@
                         <Style>None</Style>
                       </TopBorder>
                       <BottomBorder>
+                        <Color>Black</Color>
                         <Width>1pt</Width>
                       </BottomBorder>
                       <LeftBorder>