From 5516cd2bc6d335fd0e52a9453147e1e0c8395960 Mon Sep 17 00:00:00 2001
From: HECTOR RODRIGUEZ <hecttor201@gmail.com>
Date: Wed, 31 Mar 2021 12:03:31 -0700
Subject: [PATCH 1/3] Cambios para ContaSIG - Saldos Iniciales Cuentas

---
 General/SaldosIniciales.aspx.vb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/General/SaldosIniciales.aspx.vb b/General/SaldosIniciales.aspx.vb
index 3a88f8496..f37302c1c 100644
--- a/General/SaldosIniciales.aspx.vb
+++ b/General/SaldosIniciales.aspx.vb
@@ -1981,7 +1981,7 @@ Partial Class General_SaldosIniciales
                     Dim CvePrePoliza As Integer = 0
                     Dim Cuenta As String = ""
                     Dim Reporte As New StringBuilder
-
+                    Dim SubProTemp As DataTable = GlobalDTSubProyectos(-1, -1, CveEmpresa:=UsuarioActual.CveEmpresa)
                     CvePrePoliza = ObjConta.AddPrePolizas("SI", 1, 0, 0, 1, Now.ToDate, "Saldos Iniciales", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa)
 
                     For Each Row As DataRow In dt.Rows
@@ -1994,12 +1994,14 @@ Partial Class General_SaldosIniciales
                         Dim CveSubProyecto As Integer = -1
                         Dim TipoMovto As Boolean = If(Row("Cargo").ToString.ToDecimal <> 0, False, True)
                         Dim YaExiste As Boolean = False
+                        Dim DataTemp As DataTable
 
                         Dim SubP As String = Row("SubProyecto").ToString
                         If SubP <> "" Then
-                            CveSubProyecto = GlobalDTSubProyectos(-1, -1, CveEmpresa:=UsuarioActual.CveEmpresa, Estatus:=-1).FiltroPrimeroValor("CveSubProyecto", "").ToEntero
+                            DataTemp = SubProTemp.FiltraParametros(String.Format("SubProyecto = '{0}'", SubP))
+                            CveSubProyecto = DataTemp.FiltroPrimeroValor("CveSubProyecto", "").ToEntero
                         End If
-
+                        Cuenta = Cuenta.Replace(" ", "")
                         If ObjConta.GetCuentas(-1, Cuenta.Replace("-", ""), 1, UsuarioActual.CveEmpresa) Then
                             If ObjConta.DtResultados.Rows.Count > 0 Then
                                 IdCuenta = ObjConta.DtResultados().FiltroPrimeroValor("CveCuenta").ToEntero

From 92497c455d7baca20765e2d8c0c6dc3e70073bf6 Mon Sep 17 00:00:00 2001
From: HECTOR RODRIGUEZ <hecttor201@gmail.com>
Date: Wed, 31 Mar 2021 12:04:27 -0700
Subject: [PATCH 2/3] Validar Fechas

---
 OI/RepTareas.aspx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OI/RepTareas.aspx b/OI/RepTareas.aspx
index bf1d9f034..c0b51ef60 100644
--- a/OI/RepTareas.aspx
+++ b/OI/RepTareas.aspx
@@ -60,19 +60,19 @@
                     </td>
                     <td>Estatus:</td>
                     <td>
-                        <asp:DropDownList ID="DdlEventoEstatus" runat="server" AppendDataBoundItems="true" DataTextField="EventoEstatus" DataValueField="CveEventoEstatus" Class="table-group-action-input form-control input-inline input-small input-sm" Style="width: 150px !important;" ValidationGroup="GrpGuardar">
+                        <asp:DropDownList ID="DdlEventoEstatus" runat="server" AppendDataBoundItems="true" DataTextField="EventoEstatus" DataValueField="CveEventoEstatus" Class="table-group-action-input form-control input-inline input-small input-sm" Style="width: 150px !important;" ValidationGroup="Valida">
                             <asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
                         </asp:DropDownList>
                     </td>
                     <td>Tema:</td>
                     <td>
