From 86481c478bc829bb2ec0c58d0806d16d84413946 Mon Sep 17 00:00:00 2001
From: Rene Molina <Rene.Molina@adssistemas.mx>
Date: Thu, 27 Feb 2020 08:33:22 -0700
Subject: [PATCH 01/13]  inventarios

---
 App_Code/ClsInventarios.vb                  |  3 +-
 Inventarios/KardexAlmacenHorizontal.aspx    | 49 +++++++++++++++++----
 Inventarios/KardexAlmacenHorizontal.aspx.vb |  4 +-
 vwd.webinfo                                 |  2 +
 4 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/App_Code/ClsInventarios.vb b/App_Code/ClsInventarios.vb
index 7b8d53ecf..32297767a 100644
--- a/App_Code/ClsInventarios.vb
+++ b/App_Code/ClsInventarios.vb
@@ -1472,7 +1472,7 @@ Public Class ClsInventarios
         Return Retorno
 
     End Function
-    Public Function GetKardexAlmacenHorizontal(CvePS As Integer, FechaFin As Date, CveAlmacen As Integer, CveUnidadMedida As Integer, CveProveedor As Integer, CveTipoAlmacen As Integer, IncluyeTransitorios As Integer, CveClasificacion As Integer, CveUsuario As Integer, CveEmpresa As Integer, Optional CondicionExistencias As Integer = 0) As Boolean
+    Public Function GetKardexAlmacenHorizontal(CvePS As Integer, FechaFin As Date, CveAlmacen As Integer, CveUnidadMedida As Integer, CveProveedor As Integer, CveTipoAlmacen As Integer, IncluyeTransitorios As Integer, CveClasificacion As Integer, CveUsuario As Integer, CveEmpresa As Integer, Optional CondicionExistencias As Integer = 0, Optional Orden As Integer = -1) As Boolean
         Dim Retorno As Boolean = False
 
         DataAdapter("PA_Inv_KardexAlmacenHorizontalGet")
@@ -1490,6 +1490,7 @@ Public Class ClsInventarios
             .Add("@CveProveedorCompra", SqlDbType.Int).Value = CveProveedor
             .Add("@CveTipoAlmacen", SqlDbType.Int).Value = CveTipoAlmacen
             .Add("@ExistenciasCondicion", SqlDbType.Int).Value = CondicionExistencias
+            .Add("@Orden", SqlDbType.Int).Value = Orden
         End With
 
         Try
diff --git a/Inventarios/KardexAlmacenHorizontal.aspx b/Inventarios/KardexAlmacenHorizontal.aspx
index 397af66ab..b0c469f31 100644
--- a/Inventarios/KardexAlmacenHorizontal.aspx
+++ b/Inventarios/KardexAlmacenHorizontal.aspx
@@ -58,6 +58,26 @@
             .psagregar > div.codigo > input[type="submit"] {
                 display: none;
             }
+
+        @media (min-width: 991px) {
+            .textfilter {
+                max-width: 80px;
+            }
+
+            .textfilter2 {
+                max-width: 70px;
+            }
+
+            .dateFilter {
+                min-width: 115px;
+            }
+        }
+
+        @media (min-width: 991px) and (max-width: 1400px) {
+            .titlefiltrosmedia .col-md-3 {
+                width: 22%;
+            }
+        }
     </style>
 </asp:Content>
 
@@ -87,18 +107,18 @@
                         <a href="javascript;" data-idchekbox="<%= chkexpand.ClientID%>" class=" <%= IIf(chkexpand.Checked = True, "collapse", "expand")%>"></a>
                         <asp:CheckBox ID="chkexpand" CssClass="hidden" runat="server" />
                     </div>
-                    <div class="titlefiltros caption ">
+                    <div class="titlefiltros titlefiltrosmedia  caption ">
                         <div class="row" style="padding-top: 10px; position: relative;">
-                            <div class="col-md-1 truncate">Proveedor</div>
+                            <div class="col-md-1 truncate textfilter">Proveedor</div>
                             <div class="col-md-3">
                                 <ADS:Dropdownlost ID="DdlProveedor" runat="server" DataValueField="CveProveedor" DataTextField="RazonSocial" Width="100%" CssClassDdl="select2me" CssStyle="width: 100%;"></ADS:Dropdownlost>
                             </div>
-                            <label class="col-md-1 truncate">Producto:</label>
-                            <div class="col-md-3" style="min-width: 250px; max-width: 300px;">
-                                <ADS:Dropdownlost ID="ddlProducto2" runat="server" AutoPostBack="False" DataTextField="PSCodigo" DataValueField="CvePS" CssClassDdl="select2me" CssStyle="width: 250px; "></ADS:Dropdownlost>
+                            <label class="col-md-1 truncate textfilter2">Producto:</label>
+                            <div class="col-md-3">
+                                <ADS:Dropdownlost ID="ddlProducto2" runat="server" AutoPostBack="False" DataTextField="PSCodigo" DataValueField="CvePS" CssClassDdl="select2me" Width="100%" CssStyle="width: 100%; "></ADS:Dropdownlost>
                             </div>
-                            <label class="col-md-1">Fecha Fin:</label>
-                            <div class="col-md-1">
+                            <label class="col-md-1 textfilter">Fecha Fin:</label>
+                            <div class="col-md-1" style="min-width: 110px;">
                                 <div style="display: inline-block; vertical-align: text-bottom;">
                                     <div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 110px !important; padding: 0px;">
                                         <asp:TextBox ID="TxtFechaF" runat="server" CssClass="form-control" CausesValidation="true" Style="width: 80px" MaxLength="10"></asp:TextBox>
@@ -110,7 +130,7 @@
                                     <ajax:CalendarExtender runat="server" ID="CalendarExtender1" TargetControlID="TxtFechaF" PopupButtonID="ImgFechaF" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
                                 </div>
                             </div>
-                            <label class="col-md-1 truncate" style="width:120px">Producto:</label>
+                            <label class="col-md-1 truncate textfilter2">Producto:</label>
                             <div class="col-md-1">
                                 <asp:DropDownList ID="DdlExistencia" runat="server" CssClass="select2me">
                                     <asp:ListItem Text="Con existencia" Value="2" />
@@ -146,7 +166,7 @@
                         </div>
                         <label class="col-md-1 truncate">Tránsito?:</label>
                         <div class="col-md-1">
-                            <asp:DropDownList ID="DdlIncluyeTransitorios" CssClass="select2me" runat="server" AppendDataBoundItems="true"  Class="table-group-action-input form-control input-inline input-small input-sm" Style="width: 100px !important;">
+                            <asp:DropDownList ID="DdlIncluyeTransitorios" CssClass="select2me" runat="server" AppendDataBoundItems="true" Class="table-group-action-input form-control input-inline input-small input-sm" Style="width: 100px !important;">
                                 <asp:ListItem Text="No" Value="0" Selected="True"></asp:ListItem>
                                 <asp:ListItem Text="Si (Origen)" Value="1"></asp:ListItem>
                                 <asp:ListItem Text="Si (Destino)" Value="2"></asp:ListItem>
@@ -154,6 +174,17 @@
                             <%--<asp:CheckBox ID="ChkIncluyeTransitorios" runat="server" Checked="false" />--%>
                         </div>
                     </div>
+                    <asp:Panel ID="pnlOrden" runat="server" CssClass="row">
+                        <label class="col-md-1 truncate">Orden:</label>
+                            <div class="col-md-2">
+                                <asp:DropDownList ID="DdlOrden" runat="server" CssClass="select2me" Width="100%">
+                                    <asp:ListItem Text="Seleccione" Value="-1" Selected="True" />
+                                    <asp:ListItem Text="Marca,Modelo,Rin,Medida de Barrenación" Value="1" />
+                                    <asp:ListItem Text="Familia,Marca,Rin,Medida de Barrenación" Value="2" />
+                                    <asp:ListItem Text="Familia,Linea,Rin,Medida de Barrenación" Value="3" />
+                                </asp:DropDownList>
+                            </div>
+                    </asp:Panel>
                 </div>
             </div>
         </ContentTemplate>
diff --git a/Inventarios/KardexAlmacenHorizontal.aspx.vb b/Inventarios/KardexAlmacenHorizontal.aspx.vb
index b8c30dfb3..92b34df1c 100644
--- a/Inventarios/KardexAlmacenHorizontal.aspx.vb
+++ b/Inventarios/KardexAlmacenHorizontal.aspx.vb
@@ -13,7 +13,7 @@ Partial Class Inventarios_KardexAlmacen
             TxtFechaF.Text = Now.ToShortDateString
             CargaCombos()
             ddlAlmacen.Items.Insert(0, New ListItem("Todos", "-1"))
-
+            pnlOrden.Visible = UsuarioActual.CveEmpresa = 141
             If IfNull(Request("CvePS"), "-1").ToString.ToEntero > 0 Then CargarKardex(Request("CvePS").ToString.ToEntero)
             ddlProducto2.SelectedValue = If(Request("CvePS") IsNot Nothing, Request("CvePS").ToString, "-1")
         End If
@@ -128,7 +128,7 @@ Partial Class Inventarios_KardexAlmacen
         Dim CveAlmacen As Integer = ddlAlmacen.SelectedValue.ToEntero
         Dim CveProveedorCompra As Integer = If(DdlProveedor.SelectedValue.ToEntero > 0, DdlProveedor.SelectedValue.ToEntero, -1)
 
