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

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

Browse Source
This commit is contained in:
rrene
2022-01-11 07:51:37 -07:00
parent 94a6144f95 254321068a
commit a8d642732f
6 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Compras/PopUpVerFactura.aspx.vb
View File

@@ -297,7 +297,7 @@ Partial Class PopUpVerFactura
lrds.Add(rds)
'"Empresas/Grales/Formatos/EquiposGPS.rdlc"
'"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc"
ImprimirPDF("GPS/EmbarqueManifiesto.rdlc", lrds, params, "Equipo GPS")
ImprimirPDF("GPS/EmbarqueManifiesto.rdlc", lrds, params, "Manifesto")
End Sub
Private Sub imprimirpallet2(cvePallet As Integer)
Dim Envase As String = ""
@@ -332,13 +332,14 @@ Partial Class PopUpVerFactura
Dim tablaReporte As New DataTable
'"Empresas/Grales/Formatos/EquiposGPS.rdlc"
'"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc"
ImprimirPDF("GPS/PalletEtiqueta2.rdlc", (New List(Of ReportDataSource)), params, "Equipo GPS")
ImprimirPDF("GPS/PalletEtiqueta2.rdlc", (New List(Of ReportDataSource)), params, "Pallet")
End Sub
Private Sub imprimirpallet(cvePallet As Integer)
Dim Envase As String = ""
Dim Tamano As String = ""
Dim Cultivo As String = ""
Dim noPallet As String = ""
Dim FormatoImpresion As String = ""
'Envase = "1 1/9"
'Tamano = "Small"
@@ -351,6 +352,7 @@ Partial Class PopUpVerFactura
Tamano = row("Tamaño").ToString()
Cultivo = row("Cultivo").ToString()
noPallet = row("Codigo").ToString()
FormatoImpresion = row("FormatoImpresion").ToString()
End If
@@ -360,10 +362,11 @@ Partial Class PopUpVerFactura
params.Add(New ReportParameter("Tamano", Tamano))
params.Add(New ReportParameter("Cultivo", Cultivo))
params.Add(New ReportParameter("noPallet", noPallet))
params.Add(New ReportParameter("FormatoImpresion", FormatoImpresion))
Dim tablaReporte As New DataTable
'"Empresas/Grales/Formatos/EquiposGPS.rdlc"
'"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc"
ImprimirPDF("GPS/PalletEtiqueta.rdlc", (New List(Of ReportDataSource)), params, "Equipo GPS")
ImprimirPDF("GPS/PalletEtiqueta.rdlc", (New List(Of ReportDataSource)), params, "Pallet Caja")
End Sub
#Region "U S U A R I O - T O K E N"

29
GPS/PalletEtiqueta.rdlc
View File

@@ -386,7 +386,8 @@ KM12 HERMOSILLO, SONORA</Value>
</Textbox>
</ReportItems>
<KeepTogether>true</KeepTogether>
<Top>0.36724cm</Top>
<Top>0.1097cm</Top>
<Left>0.17195cm</Left>
<Height>7.13021cm</Height>
<Width>6.00674cm</Width>
<Style>
@@ -776,11 +777,14 @@ KM12 HERMOSILLO, SONORA</Value>
</Textbox>
</ReportItems>
<KeepTogether>true</KeepTogether>
<Top>0.36724cm</Top>
<Left>6.18313cm</Left>
<Top>0.1097cm</Top>
<Left>6.31984cm</Left>
<Height>7.13021cm</Height>
<Width>6.00674cm</Width>
<ZIndex>1</ZIndex>
<Visibility>
<Hidden>=Parameters!FormatoImpresion.Value ="Sencillas"</Hidden>
</Visibility>
<Style>
<Border>
<Style>None</Style>
@@ -1168,8 +1172,8 @@ KM12 HERMOSILLO, SONORA</Value>
</Textbox>
</ReportItems>
<KeepTogether>true</KeepTogether>
<Top>7.5274cm</Top>
<Left>0.13668cm</Left>
<Top>7.4163cm</Top>
<Left>0.17199cm</Left>
<Height>7.13021cm</Height>
<Width>6.00674cm</Width>
<ZIndex>2</ZIndex>
@@ -1560,11 +1564,14 @@ KM12 HERMOSILLO, SONORA</Value>
</Textbox>
</ReportItems>
<KeepTogether>true</KeepTogether>
<Top>7.5274cm</Top>
<Top>7.4163cm</Top>
<Left>6.31981cm</Left>
<Height>7.13021cm</Height>
<Width>6.00674cm</Width>
<ZIndex>3</ZIndex>
<Visibility>
<Hidden>=Parameters!FormatoImpresion.Value ="Sencillas"</Hidden>
</Visibility>
<Style>
<Border>
<Style>None</Style>
@@ -1572,10 +1579,10 @@ KM12 HERMOSILLO, SONORA</Value>
</Style>
</Rectangle>
</ReportItems>
<Height>6.24016in</Height>
<Height>5.84433in</Height>
<Style />
</Body>
<Width>4.93458in</Width>
<Width>5.09083in</Width>
<Page>
<PageHeight>29.7cm</PageHeight>
<PageWidth>21cm</PageWidth>
@@ -1613,6 +1620,12 @@ KM12 HERMOSILLO, SONORA</Value>
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
<ReportParameter Name="FormatoImpresion">
<DataType>String</DataType>
<Nullable>true</Nullable>
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
</ReportParameters>
<EmbeddedImages>
<EmbeddedImage Name="logojam">