-                        <asp:DropDownList ID="DdlRevision" runat="server" AppendDataBoundItems="true" DataTextField="Revision" DataValueField="CveRevision" Class="table-group-action-input form-control input-inline input-small input-sm" Style="width: 150px !important;" ValidationGroup="GrpGuardar">
+                        <asp:DropDownList ID="DdlRevision" runat="server" AppendDataBoundItems="true" DataTextField="Revision" DataValueField="CveRevision" Class="table-group-action-input form-control input-inline input-small input-sm" Style="width: 150px !important;" ValidationGroup="Valida">
                             <asp:ListItem Selected="True" Text="Todos" Value="-1"></asp:ListItem>
                             <asp:ListItem Text="Sin Revisión" Value="-2"></asp:ListItem>
                         </asp:DropDownList>
                     </td>
                     <td>
-                        <asp:Button ID="BtnConsultar" runat="server" Text="Consultar" class="btn btn-default" />
+                        <asp:Button ID="BtnConsultar" runat="server" Text="Consultar" class="btn btn-default" ValidationGroup="Valida"/>
                     </td>
                     <td>
                         <asp:Button ID="BtnEscritorio" runat="server" Text="Escritorio" class="btn btn-default" />

From 6efd4cd923536fc5694c6a2a3687865919152921 Mon Sep 17 00:00:00 2001
From: HECTOR RODRIGUEZ <hecttor201@gmail.com>
Date: Wed, 31 Mar 2021 12:04:51 -0700
Subject: [PATCH 3/3] Cambios en reporte y forma de mostrar la informacion

---
 .../Grales/Formatos/RepTraspasoAlmacen.rdlc   | 376 ++++++++++++++++--
 Inventarios/RepTraspasoAlmacen.aspx           |  11 +-
 Inventarios/RepTraspasoAlmacen.aspx.vb        |  19 +-
 3 files changed, 342 insertions(+), 64 deletions(-)

diff --git a/Empresas/Grales/Formatos/RepTraspasoAlmacen.rdlc b/Empresas/Grales/Formatos/RepTraspasoAlmacen.rdlc
index a5526206a..90d52fea7 100644
--- a/Empresas/Grales/Formatos/RepTraspasoAlmacen.rdlc
+++ b/Empresas/Grales/Formatos/RepTraspasoAlmacen.rdlc
@@ -80,28 +80,93 @@
             <TablixBody>
               <TablixColumns>
                 <TablixColumn>
-                  <Width>3.57404cm</Width>
+                  <Width>1.23101cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>2.36927cm</Width>
+                  <Width>1.98488cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>2.15604cm</Width>
+                  <Width>1.51446cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>12.63354cm</Width>
+                  <Width>3.83319cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>1.57396cm</Width>
+                  <Width>6.041cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>1.8105cm</Width>
+                  <Width>2.20896cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>2.31165cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>2.50891cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>2.5778cm</Width>
                 </TablixColumn>
               </TablixColumns>
               <TablixRows>
                 <TablixRow>
-                  <Height>0.4148cm</Height>
+                  <Height>0.52063cm</Height>
                   <TablixCells>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Textbox27">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Folio</Value>
+                                  <Style>
+                                    <FontSize>9pt</FontSize>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style>
+                                <TextAlign>Center</TextAlign>
+                              </Style>
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Textbox27</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <TopBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </TopBorder>
+                            <BottomBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </BottomBorder>
+                            <LeftBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </LeftBorder>
+                            <RightBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </RightBorder>
+                            <BackgroundColor>Silver</BackgroundColor>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Textbox3">
@@ -113,6 +178,7 @@
                                 <TextRun>
                                   <Value>Disponible</Value>
                                   <Style>
+                                    <FontSize>9pt</FontSize>
                                     <FontWeight>Bold</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -168,6 +234,7 @@
                                 <TextRun>
                                   <Value>Unidad</Value>
                                   <Style>
+                                    <FontSize>9pt</FontSize>
                                     <FontWeight>Bold</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -223,6 +290,7 @@
                                 <TextRun>
                                   <Value>Código</Value>
                                   <Style>
+                                    <FontSize>9pt</FontSize>
                                     <FontWeight>Bold</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -278,6 +346,7 @@
                                 <TextRun>
                                   <Value>Producto</Value>
                                   <Style>
+                                    <FontSize>9pt</FontSize>
                                     <FontWeight>Bold</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -331,8 +400,9 @@
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>SerieLote</Value>
+                                  <Value>Valor</Value>
                                   <Style>
