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

App_Code/ClsContPAQi.vb

@@ -443,7 +443,7 @@ Public Class ClsContPAQi
         End If
 
         ' no puede ser menor el subtotal al IVA, para evitar numeros negativos, excepto VSH
-        If Not CveEmpresa.Contiene(4, 7, 11, 12, 122) Then
+        If Not CveEmpresa.Contiene(4, 7, 11, 12, 122, 145) Then
             If Math.Abs(SubTotal) < Math.Abs(IVA) Then
                 Return False
             End If

Compras/PopUpVerFactura.aspx.vb

@@ -1082,6 +1082,12 @@ Partial Class PopUpVerFactura
                 If dtVentas(0)("TipoDocto").ToString.Contiene("Egs", "Dev", "Ant") Then
                     If ObjVentas.GetVentasAntNC(-1, CveVenta) Then
                         Vta.DtDocumentosRelacionados = ObjVentas.DtResultados.FiltraParametros("FolioFiscal IS NOT NULL")
+                        If Vta.DtDocumentosRelacionados.Rows.Count > 0 Then
+                            If Vta.TipoDocto.Contiene("Dev") Then
+                                Vta.Timbre.CFDIRelacionados.TipoRelacion = "03"
+                                Vta.Timbre.CFDIRelacionados.TipoRelacionTexto = "Devolución aplicada a Ingreso"
+                            End If
+                        End If
                     End If
                 End If
             End If

Compras/RepNotasCredito.aspx.vb

@@ -169,7 +169,7 @@ Partial Class Compras_RepNotasCredito
                     MsgError = "Ocurrio un Error al saldar el movimiento"
                 End If
 
-                If TC <> TCCompra AndAlso CveMoneda > 1 AndAlso UsaComplementaria Then
+                If TC <> TCCompra AndAlso CveMoneda > 1 Then
                     Dim difFluctuacion As Decimal = TC - TCCompra
                     Dim CveConceptoFluctua As Integer = 64 '64.ganacia, 65.perdida
                     Dim TipoMovtoFluctua As Boolean = True

CxC/RepCxCDetalle.aspx

@@ -386,12 +386,19 @@
 
     <asp:UpdatePanel ID="UPDatos" runat="server" UpdateMode="Conditional">
         <ContentTemplate>
-            <asp:GridView ID="GvDatos" runat="server" AutoGenerateColumns="False" Width="100%" EmptyDataText="No se encontraron Ventas con los filtros especificados" data-sort="true" ToolTip="Listado de Ventas" CssClass="ScrollAD table table-striped table-hover Widthall" data-heighterror="320" data-freezecols="0" data-freezerows="0" GridLines="None"
+            <asp:GridView ID="GvDatos" runat="server" AutoGenerateColumns="False" Width="100%" 
-                DataKeyNames="CveVenta">
+                EmptyDataText="No se encontraron Ventas con los filtros especificados" data-sort="true" ToolTip="Listado de Ventas" 
+                CssClass="ScrollAD table table-striped table-hover Widthall" data-heighterror="320" data-freezecols="0" data-freezerows="0" GridLines="None"
+                DataKeyNames="CveVenta,TipoDocto">
                 <Columns>
                     <asp:BoundField HeaderText="TipoDocto" DataField="TipoDocto" ItemStyle-HorizontalAlign="Center" />
                     <asp:BoundField HeaderText="Fecha" DataField="Fecha" DataFormatString="{0:d}" ItemStyle-HorizontalAlign="Center" />