-        If ObjMovimientos.GetKardexAlmacenHorizontal(CvePS, FechaF, CveAlmacen, DdlUnidadMedida.SelectedValue.ToEntero, CveProveedorCompra, DdlTipoAlmacen.SelectedValue.ToEntero(), DdlIncluyeTransitorios.SelectedValue.ToEntero(), DdlClasificacion.SelectedValue.ToEntero, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CondicionExistencias:=DdlExistencia.SelectedValue) Then
+        If ObjMovimientos.GetKardexAlmacenHorizontal(CvePS, FechaF, CveAlmacen, DdlUnidadMedida.SelectedValue.ToEntero, CveProveedorCompra, DdlTipoAlmacen.SelectedValue.ToEntero(), DdlIncluyeTransitorios.SelectedValue.ToEntero(), DdlClasificacion.SelectedValue.ToEntero, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CondicionExistencias:=DdlExistencia.SelectedValue, Orden:=DdlOrden.SelectedValue.ToEntero()) Then
             If ObjMovimientos.DtResultados IsNot Nothing AndAlso ObjMovimientos.DtResultados.Rows.Count > 0 Then
                 dt = ObjMovimientos.DtResultados
                 Dim ListaBorrar As New List(Of DataColumn)
diff --git a/vwd.webinfo b/vwd.webinfo
index 2515705b1..bfda47f43 100644
--- a/vwd.webinfo
+++ b/vwd.webinfo
@@ -21,6 +21,8 @@
   
     
   
+    
+  
     <Service ID="{C0C07587-41A7-46C8-8FBD-3F9C8EBE2DDC}"/>
   </StartupServices>
 </VisualWebDeveloper>
\ No newline at end of file

From 9fdfbcdd7250e0f77584db3a4f69018a4bef080f Mon Sep 17 00:00:00 2001
From: rrene <rrene@DESKTOP-04EII7E>
Date: Mon, 2 Mar 2020 12:56:50 -0700
Subject: [PATCH 02/13] - checa la base de iva, para ver si lo agrega

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

diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index 9ecd8ab82..bc28592cc 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -8803,8 +8803,8 @@ Partial Class Ventas
             'siempre estaremos agregando el iva, auqnue sea en importe cero o tasa cero, para que se emita la factura
             ' If drr("ImporteIVA").ToString.ToDouble > 0 Then
 
-            'si es ingreso amortizado por la totalidad, y arroja el valor total de cero, no debe de impuestos
-            If Timbre.Comprobante.Total > 0 Then
+            'si es ingreso amortizado por la totalidad, y arroja el valor total de cero, no debe de impuestos, y si la BASE de calculo es mayor a cero
+            If Timbre.Comprobante.Total > 0 AndAlso concepto.Importe - concepto.Descuento + concepto.ImporteGravaIVAAdicional > 0 Then
                 concepto.Impuestos.Add(New CFDIConceptosImpuestos With {.TrasladooRetencion = "T", .Base = concepto.Importe - concepto.Descuento + concepto.ImporteGravaIVAAdicional, .TasaOCuota = drr("PorcentajeIVA").ToString.ToDecimal, .Impuesto = "002", .Importe = drr("ImporteIVA").ToString.ToDecimal})
             End If
 

From 91b0b7772f50cc9dce44708b6c9139ac1986c47d Mon Sep 17 00:00:00 2001
From: rrene <rrene@DESKTOP-04EII7E>
Date: Tue, 3 Mar 2020 11:47:06 -0700
Subject: [PATCH 03/13] - cambio en dropdownlost

---
 CxC/RepCxC.aspx.vb        |  8 +++-----
 CxC/RepCxCDetalle.aspx.vb | 10 ++++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/CxC/RepCxC.aspx.vb b/CxC/RepCxC.aspx.vb
index 34a9b77b2..7c3b73753 100644
--- a/CxC/RepCxC.aspx.vb
+++ b/CxC/RepCxC.aspx.vb
@@ -114,13 +114,11 @@ Partial Class RepCxC
 #Region "CARGAS"
     Private Sub CargaCombos()
         'CargaClientes
-        If UsuarioActual.CveEmpresa = 119 Then
+        If UsuarioActual.Empresa.Funcionalidad(105) = "1" Then
             DdlClientesWS.setEsWebService(True)
         Else
             DdlClientesWS.setEsWebService(False)
-            DdlClientesWS.DataSource = GlobalDTCliente(UsuarioActual.CveEmpresa, -1)
-            DdlClientesWS.DataBind()
-            DdlClientesWS.ddl.Items.Insert(0, New ListItem("Todos", "-1"))
+            CargaClientes()
         End If
         'DdlClientes.DataSource = GlobalDTCliente(UsuarioActual.CveEmpresa, -1)
         'DdlClientes.DataBind()
@@ -1433,7 +1431,7 @@ Partial Class RepCxC
     End Sub
 
     Private Sub CargaClientes()
-        If UsuarioActual.CveEmpresa <> 119 Then
+        If Not UsuarioActual.Empresa.Funcionalidad(105) = "1" Then
             DdlClientesWS.ddl.Items.Clear()
             DdlClientesWS.DataSource = GlobalDTCliente(UsuarioActual.CveEmpresa, -1).FiltraParametros($"CveClienteClasificacion = {DdlClienteClasificacion.SelectedValue.ToEntero} OR {DdlClienteClasificacion.SelectedValue.ToEntero} = -1")
             DdlClientesWS.DataBind()
diff --git a/CxC/RepCxCDetalle.aspx.vb b/CxC/RepCxCDetalle.aspx.vb
index 9795b367f..8b2f794e6 100644
--- a/CxC/RepCxCDetalle.aspx.vb
+++ b/CxC/RepCxCDetalle.aspx.vb
@@ -205,13 +205,11 @@ Partial Class RepCxCDetalle
 
         'CargaClientes
         'CargaClientes
-        If UsuarioActual.CveEmpresa = 119 Then
+        If UsuarioActual.Empresa.Funcionalidad(105) = "1" Then
             DdlClientesWS.setEsWebService(True)
         Else
-            DdlClientesWS.setEsWebService(False)
-            DdlClientesWS.DataSource = GlobalDTCliente(UsuarioActual.CveEmpresa, -1)
-            DdlClientesWS.DataBind()
-            DdlClientesWS.ddl.Items.Insert(0, New ListItem("Todos", "-1"))
+            DdlClientesWS.setEsWebService(False)
+            CargaClientes()
         End If
         'DdlClientes.DataSource = GlobalDTCliente(UsuarioActual.CveEmpresa, -1)
         'DdlClientes.DataBind()
@@ -983,7 +981,7 @@ Partial Class RepCxCDetalle
     End Sub
 
     Private Sub CargaClientes()
-        If UsuarioActual.CveEmpresa <> 119 Then
+        If Not UsuarioActual.Empresa.Funcionalidad(105) = "1" Then
             DdlClientesWS.ddl.Items.Clear()
             DdlClientesWS.DataSource = GlobalDTCliente(UsuarioActual.CveEmpresa, -1).FiltraParametros($"CveClienteClasificacion = {DdlClienteClasificacion.SelectedValue.ToEntero} OR {DdlClienteClasificacion.SelectedValue.ToEntero} = -1")
             DdlClientesWS.DataBind()

From 8e7287a941d2bad27cdae95790fab16f19418358 Mon Sep 17 00:00:00 2001
From: Rene Molina <Rene.Molina@adssistemas.mx>
Date: Wed, 4 Mar 2020 09:51:47 -0700
Subject: [PATCH 04/13]

---
 Inventarios/KardexAlmacenHorizontal.aspx    | 2 +-
 Inventarios/KardexAlmacenHorizontal.aspx.vb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Inventarios/KardexAlmacenHorizontal.aspx b/Inventarios/KardexAlmacenHorizontal.aspx
index b0c469f31..e0035b667 100644
--- a/Inventarios/KardexAlmacenHorizontal.aspx
+++ b/Inventarios/KardexAlmacenHorizontal.aspx
@@ -174,7 +174,7 @@
                             <%--<asp:CheckBox ID="ChkIncluyeTransitorios" runat="server" Checked="false" />--%>
                         </div>
                     </div>
-                    <asp:Panel ID="pnlOrden" runat="server" CssClass="row">
+                    <asp:Panel ID="pnlOrden" runat="server" CssClass="row"> 
                         <label class="col-md-1 truncate">Orden:</label>
                             <div class="col-md-2">
                                 <asp:DropDownList ID="DdlOrden" runat="server" CssClass="select2me" Width="100%">
diff --git a/Inventarios/KardexAlmacenHorizontal.aspx.vb b/Inventarios/KardexAlmacenHorizontal.aspx.vb
index 92b34df1c..32a4a710e 100644
--- a/Inventarios/KardexAlmacenHorizontal.aspx.vb
+++ b/Inventarios/KardexAlmacenHorizontal.aspx.vb
@@ -10,7 +10,7 @@ Partial Class Inventarios_KardexAlmacen
     Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load
         If Not IsPostBack Then
             'TxtFechaI.Text =  Now.AddMonths(-1).ToShortDateString
-            TxtFechaF.Text = Now.ToShortDateString
+            TxtFechaF.Text = Now.ToShortDateString
             CargaCombos()
             ddlAlmacen.Items.Insert(0, New ListItem("Todos", "-1"))
             pnlOrden.Visible = UsuarioActual.CveEmpresa = 141

From f8c3cb3d9ec5f9b8bb629f9a8779ea30754a7e45 Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <jose_antony11@hotmail.com>
Date: Wed, 4 Mar 2020 10:08:56 -0700
Subject: [PATCH 05/13] css en ventas mensuales y acomodo de Factura.rdlc

---
 Empresas/141/Formatos/Factura.rdlc | 214 +++++++++++++----------------
 Ventas/RepVentasMensuales.aspx     |  33 +++--
 2 files changed, 111 insertions(+), 136 deletions(-)

diff --git a/Empresas/141/Formatos/Factura.rdlc b/Empresas/141/Formatos/Factura.rdlc
index fe9d24568..8061393f9 100644
--- a/Empresas/141/Formatos/Factura.rdlc
+++ b/Empresas/141/Formatos/Factura.rdlc
@@ -333,10 +333,10 @@
                 <Source>External</Source>
                 <Value>=Parameters!QR.Value</Value>
                 <Sizing>FitProportional</Sizing>
-                <Top>0.1632in</Top>
+                <Top>0.02778in</Top>
                 <Left>0.02254in</Left>