+                                    <FontSize>9pt</FontSize>
                                     <FontWeight>Bold</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -379,15 +449,16 @@
                     </TablixCell>
                     <TablixCell>
                       <CellContents>
-                        <Textbox Name="Textbox6">
+                        <Textbox Name="Textbox11">
                           <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>Valor</Value>
+                                  <Value>Alm. Origen</Value>
                                   <Style>
+                                    <FontSize>9pt</FontSize>
                                     <FontWeight>Bold</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -397,7 +468,119 @@
                               </Style>
                             </Paragraph>
                           </Paragraphs>
-                          <rd:DefaultName>Textbox6</rd:DefaultName>
+                          <rd:DefaultName>Textbox11</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <TopBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </TopBorder>
+                            <BottomBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </BottomBorder>
+                            <LeftBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </LeftBorder>
+                            <RightBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </RightBorder>
+                            <BackgroundColor>Silver</BackgroundColor>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Textbox21">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Alm. Destino</Value>
+                                  <Style>
+                                    <FontSize>9pt</FontSize>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style>
+                                <TextAlign>Center</TextAlign>
+                              </Style>
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Textbox21</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <TopBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </TopBorder>
+                            <BottomBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </BottomBorder>
+                            <LeftBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </LeftBorder>
+                            <RightBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </RightBorder>
+                            <BackgroundColor>Silver</BackgroundColor>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Textbox14">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Responsable</Value>
+                                  <Style>
+                                    <FontSize>9pt</FontSize>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style>
+                                <TextAlign>Center</TextAlign>
+                              </Style>
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Textbox14</rd:DefaultName>
                           <Style>
                             <Border>
                               <Color>LightGrey</Color>
@@ -437,6 +620,40 @@
                 <TablixRow>
                   <Height>0.49417cm</Height>
                   <TablixCells>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="FolioSalida">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!FolioSalida.Value</Value>
+                                  <Style>
+                                    <FontSize>7pt</FontSize>
+                                    <FontWeight>=IIf(Fields!PS.Value = "", "Bold", "Default")</FontWeight>
+                                    <Color>=IIf(Fields!PS.Value = "", "White", "Black")</Color>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>FolioSalida</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Style>None</Style>
+                            </Border>
+                            <BackgroundColor>=IIf(Fields!PS.Value = "", "#9cacc1", "NoColor")</BackgroundColor>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Cantidad">
@@ -446,9 +663,9 @@
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>=IIf(Fields!PS.Value = "", IIf(Fields!FolioSalida.Value &gt; 0,"Folio: " &amp; Fields!FolioSalida.Value,"Total General"), Fields!Cantidad.Value)</Value>
+                                  <Value>=Fields!Cantidad.Value</Value>
                                   <Style>
-                                    <FontSize>8pt</FontSize>
+                                    <FontSize>7pt</FontSize>
                                     <FontWeight>=IIf(Fields!PS.Value = "", "Bold", "Default")</FontWeight>
                                     <Format>#,0.00</Format>
                                     <Color>=IIf(Fields!PS.Value = "", "White", "Black")</Color>
@@ -481,9 +698,9 @@
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>=IIf(Fields!PS.Value = "", Fields!FechaMovto.Value, Fields!UnidadMedida.Value)</Value>
+                                  <Value>=Fields!UnidadMedida.Value</Value>
                                   <Style>
-                                    <FontSize>8pt</FontSize>
+                                    <FontSize>7pt</FontSize>
                                     <FontWeight>=IIf(Fields!PS.Value = "", "Bold", "Default")</FontWeight>
                                     <Format>d</Format>
                                     <Color>=IIf(Fields!PS.Value = "", "White", "Black")</Color>
@@ -520,7 +737,7 @@
                                 <TextRun>
                                   <Value>=Fields!Codigo.Value</Value>
                                   <Style>
-                                    <FontSize>8pt</FontSize>
+                                    <FontSize>7pt</FontSize>
                                     <Color>=IIf(Fields!PS.Value = "", "White", "Black")</Color>
                                   </Style>
                                 </TextRun>