-                    <asp:HyperLinkField HeaderText="Folio" DataNavigateUrlFields="CveVenta" DataNavigateUrlFormatString="/Ventas/Ventas.aspx?CveVenta={0}" ControlStyle-Width ="85px"  DataTextField="SerieFolio" />
+                    <asp:TemplateField HeaderText="Folio">
+                        <ItemTemplate>
+                            <asp:HyperLink ID="HlFolio" runat="server" ControlStyle-Width="85px"></asp:HyperLink>
+                        </ItemTemplate>
+                    </asp:TemplateField>
+                    <%--<asp:HyperLinkField HeaderText="Folio" DataNavigateUrlFields="CveVenta" DataNavigateUrlFormatString="/Ventas/Ventas.aspx?CveVenta={0}" ControlStyle-Width ="85px"  DataTextField="SerieFolio" />--%>
                     <asp:BoundField HeaderText="Total" DataField="Total" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />
                     <asp:BoundField HeaderText="SubTotal" DataField="SubTotal" DataFormatString="{0:N2}" Visible="false" ItemStyle-HorizontalAlign="Right" />
                     <asp:BoundField HeaderText="IVA" DataField="IVA" DataFormatString="{0:N2}" Visible="false" ItemStyle-HorizontalAlign="Right" />

CxC/RepCxCDetalle.aspx.vb

@@ -433,6 +433,15 @@ Partial Class RepCxCDetalle
                 e.Row.Cells(1).Width = Unit.Pixel(70)
                 e.Row.Cells(2).Width = Unit.Pixel(75)
             End If
+            e.Row.FCHyperLink("HlFolio").Text = e.Row.DBCampo("SerieFolio")
+
+            If e.Row.DBCampo("CveVenta").ToEntero() > 0 Then
+                If e.Row.DBCampo("TipoDocto") = "IxC" Then
+                    e.Row.FCHyperLink("HlFolio").NavigateUrl = String.Format("/Bancos/IE.aspx?CveIE={0}", e.Row.DBCampo("CveVenta"))
+                Else
+                    e.Row.FCHyperLink("HlFolio").NavigateUrl = String.Format("/Ventas/Ventas.aspx?CveVenta={0}", e.Row.DBCampo("CveVenta"))
+                End If
+            End If
 
             If e.Row.DBCampo("SubProyecto") = "" And e.Row.DBCampo("CveMoneda") = "1" Then
                 e.Row.Cells(11).Text = "Total Pesos"
@@ -928,21 +937,26 @@ Partial Class RepCxCDetalle
         UpCobranza.Update()
     End Sub
     Private Sub BtnAsignaCobranza_Click(sender As Object, e As EventArgs) Handles BtnAsignaCobranza.Click
-        Dim ObjVentas As New ClsVentas
         Dim time As DateTime
         Dim TieneError = False
 
+        Dim ObjVentas As New ClsVentas
         ObjVentas.IniciaTransacSQL()
-
+        Try
-        For Each row As GridViewRow In GvDatos.Rows
+            For Each row As GridViewRow In GvDatos.Rows
-            If row.FCCheckBox("ChkCobranza").Checked Then
+                Dim TipoDocto As String = row.DataKey("TipoDocto")
-                time = DateTime.Parse(String.Format("{0} {1}:{2} {3}", TxtFechaCobranza.Text, TimeSelector.Hour, TimeSelector.Minute, TimeSelector.AmPm))
+                If row.FCCheckBox("ChkCobranza").Checked AndAlso TipoDocto <> "IxC" Then
-                If Not ObjVentas.UpdateAsignaVentaCobranza(row.DataKey("CveVenta").ToEntero, DdlCobranzaEstatus.SelectedValue.ToEntero, DdlUsuarioCobranza.SelectedValue.ToEntero, DdlTurnoCobranza.SelectedValue.ToEntero, TxtObservacionCobranza.Text.Trim, time) Then
+                    time = DateTime.Parse(String.Format("{0} {1}:{2} {3}", TxtFechaCobranza.Text, TimeSelector.Hour, TimeSelector.Minute, TimeSelector.AmPm))
-                    TieneError = True
+                    If Not ObjVentas.UpdateAsignaVentaCobranza(row.DataKey("CveVenta").ToEntero, DdlCobranzaEstatus.SelectedValue.ToEntero, DdlUsuarioCobranza.SelectedValue.ToEntero, DdlTurnoCobranza.SelectedValue.ToEntero, TxtObservacionCobranza.Text.Trim, time) Then
+                        TieneError = True
+                    End If
                 End If
-            End If
 
-        Next
+            Next
+        Catch ex As Exception
+            OnError("Ocurrió un error al actualizar", ex)
+            TieneError = True
+        End Try
 
         If Not TieneError Then
             ObjVentas.Commit()