-                <Height>1.2939in</Height>
-                <Width>1.53682in</Width>
+                <Height>0.88765in</Height>
+                <Width>0.97432in</Width>
                 <Style>
                   <Border>
                     <Style>None</Style>
@@ -345,6 +345,7 @@
               </Image>
               <Textbox Name="Textbox88">
                 <CanGrow>true</CanGrow>
+                <CanShrink>true</CanShrink>
                 <KeepTogether>true</KeepTogether>
                 <Paragraphs>
                   <Paragraph>
@@ -372,19 +373,6 @@
                     </TextRuns>
                     <Style />
                   </Paragraph>
-                  <Paragraph>
-                    <TextRuns>
-                      <TextRun>
-                        <Value />
-                        <Style>
-                          <FontFamily>calibri</FontFamily>
-                          <FontSize>6pt</FontSize>
-                          <FontWeight>Normal</FontWeight>
-                        </Style>
-                      </TextRun>
-                    </TextRuns>
-                    <Style />
-                  </Paragraph>
                   <Paragraph>
                     <TextRuns>
                       <TextRun>
@@ -411,19 +399,6 @@
                     </TextRuns>
                     <Style />
                   </Paragraph>
-                  <Paragraph>
-                    <TextRuns>
-                      <TextRun>
-                        <Value />
-                        <Style>
-                          <FontFamily>calibri</FontFamily>
-                          <FontSize>6pt</FontSize>
-                          <FontWeight>Normal</FontWeight>
-                        </Style>
-                      </TextRun>
-                    </TextRuns>
-                    <Style />
-                  </Paragraph>
                   <Paragraph>
                     <TextRuns>
                       <TextRun>
@@ -450,19 +425,6 @@
                     </TextRuns>
                     <Style />
                   </Paragraph>
-                  <Paragraph>
-                    <TextRuns>
-                      <TextRun>
-                        <Value />
-                        <Style>
-                          <FontFamily>calibri</FontFamily>
-                          <FontSize>6pt</FontSize>
-                          <FontWeight>Normal</FontWeight>
-                        </Style>
-                      </TextRun>
-                    </TextRuns>
-                    <Style />
-                  </Paragraph>
                   <Paragraph>
                     <TextRuns>
                       <TextRun>
@@ -491,9 +453,9 @@
                   </Paragraph>
                 </Paragraphs>
                 <rd:DefaultName>Textbox88</rd:DefaultName>
-                <Top>0.41453cm</Top>
+                <Top>0.07057cm</Top>
                 <Left>4.18558cm</Left>
-                <Height>3.5806cm</Height>
+                <Height>2.25463cm</Height>
                 <Width>16.69544cm</Width>
                 <ZIndex>1</ZIndex>
                 <Style>
@@ -511,9 +473,9 @@
               <BreakLocation>Start</BreakLocation>
             </PageBreak>
             <KeepTogether>true</KeepTogether>
-            <Top>6.39675in</Top>
-            <Left>0.0645in</Left>
-            <Height>1.67778in</Height>
+            <Top>5.84118in</Top>
+            <Left>0.07484in</Left>
+            <Height>0.91543in</Height>
             <Width>8.23221in</Width>
             <Style>
               <Border>
@@ -1295,7 +1257,7 @@
               </TablixMembers>
             </TablixRowHierarchy>
             <DataSetName>DsOC</DataSetName>
-            <Top>2.25278in</Top>
+            <Top>2.12778in</Top>
             <Left>0.09836in</Left>
             <Height>0.34081in</Height>
             <Width>8.20966in</Width>
@@ -1321,7 +1283,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox5</rd:DefaultName>
-            <Top>7.85266cm</Top>
+            <Top>7.50341cm</Top>
             <Left>0.28014cm</Left>
             <Height>0.05496cm</Height>
             <Width>20.88652cm</Width>
@@ -1355,9 +1317,9 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox1</rd:DefaultName>
-            <Top>8.04874cm</Top>
+            <Top>7.73124cm</Top>
             <Left>1.89472cm</Left>
-            <Height>1.09816cm</Height>
+            <Height>0.51608cm</Height>
             <Width>19.15264cm</Width>
             <ZIndex>3</ZIndex>
             <Style>
@@ -1374,7 +1336,7 @@
             <Source>Embedded</Source>
             <Value>ID2</Value>
             <Sizing>FitProportional</Sizing>
-            <Top>0.61418cm</Top>
+            <Top>0.29668cm</Top>
             <Left>1.15361cm</Left>
             <Height>2.413cm</Height>
             <Width>2.75323cm</Width>
@@ -1455,9 +1417,8 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox4</rd:DefaultName>
-            <Top>0.31432cm</Top>
             <Left>4.32565cm</Left>
-            <Height>2.06903cm</Height>
+            <Height>2.70968cm</Height>
             <Width>7.93893cm</Width>
             <ZIndex>5</ZIndex>
             <Style>
@@ -1536,9 +1497,8 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox4</rd:DefaultName>
-            <Top>0.31432cm</Top>
             <Left>12.68838cm</Left>
-            <Height>2.88925cm</Height>
+            <Height>2.70968cm</Height>
             <Width>5.11312cm</Width>
             <ZIndex>6</ZIndex>
             <Style>
@@ -1571,7 +1531,6 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox8</rd:DefaultName>
-            <Top>0.31432cm</Top>
             <Left>18.23008cm</Left>
             <Height>0.6cm</Height>
             <Width>2.79101cm</Width>
@@ -1607,7 +1566,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox8</rd:DefaultName>
-            <Top>0.91432cm</Top>
+            <Top>0.59682cm</Top>
             <Left>18.23008cm</Left>
             <Height>0.6cm</Height>
             <Width>2.79101cm</Width>
@@ -1658,7 +1617,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox8</rd:DefaultName>
-            <Top>1.51432cm</Top>
+            <Top>1.19682cm</Top>
             <Left>18.23008cm</Left>
             <Height>0.86903cm</Height>
             <Width>2.79101cm</Width>
@@ -1675,6 +1634,7 @@
           </Textbox>
           <Textbox Name="Textbox20">
             <CanGrow>true</CanGrow>
+            <CanShrink>true</CanShrink>
             <KeepTogether>true</KeepTogether>
             <Paragraphs>
               <Paragraph>
@@ -1696,7 +1656,9 @@
                     </Style>
                   </TextRun>
                 </TextRuns>
-                <Style />
+                <Style>
+                  <LineHeight>1pt</LineHeight>
+                </Style>
               </Paragraph>
               <Paragraph>
                 <TextRuns>
@@ -1717,7 +1679,9 @@
                     </Style>
                   </TextRun>
                 </TextRuns>
-                <Style />
+                <Style>
+                  <LineHeight>1pt</LineHeight>
+                </Style>
               </Paragraph>
               <Paragraph>
                 <TextRuns>
@@ -1738,7 +1702,9 @@
                     </Style>
                   </TextRun>
                 </TextRuns>
-                <Style />
+                <Style>
+                  <LineHeight>1pt</LineHeight>
+                </Style>
               </Paragraph>
               <Paragraph>
                 <TextRuns>
@@ -1751,7 +1717,9 @@
                     </Style>
                   </TextRun>
                 </TextRuns>
-                <Style />
+                <Style>
+                  <LineHeight>1pt</LineHeight>
+                </Style>
               </Paragraph>
               <Paragraph>
                 <TextRuns>
@@ -1767,7 +1735,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox4</rd:DefaultName>
-            <Top>3.20357cm</Top>
+            <Top>2.88607cm</Top>
             <Left>0.28014cm</Left>
             <Height>1.09007cm</Height>
             <Width>9.71199cm</Width>
@@ -1784,6 +1752,7 @@
           </Textbox>
           <Textbox Name="Textbox30">
             <CanGrow>true</CanGrow>
+            <CanShrink>true</CanShrink>
             <KeepTogether>true</KeepTogether>
             <Paragraphs>
               <Paragraph>
@@ -1871,7 +1840,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox4</rd:DefaultName>
-            <Top>3.50094cm</Top>
+            <Top>2.86594cm</Top>
             <Left>10.06268cm</Left>
             <Height>0.7927cm</Height>
             <Width>9.71199cm</Width>
@@ -2045,7 +2014,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox4</rd:DefaultName>
-            <Top>4.29364cm</Top>
+            <Top>3.97614cm</Top>
             <Left>0.25136cm</Left>
             <Height>0.74611cm</Height>
             <Width>13.82025cm</Width>
@@ -2078,7 +2047,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox32</rd:DefaultName>
-            <Top>4.46621cm</Top>
+            <Top>3.98996cm</Top>
             <Left>14.07729cm</Left>
             <Height>0.57354cm</Height>
             <Width>2.90753cm</Width>
@@ -2113,7 +2082,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox35</rd:DefaultName>
-            <Top>5.09559cm</Top>
+            <Top>4.77809cm</Top>
             <Left>0.26772cm</Left>
             <Height>0.52062cm</Height>
             <Width>9.72441cm</Width>
@@ -2175,7 +2144,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox4</rd:DefaultName>
-            <Top>6.7641cm</Top>
+            <Top>6.3831cm</Top>
             <Left>3.33321cm</Left>
             <Height>1.05328cm</Height>
             <Width>17.71415cm</Width>
@@ -2195,6 +2164,7 @@
           </Textbox>
           <Textbox Name="Textbox40">
             <CanGrow>true</CanGrow>
+            <CanShrink>true</CanShrink>
             <KeepTogether>true</KeepTogether>
             <Paragraphs>
               <Paragraph>
@@ -2213,6 +2183,7 @@
                 </TextRuns>
                 <Style>
                   <TextAlign>Center</TextAlign>
+                  <LineHeight>1pt</LineHeight>
                 </Style>
               </Paragraph>
               <Paragraph>
@@ -2231,6 +2202,7 @@
                 </TextRuns>
                 <Style>
                   <TextAlign>Center</TextAlign>
+                  <LineHeight>1pt</LineHeight>
                 </Style>
               </Paragraph>
               <Paragraph>