@@ -552,9 +769,9 @@
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>=IIf(Fields!PS.Value = "", IIf(Fields!FolioSalida.Value &gt; 0,"Almacén Origen: " &amp; Fields!Almacen.Value &amp; "  Almacén Destino: " &amp; Fields!AlmacenDestino.Value &amp; " Responsable: " &amp; Fields!Recibio.Value,""), Fields!PS.Value)</Value>
+                                  <Value>=Fields!PS.Value</Value>
                                   <Style>
-                                    <FontSize>8pt</FontSize>
+                                    <FontSize>7pt</FontSize>
                                     <FontWeight>=IIf(Fields!PS.Value = "", "Bold", "Default")</FontWeight>
                                     <Color>=IIf(Fields!PS.Value = "", "White", "Black")</Color>
                                   </Style>
@@ -579,26 +796,27 @@
                     </TablixCell>
                     <TablixCell>
                       <CellContents>
-                        <Textbox Name="SerieLote">
+                        <Textbox Name="Valor1">
                           <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>=Fields!SerieLote.Value</Value>
+                                  <Value>=Fields!Valor.Value</Value>
                                   <Style>
-                                    <FontSize>8pt</FontSize>
+                                    <FontSize>7pt</FontSize>
+                                    <FontWeight>=IIf(Fields!PS.Value = "", "Bold", "Default")</FontWeight>
                                     <Color>=IIf(Fields!PS.Value = "", "White", "Black")</Color>
                                   </Style>
                                 </TextRun>
                               </TextRuns>
                               <Style>
-                                <TextAlign>Center</TextAlign>
+                                <TextAlign>Right</TextAlign>
                               </Style>
                             </Paragraph>
                           </Paragraphs>
-                          <rd:DefaultName>SerieLote</rd:DefaultName>
+                          <rd:DefaultName>Valor1</rd:DefaultName>
                           <Style>
                             <Border>
                               <Style>None</Style>
@@ -614,27 +832,99 @@
                     </TablixCell>
                     <TablixCell>
                       <CellContents>
-                        <Textbox Name="Valor">
+                        <Textbox Name="Almacen">
                           <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>=Fields!Valor.Value</Value>
+                                  <Value>=Fields!Almacen.Value</Value>
                                   <Style>
-                                    <FontSize>8pt</FontSize>
-                                    <Format>#,0.00;(#,0.00)</Format>
+                                    <FontSize>7pt</FontSize>
+                                    <FontWeight>=IIf(Fields!PS.Value = "", "Bold", "Default")</FontWeight>
                                     <Color>=IIf(Fields!PS.Value = "", "White", "Black")</Color>
                                   </Style>
                                 </TextRun>
                               </TextRuns>
                               <Style>
-                                <TextAlign>Right</TextAlign>
+                                <TextAlign>Left</TextAlign>
                               </Style>
                             </Paragraph>
                           </Paragraphs>
-                          <rd:DefaultName>Valor</rd:DefaultName>
+                          <rd:DefaultName>Almacen</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Style>None</Style>
+                            </Border>
+                            <BackgroundColor>=IIf(Fields!PS.Value = "", "#9cacc1", "NoColor")</BackgroundColor>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="AlmacenDestino">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!AlmacenDestino.Value</Value>
+                                  <Style>
+                                    <FontSize>7pt</FontSize>
+                                    <FontWeight>=IIf(Fields!PS.Value = "", "Bold", "Default")</FontWeight>
+                                    <Color>=IIf(Fields!PS.Value = "", "White", "Black")</Color>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style>
+                                <TextAlign>Left</TextAlign>
+                              </Style>
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>AlmacenDestino</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Style>None</Style>
+                            </Border>
+                            <BackgroundColor>=IIf(Fields!PS.Value = "", "#9cacc1", "NoColor")</BackgroundColor>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Recibio">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!Recibio.Value</Value>
+                                  <Style>
+                                    <FontSize>7pt</FontSize>
+                                    <FontWeight>=IIf(Fields!PS.Value = "", "Bold", "Default")</FontWeight>
+                                    <Color>=IIf(Fields!PS.Value = "", "White", "Black")</Color>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style>
+                                <TextAlign>Left</TextAlign>
+                              </Style>
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Recibio</rd:DefaultName>
                           <Style>
                             <Border>
                               <Style>None</Style>
@@ -658,11 +948,10 @@
                 <TablixMember />
                 <TablixMember />
                 <TablixMember />