Empresas/119/Formatos/NotaDevolucion.rdlc

@@ -2,6 +2,52 @@
 <Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2008/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
   <Body>
     <ReportItems>
+      <Rectangle Name="Rectangle4">
+        <ReportItems>
+          <Textbox Name="Textbox43">
+            <CanGrow>true</CanGrow>
+            <KeepTogether>true</KeepTogether>
+            <Paragraphs>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>=Parameters!TipoRelacionTexto.Value</Value>
+                    <Style>
+                      <FontFamily>Myriad Pro</FontFamily>
+                      <FontSize>8pt</FontSize>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style />
+              </Paragraph>
+            </Paragraphs>
+            <rd:DefaultName>Textbox29</rd:DefaultName>
+            <Top>0.7092cm</Top>
+            <Left>10.09673cm</Left>
+            <Height>0.41981cm</Height>
+            <Width>7.14985cm</Width>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+              <PaddingLeft>2pt</PaddingLeft>
+              <PaddingRight>2pt</PaddingRight>
+              <PaddingTop>2pt</PaddingTop>
+              <PaddingBottom>2pt</PaddingBottom>
+            </Style>
+          </Textbox>
+        </ReportItems>
+        <KeepTogether>true</KeepTogether>
+        <Top>5.67653in</Top>
+        <Left>0.06096in</Left>
+        <Height>1.11356in</Height>
+        <Width>8.15264in</Width>
+        <Style>
+          <Border>
+            <Style>None</Style>
+          </Border>
+        </Style>
+      </Rectangle>
       <Rectangle Name="Rectangle3">
         <ReportItems>
           <Textbox Name="Textbox45">
@@ -229,6 +275,7 @@
         <Left>0.16719in</Left>
         <Height>1.4758in</Height>
         <Width>8.12499in</Width>
+        <ZIndex>1</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -803,7 +850,7 @@
         <Left>0.04219in</Left>
         <Height>0.34081in</Height>
         <Width>8.23727in</Width>
-        <ZIndex>1</ZIndex>
+        <ZIndex>2</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -835,7 +882,7 @@
         <Left>0.77448in</Left>
         <Height>0.18861in</Height>
         <Width>7.22552in</Width>
-        <ZIndex>2</ZIndex>
+        <ZIndex>3</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -864,7 +911,7 @@
         <Top>9.95583cm</Top>
         <Height>0.0882cm</Height>
         <Width>21.06212cm</Width>
-        <ZIndex>3</ZIndex>
+        <ZIndex>4</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -891,10 +938,10 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox5</rd:DefaultName>
-        <Top>14.23641cm</Top>
+        <Top>14.20466cm</Top>
         <Height>0.14316cm</Height>
         <Width>21.06212cm</Width>
-        <ZIndex>4</ZIndex>
+        <ZIndex>5</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -924,7 +971,7 @@
         <Top>9.08065cm</Top>
         <Height>0.14316cm</Height>
         <Width>21.06212cm</Width>
-        <ZIndex>5</ZIndex>
+        <ZIndex>6</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -958,7 +1005,7 @@
         <Left>0.42466cm</Left>
         <Height>0.34219cm</Height>
         <Width>13.97836cm</Width>
-        <ZIndex>6</ZIndex>
+        <ZIndex>7</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -1076,7 +1123,7 @@
         <Left>12.94818cm</Left>
         <Height>0.48004cm</Height>
         <Width>7.28058cm</Width>
-        <ZIndex>7</ZIndex>
+        <ZIndex>8</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -1101,7 +1148,7 @@
         <Top>8.27399cm</Top>
         <Height>0.14316cm</Height>
         <Width>21.06212cm</Width>
-        <ZIndex>8</ZIndex>
+        <ZIndex>9</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -1433,7 +1480,7 @@
         <Left>4.38498cm</Left>
         <Height>1.62208in</Height>
         <Width>3.6362in</Width>
-        <ZIndex>9</ZIndex>
+        <ZIndex>10</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -1532,7 +1579,7 @@
         <Left>0.15484cm</Left>
         <Height>2.1447cm</Height>
         <Width>4.08234cm</Width>