2
Nomina/CalculoISRAnual.aspx
View File

@@ -97,7 +97,7 @@
<asp:GridView ID="GVCalculoISRAnual" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD GVCalculoISRAnual Widthall" AutoGenerateColumns="False"
DataKeyNames="CvePersonal,Codigo,NombreCompleto,TipoIngreso,FechaInicio,IngresosTotales,BaseGravada,Deducciones,ISRRetenido,Art152,SubsCorrespondiente,LimiteInferior,LimiteSuperior,CuotaFija,Porcentaje,ImpuestoAnual,Acargo,Acompensar">
DataKeyNames="CvePersonal,Codigo,NombreCompleto,TipoIngreso,FechaInicio,FechaFin,IngresosTotales,BaseGravada,Deducciones,ISRRetenido,Art152,SubsCorrespondiente,LimiteInferior,LimiteSuperior,CuotaFija,Porcentaje,ImpuestoAnual,Acargo,Acompensar">
<Columns>
<asp:TemplateField HeaderText="Aplica">
<ItemTemplate>

33
Nomina/CalculoISRAnual.aspx.cs
View File

@@ -72,15 +72,30 @@ public partial class Nomina_CalculoISRAnual : ClsPaginas
ClosedXML.Excel.XLWorkbook wb = new ClosedXML.Excel.XLWorkbook();
var libro = wb.AddWorksheet("Asistencia");
int column = 1;
int row = 1;
string imagePath = string.Format("{0}{1}\\Logo.png", ModExtensiones.DirectorioEmpresas, UsuarioActual.CveEmpresa);
if (System.IO.File.Exists(imagePath))
{
var image = libro.AddPicture(imagePath)
.MoveTo(libro.Cell(row, 2))//, libro.Cell(row, 5));
.Scale(.8);
}
row++;
libro.Range(row, 3, row, 5).Merge().Value = UsuarioActual.Empresa.Empresa;
row++;
libro.Range(row, 3, row, 5).Merge().Value = string.Format("Calculo I.S.R anual del ejercicio {0}", DdlEjercicios.SelectedValue);
row++;
row++;
int column = 1;
libro.Cell(row, column++).Value = "Aplica";
libro.Cell(row, column++).Value = "Causa";
libro.Cell(row, column++).Value = "Código";
libro.Cell(row, column++).Value = "Nombre";
libro.Cell(row, column++).Value = "Tipo ingreso";
libro.Cell(row, column++).Value = "Fecha ingreso";
libro.Cell(row, column++).Value = "Fecha baja";
libro.Cell(row, column++).Value = "Ingresos totales";
libro.Cell(row, column++).Value = "Base gravada";
libro.Cell(row, column++).Value = "Base exenta";
@@ -93,6 +108,7 @@ public partial class Nomina_CalculoISRAnual : ClsPaginas
libro.Range(row, 1, row, column - 1).CellsUsed().Style.Font.FontColor = ClosedXML.Excel.XLColor.White;
libro.Range(row, 1, row, column - 1).CellsUsed().Style.Fill.SetBackgroundColor(ClosedXML.Excel.XLColor.FromArgb(79, 129, 189));
row++;
int initrowdata = row;
using (ClsNominas onom = new ClsNominas())
{
if (onom.CalculoISRAnual(DdlEjercicios.SelectedValue.ToEntero(), UsuarioActual.Empresa.CveEmpresa) && onom.DtResultados.Rows.Count > 0)
@@ -105,7 +121,9 @@ public partial class Nomina_CalculoISRAnual : ClsPaginas
libro.Cell(row, column++).Value = drow["causa"];
libro.Cell(row, column++).Value = drow["Codigo"];
libro.Cell(row, column++).Value = drow["NombreCompleto"];
libro.Cell(row, column++).Value = string.Format("{0} - {1:dd/MM/yyyy}", drow["TipoIngreso"], drow["FechaInicio"]);
libro.Cell(row, column++).Value = string.Format("{0}", drow["TipoIngreso"], drow["FechaInicio"]);
libro.Cell(row, column++).Value = string.Format("{0:dd/MM/yyyy}", drow["FechaInicio"]);
libro.Cell(row, column++).Value = string.Format("{0:dd/MM/yyyy}", drow["FechaFin"]);
libro.Cell(row, column++).Value = drow["IngresosTotales"];
libro.Cell(row, column++).Value = drow["BaseGravada"];
libro.Cell(row, column++).Value = drow["BaseExcenta"];
@@ -120,12 +138,12 @@ public partial class Nomina_CalculoISRAnual : ClsPaginas
}
}
libro.SheetView.Freeze(1, 4);
libro.SheetView.Freeze(initrowdata-1, 5);
libro.ColumnsUsed().AdjustToContents();
libro.Range(1, 6, 1, column).Style.Alignment.Horizontal = ClosedXML.Excel.XLAlignmentHorizontalValues.Center;
libro.Range(2, 6, row, column).Style.Alignment.Horizontal = ClosedXML.Excel.XLAlignmentHorizontalValues.Right;
libro.Range(2, 6, row, column).SetDataType(ClosedXML.Excel.XLDataType.Number);
libro.Range(2, 6, row, column).Style.NumberFormat.Format = "$#,###,###,###,###,###,0.00";
libro.Range(initrowdata-1, 6, initrowdata-1, column).Style.Alignment.Horizontal = ClosedXML.Excel.XLAlignmentHorizontalValues.Center;
libro.Range(initrowdata, 8, row, column).Style.Alignment.Horizontal = ClosedXML.Excel.XLAlignmentHorizontalValues.Right;
libro.Range(initrowdata, 8, row, column).SetDataType(ClosedXML.Excel.XLDataType.Number);
libro.Range(initrowdata, 8, row, column).Style.NumberFormat.Format = "$#,###,###,###,###,###,0.00";
System.IO.Stream fs = new System.IO.MemoryStream();
@@ -146,6 +164,7 @@ public partial class Nomina_CalculoISRAnual : ClsPaginas
Response.AddHeader("content-disposition", string.Format("attachment;filename={0}.xlsx", "Calculo Anual"));
Response.BinaryWrite(memoryStream.ToArray());
Response.End();
//Alert(string.Format("<pre> {0} {1}</pre>",imagePath, System.IO.File.Exists(imagePath)));
}

2
Site.master.vb
View File

@@ -365,7 +365,7 @@ Partial Class Site
MenuHTML.AppendFormat("<li id='m{3}'><a href='{0}'>{2}{1}<span class='arrow '></span> </a><ul class='sub-menu'>", LinkHijo, drH("Modulo"), If(drP("Estilo").ToString() <> "", String.Format("<i class='{0}'></i>", drH("Estilo")), ""), drH("CveModulo"))
For Each drN As DataRow In Nietos
LinkNieto = drN("LIGA").ToString()
If (drH("IsAngular").ToString() = "1") Then
If (drN("IsAngular").ToString() = "1") Then
LinkNieto = String.Format("{1}:84{0}", drN("LIGA"), strdomain)
End If
If CveModulo = drN("CveModulo").ToString().ToEntero Then

4
vwd.webinfo
View File

@@ -394,6 +394,10 @@