-                <TablixMember>
-                  <Visibility>
-                    <Hidden>true</Hidden>
-                  </Visibility>
-                </TablixMember>
+                <TablixMember />
+                <TablixMember />
+                <TablixMember />
+                <TablixMember />
                 <TablixMember />
               </TablixMembers>
             </TablixColumnHierarchy>
@@ -683,8 +972,8 @@
             <DataSetName>DataSet1</DataSetName>
             <Top>0.17639cm</Top>
             <Left>0.24474cm</Left>
-            <Height>0.90897cm</Height>
-            <Width>24.11735cm</Width>
+            <Height>1.0148cm</Height>
+            <Width>24.21186cm</Width>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -695,7 +984,7 @@
         <Height>0.67394in</Height>
         <Style />
       </Body>
-      <Width>9.62262in</Width>
+      <Width>9.62858in</Width>
       <Page>
         <PageHeader>
           <Height>3.48078cm</Height>
@@ -723,7 +1012,7 @@
               <rd:DefaultName>Textbox1</rd:DefaultName>
               <Top>0.47625cm</Top>
               <Height>0.6cm</Height>
-              <Width>22.55159cm</Width>
+              <Width>24.4566cm</Width>
               <Style>
                 <Border>
                   <Style>None</Style>
@@ -770,7 +1059,7 @@
               <rd:DefaultName>Textbox2</rd:DefaultName>
               <Top>1.07625cm</Top>
               <Height>0.52945cm</Height>
-              <Width>22.55159cm</Width>
+              <Width>24.4566cm</Width>
               <ZIndex>1</ZIndex>
               <Style>
                 <Border>
@@ -789,7 +1078,7 @@
               <Top>0.11458in</Top>
               <Left>0.24474cm</Left>
               <Height>2.09585cm</Height>
-              <Width>22.30685cm</Width>
+              <Width>24.21186cm</Width>
               <ZIndex>2</ZIndex>
               <Style>
                 <Border>
@@ -818,7 +1107,7 @@
               <Top>2.56328cm</Top>
               <Left>0.24474cm</Left>
               <Height>0.6cm</Height>
-              <Width>22.30685cm</Width>
+              <Width>24.21186cm</Width>
               <ZIndex>3</ZIndex>
               <Style>
                 <Border>
@@ -834,7 +1123,7 @@
               <Top>3.30439cm</Top>
               <Left>0.24474cm</Left>
               <Height>0cm</Height>
-              <Width>22.30685cm</Width>
+              <Width>24.21186cm</Width>
               <ZIndex>4</ZIndex>
               <Style>
                 <Border>
@@ -994,7 +1283,7 @@
               <Top>0.15875cm</Top>
               <Left>0.24474cm</Left>
               <Height>0cm</Height>
-              <Width>22.30685cm</Width>
+              <Width>24.21186cm</Width>
               <ZIndex>4</ZIndex>
               <Style>
                 <Border>
@@ -1132,7 +1421,6 @@
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
   </ReportParameters>
-  
   <rd:ReportUnitType>Cm</rd:ReportUnitType>
   <rd:ReportID>40c94aad-a12a-44fb-ab0d-ea36a9656792</rd:ReportID>
 </Report>
\ No newline at end of file
diff --git a/Inventarios/RepTraspasoAlmacen.aspx b/Inventarios/RepTraspasoAlmacen.aspx
index 27f8bf4b6..0a1fd7f89 100644
--- a/Inventarios/RepTraspasoAlmacen.aspx
+++ b/Inventarios/RepTraspasoAlmacen.aspx
@@ -202,16 +202,23 @@
     <asp:UpdatePanel ID="UPDatos" runat="server" UpdateMode="Conditional">
         <ContentTemplate>
             <asp:GridView ID="GvDatos" runat="server" AutoGenerateColumns="False" EmptyDataText="No se encontró ningun Traspaso de Almacén"
-                ToolTip="" data-rows="2"
+                ToolTip="" data-rows="1"
                 CssClass="table table-striped table-advance table-hover Widthall ScrollAD"
                 data-sort="true" GridLines="None">
                 <Columns>
