AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2021-02-23 06:02:44 -07:00
parent 9af06cfeb1
commit 6d7f64f1ec
4 changed files with 33 additions and 9351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
App_Code/ClsPaginas.vb
View File

@@ -7962,7 +7962,7 @@ Public Class ClsPaginas
If ObjNomina.GetNom_NominasDetalles(CveNomina, CvePersonal, CvePeriodo, "-1") Then If ObjNomina.GetNom_NominasDetalles(CveNomina, CvePersonal, CvePeriodo, "-1") Then
DTPercepciones = ObjNomina.DtResultados.FiltraParametros("(Tipo = 'P' OR (Tipo = 'D' AND Importe <0)) AND Importe <>0 AND EsPadre = 1 AND SoloVisible =0") DTPercepciones = ObjNomina.DtResultados.FiltraParametros("(Tipo = 'P' OR (Tipo = 'D' AND Importe <0)) AND Importe <>0 AND EsPadre = 1 AND SoloVisible =0")
DTDeducciones = ObjNomina.DtResultados.FiltraParametros("Tipo = 'D' AND Importe >0 AND EsPadre = 1 AND SoloVisible =0") DTDeducciones = ObjNomina.DtResultados.FiltraParametros("Tipo = 'D' AND Importe >0 AND EsPadre = 1 AND SoloVisible =0")
DTDeducciones2 = ObjNomina.DtResultados.FiltraParametros("(Tipo = 'D' AND Importe >0 AND EsPadre = 1 AND SoloVisible =0) OR CveConcepto IN (1471,1491)", "Orden") DTDeducciones2 = ObjNomina.DtResultados.FiltraParametros("(Tipo = 'D' AND Importe >0 AND EsPadre = 1 AND SoloVisible =0) OR CveConcepto IN (1471,1491)")
For Each row As DataRow In DTPercepciones.Rows For Each row As DataRow In DTPercepciones.Rows
If row("Tipo").ToString() = "D" Then If row("Tipo").ToString() = "D" Then
row("Codigo") = row("Codigo").ToString().Replace("D", "OP") row("Codigo") = row("Codigo").ToString().Replace("D", "OP")
@@ -8011,7 +8011,25 @@ Public Class ClsPaginas
rds2.Name = "dsImagenes" rds2.Name = "dsImagenes"
rds2.Value = dtqr rds2.Value = dtqr
LSRds.Add(rds2) LSRds.Add(rds2)
Dim numnewfiles As Integer = 0
If DTPercepciones.Rows.Count > DTDeducciones2.Rows.Count Then
numnewfiles = DTPercepciones.Rows.Count - DTDeducciones2.Rows.Count
For index = 1 To numnewfiles
DTDeducciones2.Rows.Add(DTDeducciones2.NewRow)
Next
Else
If DTDeducciones2.Rows.Count > DTPercepciones.Rows.Count Then
numnewfiles = DTDeducciones2.Rows.Count - DTPercepciones.Rows.Count
For index = 1 To numnewfiles
DTPercepciones.Rows.Add(DTPercepciones.NewRow)
Next
End If
End If
Dim RptDS As New ReportDataSource Dim RptDS As New ReportDataSource
RptDS.Name = "DsOC" RptDS.Name = "DsOC"
@@ -8369,7 +8387,7 @@ Public Class ClsPaginas
DdlSeccionAlmacen.DataSource = dtsec DdlSeccionAlmacen.DataSource = dtsec
DdlSeccionAlmacen.DataBind() DdlSeccionAlmacen.DataBind()
If dtsec Is Nothing Then Exit Sub If dtsec Is Nothing Then Exit Sub
If dtsec.Rows.Count = 1 Then If dtsec.Rows.Count = 1 Then
DdlSeccionAlmacen.SelectedIndex = 0 DdlSeccionAlmacen.SelectedIndex = 0
DdlSeccionAlmacen.Enabled = False DdlSeccionAlmacen.Enabled = False
Else 'si es mayor a uno que por default seleccione el primero, que seria el predeterminado Else 'si es mayor a uno que por default seleccione el primero, que seria el predeterminado

19
Empresas/119/Formatos/Nomina.rdlc
View File