@@ -2249,6 +2221,7 @@
                 </TextRuns>
                 <Style>
                   <TextAlign>Center</TextAlign>
+                  <LineHeight>1pt</LineHeight>
                 </Style>
               </Paragraph>
               <Paragraph>
@@ -2267,6 +2240,7 @@
                 </TextRuns>
                 <Style>
                   <TextAlign>Center</TextAlign>
+                  <LineHeight>1pt</LineHeight>
                 </Style>
               </Paragraph>
               <Paragraph>
@@ -2285,6 +2259,7 @@
                 </TextRuns>
                 <Style>
                   <TextAlign>Center</TextAlign>
+                  <LineHeight>1pt</LineHeight>
                 </Style>
               </Paragraph>
               <Paragraph>
@@ -2303,11 +2278,12 @@
                 </TextRuns>
                 <Style>
                   <TextAlign>Center</TextAlign>
+                  <LineHeight>1pt</LineHeight>
                 </Style>
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox4</rd:DefaultName>
-            <Top>9.21745cm</Top>
+            <Top>8.32845cm</Top>
             <Left>0.22108cm</Left>
             <Height>2.03224cm</Height>
             <Width>20.79751cm</Width>
@@ -2337,8 +2313,8 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox5</rd:DefaultName>
-            <Top>12.95331cm</Top>
-            <Left>0.19009cm</Left>
+            <Top>12.03609cm</Top>
+            <Left>0.21585cm</Left>
             <Height>0.05496cm</Height>
             <Width>20.88652cm</Width>
             <ZIndex>17</ZIndex>
@@ -2357,7 +2333,7 @@
             <Source>Embedded</Source>
             <Value>ID5</Value>
             <Sizing>FitProportional</Sizing>
-            <Top>11.49964cm</Top>
+            <Top>10.51539cm</Top>
             <Left>0.17151cm</Left>
             <Height>0.96488cm</Height>
             <Width>3.75909cm</Width>
@@ -2415,7 +2391,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox4</rd:DefaultName>
-            <Top>12.51148cm</Top>
+            <Top>11.55898cm</Top>
             <Left>0.19008cm</Left>
             <Height>0.40655cm</Height>
             <Width>12.88812cm</Width>
@@ -2434,7 +2410,7 @@
             <Source>Embedded</Source>
             <Value>ID4</Value>
             <Sizing>FitProportional</Sizing>
-            <Top>11.49964cm</Top>
+            <Top>10.51539cm</Top>
             <Left>4.34941cm</Left>
             <Height>0.91769cm</Height>
             <Width>3.03541cm</Width>
@@ -2449,7 +2425,7 @@
             <Source>Embedded</Source>
             <Value>ID1</Value>
             <Sizing>FitProportional</Sizing>
-            <Top>11.49964cm</Top>
+            <Top>10.51539cm</Top>
             <Left>7.56121cm</Left>
             <Height>0.97656cm</Height>
             <Width>4.16281cm</Width>
@@ -2464,9 +2440,9 @@
             <Source>Embedded</Source>
             <Value>ID6</Value>
             <Sizing>FitProportional</Sizing>
-            <Top>11.49964cm</Top>
+            <Top>10.51539cm</Top>
             <Left>11.90634cm</Left>
-            <Height>1.01184cm</Height>
+            <Height>0.97656cm</Height>
             <Width>3.76809cm</Width>
             <ZIndex>22</ZIndex>
             <Style>
@@ -2479,7 +2455,7 @@
             <Source>Embedded</Source>
             <Value>ID3</Value>
             <Sizing>FitProportional</Sizing>
-            <Top>11.84646cm</Top>
+            <Top>11.0854cm</Top>
             <Left>15.67443cm</Left>
             <Height>0.93046cm</Height>
             <Width>5.37042cm</Width>
@@ -2511,7 +2487,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox60</rd:DefaultName>
-            <Top>11.3082cm</Top>
+            <Top>10.51539cm</Top>
             <Left>15.67443cm</Left>
             <Height>0.50299cm</Height>
             <Width>5.42547cm</Width>
@@ -2565,7 +2541,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox32</rd:DefaultName>
-            <Top>4.39947cm</Top>
+            <Top>3.92322cm</Top>
             <Left>17.09066cm</Left>
             <Height>0.64028cm</Height>
             <Width>3.90165cm</Width>
@@ -2710,7 +2686,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox4</rd:DefaultName>
-            <Top>13.4316cm</Top>
+            <Top>12.19688cm</Top>
             <Left>0.16383cm</Left>
             <Height>2.44366cm</Height>
             <Width>15.5106cm</Width>
@@ -2745,9 +2721,9 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox19</rd:DefaultName>
-            <Top>5.19081in</Top>
-            <Left>6.24049in</Left>
-            <Height>0.21875in</Height>
+            <Top>4.78803in</Top>
+            <Left>6.21617in</Left>
+            <Height>0.17708in</Height>
             <Width>0.94607in</Width>
             <ZIndex>27</ZIndex>
             <Style>
@@ -2780,9 +2756,9 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox19</rd:DefaultName>
-            <Top>5.40689in</Top>
-            <Left>6.24048in</Left>
-            <Height>0.21875in</Height>
+            <Top>4.9805in</Top>
+            <Left>6.21616in</Left>
+            <Height>0.17966in</Height>
             <Width>0.94607in</Width>
             <ZIndex>28</ZIndex>
             <Style>
@@ -2815,9 +2791,9 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox19</rd:DefaultName>
-            <Top>5.61977in</Top>
-            <Left>6.24048in</Left>
-            <Height>0.21875in</Height>
+            <Top>5.17949in</Top>
+            <Left>6.21616in</Left>
+            <Height>0.18819in</Height>
             <Width>0.94607in</Width>
             <ZIndex>29</ZIndex>
             <Style>
@@ -2850,9 +2826,9 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox19</rd:DefaultName>
-            <Top>5.83852in</Top>
-            <Left>6.24048in</Left>
-            <Height>0.21875in</Height>
+            <Top>5.38574in</Top>
+            <Left>6.22658in</Left>
+            <Height>0.17119in</Height>
             <Width>0.94607in</Width>
             <ZIndex>30</ZIndex>
             <Style>
@@ -2886,9 +2862,9 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox19</rd:DefaultName>
-            <Top>6.05415in</Top>
-            <Left>6.24048in</Left>
-            <Height>0.21875in</Height>
+            <Top>5.57637in</Top>
+            <Left>6.237in</Left>
+            <Height>0.19596in</Height>
             <Width>0.94607in</Width>
             <ZIndex>31</ZIndex>
             <Style>
@@ -2922,9 +2898,9 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox42</rd:DefaultName>
-            <Top>5.19081in</Top>
-            <Left>7.18656in</Left>
-            <Height>0.21875in</Height>
+            <Top>4.78803in</Top>
+            <Left>7.16224in</Left>
+            <Height>0.17708in</Height>
             <Width>0.98426in</Width>
             <ZIndex>32</ZIndex>
             <Style>
@@ -2957,9 +2933,9 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox42</rd:DefaultName>
-            <Top>5.40956in</Top>
-            <Left>7.18656in</Left>
-            <Height>0.20486in</Height>
+            <Top>4.9805in</Top>
+            <Left>7.16224in</Left>
+            <Height>0.17966in</Height>
             <Width>0.98425in</Width>
             <ZIndex>33</ZIndex>
             <Style>
@@ -2992,9 +2968,9 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox42</rd:DefaultName>
-            <Top>5.61977in</Top>
-            <Left>7.18656in</Left>
-            <Height>0.19899in</Height>
+            <Top>5.17949in</Top>
+            <Left>7.17266in</Left>
+            <Height>0.18819in</Height>
             <Width>0.98425in</Width>
             <ZIndex>34</ZIndex>
             <Style>
@@ -3028,9 +3004,9 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox42</rd:DefaultName>
-            <Top>5.83852in</Top>
-            <Left>7.18656in</Left>
-            <Height>0.19284in</Height>
+            <Top>5.38574in</Top>
+            <Left>7.17266in</Left>
+            <Height>0.17119in</Height>
             <Width>0.98425in</Width>
             <ZIndex>35</ZIndex>
             <Style>
@@ -3064,8 +3040,8 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox42</rd:DefaultName>
-            <Top>6.05415in</Top>
-            <Left>7.18656in</Left>
+            <Top>5.57637in</Top>
+            <Left>7.18308in</Left>
             <Height>0.19596in</Height>
             <Width>0.98425in</Width>
             <ZIndex>36</ZIndex>
@@ -3099,10 +3075,10 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox90</rd:DefaultName>
-            <Top>2.38336cm</Top>
-            <Left>4.32565cm</Left>
+            <Top>1.88947cm</Top>
+            <Left>8.42669cm</Left>
             <Height>0.82021cm</Height>
-            <Width>7.93893cm</Width>
+            <Width>3.83789cm</Width>
             <ZIndex>37</ZIndex>
             <Style>
               <Border>
@@ -3129,8 +3105,8 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox5</rd:DefaultName>
-            <Top>16.1575cm</Top>
-            <Left>0.19009cm</Left>
+            <Top>14.74637cm</Top>
+            <Left>0.10579cm</Left>
             <Height>0.05496cm</Height>
             <Width>20.88652cm</Width>
             <ZIndex>38</ZIndex>
@@ -3146,13 +3122,13 @@
             </Style>
           </Textbox>
         </ReportItems>
-        <Height>20.50931cm</Height>
+        <Height>17.16179cm</Height>
         <Style />
       </Body>
       <Width>21.16666cm</Width>
       <Page>
         <PageFooter>
-          <Height>0.94545cm</Height>
+          <Height>0.52388cm</Height>
           <PrintOnFirstPage>true</PrintOnFirstPage>
           <PrintOnLastPage>true</PrintOnLastPage>
           <ReportItems>
@@ -3177,7 +3153,7 @@
                 </Paragraph>
               </Paragraphs>
               <rd:DefaultName>Textbox35</rd:DefaultName>
