From fdce588151cea04735e0a956340f70a7dcc376e1 Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <jose_antony11@hotmail.com>
Date: Tue, 13 Oct 2020 18:36:03 -0700
Subject: [PATCH] acomodo de layout en reportes

---
 Compras/ProveedoresAuxiliar.aspx.vb           |  26 ++--
 Empresas/Grales/Formatos/EntradasSalidas.rdlc | 113 ++++++------------
 Empresas/Grales/Formatos/RepAlmacen.rdlc      |  49 ++++----
 Inventarios/RepAlmacen.aspx.vb                |  11 +-
 Ventas/Ventas.aspx                            |   1 +
 Ventas/Ventas.aspx.vb                         |  14 ++-
 6 files changed, 94 insertions(+), 120 deletions(-)

diff --git a/Compras/ProveedoresAuxiliar.aspx.vb b/Compras/ProveedoresAuxiliar.aspx.vb
index 26f320e35..529a6887d 100644
--- a/Compras/ProveedoresAuxiliar.aspx.vb
+++ b/Compras/ProveedoresAuxiliar.aspx.vb
@@ -118,23 +118,19 @@ Partial Class Compras_ProveedoresAuxiliar
         Dim OpcionP = If(DdlOpcion.SelectedValue = "-1", "", $"&emsp;<b>Opción:</b> {DdlOpcion.SelectedItem.Text}")
         Dim TipoProv = If(DdlTipoProveedor.SelectedValue = "-1", "", $"&emsp;<b>Tipo Proveedor:</b> {DdlTipoProveedor.SelectedItem.Text}")
         Dim ContaP = If(DdlOpcionContabilizable.SelectedValue = "-1", "", $"&emsp;<b>Contabilizable:</b> {DdlOpcionContabilizable.SelectedItem.Text}")
-        If DtDatos IsNot Nothing AndAlso DtDatos.Rows.Count > 0 Then
-            Dim Imagen As New System.IO.FileInfo(String.Format("{0}/Logo.png", UsuarioActual.Empresa.Ruta))
-            Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
-            Dim params As New List(Of ReportParameter)
-            params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa))
-            params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
-            params.Add(New ReportParameter("FechaImpresion", Now.ToString))
-            params.Add(New ReportParameter("Filtros", $"<b>Filtros:</b> {Proveedor}{FechaIn}{FechaFn}{OpcionP}{TipoProv}{ContaP}"))
-            If Imagen.Exists Then
-                params.Add(New ReportParameter("LogoPath", logouri))
-            Else
-                params.Add(New ReportParameter("LogoPath", ""))
-            End If
-            ImprimirPDF("Empresas/Grales/Formatos/AuxiliarProveedor.rdlc", DtDatos, params, "AuxiliarProveedor", Opcion)
+        Dim Imagen As New System.IO.FileInfo(String.Format("{0}/Logo.png", UsuarioActual.Empresa.Ruta))
+        Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
+        Dim params As New List(Of ReportParameter)
+        params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa))
+        params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
+        params.Add(New ReportParameter("FechaImpresion", Now.ToString))
+        params.Add(New ReportParameter("Filtros", $"<b>Filtros:</b> {Proveedor}{FechaIn}{FechaFn}{OpcionP}{TipoProv}{ContaP}"))
+        If Imagen.Exists Then
+            params.Add(New ReportParameter("LogoPath", logouri))
         Else
-            Alert("No hay datos consultados", TipoMensaje.MsgAdvertencia)
+            params.Add(New ReportParameter("LogoPath", ""))
         End If
+        ImprimirPDF("Empresas/Grales/Formatos/AuxiliarProveedor.rdlc", DtDatos, params, "AuxiliarProveedor", Opcion)
     End Sub
     Protected Sub LnkPdf_Click(sender As Object, e As EventArgs) Handles LnkPdf.Click
         GenerarPDF("PDF")
diff --git a/Empresas/Grales/Formatos/EntradasSalidas.rdlc b/Empresas/Grales/Formatos/EntradasSalidas.rdlc
index 176b0a50e..edfdd2cda 100644
--- a/Empresas/Grales/Formatos/EntradasSalidas.rdlc
+++ b/Empresas/Grales/Formatos/EntradasSalidas.rdlc
@@ -108,34 +108,34 @@
             <TablixBody>
               <TablixColumns>
                 <TablixColumn>