@@ -1076,6 +1076,7 @@
<Value>=Parameters!ImporteDeducciones.Value</Value> <Value>=Parameters!ImporteDeducciones.Value</Value>
<Style> <Style>
<FontSize>7pt</FontSize> <FontSize>7pt</FontSize>
<Format>'$'#,0.00;('$'#,0.00)</Format>
</Style> </Style>
</TextRun> </TextRun>
</TextRuns> </TextRuns>
@@ -1096,8 +1097,10 @@
<PaddingRight>2pt</PaddingRight> <PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop> <PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom> <PaddingBottom>2pt</PaddingBottom>
<rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
</Style> </Style>
</Textbox> </Textbox>
<rd:Selected>true</rd:Selected>
</CellContents> </CellContents>
</TablixCell> </TablixCell>
</TablixCells> </TablixCells>
@@ -1326,7 +1329,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>Sello digital del Emisor</Value> <Value>Sello digital del emisor</Value>
<Style> <Style>
<FontFamily>Calibri</FontFamily> <FontFamily>Calibri</FontFamily>
<FontSize>9pt</FontSize> <FontSize>9pt</FontSize>
@@ -1690,7 +1693,7 @@
<Top>0.11768cm</Top> <Top>0.11768cm</Top>
<Left>5.05803cm</Left> <Left>5.05803cm</Left>
<Height>5.21479cm</Height> <Height>5.21479cm</Height>
<Width>14.74044cm</Width> <Width>14.74045cm</Width>
<ZIndex>1</ZIndex> <ZIndex>1</ZIndex>
<Style> <Style>
<Border> <Border>
@@ -2242,6 +2245,7 @@ Lugar de expedición: 83220 Hermosillo</Value>
<FontFamily>calibri</FontFamily> <FontFamily>calibri</FontFamily>
<FontSize>7.5pt</FontSize> <FontSize>7.5pt</FontSize>
<FontWeight>Normal</FontWeight> <FontWeight>Normal</FontWeight>
<Format>'$'#,0.00;('$'#,0.00)</Format>
</Style> </Style>
</TextRun> </TextRun>
</TextRuns> </TextRuns>
@@ -2256,14 +2260,13 @@ Lugar de expedición: 83220 Hermosillo</Value>
<Style>None</Style> <Style>None</Style>
</Border> </Border>
<BottomBorder> <BottomBorder>
<Color>Black</Color>
<Style>Solid</Style> <Style>Solid</Style>
<Width>1pt</Width>
</BottomBorder> </BottomBorder>
<PaddingLeft>2pt</PaddingLeft> <PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight> <PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop> <PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom> <PaddingBottom>2pt</PaddingBottom>
<rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
</Style> </Style>
</Textbox> </Textbox>
</CellContents> </CellContents>
@@ -4762,7 +4765,7 @@ Lugar de expedición: 83220 Hermosillo</Value>
<FontFamily>arial</FontFamily> <FontFamily>arial</FontFamily>
<FontSize>7.5pt</FontSize> <FontSize>7.5pt</FontSize>
<FontWeight>Normal</FontWeight> <FontWeight>Normal</FontWeight>
<Format>#,0.00;(#,0.00)</Format> <Format>'$'#,0.00;('$'#,0.00)</Format>
</Style> </Style>
</TextRun> </TextRun>
</TextRuns> </TextRuns>
@@ -4780,6 +4783,7 @@ Lugar de expedición: 83220 Hermosillo</Value>
<PaddingRight>2pt</PaddingRight> <PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop> <PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom> <PaddingBottom>2pt</PaddingBottom>
<rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
</Style> </Style>
</Textbox> </Textbox>
</CellContents> </CellContents>
@@ -4816,6 +4820,7 @@ Lugar de expedición: 83220 Hermosillo</Value>
<PaddingRight>2pt</PaddingRight> <PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop> <PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom> <PaddingBottom>2pt</PaddingBottom>
<rd:FormatSymbolCulture>es-MX</rd:FormatSymbolCulture>
</Style> </Style>
</Textbox> </Textbox>
</CellContents> </CellContents>
@@ -4853,9 +4858,9 @@ Lugar de expedición: 83220 Hermosillo</Value>
</TablixMembers> </TablixMembers>
</TablixRowHierarchy> </TablixRowHierarchy>
<DataSetName>DsOC</DataSetName> <DataSetName>DsOC</DataSetName>
<Top>2.45745cm</Top> <Top>2.58974cm</Top>
<Left>0.14687cm</Left> <Left>0.14687cm</Left>
<Height>6.13312cm</Height> <Height>6.13311cm</Height>
<Width>19.90317cm</Width> <Width>19.90317cm</Width>
<ZIndex>5</ZIndex> <ZIndex>5</ZIndex>
<Style> <Style>

9341
RH/ActualizacionMasiva.aspx.vb
View File

File diff suppressed because it is too large Load Diff

2
RH/CatPersonal.aspx
View File

@@ -604,7 +604,7 @@
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField> <asp:TemplateField>
<HeaderTemplate>Fecha Ing</HeaderTemplate> <HeaderTemplate>Fecha registro</HeaderTemplate>
<ItemTemplate> <ItemTemplate>
<asp:Literal ID="LtlFechaIng" runat="server" Text='<%# Eval("FechaIng ", "{0:d}") %>'></asp:Literal> <asp:Literal ID="LtlFechaIng" runat="server" Text='<%# Eval("FechaIng ", "{0:d}") %>'></asp:Literal>
</ItemTemplate> </ItemTemplate>