From b443df0a90b1c1a254b33a9c45537fc3eabdee19 Mon Sep 17 00:00:00 2001
From: Jonathan Alexis Perez Morales <jonathan.perez@adssistemas.mx>
Date: Fri, 10 Jun 2022 20:17:28 -0700
Subject: [PATCH] E13, cambios pdf de factura y carta porte

---
 Empresas/13/Formatos/CartaPorteTimbrado.rdlc |  10 ++
 Empresas/13/Formatos/Factura.rdlc            | 138 +++++++++++++++----
 2 files changed, 123 insertions(+), 25 deletions(-)

diff --git a/Empresas/13/Formatos/CartaPorteTimbrado.rdlc b/Empresas/13/Formatos/CartaPorteTimbrado.rdlc
index 9ed1afae5..fabf967ac 100644
--- a/Empresas/13/Formatos/CartaPorteTimbrado.rdlc
+++ b/Empresas/13/Formatos/CartaPorteTimbrado.rdlc
@@ -1782,6 +1782,7 @@
               <TextRun>
                 <Value>Remolque 1</Value>
                 <Style>
+                  <FontFamily>calibri</FontFamily>
                   <FontSize>7pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
@@ -1789,24 +1790,28 @@
               <TextRun>
                 <Value> Placa: </Value>
                 <Style>
+                  <FontFamily>calibri</FontFamily>
                   <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>=Parameters!RemolquePlaca1.Value</Value>
                 <Style>
+                  <FontFamily>calibri</FontFamily>
                   <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>  Tipo Rem: </Value>
                 <Style>
+                  <FontFamily>calibri</FontFamily>
                   <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>=Parameters!RemolqueSubtimo1.Value</Value>
                 <Style>
+                  <FontFamily>calibri</FontFamily>
                   <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
@@ -1842,6 +1847,7 @@
               <TextRun>
                 <Value>Remolque 2</Value>
                 <Style>
+                  <FontFamily>calibri</FontFamily>
                   <FontSize>7pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
@@ -1849,24 +1855,28 @@
               <TextRun>
                 <Value> Placa: </Value>
                 <Style>
+                  <FontFamily>calibri</FontFamily>
                   <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>=Parameters!RemolquePlaca2.Value</Value>
                 <Style>
+                  <FontFamily>calibri</FontFamily>
                   <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>   Tipo Rem: </Value>
                 <Style>
+                  <FontFamily>calibri</FontFamily>
                   <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
               <TextRun>
                 <Value>=Parameters!RemolqueSubtimo2.Value</Value>
                 <Style>
+                  <FontFamily>calibri</FontFamily>
                   <FontSize>7pt</FontSize>
                 </Style>
               </TextRun>
diff --git a/Empresas/13/Formatos/Factura.rdlc b/Empresas/13/Formatos/Factura.rdlc
index 0d9fdd708..5b4e9fbf0 100644
--- a/Empresas/13/Formatos/Factura.rdlc
+++ b/Empresas/13/Formatos/Factura.rdlc
@@ -141,7 +141,7 @@
         <Top>1.43777in</Top>
         <Left>0.27639cm</Left>
         <Height>0.17222in</Height>
-        <Width>0.81128in</Width>
+        <Width>0.57108in</Width>
         <ZIndex>2</ZIndex>
         <Style>
           <Border>
@@ -180,9 +180,9 @@
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
         <Top>1.43777in</Top>
-        <Left>0.93398in</Left>
+        <Left>0.67989in</Left>
         <Height>0.17222in</Height>
-        <Width>3.24868in</Width>
+        <Width>3.44722in</Width>
         <ZIndex>3</ZIndex>
         <Style>
           <Border>
@@ -1703,7 +1703,7 @@
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
         <Top>1.43777in</Top>
-        <Left>10.65925cm</Left>
+        <Left>10.53225cm</Left>
         <Height>0.1875in</Height>
         <Width>0.36336in</Width>
         <ZIndex>20</ZIndex>
@@ -1745,9 +1745,9 @@
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
         <Top>1.43916in</Top>
-        <Left>4.55379in</Left>
+        <Left>4.50379in</Left>
         <Height>0.18472in</Height>
-        <Width>1.12758in</Width>
+        <Width>0.93723in</Width>
         <ZIndex>21</ZIndex>
         <Style>
           <Border>
@@ -1778,6 +1778,7 @@
               <TextRun>
                 <Value>Uso CFDI:</Value>
                 <Style>
+                  <FontFamily>Calibri</FontFamily>
                   <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
@@ -1788,9 +1789,9 @@
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
         <Top>1.43777in</Top>
-        <Left>14.44108cm</Left>
+        <Left>13.86958cm</Left>
         <Height>0.17222in</Height>
-        <Width>0.63582in</Width>
+        <Width>0.51158in</Width>
         <ZIndex>22</ZIndex>
         <Style>
           <Border>
@@ -1830,9 +1831,9 @@
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
         <Top>1.43916in</Top>
-        <Left>6.36573in</Left>
+        <Left>5.98593in</Left>
         <Height>0.17083in</Height>