-                  <Width>1.82858cm</Width>
+                  <Width>3.4316cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>5.84308cm</Width>
+                  <Width>3.4316cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>1.40241cm</Width>
+                  <Width>1.7158cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>1.59046cm</Width>
+                  <Width>1.7158cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>1.59046cm</Width>
+                  <Width>1.7158cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>1.3846cm</Width>
+                  <Width>1.7158cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>1.62687cm</Width>
+                  <Width>1.7158cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>1.99138cm</Width>
+                  <Width>1.7158cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>1.7797cm</Width>
+                  <Width>1.7158cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>1.865cm</Width>
+                  <Width>1.7158cm</Width>
                 </TablixColumn>
               </TablixColumns>
               <TablixRows>
@@ -193,7 +193,7 @@
                     </TablixCell>
                     <TablixCell>
                       <CellContents>
-                        <Textbox Name="Textbox9">
+                        <Textbox Name="Textbox1">
                           <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
@@ -211,7 +211,7 @@
                               </Style>
                             </Paragraph>
                           </Paragraphs>
-                          <rd:DefaultName>Textbox9</rd:DefaultName>
+                          <rd:DefaultName>Textbox1</rd:DefaultName>
                           <Style>
                             <Border>
                               <Style>None</Style>
@@ -266,26 +266,9 @@
                               <Color>White</Color>
                               <Style>Solid</Style>
                             </Border>
-                            <TopBorder>
-                              <Color>White</Color>
-                              <Style>Solid</Style>
-                              <Width>1pt</Width>
-                            </TopBorder>
-                            <BottomBorder>
-                              <Color>White</Color>
-                              <Style>Solid</Style>
-                              <Width>1pt</Width>
-                            </BottomBorder>
                             <LeftBorder>
-                              <Color>White</Color>
-                              <Style>Solid</Style>
-                              <Width>1pt</Width>
+                              <Style>None</Style>
                             </LeftBorder>
-                            <RightBorder>
-                              <Color>White</Color>
-                              <Style>Solid</Style>
-                              <Width>1pt</Width>
-                            </RightBorder>
                             <BackgroundColor>#d3d3d3</BackgroundColor>
                             <PaddingLeft>2pt</PaddingLeft>
                             <PaddingRight>2pt</PaddingRight>
@@ -308,7 +291,7 @@
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>Importe</Value>
+                                  <Value />
                                   <Style>
                                     <FontWeight>SemiBold</FontWeight>
                                   </Style>
@@ -422,7 +405,7 @@
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>Articulos</Value>
+                                  <Value>Artículos</Value>
                                   <Style>
                                     <FontSize>9pt</FontSize>
                                     <FontWeight>SemiBold</FontWeight>
@@ -491,23 +474,15 @@
                               <Style>Solid</Style>
                             </Border>
                             <TopBorder>
-                              <Color>White</Color>
-                              <Style>Solid</Style>
                               <Width>1pt</Width>
                             </TopBorder>
                             <BottomBorder>
-                              <Color>White</Color>
-                              <Style>Solid</Style>
                               <Width>1pt</Width>
                             </BottomBorder>
                             <LeftBorder>
-                              <Color>White</Color>
-                              <Style>Solid</Style>
-                              <Width>1pt</Width>
+                              <Style>None</Style>
                             </LeftBorder>
                             <RightBorder>
-                              <Color>White</Color>
-                              <Style>Solid</Style>
                               <Width>1pt</Width>
                             </RightBorder>
                             <BackgroundColor>#d3d3d3</BackgroundColor>
@@ -1763,9 +1738,8 @@
             </TablixRowHierarchy>
             <DataSetName>DataSet1</DataSetName>
             <Top>0.20849cm</Top>
-            <Left>0.00415cm</Left>
             <Height>2.52171cm</Height>
-            <Width>20.90254cm</Width>
+            <Width>20.5896cm</Width>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -1776,7 +1750,7 @@
         <Height>1.16692in</Height>
         <Style />
       </Body>