-        <ZIndex>10</ZIndex>
+        <ZIndex>11</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -1800,7 +1847,7 @@
         <Left>5.59571in</Left>
         <Height>1.62345in</Height>
         <Width>2.64893in</Width>
-        <ZIndex>11</ZIndex>
+        <ZIndex>12</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -1927,7 +1974,7 @@
         <Left>15.01302cm</Left>
         <Height>2.63207cm</Height>
         <Width>5.92837cm</Width>
-        <ZIndex>12</ZIndex>
+        <ZIndex>13</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -1946,15 +1993,466 @@
         <Left>0.04219in</Left>
         <Height>0.99993in</Height>
         <Width>1.62599in</Width>
-        <ZIndex>13</ZIndex>
+        <ZIndex>14</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
           </Border>
         </Style>
       </Image>
+      <Tablix Name="Tablix1">
+        <TablixBody>
+          <TablixColumns>
+            <TablixColumn>
+              <Width>2.42456cm</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>2.05585cm</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>3.03631cm</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>7.7847cm</Width>
+            </TablixColumn>
+          </TablixColumns>
+          <TablixRows>
+            <TablixRow>
+              <Height>0.44125cm</Height>
+              <TablixCells>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox10">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Folio</Value>
+                              <Style>
+                                <FontFamily>myriad Pro</FontFamily>
+                                <FontSize>9pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>White</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox10</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <BackgroundColor>#008204</BackgroundColor>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox12">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Fecha</Value>
+                              <Style>
+                                <FontFamily>myriad Pro</FontFamily>
+                                <FontSize>9pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>White</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox12</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <BackgroundColor>#008204</BackgroundColor>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox2222">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Importe</Value>
+                              <Style>
+                                <FontFamily>myriad Pro</FontFamily>
+                                <FontSize>9pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>White</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox2222</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <BackgroundColor>#008204</BackgroundColor>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox11">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>Folio Fiscal</Value>
+                              <Style>
+                                <FontFamily>myriad Pro</FontFamily>
+                                <FontSize>9pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>White</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox11</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <BackgroundColor>#008204</BackgroundColor>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+              </TablixCells>
+            </TablixRow>
+            <TablixRow>
+              <Height>0.41479cm</Height>
+              <TablixCells>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="SerieFolio">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!SerieFolio.Value</Value>
+                              <Style>
+                                <FontFamily>myriad pro</FontFamily>
+                                <FontSize>7.5pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>SerieFolio</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Fecha">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Fecha.Value</Value>
+                              <Style>
+                                <FontFamily>myriad pro</FontFamily>
+                                <FontSize>7.5pt</FontSize>
+                                <Format>dd/MM/yyyy</Format>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Fecha</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Importe1">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!Importe.Value</Value>
+                              <Style>
+                                <FontFamily>myriad pro</FontFamily>
+                                <FontSize>7.5pt</FontSize>
+                                <Format>#,0.00;-#,0.00;'-'</Format>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Right</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Importe1</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="FolioFiscal">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Fields!FolioFiscal.Value</Value>
+                              <Style>
+                                <FontFamily>myriad pro</FontFamily>
+                                <FontSize>7.5pt</FontSize>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>FolioFiscal</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>None</Style>
+                        </Border>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
+              </TablixCells>
+            </TablixRow>
+          </TablixRows>
+        </TablixBody>
+        <TablixColumnHierarchy>
+          <TablixMembers>
+            <TablixMember />
+            <TablixMember />
+            <TablixMember />
+            <TablixMember />
+          </TablixMembers>
+        </TablixColumnHierarchy>
+        <TablixRowHierarchy>
+          <TablixMembers>
+            <TablixMember>
+              <KeepWithGroup>After</KeepWithGroup>
+            </TablixMember>
+            <TablixMember>
+              <Group Name="Details1" />
+            </TablixMember>
+          </TablixMembers>
+        </TablixRowHierarchy>
+        <DataSetName>DataSet4</DataSetName>
+        <Top>15.68638cm</Top>
+        <Left>3.50335cm</Left>
+        <Height>0.85604cm</Height>
+        <Width>15.30142cm</Width>
+        <ZIndex>15</ZIndex>
+        <Style>
+          <Border>
+            <Style>None</Style>
+          </Border>
+        </Style>
+      </Tablix>
+      <Textbox Name="Textbox42">
+        <CanGrow>true</CanGrow>
+        <KeepTogether>true</KeepTogether>
+        <Paragraphs>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>Tipo Relación:</Value>
+                <Style>
+                  <FontFamily>Myriad Pro</FontFamily>
+                  <FontSize>8pt</FontSize>
+                  <FontWeight>Bold</FontWeight>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Right</TextAlign>
+            </Style>
+          </Paragraph>
+        </Paragraphs>
+        <rd:DefaultName>Textbox29</rd:DefaultName>
+        <Top>15.12759cm</Top>
+        <Left>4.93316cm</Left>
+        <Height>0.41981cm</Height>
+        <Width>5.31841cm</Width>
+        <ZIndex>16</ZIndex>
+        <Style>
+          <Border>
+            <Style>None</Style>
+          </Border>
+          <PaddingLeft>2pt</PaddingLeft>
+          <PaddingRight>2pt</PaddingRight>
+          <PaddingTop>2pt</PaddingTop>
+          <PaddingBottom>2pt</PaddingBottom>
+        </Style>
+      </Textbox>
+      <Textbox Name="Textbox41">
+        <CanGrow>true</CanGrow>
+        <KeepTogether>true</KeepTogether>
+        <Paragraphs>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>CFDI Relacionados</Value>
+                <Style>
+                  <FontFamily>Myriad Pro</FontFamily>
+                  <FontSize>10.16pt</FontSize>
+                  <FontWeight>Bold</FontWeight>
+                  <Color>White</Color>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Center</TextAlign>
+            </Style>
+          </Paragraph>
+        </Paragraphs>
+        <rd:DefaultName>Textbox5</rd:DefaultName>
+        <Top>14.4466cm</Top>
+        <Left>0.21692cm</Left>
+        <Height>0.54004cm</Height>
+        <Width>20.7077cm</Width>
+        <ZIndex>17</ZIndex>
+        <Style>
+          <Border>
+            <Style>None</Style>
+          </Border>
+          <BackgroundColor>#008204</BackgroundColor>
+          <PaddingLeft>2pt</PaddingLeft>
+          <PaddingRight>2pt</PaddingRight>
+          <PaddingTop>2pt</PaddingTop>
+          <PaddingBottom>2pt</PaddingBottom>
+        </Style>
+      </Textbox>
+      <Textbox Name="Textbox5">
+        <CanGrow>true</CanGrow>
+        <KeepTogether>true</KeepTogether>
+        <Paragraphs>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>VERSION 3.3</Value>
+                <Style>
+                  <FontFamily>MYRiad Pro</FontFamily>
+                  <FontSize>9.16pt</FontSize>
+                  <FontWeight>Bold</FontWeight>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Center</TextAlign>
+            </Style>
+          </Paragraph>
+        </Paragraphs>
+        <rd:DefaultName>Textbox5</rd:DefaultName>
+        <Top>16.55158cm</Top>
+        <Left>17.56899cm</Left>
+        <Height>0.6cm</Height>
+        <Width>3.32021cm</Width>
+        <ZIndex>18</ZIndex>
+        <Style>
+          <Border>
+            <Style>None</Style>
+          </Border>
+          <PaddingLeft>2pt</PaddingLeft>
+          <PaddingRight>2pt</PaddingRight>
+          <PaddingTop>2pt</PaddingTop>
+          <PaddingBottom>2pt</PaddingBottom>
+        </Style>
+      </Textbox>
     </ReportItems>
