Merge branch 'master' of http://192.168.10.111:8383/SIG

2020-03-04 11:14:18 -07:00
parent 661a2bb56f e05de4bd31
commit 8fbdd46e2d
4 changed files with 90 additions and 44 deletions
--- 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()
--- 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()
--- 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>
--- 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>