Merge branch 'master' of http://jperez@192.168.10.111:8383/SIG.git

Empresas/7/Formatos/OC.rdlc

@@ -256,7 +256,7 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value>=Parameters!FechaEntrega.Value</Value>
+                <Value>=  FORMAT(Parameters!FechaEntrega.Value,"dd/MM/yyyy")</Value>
                 <Style>
                   <FontSize>8pt</FontSize>
                   <Format>dd/MM/yyyy hh:mm tt</Format>
@@ -2199,7 +2199,7 @@
                   </Style>
                 </TextRun>
                 <TextRun>
-                  <Value>=Today</Value>
+                  <Value>=  FORMAT(Today,"dd/MM/yyyy")</Value>
                   <Style>
                     <FontSize>8pt</FontSize>
                   </Style>

Empresas/83/Formatos/Factura.rdlc

@@ -26,7 +26,7 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value>DE C.V. RFC: CMN9810221L8</Value>
+                <Value>RFC: CMN9810221L8</Value>
                 <Style>
                   <FontStyle>Normal</FontStyle>
                   <FontFamily>arial</FontFamily>

Empresas/Grales/Formatos/CartaPorte.rdlc

@@ -1248,7 +1248,7 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox1</rd:DefaultName>
-        <Top>20.42682cm</Top>
+        <Top>19.15682cm</Top>
         <Left>0.23022cm</Left>
         <Height>2.22232cm</Height>
         <Width>19.21855cm</Width>
@@ -1291,7 +1291,7 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox1</rd:DefaultName>
-        <Top>19.80083cm</Top>
+        <Top>18.53083cm</Top>
         <Left>0.23022cm</Left>
         <Height>0.62599cm</Height>
         <Width>19.21855cm</Width>
@@ -1449,7 +1449,7 @@
         </Style>
       </Rectangle>
     </ReportItems>
-    <Height>8.91698in</Height>
+    <Height>8.41698in</Height>
     <Style />
   </Body>
   <Width>7.66009in</Width>
@@ -1708,7 +1708,7 @@
       <PrintOnLastPage>true</PrintOnLastPage>
       <ReportItems>
         <Line Name="Line1">
-          <Top>0.03525cm</Top>
+          <Top>0.03524cm</Top>
           <Left>0.22015cm</Left>
           <Height>0cm</Height>
           <Width>19.22862cm</Width>
@@ -1738,7 +1738,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox13</rd:DefaultName>
-          <Top>0.14108cm</Top>
+          <Top>0.14107cm</Top>
           <Left>0.22015cm</Left>
           <Height>0.54708cm</Height>
           <Width>1.55632cm</Width>
@@ -1772,7 +1772,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox14</rd:DefaultName>
-          <Top>0.14108cm</Top>
+          <Top>0.14107cm</Top>
           <Left>1.77647cm</Left>
           <Height>0.54708cm</Height>
           <Width>4.96223cm</Width>
@@ -1807,7 +1807,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox13</rd:DefaultName>
-          <Top>0.14108cm</Top>
+          <Top>0.14107cm</Top>
           <Left>6.84454cm</Left>
           <Height>0.54708cm</Height>
           <Width>2.84562cm</Width>
@@ -1842,7 +1842,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox14</rd:DefaultName>
-          <Top>0.14108cm</Top>
+          <Top>0.14107cm</Top>
           <Left>9.69015cm</Left>
           <Height>0.54708cm</Height>
           <Width>4.68641cm</Width>
@@ -1876,7 +1876,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox14</rd:DefaultName>
-          <Top>0.17636cm</Top>
+          <Top>0.17635cm</Top>
           <Left>14.62633cm</Left>
           <Height>0.54708cm</Height>
           <Width>4.8023cm</Width>
@@ -1908,7 +1908,7 @@
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox14</rd:DefaultName>
-          <Top>0.68816cm</Top>
+          <Top>0.68815cm</Top>
           <Left>0.22015cm</Left>
           <Height>0.54708cm</Height>
           <Width>6.21751cm</Width>