-    <Height>5.66125in</Height>
+    <Height>6.91125in</Height>
     <Style />
   </Body>
   <Width>21.14151cm</Width>
@@ -1990,7 +2488,7 @@
           </Paragraphs>
           <rd:DefaultName>Textbox29</rd:DefaultName>
           <Top>0.17639cm</Top>
-          <Left>0.42814cm</Left>
+          <Left>0.42466cm</Left>
           <Height>0.41981cm</Height>
           <Width>6.40316cm</Width>
           <Style>
@@ -2029,7 +2527,7 @@
           </Paragraphs>
           <rd:DefaultName>Textbox31</rd:DefaultName>
           <Top>0.17639cm</Top>
-          <Left>8.48417cm</Left>
+          <Left>8.48069cm</Left>
           <Height>0.41981cm</Height>
           <Width>6.02198cm</Width>
           <ZIndex>1</ZIndex>
@@ -2064,7 +2562,7 @@
           </Paragraphs>
           <rd:DefaultName>Textbox35</rd:DefaultName>
           <Top>0.17639cm</Top>
-          <Left>18.21986cm</Left>
+          <Left>18.21638cm</Left>
           <Height>0.41981cm</Height>
           <Width>2.5cm</Width>
           <ZIndex>2</ZIndex>
@@ -2117,6 +2615,13 @@
       </ConnectionProperties>
       <rd:DataSourceID>c220a38d-e45b-4e04-917e-7dfd9cc3345f</rd:DataSourceID>
     </DataSource>