-              <Top>0.17639cm</Top>
+              <Top>0.01764cm</Top>
               <Left>18.52109cm</Left>
               <Height>0.50624cm</Height>
               <Width>2.5cm</Width>
diff --git a/Ventas/RepVentasMensuales.aspx b/Ventas/RepVentasMensuales.aspx
index 248ffec8c..596318722 100644
--- a/Ventas/RepVentasMensuales.aspx
+++ b/Ventas/RepVentasMensuales.aspx
@@ -83,7 +83,7 @@
 
                             </div>
 
-                            <div class="col-md-1 truncate">Fecha Fin: </div>
+                            <div class="col-md-1 truncate text-right">Fecha Fin: </div>
                             <div class="col-md-2 col-sm-2">
                                 <div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 95px !important; padding: 0px;">
                                     <asp:TextBox Style="width: 80px !important;" ID="TxtFechaF" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="10"></asp:TextBox>
@@ -95,35 +95,34 @@
                                 <ajax:CalendarExtender runat="server" ID="CalendarExtender1" TargetControlID="TxtFechaF" PopupButtonID="ImgFechaF" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
                             </div>
 
-                            <div class="col-md-1 truncate">Sucursal: </div>
+                            <div class="col-md-1 truncate text-right">Sucursal: </div>
                             <div class="col-md-2">
-                                <asp:DropDownList ID="DdlSubProyecto" runat="server" CssClass="form-control input-sm select2me" Width="250" DataValueField="CveSubProyecto" DataTextField="SubProyecto"></asp:DropDownList>
+                                <asp:DropDownList ID="DdlSubProyecto" runat="server" CssClass="form-control input-sm select2me" Width="50%" DataValueField="CveSubProyecto" DataTextField="SubProyecto"></asp:DropDownList>
                             </div>
                         </div>
                         <div class="row" style="margin-top:10px">
-                            <div class="col-md-1 truncate" style="width:170px">Clasificación de Productos: </div>
-                            <div class="col-md-2">
-                                <asp:DropDownList ID="DdlClasificacionesPS" runat="server" CssClass="form-control input-sm select2me" Width="250" DataValueField="CveClasificacion" DataTextField="Clasificacion"></asp:DropDownList>
+                            <label class="col-md-1 ">Clasificación de Productos: </label>
+                            <div class="col-md-3">
+                                <asp:DropDownList ID="DdlClasificacionesPS" runat="server" Class="table-group-action-input form-control input-inline input-sm select2me" Width="50%" DataValueField="CveClasificacion" DataTextField="Clasificacion"></asp:DropDownList>
                             </div>
 
-                            <div class="col-md-1 truncate" style="width:170px">Vendedor: </div>
-                            <div class="col-md-2">
-                                <asp:DropDownList ID="DdlVendedor" runat="server" CssClass="form-control input-sm select2me" Width="250" DataValueField="CveVendedor" DataTextField="Vendedor"></asp:DropDownList>
+                            <label class="col-md-1 text-right">Vendedor: </label>
+                            <div class="col-md-3">
+                                <asp:DropDownList ID="DdlVendedor" runat="server" Class="table-group-action-input form-control input-inline input-sm select2me" Width="50%" DataValueField="CveVendedor" DataTextField="Vendedor"></asp:DropDownList>
                             </div>
 
-                            <div class="col-md-1 truncate" style="width:170px">Marca: </div>
-                            <div class="col-md-2">
-                                <asp:DropDownList ID="DdlMarca" runat="server" CssClass="form-control input-sm select2me" Width="250" DataValueField="CveMarca" DataTextField="Marca"></asp:DropDownList>
+                            <label class="col-md-1 text-right">Marca: </label>
+                            <div class="col-md-3">
+                                <asp:DropDownList ID="DdlMarca" runat="server" Class="table-group-action-input form-control input-inline input-sm select2me" Width="30%" DataValueField="CveMarca" DataTextField="Marca"></asp:DropDownList>
                             </div>
 
                         </div>
-                        <div class="row" style="margin-top:10px">
-                            <div class="col-md-1 truncate" style="width:170px">Grupo: </div>
-                            <div class="col-md-2">
-                                <asp:DropDownList ID="DdlModalidad" runat="server" CssClass="form-control input-sm select2me" Width="100px">
+                        <div class="row">
+                            <label class="col-md-1">Grupo: </label>
+                            <div class="col-md-3">
+                                <asp:DropDownList ID="DdlModalidad" runat="server" Class="table-group-action-input form-control input-inline input-sm select2me" Width="100px">
                                     <asp:ListItem Value="0">Clientes</asp:ListItem>
                                     <asp:ListItem Value="1">Sucursales</asp:ListItem>
-                                    <asp:ListItem Value="2">Productos Servicios</asp:ListItem>
                                 </asp:DropDownList>
                             </div>
                         </div>

From 47921db4db269cfd3bbf5baaf1b5b3051472fbe8 Mon Sep 17 00:00:00 2001
From: Rene Molina <Rene.Molina@adssistemas.mx>
Date: Wed, 4 Mar 2020 10:18:55 -0700
Subject: [PATCH 06/13]

---
 App_Code/ClsInventarios.vb                  |  5 +++--
 Inventarios/KardexAlmacenHorizontal.aspx    | 14 ++++++++++++--
 Inventarios/KardexAlmacenHorizontal.aspx.vb | 12 ++++++++++--
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/App_Code/ClsInventarios.vb b/App_Code/ClsInventarios.vb
index 32297767a..2a6016ebd 100644
--- a/App_Code/ClsInventarios.vb
+++ b/App_Code/ClsInventarios.vb
@@ -1472,7 +1472,7 @@ Public Class ClsInventarios
         Return Retorno
 
     End Function
-    Public Function GetKardexAlmacenHorizontal(CvePS As Integer, FechaFin As Date, CveAlmacen As Integer, CveUnidadMedida As Integer, CveProveedor As Integer, CveTipoAlmacen As Integer, IncluyeTransitorios As Integer, CveClasificacion As Integer, CveUsuario As Integer, CveEmpresa As Integer, Optional CondicionExistencias As Integer = 0, Optional Orden As Integer = -1) As Boolean
+    Public Function GetKardexAlmacenHorizontal(CvePS As Integer, FechaFin As Date, CveAlmacen As Integer, CveUnidadMedida As Integer, CveProveedor As Integer, CveTipoAlmacen As Integer, IncluyeTransitorios As Integer, CveClasificacion As Integer, CveUsuario As Integer, CveEmpresa As Integer, Optional CondicionExistencias As Integer = 0, Optional Orden As Integer = -1, Optional CveMarca As Integer = -1) As Boolean
         Dim Retorno As Boolean = False
 
         DataAdapter("PA_Inv_KardexAlmacenHorizontalGet")
@@ -1490,7 +1490,8 @@ Public Class ClsInventarios
             .Add("@CveProveedorCompra", SqlDbType.Int).Value = CveProveedor
             .Add("@CveTipoAlmacen", SqlDbType.Int).Value = CveTipoAlmacen
             .Add("@ExistenciasCondicion", SqlDbType.Int).Value = CondicionExistencias
-            .Add("@Orden", SqlDbType.Int).Value = Orden
+            .Add("@Orden", SqlDbType.Int).Value = Orden
+            .Add("@CveMarca", SqlDbType.Int).Value = CveMarca
         End With
 
         Try
diff --git a/Inventarios/KardexAlmacenHorizontal.aspx b/Inventarios/KardexAlmacenHorizontal.aspx
index e0035b667..333333643 100644
--- a/Inventarios/KardexAlmacenHorizontal.aspx
+++ b/Inventarios/KardexAlmacenHorizontal.aspx
@@ -110,12 +110,22 @@
                     <div class="titlefiltros titlefiltrosmedia  caption ">
                         <div class="row" style="padding-top: 10px; position: relative;">
                             <div class="col-md-1 truncate textfilter">Proveedor</div>
-                            <div class="col-md-3">
+                            <div class="col-md-2">
                                 <ADS:Dropdownlost ID="DdlProveedor" runat="server" DataValueField="CveProveedor" DataTextField="RazonSocial" Width="100%" CssClassDdl="select2me" CssStyle="width: 100%;"></ADS:Dropdownlost>
                             </div>
                             <label class="col-md-1 truncate textfilter2">Producto:</label>
-                            <div class="col-md-3">
+                            <div class="col-md-2">
                                 <ADS:Dropdownlost ID="ddlProducto2" runat="server" AutoPostBack="False" DataTextField="PSCodigo" DataValueField="CvePS" CssClassDdl="select2me" Width="100%" CssStyle="width: 100%; "></ADS:Dropdownlost>
+                            </div
+                            <div class="col-md-2">
+                                <div class="row">
+                                    <label class="col-md-2 truncate">Marca:</label>
+                                    <div class="col-md-10">
+                                        <asp:DropDownList ID="DdlMarca" runat="server" CssClass="select2me " Style="width: 100px !important;" DataTextField="Marca" DataValueField="CveMarca">
+                                            <asp:ListItem Text="Todas" Value="-1"></asp:ListItem>
+                                        </asp:DropDownList>
+                                    </div>
+                                </div>
                             </div>
                             <label class="col-md-1 textfilter">Fecha Fin:</label>
                             <div class="col-md-1" style="min-width: 110px;">
diff --git a/Inventarios/KardexAlmacenHorizontal.aspx.vb b/Inventarios/KardexAlmacenHorizontal.aspx.vb
index 32a4a710e..d85e92bbb 100644
--- a/Inventarios/KardexAlmacenHorizontal.aspx.vb
+++ b/Inventarios/KardexAlmacenHorizontal.aspx.vb
@@ -24,7 +24,15 @@ Partial Class Inventarios_KardexAlmacen
     Private Sub CargaCombos()
 
         CargaFuncionalidad105()