-                    <asp:BoundField HeaderText="Disponible" DataField="Cantidad" DataFormatString="{0:#,##0.00####}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="10%" />
+                    <asp:BoundField HeaderText="Folio" DataField="Folio" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="5%" />
+                    <asp:BoundField HeaderText="Disponible" DataField="Cantidad" DataFormatString="{0:#,##0.00####}" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="5%" />
                     <asp:BoundField HeaderText="Unidad" DataField="UnidadMedida" ItemStyle-Width="5%" />
                     <asp:BoundField HeaderText="Código" DataField="Codigo" ItemStyle-Width="5%" />
+
+
                     <asp:BoundField HeaderText="Producto" DataField="PS"  ItemStyle-HorizontalAlign="Left"/> 
                     <asp:BoundField HeaderText="Serie" DataField="Serie" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Left"/>                    
                     <asp:BoundField HeaderText="Valor" DataField="Valor" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Right" DataFormatString="{0:n}" />
+                    <asp:BoundField HeaderText="Almacen Origen" DataField="Almacen"  ItemStyle-Width="10%" /> 
+                    <asp:BoundField HeaderText="Almacen Destino" DataField="AlmacenDestino"  ItemStyle-Width="10%" /> 
+                    <asp:BoundField HeaderText="Responsable" DataField="Recibio"  ItemStyle-Width="10%" /> 
+
                 </Columns>
                 <HeaderStyle CssClass="Titulos" />
                 <RowStyle CssClass="Texto" />
diff --git a/Inventarios/RepTraspasoAlmacen.aspx.vb b/Inventarios/RepTraspasoAlmacen.aspx.vb
index 96dd301bb..ccc900c9c 100644
--- a/Inventarios/RepTraspasoAlmacen.aspx.vb
+++ b/Inventarios/RepTraspasoAlmacen.aspx.vb
@@ -77,7 +77,7 @@ Partial Class RepTraspasoAlmacen
         If ObjInventarios.RepTraspasoAlmacen(FechaI.ToDate, FechaF.ToDate, DdlAlmacenOrigen.SelectedValue.ToEntero, DdlAlmacenDestino.SelectedValue.ToEntero, ChkRecibido.Checked, UsuarioActual.CveEmpresa) Then
             GvDatos.DataSource = ObjInventarios.DtResultados
             DtInventarios = ObjInventarios.DtResultados
-            GvDatos.Columns(4).Visible = DtInventarios.MAX("Serie") <> ""
+            GvDatos.Columns(5).Visible = DtInventarios.MAX("Serie") <> ""
         End If
 
         ObjInventarios.Dispose()
@@ -100,23 +100,6 @@ Partial Class RepTraspasoAlmacen
     Protected Sub GvDatos_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GvDatos.RowDataBound
         If e.Row.RowType = DataControlRowType.DataRow Then
 
-            'Cuando es titulo
-            If e.Row.DBCampo("PS").ToString.Trim = "" And e.Row.DBCampo("FechaMovto") <> "" Then
-
-                e.Row.CssClass = "Totales"
-
-                e.Row.Cells(0).Text = String.Format("Folio: <a class=""texto"" style=""color:white;"" target='_blank' href='/Inventarios/EntradasSalidas.aspx?CveMovimiento={1}'>{0}</a> ", e.Row.DBCampo("FolioSalida"), e.Row.DBCampo("CveMovimientoSalida"))
-                e.Row.Cells(1).Text = String.Format("{0}", e.Row.DBCampo("FechaMovto").ToString.ToDate.ToShortDateString)
-                e.Row.Cells(2).Text = String.Format("<span style =""white-space: nowrap;"">{0}</span>", e.Row.DBCampo("Almacen"))
-                e.Row.Cells(3).Text = String.Format("<span style =""white-space: nowrap;"">{0}</span>", e.Row.DBCampo("AlmacenDestino"))
-                e.Row.Cells(4).Text = String.Format("Responsable: {0}", e.Row.DBCampo("Recibio"))
-            ElseIf e.Row.DBCampo("FechaMovto") = "" Then
-                e.Row.CssClass = "Totales"
-                e.Row.Cells(0).Text = "Total General"
-                e.Row.Cells(2).Text = String.Format("<span style =""white-space: nowrap;"">Almacen Origen</span>")
-                e.Row.Cells(3).Text = String.Format("<span style =""white-space: nowrap;"">Almacen Destino</span>")
-            Else
-            End If
 
         End If
     End Sub