+    <DataSource Name="DsDesgloseImpuestos">
+      <ConnectionProperties>
+        <DataProvider>System.Data.DataSet</DataProvider>
+        <ConnectString>/* Local Connection */</ConnectString>
+      </ConnectionProperties>
+      <rd:DataSourceID>c220a38d-e45b-4e04-917e-7dfd9cc3345f</rd:DataSourceID>
+    </DataSource>
   </DataSources>
   <DataSets>
     <DataSet Name="DsOC">
@@ -2291,6 +2796,38 @@
         <rd:TableAdapterName />
       </rd:DataSetInfo>
     </DataSet>
+    <DataSet Name="DataSet4">
+      <Query>
+        <DataSourceName>DsDesgloseImpuestos</DataSourceName>
+        <CommandText>/* Local Query */</CommandText>
+      </Query>
+      <Fields>
+        <Field Name="SerieFolio">
+          <DataField>SerieFolio</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Fecha">
+          <DataField>Fecha</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Importe">
+          <DataField>Importe</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="FolioFiscal">
+          <DataField>FolioFiscal</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+      </Fields>
+      <rd:DataSetInfo>
+        <rd:DataSetName>DsDesgloseImpuestos</rd:DataSetName>
+        <rd:SchemaPath>C:\Users\Jesus Murua\Documents\Visual Studio 2015\WebSites\WebSite2\App_Code\DsFirmas.xsd</rd:SchemaPath>
+        <rd:TableName>DataTable1</rd:TableName>
+        <rd:TableAdapterFillMethod />
+        <rd:TableAdapterGetDataMethod />
+        <rd:TableAdapterName />
+      </rd:DataSetInfo>
+    </DataSet>
   </DataSets>
   <ReportParameters>
     <ReportParameter Name="ClienteCodigo">

Empresas/Grales/Formatos/Ajuste.rdlc

@@ -419,7 +419,7 @@
                 <Style />
               </TextRun>
               <TextRun>
-                <Value>=Year(Parameters!Fecha.Value)</Value>
+                <Value>=Year(Parameters!FechaInst.Value)</Value>
                 <Style />
               </TextRun>
             </TextRuns>
@@ -463,7 +463,7 @@
                 <Style />
               </TextRun>
               <TextRun>
-                <Value>=Day(Parameters!Fecha.Value)</Value>
+                <Value>=Day(Parameters!FechaInst.Value)</Value>
                 <Style />
               </TextRun>
             </TextRuns>
@@ -502,7 +502,7 @@
                 <Style />
               </TextRun>
               <TextRun>
-                <Value>= MonthName(Month(Parameters!Fecha.Value))</Value>
+                <Value>= MonthName(Month(Parameters!FechaInst.Value))</Value>
                 <Style />
               </TextRun>
             </TextRuns>