-        CargaPS()
+        CargaPS()
+
+        Using ObjPS As New ClsProductosServicios
+            If ObjPS.GetMarcas(UsuarioActual.CveEmpresa) Then
+                DdlMarca.DataSource = ObjPS.DtResultados.Copy()
+            End If
+        End Using
+        DdlMarca.DataBind()
+        DdlMarca.Items.Insert(0, New ListItem("Todos", "-1"))
 
         ddlAlmacen.DataSource = GlobalDTAlmacenUsuarios(UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1)
         ddlAlmacen.DataBind()
@@ -128,7 +136,7 @@ Partial Class Inventarios_KardexAlmacen
         Dim CveAlmacen As Integer = ddlAlmacen.SelectedValue.ToEntero
         Dim CveProveedorCompra As Integer = If(DdlProveedor.SelectedValue.ToEntero > 0, DdlProveedor.SelectedValue.ToEntero, -1)
 
-        If ObjMovimientos.GetKardexAlmacenHorizontal(CvePS, FechaF, CveAlmacen, DdlUnidadMedida.SelectedValue.ToEntero, CveProveedorCompra, DdlTipoAlmacen.SelectedValue.ToEntero(), DdlIncluyeTransitorios.SelectedValue.ToEntero(), DdlClasificacion.SelectedValue.ToEntero, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CondicionExistencias:=DdlExistencia.SelectedValue, Orden:=DdlOrden.SelectedValue.ToEntero()) Then
+        If ObjMovimientos.GetKardexAlmacenHorizontal(CvePS, FechaF, CveAlmacen, DdlUnidadMedida.SelectedValue.ToEntero, CveProveedorCompra, DdlTipoAlmacen.SelectedValue.ToEntero(), DdlIncluyeTransitorios.SelectedValue.ToEntero(), DdlClasificacion.SelectedValue.ToEntero, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CondicionExistencias:=DdlExistencia.SelectedValue, Orden:=DdlOrden.SelectedValue.ToEntero(), CveMarca:=DdlMarca.SelectedValue.ToEntero()) Then
             If ObjMovimientos.DtResultados IsNot Nothing AndAlso ObjMovimientos.DtResultados.Rows.Count > 0 Then
                 dt = ObjMovimientos.DtResultados
                 Dim ListaBorrar As New List(Of DataColumn)

From a03487fce4c464e0f2c90ff7897197165d74fca4 Mon Sep 17 00:00:00 2001
From: JORGE LUIS CAUDILLO ESPARZA <caudillo_90@hotmail.com>
Date: Wed, 4 Mar 2020 10:32:05 -0700
Subject: [PATCH 07/13]

---
 Inventarios/KardexAlmacenHorizontal.aspx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Inventarios/KardexAlmacenHorizontal.aspx b/Inventarios/KardexAlmacenHorizontal.aspx
index 333333643..f7338501b 100644
--- a/Inventarios/KardexAlmacenHorizontal.aspx
+++ b/Inventarios/KardexAlmacenHorizontal.aspx
@@ -116,7 +116,7 @@
                             <label class="col-md-1 truncate textfilter2">Producto:</label>
                             <div class="col-md-2">
                                 <ADS:Dropdownlost ID="ddlProducto2" runat="server" AutoPostBack="False" DataTextField="PSCodigo" DataValueField="CvePS" CssClassDdl="select2me" Width="100%" CssStyle="width: 100%; "></ADS:Dropdownlost>
-                            </div
+                            </div>
                             <div class="col-md-2">
                                 <div class="row">
                                     <label class="col-md-2 truncate">Marca:</label>

From 1ef03c68fbfe5495ef02b69f7b666ffacb983bb6 Mon Sep 17 00:00:00 2001
From: rrene <rrene@DESKTOP-04EII7E>
Date: Wed, 4 Mar 2020 10:43:02 -0700
Subject: [PATCH 08/13] *-ventas  incluya ing, y dev, en las NC relacionadas -
 columnas neuvas en ingreso detalle

---
 Ventas/RepIngresosDetalle.aspx | 9 +++++++--
 Ventas/Ventas.aspx.vb          | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Ventas/RepIngresosDetalle.aspx b/Ventas/RepIngresosDetalle.aspx
index acc505d4d..942f7bbe0 100644
--- a/Ventas/RepIngresosDetalle.aspx
+++ b/Ventas/RepIngresosDetalle.aspx
@@ -188,16 +188,21 @@
                             <asp:Label runat="server" Text='<%# Eval("Total", "${0:N2}")%>'> </asp:Label>
                         </ItemTemplate>
                     </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Amortización" ItemStyle-HorizontalAlign ="Right">
+                    <asp:TemplateField HeaderText="Amortización"  >
                         <ItemTemplate>
                             <asp:Literal runat="server" Text='<%#If(Eval("EsAmortizacion").ToString = "True", "Si", "No")%>'> </asp:Literal>
                         </ItemTemplate>
                     </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Fecha Venta" ItemStyle-HorizontalAlign ="Right">
+                    <asp:TemplateField HeaderText="Fecha Venta"  >
                         <ItemTemplate>
                             <asp:Literal runat="server" Text='<%# Eval("Fecha", "{0:d}") %>'> </asp:Literal>
                         </ItemTemplate>
                     </asp:TemplateField>
+                     <asp:TemplateField HeaderText="NC"  >
+                        <ItemTemplate>
+                            <asp:Literal runat="server" Text='<%# Eval("SerieFolioNC") %>'> </asp:Literal>
+                        </ItemTemplate>
+                    </asp:TemplateField>
                 </Columns>
             </asp:GridView>
         </ContentTemplate>
diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index bc28592cc..a9e07ac93 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -9315,7 +9315,7 @@ Partial Class Ventas
                            Kilometraje:=TxtKilometraje.Text.ToDouble, EsAmortizacion:=EsNCAmortizacion) Then
             ErrorList.Add("Ocurrió un error al Generar la Venta.<br />Revise su factura y cualquier detalle comuníquese a Soporte Técnico")
         Else
-            If factura.TipoDocto.Contiene("Dev") Or DtVentasNC IsNot Nothing Then
+            If factura.TipoDocto.Contiene("Dev", "Egs") Or DtVentasNC IsNot Nothing Then
                 If DtVentasNC IsNot Nothing Then
                     For Each row As DataRow In DtVentasNC.Rows
                         If Not ObjVentas.AddVentasRelacionadas(ObjVentas.CveVenta, row("CveVenta").ToString.ToEntero) Then

From 1f35c6caeeecb8e77e1034fe3d7cbf2e3bd006a9 Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <jose_antony11@hotmail.com>
Date: Wed, 4 Mar 2020 11:13:40 -0700
Subject: [PATCH 09/13] agregando nueva expression con nuevo mensaje

---
 Empresas/141/Formatos/Factura.rdlc | 107 ++++++++++++++++++++---------
 1 file changed, 76 insertions(+), 31 deletions(-)

diff --git a/Empresas/141/Formatos/Factura.rdlc b/Empresas/141/Formatos/Factura.rdlc
index 8061393f9..21039b981 100644
--- a/Empresas/141/Formatos/Factura.rdlc
+++ b/Empresas/141/Formatos/Factura.rdlc
@@ -469,11 +469,8 @@
                 </Style>
               </Textbox>
             </ReportItems>
-            <PageBreak>
-              <BreakLocation>Start</BreakLocation>
-            </PageBreak>
             <KeepTogether>true</KeepTogether>
-            <Top>5.84118in</Top>
+            <Top>6.39118in</Top>
             <Left>0.07484in</Left>
             <Height>0.91543in</Height>
             <Width>8.23221in</Width>
@@ -910,7 +907,7 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.14436in</Height>
+                  <Height>0.13436in</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -1259,7 +1256,7 @@
             <DataSetName>DsOC</DataSetName>
             <Top>2.12778in</Top>
             <Left>0.09836in</Left>
-            <Height>0.34081in</Height>
+            <Height>0.33081in</Height>
             <Width>8.20966in</Width>
             <ZIndex>1</ZIndex>
             <Style>
@@ -1283,7 +1280,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox5</rd:DefaultName>
-            <Top>7.50341cm</Top>
+            <Top>8.90041cm</Top>
             <Left>0.28014cm</Left>
             <Height>0.05496cm</Height>
             <Width>20.88652cm</Width>
@@ -1317,7 +1314,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox1</rd:DefaultName>
-            <Top>7.73124cm</Top>
+            <Top>9.12824cm</Top>
             <Left>1.89472cm</Left>
             <Height>0.51608cm</Height>
             <Width>19.15264cm</Width>
@@ -2283,7 +2280,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox4</rd:DefaultName>
-            <Top>8.32845cm</Top>
+            <Top>9.72545cm</Top>
             <Left>0.22108cm</Left>
             <Height>2.03224cm</Height>
             <Width>20.79751cm</Width>
@@ -2313,7 +2310,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox5</rd:DefaultName>
-            <Top>12.03609cm</Top>
+            <Top>13.43309cm</Top>
             <Left>0.21585cm</Left>
             <Height>0.05496cm</Height>
             <Width>20.88652cm</Width>
@@ -2333,7 +2330,7 @@
             <Source>Embedded</Source>
             <Value>ID5</Value>
             <Sizing>FitProportional</Sizing>
-            <Top>10.51539cm</Top>
+            <Top>11.91239cm</Top>
             <Left>0.17151cm</Left>
             <Height>0.96488cm</Height>
             <Width>3.75909cm</Width>
@@ -2391,7 +2388,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox4</rd:DefaultName>
-            <Top>11.55898cm</Top>
+            <Top>12.95598cm</Top>
             <Left>0.19008cm</Left>
             <Height>0.40655cm</Height>
             <Width>12.88812cm</Width>
@@ -2410,7 +2407,7 @@
             <Source>Embedded</Source>
             <Value>ID4</Value>
             <Sizing>FitProportional</Sizing>
-            <Top>10.51539cm</Top>
+            <Top>11.91239cm</Top>
             <Left>4.34941cm</Left>
             <Height>0.91769cm</Height>
             <Width>3.03541cm</Width>
