From 17988bad434cf7f3d8d93085dcf72ab996a7d155 Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <jose_antony11@hotmail.com>
Date: Thu, 12 Nov 2020 20:16:13 -0700
Subject: [PATCH 1/3] =?UTF-8?q?condici=C3=B3n=20en=20el=20reporte=20de=20O?=
 =?UTF-8?q?C=20para=20el=20tipo=20de=20proveedor=20y=20validaci=C3=B3n=20d?=
 =?UTF-8?q?e=20c=C3=B3digo=20PS=20SAT=20no=20permitido?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App_Code/ClsOC.vb      |  2 ++
 App_Code/ClsPaginas.vb |  3 +++
 Ventas/Ventas.aspx.vb  | 13 +++++++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/App_Code/ClsOC.vb b/App_Code/ClsOC.vb
index b12725805..4f046f9db 100644
--- a/App_Code/ClsOC.vb
+++ b/App_Code/ClsOC.vb
@@ -68,6 +68,7 @@ Public Class ClsOC
     Public Property FechaEstimadaEntrega As Date
     'Private _NombreUsuario As String
     Public Property CveProveedor As Integer
+    Public Property TipoProveedor As String
     Public Property CveProveedorSucursal As Integer
     Public Property SucursalDireccion As String
     Public Property ProveedorContacto As String
@@ -736,6 +737,7 @@ Public Class ClsOC
                 _NombreUsuario = dr("NombreUsuario").ToString
 
                 _CveProveedor = If(Not IsDBNull(dr("CveProveedor")), dr("CveProveedor").ToString.ToEntero, -1)
+                Me.TipoProveedor = If(Not IsDBNull(dr("CveTipoProveedor")), dr("CveTipoProveedor").ToString, "-1")
                 _CveProveedorSucursal = If(Not IsDBNull(dr("CveProveedorSucursal")), dr("CveProveedorSucursal").ToString.ToEntero, -1)
                 _RazonSocial = If(Not IsDBNull(dr("RazonSocial")), dr("RazonSocial").ToString, "")
                 _Direccion = If(Not IsDBNull(dr("Direccion")), dr("Direccion").ToString, "")
diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index 38ccbc84f..191b602d2 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -7406,6 +7406,9 @@ Public Class ClsPaginas
 
                 params.Add(New ReportParameter("ProveedorDireccion", If(ObjOC.CveProveedorSucursal > 0, ObjOC.SucursalDireccion, ObjOC.Direccion)))
                 params.Add(New ReportParameter("ProveedorTel", If(ObjOC.CveProveedorSucursal > 0, ObjOC.SucursalTelefono, ObjOC.Telefono)))
+                If UsuarioActual.CveEmpresa = 119 Then
+                    params.Add(New ReportParameter("TipoProveedor", ObjOC.TipoProveedor))
+                End If
                 params.Add(New ReportParameter("ProveedorRFC", ObjOC.RFC))
                 params.Add(New ReportParameter("IVA", ObjOC.IVA.ToString))
                 params.Add(New ReportParameter("RetIVA", ObjOC.RetIVA.ToString.FormatoNumero(2)))
diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index 71ec1f5d1..db277f368 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -15931,10 +15931,15 @@ Partial Class Ventas
                         Return False
                     End If
 
-                    If UsuarioActual.CveEmpresa = 72 AndAlso DrPS("SATClavePS").ToString() = "01010101" Then
-                        MensajeCveSAT.AppendFormat("<b>{0}-{1}</b>: El producto/servicio no existe en el catálogo del SAT<br/>", DrPS("Codigo").ToString(), DrPS("PS").ToString())
-                        Return False
-                    End If
+                    'If UsuarioActual.CveEmpresa.Contiene(72, 80, 146) AndAlso DrPS("SATClavePS").ToString() = "01010101" Then
+                    '    MensajeCveSAT.AppendFormat("<b>{0}-{1}</b>: El producto/servicio no existe en el catálogo del SAT<br/>", DrPS("Codigo").ToString(), DrPS("PS").ToString())
+                    '    Return False
+                    'End If
+                End If
+            Else
+                If UsuarioActual.CveEmpresa.Contiene(72, 80, 146) AndAlso DrPS("SATClavePS").ToString() = "01010101" Then
+                    MensajeCveSAT.AppendFormat("<b>{0}-{1}</b>: El producto/servicio no existe en el catálogo del SAT<br/>", DrPS("Codigo").ToString(), DrPS("PS").ToString())
+                    Return False
                 End If
             End If
 