-      <Width>8.2362in</Width>
+      <Width>8.11008in</Width>
       <Page>
         <PageHeader>
           <Height>4.57869cm</Height>
@@ -1797,14 +1771,15 @@
                       </Style>
                     </TextRun>
                   </TextRuns>
-                  <Style />
+                  <Style>
+                    <TextAlign>Center</TextAlign>
+                  </Style>
                 </Paragraph>
               </Paragraphs>
               <rd:DefaultName>Textbox1</rd:DefaultName>
               <Top>0.22049cm</Top>
-              <Left>2.78201cm</Left>
               <Height>0.6cm</Height>
-              <Width>12.60299cm</Width>
+              <Width>20.5896cm</Width>
               <Style>
                 <Border>
                   <Style>None</Style>
@@ -1850,9 +1825,8 @@
               </Paragraphs>
               <rd:DefaultName>Textbox2</rd:DefaultName>
               <Top>1.13799cm</Top>
-              <Left>4.68157cm</Left>
               <Height>0.52945cm</Height>
-              <Width>9.98771cm</Width>
+              <Width>20.5896cm</Width>
               <ZIndex>1</ZIndex>
               <Style>
                 <Border>
@@ -1868,9 +1842,8 @@
               <Source>External</Source>
               <Value>= Parameters!pImg.Value</Value>
               <Sizing>FitProportional</Sizing>
-              <Left>0.01325cm</Left>
-              <Height>2.22362cm</Height>
-              <Width>2.33715cm</Width>
+              <Height>1.66744cm</Height>
+              <Width>3.4316cm</Width>
               <ZIndex>2</ZIndex>
               <Style>
                 <Border>
@@ -1895,9 +1868,8 @@
               </Paragraphs>
               <rd:DefaultName>Textbox15</rd:DefaultName>
               <Top>2.40001cm</Top>
-              <Left>0.01325cm</Left>
               <Height>1.8259cm</Height>
-              <Width>20.89344cm</Width>
+              <Width>20.5896cm</Width>
               <ZIndex>3</ZIndex>
               <Style>
                 <Border>
@@ -1911,9 +1883,8 @@
             </Textbox>
             <Line Name="Line1">
               <Top>4.4023cm</Top>
-              <Left>0.01325cm</Left>
               <Height>0cm</Height>
-              <Width>20.90669cm</Width>
+              <Width>20.5896cm</Width>
               <ZIndex>4</ZIndex>
               <Style>
                 <Border>
@@ -1954,9 +1925,9 @@
               </Paragraphs>
               <rd:DefaultName>Textbox3</rd:DefaultName>
               <Top>0.28575cm</Top>
-              <Left>15.06595cm</Left>
+              <Left>15.4422cm</Left>
               <Height>0.44125cm</Height>
-              <Width>5.51625cm</Width>
+              <Width>5.1474cm</Width>
               <Style>
                 <Border>
                   <Style>None</Style>
@@ -1988,9 +1959,8 @@
               </Paragraphs>
               <rd:DefaultName>Textbox8</rd:DefaultName>
               <Top>0.28575cm</Top>
-              <Left>0.6059cm</Left>
               <Height>0.44125cm</Height>
-              <Width>1.60042cm</Width>
+              <Width>1.7158cm</Width>
               <ZIndex>1</ZIndex>
               <Style>
                 <Border>
@@ -2022,9 +1992,9 @@
               </Paragraphs>
               <rd:DefaultName>Textbox9</rd:DefaultName>
               <Top>0.28575cm</Top>
-              <Left>2.15023cm</Left>
+              <Left>1.7158cm</Left>
               <Height>0.44125cm</Height>
-              <Width>5.14936cm</Width>
+              <Width>5.1474cm</Width>
               <ZIndex>2</ZIndex>
               <Style>
                 <Border>
@@ -2057,9 +2027,9 @@
               </Paragraphs>
               <rd:DefaultName>Textbox10</rd:DefaultName>
               <Top>0.28575cm</Top>
-              <Left>7.47001cm</Left>
+              <Left>7.65695cm</Left>
               <Height>0.44125cm</Height>
-              <Width>2.92333cm</Width>
+              <Width>2.63785cm</Width>
               <ZIndex>3</ZIndex>
               <Style>
                 <Border>