@@ -2425,7 +2422,7 @@
             <Source>Embedded</Source>
             <Value>ID1</Value>
             <Sizing>FitProportional</Sizing>
-            <Top>10.51539cm</Top>
+            <Top>11.91239cm</Top>
             <Left>7.56121cm</Left>
             <Height>0.97656cm</Height>
             <Width>4.16281cm</Width>
@@ -2440,7 +2437,7 @@
             <Source>Embedded</Source>
             <Value>ID6</Value>
             <Sizing>FitProportional</Sizing>
-            <Top>10.51539cm</Top>
+            <Top>11.91239cm</Top>
             <Left>11.90634cm</Left>
             <Height>0.97656cm</Height>
             <Width>3.76809cm</Width>
@@ -2455,7 +2452,7 @@
             <Source>Embedded</Source>
             <Value>ID3</Value>
             <Sizing>FitProportional</Sizing>
-            <Top>11.0854cm</Top>
+            <Top>12.4824cm</Top>
             <Left>15.67443cm</Left>
             <Height>0.93046cm</Height>
             <Width>5.37042cm</Width>
@@ -2487,7 +2484,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox60</rd:DefaultName>
-            <Top>10.51539cm</Top>
+            <Top>11.91239cm</Top>
             <Left>15.67443cm</Left>
             <Height>0.50299cm</Height>
             <Width>5.42547cm</Width>
@@ -2686,7 +2683,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox4</rd:DefaultName>
-            <Top>12.19688cm</Top>
+            <Top>13.59388cm</Top>
             <Left>0.16383cm</Left>
             <Height>2.44366cm</Height>
             <Width>15.5106cm</Width>
@@ -2721,7 +2718,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox19</rd:DefaultName>
-            <Top>4.78803in</Top>
+            <Top>5.33803in</Top>
             <Left>6.21617in</Left>
             <Height>0.17708in</Height>
             <Width>0.94607in</Width>
@@ -2756,7 +2753,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox19</rd:DefaultName>
-            <Top>4.9805in</Top>
+            <Top>5.5305in</Top>
             <Left>6.21616in</Left>
             <Height>0.17966in</Height>
             <Width>0.94607in</Width>
@@ -2791,7 +2788,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox19</rd:DefaultName>
-            <Top>5.17949in</Top>
+            <Top>5.72949in</Top>
             <Left>6.21616in</Left>
             <Height>0.18819in</Height>
             <Width>0.94607in</Width>
@@ -2826,7 +2823,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox19</rd:DefaultName>
-            <Top>5.38574in</Top>
+            <Top>5.93574in</Top>
             <Left>6.22658in</Left>
             <Height>0.17119in</Height>
             <Width>0.94607in</Width>
@@ -2862,7 +2859,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox19</rd:DefaultName>
-            <Top>5.57637in</Top>
+            <Top>6.12637in</Top>
             <Left>6.237in</Left>
             <Height>0.19596in</Height>
             <Width>0.94607in</Width>
@@ -2898,7 +2895,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox42</rd:DefaultName>
-            <Top>4.78803in</Top>
+            <Top>5.33803in</Top>
             <Left>7.16224in</Left>
             <Height>0.17708in</Height>
             <Width>0.98426in</Width>
@@ -2933,7 +2930,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox42</rd:DefaultName>
-            <Top>4.9805in</Top>
+            <Top>5.5305in</Top>
             <Left>7.16224in</Left>
             <Height>0.17966in</Height>
             <Width>0.98425in</Width>
@@ -2968,7 +2965,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox42</rd:DefaultName>
-            <Top>5.17949in</Top>
+            <Top>5.72949in</Top>
             <Left>7.17266in</Left>
             <Height>0.18819in</Height>
             <Width>0.98425in</Width>
@@ -3004,7 +3001,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox42</rd:DefaultName>
-            <Top>5.38574in</Top>
+            <Top>5.93574in</Top>
             <Left>7.17266in</Left>
             <Height>0.17119in</Height>
             <Width>0.98425in</Width>
@@ -3040,7 +3037,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox42</rd:DefaultName>
-            <Top>5.57637in</Top>
+            <Top>6.12637in</Top>
             <Left>7.18308in</Left>
             <Height>0.19596in</Height>
             <Width>0.98425in</Width>
@@ -3105,7 +3102,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox5</rd:DefaultName>
-            <Top>14.74637cm</Top>
+            <Top>16.14337cm</Top>
             <Left>0.10579cm</Left>
             <Height>0.05496cm</Height>
             <Width>20.88652cm</Width>
@@ -3121,8 +3118,56 @@
               <PaddingBottom>2pt</PaddingBottom>
             </Style>
           </Textbox>