From e4150c4d5ba4dcc13a4eb25467e13ae073f3db46 Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <jose_antony11@hotmail.com>
Date: Thu, 12 Nov 2020 20:29:39 -0700
Subject: [PATCH 2/3] =?UTF-8?q?columnas=20de=20reporte=20con=20condici?=
 =?UTF-8?q?=C3=B3n=20para=20aparecer=20y=20desaparecer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Empresas/119/Formatos/OC.rdlc | 218 +++++++++++++++++++++++++++++++++-
 1 file changed, 214 insertions(+), 4 deletions(-)

diff --git a/Empresas/119/Formatos/OC.rdlc b/Empresas/119/Formatos/OC.rdlc
index 972fe2b26..1d461c99b 100644
--- a/Empresas/119/Formatos/OC.rdlc
+++ b/Empresas/119/Formatos/OC.rdlc
@@ -12,10 +12,16 @@
               <Width>1.5586cm</Width>
             </TablixColumn>
             <TablixColumn>
-              <Width>11.45281cm</Width>
+              <Width>9.58751cm</Width>
             </TablixColumn>
             <TablixColumn>
-              <Width>5.42617cm</Width>
+              <Width>3.627cm</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>1.8653cm</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>1.79919cm</Width>
             </TablixColumn>
           </TablixColumns>
           <TablixRows>
@@ -254,6 +260,122 @@
                     </Textbox>
                   </CellContents>
                 </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox2">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>P. U.</Value>
+                              <Style>
+                                <FontFamily>calibri</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>White</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox2</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Color>LightGrey</Color>
+                          <Style>Solid</Style>
+                        </Border>
+                        <TopBorder>
+                          <Color>LightGrey</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </TopBorder>
+                        <BottomBorder>
+                          <Color>LightGrey</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </BottomBorder>
+                        <LeftBorder>
+                          <Color>LightGrey</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </LeftBorder>
+                        <RightBorder>
+                          <Color>LightGrey</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </RightBorder>
+                        <BackgroundColor>#008204</BackgroundColor>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox1">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Total</Value>
+                              <Style>
+                                <FontFamily>calibri</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>White</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox1</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Color>LightGrey</Color>
+                          <Style>Solid</Style>
+                        </Border>
+                        <TopBorder>
+                          <Color>LightGrey</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </TopBorder>
+                        <BottomBorder>
+                          <Color>LightGrey</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </BottomBorder>
+                        <LeftBorder>
+                          <Color>LightGrey</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </LeftBorder>
+                        <RightBorder>
+                          <Color>LightGrey</Color>
+                          <Style>Solid</Style>
+                          <Width>1pt</Width>
+                        </RightBorder>
+                        <BackgroundColor>#008204</BackgroundColor>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
               </TablixCells>
             </TablixRow>
             <TablixRow>
@@ -477,6 +599,75 @@
                     </Textbox>
                   </CellContents>
                 </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Importe">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Importe.Value</Value>
+                              <Style>
+                                <FontFamily>calibri</FontFamily>
+                                <FontSize>8pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Importe</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Color>LightGrey</Color>
+                          <Style>Solid</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>1pt</PaddingTop>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Total">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Total.Value</Value>
+                              <Style>
+                                <FontFamily>calibri</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <Format>#,0.00;(#,0.00)</Format>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Total</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Color>LightGrey</Color>
+                          <Style>Solid</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>1pt</PaddingTop>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
               </TablixCells>
             </TablixRow>
           </TablixRows>