@@ -2092,9 +2062,9 @@
               </Paragraphs>
               <rd:DefaultName>Textbox11</rd:DefaultName>
               <Top>0.28575cm</Top>
-              <Left>10.37923cm</Left>
+              <Left>10.2948cm</Left>
               <Height>0.44125cm</Height>
-              <Width>4.32745cm</Width>
+              <Width>3.4316cm</Width>
               <ZIndex>4</ZIndex>
               <Style>
                 <Border>
@@ -2109,7 +2079,7 @@
             <Line Name="Line2">
               <Top>0.127cm</Top>
               <Height>0cm</Height>
-              <Width>20.90669cm</Width>
+              <Width>20.59cm</Width>
               <ZIndex>5</ZIndex>
               <Style>
                 <Border>
@@ -2150,8 +2120,9 @@
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
     <ReportParameter Name="FechaFinal">
-      <DataType>DateTime</DataType>
+      <DataType>String</DataType>
       <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
     <ReportParameter Name="AgrupadoPor">
@@ -2171,12 +2142,6 @@
       <AllowBlank>true</AllowBlank>
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
-    <ReportParameter Name="DomicilioFiscal">
-      <DataType>String</DataType>
-      <Nullable>true</Nullable>
-      <AllowBlank>true</AllowBlank>
-      <Prompt>ReportParameter1</Prompt>
-    </ReportParameter>
   </ReportParameters>
   <rd:ReportUnitType>Cm</rd:ReportUnitType>
   <rd:ReportID>1d5d9525-4bdd-4783-9df6-cce93069c30f</rd:ReportID>
diff --git a/Empresas/Grales/Formatos/RepAlmacen.rdlc b/Empresas/Grales/Formatos/RepAlmacen.rdlc
index f8b2c15e1..945946299 100644
--- a/Empresas/Grales/Formatos/RepAlmacen.rdlc
+++ b/Empresas/Grales/Formatos/RepAlmacen.rdlc
@@ -92,10 +92,10 @@
         <TablixBody>
           <TablixColumns>
             <TablixColumn>
-              <Width>2.5cm</Width>
+              <Width>5cm</Width>
             </TablixColumn>
             <TablixColumn>
-              <Width>3.17009cm</Width>
+              <Width>5cm</Width>
             </TablixColumn>
           </TablixColumns>
           <TablixRows>
@@ -274,7 +274,7 @@
                 </SortExpression>
               </SortExpressions>
               <TablixHeader>
-                <Size>6.90208cm</Size>
+                <Size>5cm</Size>
                 <CellContents>
                   <Textbox Name="Almacen">
                     <KeepTogether>true</KeepTogether>
@@ -309,7 +309,7 @@
               <TablixMembers>
                 <TablixMember>
                   <TablixHeader>
-                    <Size>6.13624cm</Size>
+                    <Size>5cm</Size>
                     <CellContents>
                       <Textbox Name="TipoAlmacen1">
                         <CanGrow>true</CanGrow>
@@ -350,7 +350,7 @@
         <DataSetName>DataSet1</DataSetName>
         <Top>0.38751in</Top>
         <Height>0.7502cm</Height>
-        <Width>18.70841cm</Width>
+        <Width>20cm</Width>
         <Style>
           <Border>
             <Style>None</Style>
@@ -379,7 +379,7 @@
         <rd:DefaultName>Filtros</rd:DefaultName>
         <Top>0.20788cm</Top>
         <Height>0.6cm</Height>
-        <Width>18.70841cm</Width>
+        <Width>20cm</Width>
         <ZIndex>1</ZIndex>
         <Style>
           <Border>
@@ -395,7 +395,7 @@
     <Height>0.81828in</Height>
     <Style />
   </Body>
-  <Width>7.58635in</Width>
+  <Width>7.87402in</Width>
   <Page>
     <PageHeader>
       <Height>2.32946cm</Height>
@@ -422,9 +422,9 @@
           </Paragraphs>
           <rd:DefaultName>Textbox1</rd:DefaultName>
           <Top>0.18521cm</Top>
-          <Left>3.59188cm</Left>
+          <Left>5cm</Left>
           <Height>0.6cm</Height>