+          <Textbox Name="Textbox3">
+            <CanGrow>true</CanGrow>
+            <KeepTogether>true</KeepTogether>
+            <Paragraphs>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>** SI LAS LLANTAS NO SON INSTALADAS EN ECONOLLANTAS PIERDE SU GARANTÍA DE FABRICA **</Value>
+                    <Style>
+                      <FontSize>9pt</FontSize>
+                      <FontWeight>Bold</FontWeight>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style />
+              </Paragraph>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>EL CLIENTE NO ACEPTA PÓLIZA DE SEGURO,*ESTAS LLANTASSOLO TENDRAN GARANTÍA DE PROVIDA CONTRA DEFECTO DE FABRICA.</Value>
+                    <Style>
+                      <FontSize>9pt</FontSize>
+                      <FontWeight>Bold</FontWeight>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style />
+              </Paragraph>
+            </Paragraphs>
+            <rd:DefaultName>Textbox3</rd:DefaultName>
+            <Top>7.43638cm</Top>
+            <Left>1.15361cm</Left>
+            <Height>1.32415cm</Height>
+            <Width>19.15078cm</Width>
+            <ZIndex>39</ZIndex>
+            <Visibility>
+              <Hidden>=IIF((Sum(IIF(Fields!CveClasificacion.Value = 20345,1,0), "DsOC") = 0) and (Sum(IIF(Fields!CveClasificacion.Value = 20342 or Fields!CveClasificacion.Value = 20341,1,0), "DsOC") &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>
         </ReportItems>
-        <Height>17.16179cm</Height>
+        <Height>18.7493cm</Height>
         <Style />
       </Body>
       <Width>21.16666cm</Width>
@@ -3153,7 +3198,7 @@
                 </Paragraph>
               </Paragraphs>
               <rd:DefaultName>Textbox35</rd:DefaultName>
-              <Top>0.01764cm</Top>
+              <Top>0.01763cm</Top>
               <Left>18.52109cm</Left>
               <Height>0.50624cm</Height>
               <Width>2.5cm</Width>

From 661a2bb56f8b8760789c7a2acafd67b7a6703fca Mon Sep 17 00:00:00 2001
From: JORGE LUIS CAUDILLO ESPARZA <caudillo_90@hotmail.com>
Date: Wed, 4 Mar 2020 11:14:14 -0700
Subject: [PATCH 10/13]

---
 Inventarios/KardexAlmacenHorizontal.aspx.vb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Inventarios/KardexAlmacenHorizontal.aspx.vb b/Inventarios/KardexAlmacenHorizontal.aspx.vb
index d85e92bbb..4366af744 100644
--- a/Inventarios/KardexAlmacenHorizontal.aspx.vb
+++ b/Inventarios/KardexAlmacenHorizontal.aspx.vb
@@ -13,7 +13,11 @@ Partial Class Inventarios_KardexAlmacen
             TxtFechaF.Text = Now.ToShortDateString
             CargaCombos()
             ddlAlmacen.Items.Insert(0, New ListItem("Todos", "-1"))
-            pnlOrden.Visible = UsuarioActual.CveEmpresa = 141
+            pnlOrden.Visible = False
+            If UsuarioActual.CveEmpresa = 141 Then
+                pnlOrden.Visible = True
+                DdlOrden.SelectedValue = 2
+            End If
             If IfNull(Request("CvePS"), "-1").ToString.ToEntero > 0 Then CargarKardex(Request("CvePS").ToString.ToEntero)
             ddlProducto2.SelectedValue = If(Request("CvePS") IsNot Nothing, Request("CvePS").ToString, "-1")
         End If

From b62f5388efea50b06579996873136ccb84790cd4 Mon Sep 17 00:00:00 2001
From: rrene <rrene@DESKTOP-04EII7E>
Date: Wed, 4 Mar 2020 11:19:30 -0700
Subject: [PATCH 11/13] -filtro tipo almacen

---
 Acumuladores/RepEntradasUsadosClientes.aspx.vb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Acumuladores/RepEntradasUsadosClientes.aspx.vb b/Acumuladores/RepEntradasUsadosClientes.aspx.vb
index 9d266557c..e23ddf41d 100644
--- a/Acumuladores/RepEntradasUsadosClientes.aspx.vb
+++ b/Acumuladores/RepEntradasUsadosClientes.aspx.vb
@@ -29,7 +29,7 @@ Partial Class Acumuladores_RepEntradasUsadosClientes
     End Sub
 
     Public Sub CargaCombos()
-        DdlAlmacen.DataSource = GlobalDTAlmacenUsuarios(UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa)
+        DdlAlmacen.DataSource = GlobalDTAlmacenUsuarios(UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, 22)
         DdlAlmacen.DataBind()
         DdlAlmacen.Items.Insert(0, New ListItem("Todos", "-1"))
 

From b085b2c8521499fb702e3f40976a9880d6e4c4a1 Mon Sep 17 00:00:00 2001
From: rrene <rrene@DESKTOP-04EII7E>
Date: Wed, 4 Mar 2020 11:25:53 -0700
Subject: [PATCH 12/13] - se quito funcionalidad 520 al emitir complemento

---
 Ventas/ClientesAbonar.aspx    | 2 +-
 Ventas/ClientesAbonar.aspx.vb | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Ventas/ClientesAbonar.aspx b/Ventas/ClientesAbonar.aspx
index d23679560..372c52348 100644
--- a/Ventas/ClientesAbonar.aspx
+++ b/Ventas/ClientesAbonar.aspx
@@ -238,7 +238,7 @@
                         <asp:CheckBox Text=" Seguir Registrando Pagos" ID="ChkSeguirRegistrando" CssClass="md-checksd" runat="server" />
                     </td>
                     <td style="text-align: left; width: 9%">
-                        <asp:CheckBox Text=" Emitir complemento de pago" ID="ChkComplementoPago" Visible="false" CssClass="md-checksd" runat="server" />
+                        <asp:CheckBox Text=" Emitir complemento de pago" ID="ChkComplementoPago" Visible="true" CssClass="md-checksd" runat="server" />
                         <br />
                         <asp:Label ID="LblValidaCeuntaTipoTransaccion" runat="server" Visible="false" ForeColor="Red"></asp:Label>
                     </td>
diff --git a/Ventas/ClientesAbonar.aspx.vb b/Ventas/ClientesAbonar.aspx.vb
index a9c503494..b50c93038 100644
--- a/Ventas/ClientesAbonar.aspx.vb
+++ b/Ventas/ClientesAbonar.aspx.vb
@@ -333,12 +333,7 @@ Partial Class Ventas_ClientesAbonar
                     ElseIf CveMoneda = -1 Then
                         TxtFechaDocumento.Attributes.Add("onchange", "CambiaTC(this);")
                         TxtTCDolares.Text = GlobalTipoCambio(Fecha).FormatoNumero(4)
-                        TxtTC.Text = GlobalTipoCambio(Fecha).FormatoNumero(4)
-                    End If
-
-                    If UsuarioActual.Empresa.Funcionalidad(520) = "1" Then
-                        ChkComplementoPago.Visible = True
-                        'ChkComplementoPago.Checked = True
+                        TxtTC.Text = GlobalTipoCambio(Fecha).FormatoNumero(4)
                     End If
 
                     If UsuarioActual.TienePermisoProceso(209) Or UsuarioActual.TienePermisoProceso(204) Then

From 08b3f92f30607dba4df7d355004717723baa2418 Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <jose_antony11@hotmail.com>
Date: Wed, 4 Mar 2020 11:54:51 -0700
Subject: [PATCH 13/13] .

---
 Empresas/141/Formatos/Factura.rdlc | 75 +++++++++++++++++-------------
 1 file changed, 42 insertions(+), 33 deletions(-)

diff --git a/Empresas/141/Formatos/Factura.rdlc b/Empresas/141/Formatos/Factura.rdlc
index 21039b981..214c598f8 100644
--- a/Empresas/141/Formatos/Factura.rdlc
+++ b/Empresas/141/Formatos/Factura.rdlc
@@ -144,6 +144,14 @@
           <DataField>SATClaveProdServ</DataField>
           <rd:TypeName>System.String</rd:TypeName>
         </Field>
+        <Field Name="SATClaveUM">
+          <DataField>SATClaveUM</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="PorcentajeIVA">
+          <DataField>PorcentajeIVA</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
       </Fields>
       <rd:DataSetInfo>
         <rd:DataSetName>DsOC</rd:DataSetName>
@@ -484,22 +492,22 @@
             <TablixBody>
               <TablixColumns>
                 <TablixColumn>
-                  <Width>0.63263in</Width>
+                  <Width>0.53032in</Width>
                 </TablixColumn>
                 <TablixColumn>
                   <Width>0.58129in</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>0.90001in</Width>
+                  <Width>0.79377in</Width>
                 </TablixColumn>
                 <TablixColumn>
                   <Width>0.65422in</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>2.11153in</Width>
+                  <Width>2.59092in</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>0.98425in</Width>
+                  <Width>0.8212in</Width>
                 </TablixColumn>
                 <TablixColumn>
                   <Width>0.63048in</Width>
@@ -508,7 +516,7 @@
                   <Width>0.68106in</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>1.03419in</Width>
+                  <Width>0.88308in</Width>
                 </TablixColumn>
               </TablixColumns>
               <TablixRows>
@@ -907,12 +915,12 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.13436in</Height>
+                  <Height>0.16561in</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Cantidad1">
-                          <CanGrow>true</CanGrow>
+                          <CanShrink>true</CanShrink>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -921,7 +929,7 @@
                                   <Value>=Fields!Cantidad.Value</Value>
                                   <Style>
                                     <FontFamily>calibri</FontFamily>
-                                    <FontSize>8.75pt</FontSize>
+                                    <FontSize>8pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -947,7 +955,7 @@
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="UM">
-                          <CanGrow>true</CanGrow>
+                          <CanShrink>true</CanShrink>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -956,7 +964,7 @@
                                   <Value>=Fields!UM.Value</Value>
                                   <Style>
                                     <FontFamily>calibri</FontFamily>
-                                    <FontSize>8.75pt</FontSize>
+                                    <FontSize>8pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -982,7 +990,7 @@
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Codigo">
-                          <CanGrow>true</CanGrow>
+                          <CanShrink>true</CanShrink>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -991,7 +999,7 @@
                                   <Value>=Fields!Codigo.Value</Value>
                                   <Style>
                                     <FontFamily>calibri</FontFamily>
-                                    <FontSize>8.75pt</FontSize>
+                                    <FontSize>8pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -1016,17 +1024,17 @@
                     </TablixCell>
                     <TablixCell>
                       <CellContents>
-                        <Textbox Name="SATClaveProdServ">
-                          <CanGrow>true</CanGrow>
+                        <Textbox Name="SATClaveUM">
+                          <CanShrink>true</CanShrink>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>=Fields!SATClaveProdServ.Value</Value>
+                                  <Value>=Fields!SATClaveUM.Value</Value>
                                   <Style>
                                     <FontFamily>calibri</FontFamily>
-                                    <FontSize>8.75pt</FontSize>
+                                    <FontSize>8pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -1036,7 +1044,7 @@
                               </Style>
                             </Paragraph>
                           </Paragraphs>
-                          <rd:DefaultName>SATClaveProdServ</rd:DefaultName>
+                          <rd:DefaultName>SATClaveUM</rd:DefaultName>
                           <Style>
                             <Border>
                               <Style>None</Style>
@@ -1052,7 +1060,7 @@
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="PS">
-                          <CanGrow>true</CanGrow>
+                          <CanShrink>true</CanShrink>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -1061,7 +1069,7 @@
                                   <Value>=Fields!PS.Value &amp; System.Environment.NewLine &amp; IIF(Fields!Obs.Value &lt;&gt; "","Observaciones: ","") &amp; Fields!Obs.Value</Value>
                                   <Style>
                                     <FontFamily>calibri</FontFamily>
-                                    <FontSize>8.75pt</FontSize>
+                                    <FontSize>8pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -1085,7 +1093,7 @@
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="PU1">
-                          <CanGrow>true</CanGrow>
+                          <CanShrink>true</CanShrink>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -1094,8 +1102,9 @@
                                   <Value>=Fields!PU.Value</Value>
                                   <Style>
                                     <FontFamily>calibri</FontFamily>
-                                    <FontSize>8.75pt</FontSize>
+                                    <FontSize>8pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
+                                    <Format>#,0.00;(#,0.00)</Format>
                                   </Style>
                                 </TextRun>
                               </TextRuns>
@@ -1117,17 +1126,17 @@
                     </TablixCell>
                     <TablixCell>
                       <CellContents>
-                        <Textbox Name="Descuento">
-                          <CanGrow>true</CanGrow>
+                        <Textbox Name="PorcentajeIVA">
+                          <CanShrink>true</CanShrink>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value />
+                                  <Value>=Fields!PorcentajeIVA.Value</Value>
                                   <Style>
                                     <FontFamily>calibri</FontFamily>
-                                    <FontSize>8.75pt</FontSize>
+                                    <FontSize>8pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                     <Format>#,0.00</Format>
                                     <Language>es-MX</Language>
@@ -1139,7 +1148,7 @@
                               </Style>
                             </Paragraph>
                           </Paragraphs>
-                          <rd:DefaultName>Descuento</rd:DefaultName>
+                          <rd:DefaultName>PorcentajeIVA</rd:DefaultName>
                           <Style>
                             <Border>
                               <Style>None</Style>
@@ -1155,7 +1164,7 @@
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Descuento1">
-                          <CanGrow>true</CanGrow>
+                          <CanShrink>true</CanShrink>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -1164,7 +1173,7 @@
                                   <Value>=Fields!Descuento.Value</Value>
                                   <Style>
                                     <FontFamily>calibri</FontFamily>
-                                    <FontSize>8.75pt</FontSize>
+                                    <FontSize>8pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                     <Format>#,0.00##;(#,0.00##);'-'</Format>
                                     <Language>es-MX</Language>
@@ -1192,7 +1201,7 @@
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="TiempoEntrega">
-                          <CanGrow>true</CanGrow>
+                          <CanShrink>true</CanShrink>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -1201,7 +1210,7 @@
                                   <Value>=Fields!Cantidad.Value * Fields!PU.Value</Value>
                                   <Style>
                                     <FontFamily>calibri</FontFamily>
-                                    <FontSize>8.75pt</FontSize>
+                                    <FontSize>8pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                     <Format>#,0.00</Format>
                                     <Language>es-MX</Language>
@@ -1256,8 +1265,8 @@
             <DataSetName>DsOC</DataSetName>
             <Top>2.12778in</Top>
             <Left>0.09836in</Left>
-            <Height>0.33081in</Height>
-            <Width>8.20966in</Width>
+            <Height>0.36206in</Height>
+            <Width>8.16634in</Width>
             <ZIndex>1</ZIndex>
             <Style>
               <Border>
@@ -2142,7 +2151,7 @@
             </Paragraphs>
             <rd:DefaultName>Textbox4</rd:DefaultName>
             <Top>6.3831cm</Top>
-            <Left>3.33321cm</Left>
+            <Left>1.74571cm</Left>
             <Height>1.05328cm</Height>
             <Width>17.71415cm</Width>
             <ZIndex>15</ZIndex>