@@ -577,7 +577,11 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value>Año:</Value>
+                <Value>Año: </Value>
+                <Style />
+              </TextRun>
+              <TextRun>
+                <Value>= Year(Parameters!Fecha.Value)</Value>
                 <Style />
               </TextRun>
             </TextRuns>
@@ -617,7 +621,11 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value>Día:</Value>
+                <Value>Día: </Value>
+                <Style />
+              </TextRun>
+              <TextRun>
+                <Value>=Day(Parameters!Fecha.Value)</Value>
                 <Style />
               </TextRun>
             </TextRuns>
@@ -652,7 +660,11 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value>Mes:</Value>
+                <Value>Mes: </Value>
+                <Style />
+              </TextRun>
+              <TextRun>
+                <Value>= MonthName(Month(Parameters!Fecha.Value))</Value>
                 <Style />
               </TextRun>
             </TextRuns>
@@ -1725,6 +1737,40 @@
           <PaddingBottom>2pt</PaddingBottom>
         </Style>
       </Textbox>
+      <Textbox Name="Textbox48">
+        <CanGrow>true</CanGrow>
+        <KeepTogether>true</KeepTogether>
+        <Paragraphs>
+          <Paragraph>
+            <TextRuns>
+              <TextRun>
+                <Value>=Parameters!Fecha.Value</Value>
+                <Style>
+                  <Format>d' de 'MMMM' de 'yyyy</Format>
+                </Style>
+              </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Center</TextAlign>
+            </Style>
+          </Paragraph>
+        </Paragraphs>
+        <rd:DefaultName>Textbox46</rd:DefaultName>
+        <Top>5.70014in</Top>
+        <Left>0.70708in</Left>
+        <Height>0.25in</Height>
+        <Width>3.03125in</Width>
+        <ZIndex>46</ZIndex>
+        <Style>
+          <Border>
+            <Style>None</Style>
+          </Border>
+          <PaddingLeft>2pt</PaddingLeft>
+          <PaddingRight>2pt</PaddingRight>
+          <PaddingTop>2pt</PaddingTop>
+          <PaddingBottom>2pt</PaddingBottom>
+        </Style>
+      </Textbox>
     </ReportItems>
     <Height>6.57167in</Height>
     <Style />
@@ -1769,7 +1815,7 @@
       <AllowBlank>true</AllowBlank>
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
-    <ReportParameter Name="Fecha">
+    <ReportParameter Name="FechaInst">
       <DataType>DateTime</DataType>
       <Nullable>true</Nullable>
       <Prompt>ReportParameter1</Prompt>
@@ -1816,7 +1862,13 @@
       <AllowBlank>true</AllowBlank>
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
+    <ReportParameter Name="Fecha">
+      <DataType>DateTime</DataType>
+      <Nullable>true</Nullable>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
   </ReportParameters>
+  <Language>Es-MX</Language>
   <rd:ReportUnitType>Inch</rd:ReportUnitType>
   <rd:ReportID>32a58a02-ed5a-499c-85e0-a4eefc333287</rd:ReportID>
 </Report>

Ventas/PV.aspx

@@ -2821,7 +2821,9 @@
                                                         <div class="col-md-6">
                                                             <div class="form-group form-md-line-input input-iconright">
                                                                 <asp:TextBox ID="TxtCodEnsamble" CssClass="form-control" runat="server" MaxLength="50"></asp:TextBox>