-          <Width>12.60299cm</Width>
+          <Width>10cm</Width>
           <Style>
             <Border>
               <Style>None</Style>
@@ -470,9 +470,9 @@
           </Paragraphs>
           <rd:DefaultName>Textbox2</rd:DefaultName>
           <Top>1.10271cm</Top>
-          <Left>3.59188cm</Left>
+          <Left>5cm</Left>
           <Height>0.52945cm</Height>
-          <Width>12.60299cm</Width>
+          <Width>10cm</Width>
           <ZIndex>1</ZIndex>
           <Style>
             <Border>
@@ -488,10 +488,8 @@
           <Source>External</Source>
           <Value>=Parameters!LogoPath.Value</Value>
           <Sizing>FitProportional</Sizing>
-          <Top>0.04167in</Top>
-          <Left>0.42624cm</Left>
-          <Height>2.22362cm</Height>
-          <Width>2.33715cm</Width>
+          <Height>1.63216cm</Height>
+          <Width>5cm</Width>
           <ZIndex>2</ZIndex>
           <Style>
             <Border>
@@ -532,9 +530,9 @@
           </Paragraphs>
           <rd:DefaultName>Textbox3</rd:DefaultName>
           <Top>0.06cm</Top>
-          <Left>16.60846cm</Left>
+          <Left>15cm</Left>
           <Height>0.68085cm</Height>
-          <Width>2.43629cm</Width>
+          <Width>5cm</Width>
           <Style>
             <Border>
               <Style>None</Style>
@@ -597,7 +595,7 @@
           <Top>0.06cm</Top>
           <Left>1.60042cm</Left>
           <Height>0.68085cm</Height>
-          <Width>5.14936cm</Width>
+          <Width>2.6852cm</Width>
           <ZIndex>2</ZIndex>
           <Style>
             <Border>
@@ -623,14 +621,16 @@
                   </Style>
                 </TextRun>
               </TextRuns>
-              <Style />
+              <Style>
+                <TextAlign>Right</TextAlign>
+              </Style>
             </Paragraph>
           </Paragraphs>
           <rd:DefaultName>Textbox10</rd:DefaultName>
           <Top>0.06cm</Top>
-          <Left>7.24367cm</Left>
+          <Left>5cm</Left>
           <Height>0.68085cm</Height>
-          <Width>2.92333cm</Width>
+          <Width>5cm</Width>
           <ZIndex>3</ZIndex>
           <Style>
             <Border>
@@ -663,9 +663,9 @@
           </Paragraphs>
           <rd:DefaultName>Textbox11</rd:DefaultName>
           <Top>0.06cm</Top>
-          <Left>10.20228cm</Left>
+          <Left>10cm</Left>
           <Height>0.68085cm</Height>
-          <Width>4.64495cm</Width>
+          <Width>5cm</Width>
           <ZIndex>4</ZIndex>
           <Style>
             <Border>
@@ -678,7 +678,6 @@
           </Style>
         </Textbox>
         <Line Name="Line1">
-          <Top>0cm</Top>
           <Height>0cm</Height>
           <Width>19.26933cm</Width>
           <ZIndex>5</ZIndex>
@@ -707,7 +706,7 @@
           <rd:DefaultName>Textbox13</rd:DefaultName>
           <Top>0.48502cm</Top>
           <Height>0.45889cm</Height>
-          <Width>6.74978cm</Width>
+          <Width>4.28563cm</Width>
           <ZIndex>6</ZIndex>
           <Style>
             <Border>
diff --git a/Inventarios/RepAlmacen.aspx.vb b/Inventarios/RepAlmacen.aspx.vb
index 9e335f2a6..9f7fd0836 100644
--- a/Inventarios/RepAlmacen.aspx.vb
+++ b/Inventarios/RepAlmacen.aspx.vb
@@ -77,11 +77,11 @@ Partial Class Inventarios_RepAlmacen
 
 #Region "I M P R I M I R  <i class='fa fa-print'></i>"
     Protected Sub LnkExportar_Click(sender As Object, e As EventArgs) Handles LnkExportar.Click