-        <Width>1.55925in</Width>
+        <Width>1.97686in</Width>
         <ZIndex>23</ZIndex>
         <Style>
           <Border>
@@ -1875,8 +1876,8 @@
         <rd:DefaultName>Textbox19</rd:DefaultName>
         <Top>1.62527in</Top>
         <Left>0.27639cm</Left>
-        <Height>0.15972in</Height>
-        <Width>0.81128in</Width>
+        <Height>0.17083in</Height>
+        <Width>0.57108in</Width>
         <ZIndex>24</ZIndex>
         <Style>
           <Border>
@@ -1898,6 +1899,7 @@
         </Style>
       </Textbox>
       <Textbox Name="Textbox74">
+        <CanGrow>true</CanGrow>
         <KeepTogether>true</KeepTogether>
         <Paragraphs>
           <Paragraph>
@@ -1915,24 +1917,15 @@
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
         <Top>1.62527in</Top>
-        <Left>0.92009in</Left>
-        <Height>0.15972in</Height>
-        <Width>4.18029in</Width>
+        <Left>0.67989in</Left>
+        <Height>0.17083in</Height>
+        <Width>3.44722in</Width>
         <ZIndex>25</ZIndex>
         <Style>
           <Border>
             <Color>White</Color>
             <Style>None</Style>
           </Border>
-          <TopBorder>
-            <Style>None</Style>
-          </TopBorder>
-          <LeftBorder>
-            <Style>None</Style>
-          </LeftBorder>
-          <RightBorder>
-            <Style>None</Style>
-          </RightBorder>
           <PaddingLeft>2pt</PaddingLeft>
           <PaddingRight>2pt</PaddingRight>
           <PaddingTop>2pt</PaddingTop>
@@ -2396,7 +2389,14 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value>Este documento es una representación impresa de un CFDI Version 3.3</Value>
+                <Value>Este documento es una representación impresa de un CFDI Version </Value>
+                <Style>
+                  <FontSize>8pt</FontSize>
+                  <FontWeight>Bold</FontWeight>
+                </Style>
+              </TextRun>
+              <TextRun>
+                <Value>=IIf(Parameters!CFDIVersion.Value = "4.0","4.0","3.3")</Value>
                 <Style>
                   <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
@@ -3288,6 +3288,94 @@
           </Border>
         </Style>
       </Rectangle>
+      <Textbox Name="Textbox80">
+        <CanGrow>true</CanGrow>
+        <KeepTogether>true</KeepTogether>
+        <Paragraphs>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>Regimen  Fiscal:</Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>8pt</FontSize>
+                  <FontWeight>Bold</FontWeight>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Left</TextAlign>
+            </Style>
+          </Paragraph>
+        </Paragraphs>
+        <rd:DefaultName>Textbox19</rd:DefaultName>
+        <Top>1.62527in</Top>
+        <Left>10.5005cm</Left>
+        <Height>0.17222in</Height>
+        <Width>0.82757in</Width>
+        <ZIndex>48</ZIndex>
+        <Style>
+          <Border>
+            <Color>#4f81bd</Color>
+            <Style>None</Style>
+          </Border>
+          <TopBorder>
+            <Style>None</Style>
+          </TopBorder>
+          <LeftBorder>
+            <Style>None</Style>
+          </LeftBorder>
+          <RightBorder>
+            <Style>None</Style>
+          </RightBorder>
+          <PaddingLeft>2pt</PaddingLeft>
+          <PaddingRight>2pt</PaddingRight>
+          <PaddingTop>2pt</PaddingTop>
+          <PaddingBottom>2pt</PaddingBottom>
+        </Style>
+      </Textbox>
+      <Textbox Name="Textbox81">
+        <KeepTogether>true</KeepTogether>
+        <Paragraphs>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>=Parameters!RegimenFiscalCodigo.Value</Value>
+                <Style>
+                  <FontFamily>Calibri</FontFamily>
+                  <FontSize>8pt</FontSize>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style />
+          </Paragraph>
+        </Paragraphs>
+        <rd:DefaultName>Textbox19</rd:DefaultName>
+        <Top>1.62527in</Top>
+        <Left>4.96163in</Left>
+        <Height>0.17083in</Height>
+        <Width>3.00857in</Width>
+        <ZIndex>49</ZIndex>
+        <Style>
+          <Border>
+            <Color>White</Color>
+            <Style>None</Style>
+          </Border>
+          <TopBorder>
+            <Style>None</Style>
+          </TopBorder>
+          <LeftBorder>
+            <Style>None</Style>
+          </LeftBorder>
+          <RightBorder>
+            <Style>None</Style>
+          </RightBorder>
+          <PaddingLeft>2pt</PaddingLeft>
+          <PaddingRight>2pt</PaddingRight>
+          <PaddingTop>2pt</PaddingTop>
+          <PaddingBottom>2pt</PaddingBottom>
+        </Style>
+      </Textbox>
     </ReportItems>
     <Height>14.35534cm</Height>
     <Style />