@@ -487,6 +678,16 @@
             <TablixMember />
             <TablixMember />
             <TablixMember />
+            <TablixMember>
+              <Visibility>
+                <Hidden>=IIF(Parameters!TipoProveedor.Value = "1",true,false)</Hidden>
+              </Visibility>
+            </TablixMember>
+            <TablixMember>
+              <Visibility>
+                <Hidden>=IIF(Parameters!TipoProveedor.Value = "1",true,false)</Hidden>
+              </Visibility>
+            </TablixMember>
           </TablixMembers>
         </TablixColumnHierarchy>
         <TablixRowHierarchy>
@@ -503,7 +704,7 @@
         <Top>4.58198cm</Top>
         <Left>0.20457cm</Left>
         <Height>0.96717cm</Height>
-        <Width>20.2584cm</Width>
+        <Width>20.25842cm</Width>
         <Style>
           <Border>
             <Color>LightGrey</Color>
@@ -1875,7 +2076,7 @@
     <Height>4.17138in</Height>
     <Style />
   </Body>
-  <Width>8.10629in</Width>
+  <Width>8.0563in</Width>
   <Page>
     <PageFooter>
       <Height>0.66146cm</Height>
@@ -1893,18 +2094,21 @@
                   <Style>
                     <FontSize>8pt</FontSize>
                     <FontWeight>Bold</FontWeight>
+                    <Format>dd/MM/yyyy</Format>
                   </Style>
                 </TextRun>
                 <TextRun>
                   <Value xml:space="preserve"> </Value>
                   <Style>
                     <FontSize>8pt</FontSize>
+                    <Format>dd/MM/yyyy</Format>
                   </Style>
                 </TextRun>
                 <TextRun>
                   <Value>=Today</Value>
                   <Style>
                     <FontSize>8pt</FontSize>
+                    <Format>dd/MM/yyyy</Format>
                   </Style>
                 </TextRun>
               </TextRuns>
@@ -2276,6 +2480,12 @@
       <AllowBlank>true</AllowBlank>
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
+    <ReportParameter Name="TipoProveedor">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
   </ReportParameters>
   <EmbeddedImages>
     <EmbeddedImage Name="Logo119">

From 3db74f2b52405fa0db5fcad3eac576ef06c3716a Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <jose_antony11@hotmail.com>
Date: Fri, 13 Nov 2020 18:01:44 -0700
Subject: [PATCH 3/3] =?UTF-8?q?se=20agrego=20la=20119=20a=20la=20condici?=
 =?UTF-8?q?=C3=B3n=20de=20subtotal2=20en=20impreci=C3=B3n=20de=20OC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App_Code/ClsPaginas.vb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index 191b602d2..1fc7ddb54 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -7376,7 +7376,7 @@ Public Class ClsPaginas
                     params.Add(New ReportParameter("Descuento", DtDetalle.SUM("Descuento").ToString.FormatoNumero(2)))
                 End If
                 'DATOS PARA DESCUENTO
-                If EmpresaActual.CveEmpresa.Contiene(4, 145, 7, 11, 12, 13, 72, 80, 83, 122, 126) Then 'EMPRESAS QUE YA TIENEN EL AJUSTE EN EL FORMATO
+                If EmpresaActual.CveEmpresa.Contiene(4, 145, 7, 11, 12, 13, 72, 80, 83, 119, 122, 126) Then 'EMPRESAS QUE YA TIENEN EL AJUSTE EN EL FORMATO
                     params.Add(New ReportParameter("SubTotal", ObjOC.SubTotal.ToString))
                     params.Add(New ReportParameter("SubTotal2", DtDetalle.SUM("Total").ToString))
                 Else