-
-        GVAlmacen.ExportToExcel("RepFacturas_" & Now.ToShortDateString())
+        'GVAlmacen.ExportToExcel("RepFacturas_" & Now.ToShortDateString())
+        GenerarPDF("EXCEL")
 
     End Sub
-    Private Sub GenerarPDF()
+    Private Sub GenerarPDF(Optional Formato As String = "PDF")
         Dim Imagen As New System.IO.FileInfo(String.Format("{0}/Logo.png", UsuarioActual.Empresa.Ruta))
         Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
         Dim StrFiltro As New StringBuilder
@@ -100,7 +100,7 @@ Partial Class Inventarios_RepAlmacen
         Else
             params.Add(New ReportParameter("LogoPath", ""))
         End If
-        ImprimirPDF("Empresas/Grales/Formatos/RepAlmacen.rdlc", TmpDT, params, "ReporteAlmacen")
+        ImprimirPDF("Empresas/Grales/Formatos/RepAlmacen.rdlc", TmpDT, params, "ReporteAlmacen", Formato)
     End Sub
     Protected Sub LnkPdf_Click(sender As Object, e As EventArgs) Handles LnkPdf.Click
         GenerarPDF()
@@ -243,5 +243,6 @@ Partial Class Inventarios_RepAlmacen
     End Sub
 
 #End Region
-
+    Public Overrides Sub VerifyRenderingInServerForm(control As Control)
+    End Sub
 End Class
diff --git a/Ventas/Ventas.aspx b/Ventas/Ventas.aspx
index 4a73d5907..efd9d3f59 100644
--- a/Ventas/Ventas.aspx
+++ b/Ventas/Ventas.aspx
@@ -5369,6 +5369,7 @@
 
                                 <div class="form-group form-md-line-input input-iconright" id="DivPSSAT" runat="server" visible="false">
                                     <ADS:Dropdownlost runat="server" ID="DdlSATPS" CssStyle="width: 100%;" CssClass="form-control input-sm select2me" DataTextField="Descripcion" DataValueField="CveSATPS" />
+                                    <%--<asp:RequiredFieldValidator ID="RfvDdlSATPS" runat="server" CssClass="help-block errorimput" ControlToValidate="DdlSATPS" InitialValue="" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Producto SAT''</b> es necesario, por favor ingréselo." ValidationGroup="GrpAddPS"></asp:RequiredFieldValidator>--%>
                                     <label for="<%= DdlSATPS.ClientID.ToString()%>">Producto SAT:</label>
                                 </div>
 
diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index abb3ba8e9..14aa62dbb 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -1985,7 +1985,6 @@ Partial Class Ventas
 
             DdlSATPS.setEsWebService(True) : DdlSATPS.Attributes.Add("data-metodo", "getpssat")
             DivPSSAT.Visible = True
-
             SetValues()
             CvePresupuesto = 0
 
@@ -21286,6 +21285,11 @@ Partial Class Ventas
             Return
         End If
 
+        If DdlSATPS.SelectedValue = "" OrElse DdlSATPS.SelectedValue = "46920" Then
+            Alert("Producto SAT no valido", TipoMensaje.MsgAdvertencia)
+            Return
+        End If
+
         Dim CveMetodoInventario As Integer = 0
         If ChkRequiereSerie.Checked Then CveMetodoInventario = 5 Else CveMetodoInventario = 1
 
@@ -27321,4 +27325,12 @@ Partial Class Ventas
 
 #End Region
 
+    Protected Sub DdlClasificacionPS_SelectedIndex(sender As Object, e As EventArgs) Handles DdlClasificacionPS.SelectedIndexChanged
+        Dim SATPS As DataTable = GlobalDTClasificaciones(CveEmpresa:=UsuarioActual.CveEmpresa, CveClasificacion:=DdlClasificacionPS.SelectedValue.ToEntero)
+        Dim CveSATPS As String = SATPS.FiltroPrimeroValor("CveSATPS")
+        Dim SatPSText As String = SATPS.FiltroPrimeroValor("SATClaveProductoServicio")
+        DdlSATPS.SelectedValue = CveSATPS
+        DdlSATPS.SelectedText = SatPSText
+    End Sub
+
 End Class
\ No newline at end of file