-                                                                <%--<asp:RequiredFieldValidator ID="RFVCodEnsamble" runat="server" ControlToValidate="TxtCodEnsamble" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Folio''</b> es necesario, por favor ingréselo." ValidationGroup="VGMAjuste"></asp:RequiredFieldValidator>--%>
+                                                                <asp:RegularExpressionValidator ID="REVCodEnsamble" runat="server" ControlToValidate="TxtCodEnsamble" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Cod.Ensamble''</b> es incorrecto, por favor ingréselo correctamente." ValidationGroup="GrpAddVenta" ValidationExpression="^[0-9][A-HJ-M]([[0-2][1-9]|3[0-1])$"></asp:RegularExpressionValidator>
+                                                                <ajax:FilteredTextBoxExtender ID="FilteredTextBoxExtender2" TargetControlID="TxtCodEnsamble" FilterType="UppercaseLetters, Numbers,LowercaseLetters, Custom" runat="server" ValidChars="&Ñ" InvalidChars="-" />
+                                                                <%--<asp:RequiredFieldValidator ID="RFVCodEnsamble" runat="server" ControlToValidate="TxtCodEnsamble" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Folio''</b> es necesario, por favor ingréselo." ValidationGroup="VGMAjuste"></asp:RequiredFieldValidator>--%
                                                                 <%--<ajax:ValidatorCalloutExtender ID="VCECodEnsamble" runat="server" HighlightCssClass="vco" TargetControlID="RFVCodEnsamble"></ajax:ValidatorCalloutExtender>--%>
                                                                 <label for="<%= TxtCodEnsamble.ClientID.ToString()%>">Cod.Ensamble:</label>
                                                             </div>
@@ -2868,6 +2870,7 @@
                                                         <div class="col-md-6">
                                                             <div class="form-group form-md-line-input input-iconright">
                                                                 <asp:TextBox ID="TxtCodInspeccion" CssClass="form-control" runat="server" MaxLength="50"></asp:TextBox>
+                                                                <ajax:MaskedEditExtender TargetControlID="TxtCodInspeccion" ID="MEECodInspeccion" runat="server" Mask="L9?L" AutoComplete="True" AutoCompleteValue="0" />
                                                                 <%--<asp:RequiredFieldValidator ID="RFVCodInspeccion" runat="server" ControlToValidate="TxtCodInspeccion" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Cod. Inspeccion''</b> es necesario, por favor ingréselo." ValidationGroup="VGMAjuste"></asp:RequiredFieldValidator>--%>
                                                                 <%--<ajax:ValidatorCalloutExtender ID="VCECodInspeccion" runat="server" HighlightCssClass="vco" TargetControlID="RFVCodInspeccion"></ajax:ValidatorCalloutExtender>--%>
                                                                 <label for="<%= TxtCodInspeccion.ClientID.ToString()%>">Cod. Inspección:</label>

Ventas/PV.aspx.vb

@@ -5073,7 +5073,17 @@ Partial Class PV
     End Sub
 
     Private Sub CalculaMesesUso()
-        TxtMesesUso.Text = DateDiff(DateInterval.Month, TxtFechaAjuste.Text.ToDate, Now).ToEntero.ToString
+        Dim FechaI = TxtFechaAjuste.Text.ToDate
+        Dim FechaF = Now
+        'Dim NumDiasAlMes As Double = (365 / 12)
+
+        'Dim DiasTranscurridos = DateDiff(DateInterval.Day, FechaI, FechaF)
+
+        'Dim MesesTranscurridos As Double = DiasTranscurridos / NumDiasAlMes
+
+        'Dim NoMesesTrascurridos = Math.Ceiling(MesesTranscurridos)
+
+        TxtMesesUso.Text = (DateDiff(DateInterval.Month, FechaI, FechaF) + 1).ToString()
         CalculaPorcentajeAjuste()
     End Sub
 
@@ -5660,7 +5670,8 @@ Partial Class PV
         params.Add(New ReportParameter("FolioAcuse", If(DdlFolioGarantia.SelectedValue.ToEntero = -1, "", DdlFolioGarantia.SelectedItem.Text)))
 
         'Informacion de Garantia o ajuste
-        params.Add(New ReportParameter("Fecha", TxtFechaAjuste.Text.Trim))
+        params.Add(New ReportParameter("FechaInst", TxtFechaAjuste.Text.Trim))
+        params.Add(New ReportParameter("Fecha", Now.ToShortDateString))
         params.Add(New ReportParameter("Defecto", If(DdlTipoDefecto.SelectedValue.ToEntero = -1, "", DdlTipoDefecto.SelectedItem.Text)))
         params.Add(New ReportParameter("MesesUso", TxtMesesUso.Text.Trim))
         params.Add(New ReportParameter("PorcentajeAjuste", TxtPorcentajeAjuste.Text.Trim))