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:
Rene Molina
2019-08-28 17:48:43 -07:00
parent bad871b870 f1f3a17b00
commit 9b3d1d0a84
9 changed files with 777 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Compras/RepCompras.aspx.vb
View File

@@ -285,12 +285,10 @@ Partial Class Compras_RepCompras
If e.Row.DBCampo("Orden") = "" Then
e.Row.FCLiteral("LtlGrupo").Text = e.Row.FCLiteral("LtlGrupo").Text
e.Row.FCLiteral("LtlCantidad").Text = e.Row.FCLiteral("LtlCantidad").Text
Else
e.Row.FCLiteral("LtlGrupo").Text = String.Format("<a class='{0}' target=""_blank"" href='{1}'>{2}</a>", Css, Liga, e.Row.FCLiteral("LtlGrupo").Text)
e.Row.FCLiteral("LtlCantidad").Text = String.Format("<a class='{0}' target=""_blank"" href='{1}'>{2}</a>", Css, Liga, e.Row.FCLiteral("LtlCantidad").Text)
End If
e.Row.FCLiteral("LtlCantidad").Text = String.Format("<a class='{0}' target=""_blank"" href='{1}'>{2}</a>", Css, Liga, e.Row.FCLiteral("LtlCantidad").Text)
If e.Row.DBCampo("SubTotal").ToDouble = 0 Then e.Row.FCLiteral("LtlSubTotal").Text = ""
If e.Row.DBCampo("Descuento").ToDouble = 0 Then e.Row.FCLiteral("LtlDescuento").Text = ""
@@ -399,7 +397,7 @@ Partial Class Compras_RepCompras
params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa))
params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
params.Add(New ReportParameter("FechaImpresion", Now.ToString))
params.Add(New ReportParameter("AgrupadoPor", $"<b>Agrupado Por:</b> {Proveedor}{Capturo}{Grupo}{Moneda}{FechaIn}{FechaFn}{Proyecto}{SubProyecto}{TipoGasto}{TipoProveedor}{FechaICaptura}{FechaFCaptura}{TipoDocto}"))
params.Add(New ReportParameter("AgrupadoPor", $"<b>Agrupado Por:</b> {Grupo}{Proveedor}{Capturo}{Moneda}{FechaIn}{FechaFn}{Proyecto}{SubProyecto}{TipoGasto}{TipoProveedor}{FechaICaptura}{FechaFCaptura}{TipoDocto}"))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
Else

2
Compras/RepComprasDetalle.aspx.vb
View File

@@ -437,7 +437,7 @@ Partial Class Compras_RepComprasDetalle
params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa))
params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
params.Add(New ReportParameter("FechaImpresion", Now.ToString))
params.Add(New ReportParameter("AgrupadoPor", $"<b>Agrupado Por:</b> {Proveedor}{Capturo}{Grupo}{FechaIn}{FechaFn}{FechaCIn}{FechaCFn}{Proyecto}{SubProyecto}{TipoGasto}{TipoProveedor}{TipoDocto}"))
params.Add(New ReportParameter("AgrupadoPor", $"<b>Agrupado Por:</b> {Grupo}{Proveedor}{Capturo}{FechaIn}{FechaFn}{FechaCIn}{FechaCFn}{Proyecto}{SubProyecto}{TipoGasto}{TipoProveedor}{TipoDocto}"))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
Else

23
Compras/RepProductosServicios.aspx.vb
View File

@@ -309,23 +309,25 @@ Partial Class Compras_RepProductosServicios
If DdlGrupo.SelectedValue = "6" Then ' cuando es Año
'-1/01
If e.Row.DBCampo("Anio") = "-1/01" Then
FechaI = $"01/01/{e.Row.DBCampo("Anio")}"
If e.Row.DBCampo("Anio") = "-1" Then
FechaI = "-1"
FechaF = "-1"
Else
FechaI = $"01/01/{e.Row.DBCampo("Anio")}".ToDate.FirstDayOfMonth.ToShortDateString
FechaI = $"01/01/{e.Row.DBCampo("Anio")}"
FechaF = $"01/12/{e.Row.DBCampo("Anio")}".ToDate.LastDayOfMonth.ToShortDateString
End If
FechaF = $"01/12/{e.Row.DBCampo("Anio")}".ToDate.LastDayOfMonth.ToShortDateString
End If
If DdlGrupo.SelectedValue = "8" Then ' cuando es Año/Mes
If e.Row.DBCampo("AnioMes") = "-1/01" Then
FechaI = $"{e.Row.DBCampo("AnioMes")}/01"
If e.Row.DBCampo("AnioMes") = "-1" Then
FechaI = "-1"
FechaF = "-1"
Else
FechaI = $"{e.Row.DBCampo("AnioMes")}/01".ToDate.FirstDayOfMonth.ToShortDateString
FechaI = $"{e.Row.DBCampo("AnioMes")}/01".ToDate.ToShortDateString
FechaF = $"{e.Row.DBCampo("AnioMes")}/01".ToDate.LastDayOfMonth.ToShortDateString
End If
FechaF = $"{e.Row.DBCampo("AnioMes")}/01".ToDate.LastDayOfMonth.ToShortDateString
End If
@@ -337,9 +339,8 @@ Partial Class Compras_RepProductosServicios
If Not e.Row.DBCampo("GpoID") = "1" Then
e.Row.Cells(0).Text = String.Format("<a class=""Texto"" target=""_blank"" href=""{0}"">{1}</a>", Liga, If(e.Row.DBCampo("GpoID") = "1", e.Row.DBCampo("Moneda"), e.Row.DBCampo("GPO")))
e.Row.Cells(1).Text = String.Format("<a class=""Texto"" target=""_blank"" href=""{0}"">{1}</a>", Liga, e.Row.DBCampo("Cantidad").FormatoNumero)
End If
e.Row.Cells(1).Text = String.Format("<a class=""Texto"" target=""_blank"" href=""{0}"">{1}</a>", Liga, e.Row.DBCampo("Cantidad").FormatoNumero)
'Si son igual a cero se limpia el campo
If e.Row.DBCampo("SubTotal").ToDouble = 0 Then e.Row.Cells(2).Text = ""
@@ -482,7 +483,7 @@ Partial Class Compras_RepProductosServicios
params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
params.Add(New ReportParameter("FechaImpresion", DateTime.Now.ToString()))
params.Add(New ReportParameter("Filtros", $"{Proveedor}{FechaInicio}{FechaFin}{Grupo}{TipoGasto}{Categoria}{Clasificacion}{PS}{Proyecto}{Estatus}{Usuario}{TipoAF}{SubTipoAF}{AF}"))
params.Add(New ReportParameter("Filtros", $"{Grupo}{Proveedor}{FechaInicio}{FechaFin}{TipoGasto}{Categoria}{Clasificacion}{PS}{Proyecto}{Estatus}{Usuario}{TipoAF}{SubTipoAF}{AF}"))
'params.Add(New ReportParameter("Proveedor", DdlProveedor.SelectedItem.Text))
'params.Add(New ReportParameter("FechaInicio", txtFechaI.Text))
'params.Add(New ReportParameter("FechaFin", txtFechaF.Text))

20
Empresas/Grales/Formatos/RepComprasDetalle.rdlc
View File

@@ -50,7 +50,7 @@
<TablixBody>
<TablixColumns>
<TablixColumn>
<Width>1.25345cm</Width>
<Width>1.862cm</Width>
</TablixColumn>
<TablixColumn>
<Width>1.29144cm</Width>
@@ -68,7 +68,7 @@
<Width>1.69804cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.03728cm</Width>
<Width>1.42874cm</Width>
</TablixColumn>
<TablixColumn>
<Width>3.5848cm</Width>
@@ -86,14 +86,14 @@
<TablixCells>
<TablixCell>
<CellContents>
<Textbox Name="Moneda">
<Textbox Name="SerieFolio1">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Moneda.Value</Value>
<Value>=Fields!SerieFolio.Value</Value>
<Style>
<FontSize>7pt</FontSize>
<Color>=IIF(CInt(Fields!CveCompra.Value) &lt; 1, "White","Black")</Color>
@@ -105,7 +105,7 @@
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Moneda</rd:DefaultName>
<rd:DefaultName>SerieFolio1</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
@@ -301,14 +301,14 @@
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="SerieFolio">
<Textbox Name="Moneda">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!SerieFolio.Value</Value>
<Value>=Fields!Moneda.Value</Value>
<Style>
<FontSize>7pt</FontSize>
<Color>=IIF(CInt(Fields!CveCompra.Value) &lt; 1, "White","Black")</Color>
@@ -320,7 +320,7 @@
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>SerieFolio</rd:DefaultName>
<rd:DefaultName>Moneda</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
@@ -457,7 +457,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>Moneda</Value>
<Value>Serie/Folio</Value>
<Style>
<FontSize>7pt</FontSize>
</Style>
@@ -685,7 +685,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>Serie/Folio</Value>
<Value>Moneda</Value>
<Style>
<FontSize>7pt</FontSize>
</Style>

342
Empresas/Grales/Formatos/RepProductosServiciosDetalleCompra.rdlc
View File

@@ -5,9 +5,6 @@
<Tablix Name="Tablix1">
<TablixBody>
<TablixColumns>
<TablixColumn>
<Width>1.60749cm</Width>
</TablixColumn>
<TablixColumn>
<Width>1.70081cm</Width>
</TablixColumn>
@@ -15,73 +12,40 @@
<Width>1.92431cm</Width>
</TablixColumn>
<TablixColumn>
<Width>3.73987cm</Width>
<Width>4.71883cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.5cm</Width>
<Width>1.41521cm</Width>
</TablixColumn>
<TablixColumn>
<Width>4.74981cm</Width>
<Width>2.95064cm</Width>
</TablixColumn>
<TablixColumn>
<Width>1.3231cm</Width>
<Width>1.69352cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.88058cm</Width>
<Width>1.84871cm</Width>
</TablixColumn>
<TablixColumn>
<Width>1.70617cm</Width>
<Width>1.65325cm</Width>
</TablixColumn>
<TablixColumn>
<Width>1.82697cm</Width>
</TablixColumn>
<TablixColumn>
<Width>1.70625cm</Width>
<Width>1.65333cm</Width>
</TablixColumn>
<TablixColumn>
<Width>1.85343cm</Width>
<Width>3.70551cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.5cm</Width>
</TablixColumn>
</TablixColumns>
<TablixRows>
<TablixRow>
<Height>0.47879cm</Height>
<TablixCells>
<TablixCell>
<CellContents>
<Textbox Name="Textbox4">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>SerieFolio</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox4</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>Silver</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Textbox16">
@@ -163,7 +127,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>Proveedor</Value>
<Value>Producto/Servicio</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
@@ -199,7 +163,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>Sub Proyecto</Value>
<Value>AF</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
@@ -235,7 +199,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>Producto/Servicio</Value>
<Value>Clasificación</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
@@ -271,7 +235,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>AF</Value>
<Value>PU</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
@@ -307,7 +271,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>Clasificación</Value>
<Value>Cantidad</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
@@ -343,7 +307,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>PU</Value>
<Value>SubTotal</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
@@ -379,7 +343,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>Cantidad</Value>
<Value>Total</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
@@ -415,7 +379,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>SubTotal</Value>
<Value>SerieFolio</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
@@ -451,7 +415,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>Total</Value>
<Value>Proveedor</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
@@ -478,36 +442,34 @@
</Textbox>
</CellContents>
</TablixCell>
</TablixCells>
</TablixRow>
<TablixRow>
<Height>0.42588cm</Height>
<TablixCells>
<TablixCell>
<CellContents>
<Textbox Name="SerieFolio1">
<Textbox Name="Textbox4">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=iif(CInt(Fields!CveCompra.Value)&lt;1, Fields!GPO.Value,Fields!SerieFolio.Value)</Value>
<Value>SubProyecto</Value>
<Style>
<FontSize>7pt</FontSize>
<FontWeight>=iif(Fields!CveCompra.Value = "", "Bold", "Normal")</FontWeight>
<Color>=iif(Fields!CveCompra.Value= "", "White", "Black")</Color>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style />
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>SerieFolio1</rd:DefaultName>
<rd:DefaultName>Textbox4</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
<Color>LightGrey</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>=iif(Fields!CveCompra.Value = "", "#67809F", "Transparent")</BackgroundColor>
<BackgroundColor>Silver</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
@@ -516,6 +478,11 @@
</Textbox>
</CellContents>
</TablixCell>
</TablixCells>
</TablixRow>
<TablixRow>
<Height>0.42588cm</Height>
<TablixCells>
<TablixCell>
<CellContents>
<Textbox Name="FechaCompra">
@@ -587,14 +554,14 @@
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="RazonSocial">
<Textbox Name="PS1">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!RazonSocial.Value</Value>
<Value>=IIf(Fields!CveCompra.Value &lt;= 0, IIf(Fields!GPO.Value = "", Fields!SerieFolio.Value, Fields!GPO.Value),Fields!PS.Value)</Value>
<Style>
<FontSize>7pt</FontSize>
<FontWeight>=iif(Fields!CveCompra.Value = "", "Bold", "Normal")</FontWeight>
@@ -605,7 +572,7 @@
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>RazonSocial</rd:DefaultName>
<rd:DefaultName>PS1</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
@@ -621,14 +588,14 @@
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="SubProyecto">
<Textbox Name="CodigoAF1">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!SubProyecto.Value</Value>
<Value>=Fields!CodigoAF.Value</Value>
<Style>
<FontSize>7pt</FontSize>
<FontWeight>=iif(Fields!CveCompra.Value = "", "Bold", "Normal")</FontWeight>
@@ -636,10 +603,12 @@
</Style>
</TextRun>
</TextRuns>
<Style />
<Style>
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>SubProyecto</rd:DefaultName>
<rd:DefaultName>CodigoAF1</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
@@ -655,14 +624,14 @@
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="PS">
<Textbox Name="Clasificacion1">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!PS.Value</Value>
<Value>=Fields!Clasificacion.Value</Value>
<Style>
<FontSize>7pt</FontSize>
<FontWeight>=iif(Fields!CveCompra.Value = "", "Bold", "Normal")</FontWeight>
@@ -674,7 +643,7 @@
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>PS</rd:DefaultName>
<rd:DefaultName>Clasificacion1</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
@@ -690,81 +659,7 @@
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="CodigoAF">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!CodigoAF.Value</Value>
<Style>
<FontSize>7pt</FontSize>
<FontWeight>=iif(Fields!CveCompra.Value = "", "Bold", "Normal")</FontWeight>
<Format>#,0.00;- #,0.00;'-'</Format>
<Color>=iif(Fields!CveCompra.Value= "", "White", "Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>CodigoAF</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=iif(Fields!CveCompra.Value = "", "#67809F", "Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Clasificacion">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Clasificacion.Value</Value>
<Style>
<FontSize>7pt</FontSize>
<FontWeight>=iif(Fields!CveCompra.Value = "", "Bold", "Normal")</FontWeight>
<Format>#,0.00;- #,0.00;'-'</Format>
<Color>=iif(Fields!CveCompra.Value= "", "White", "Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Clasificacion</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=iif(Fields!CveCompra.Value = "", "#67809F", "Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="PU">
<Textbox Name="PU1">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
@@ -775,7 +670,7 @@
<Style>
<FontSize>7pt</FontSize>
<FontWeight>=iif(Fields!CveCompra.Value = "", "Bold", "Normal")</FontWeight>
<Format>#,0.00;-#,0.00;'-'</Format>
<Format>#,0.00;- #,0.00;'-'</Format>
<Color>=iif(Fields!CveCompra.Value= "", "White", "Black")</Color>
</Style>
</TextRun>
@@ -785,7 +680,7 @@
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>PU</rd:DefaultName>
<rd:DefaultName>PU1</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
@@ -801,7 +696,7 @@
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Cantidad">
<Textbox Name="Cantidad1">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
@@ -812,7 +707,7 @@
<Style>
<FontSize>7pt</FontSize>
<FontWeight>=iif(Fields!CveCompra.Value = "", "Bold", "Normal")</FontWeight>
<Format>#,0.00;(#,0.00);'-'</Format>
<Format>#,0.00;- #,0.00;'-'</Format>
<Color>=iif(Fields!CveCompra.Value= "", "White", "Black")</Color>
</Style>
</TextRun>
@@ -822,7 +717,7 @@
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Cantidad</rd:DefaultName>
<rd:DefaultName>Cantidad1</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
@@ -838,7 +733,8 @@
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="SubTotal">
<Textbox Name="SubTotal1">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
@@ -858,7 +754,7 @@
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>SubTotal</rd:DefaultName>
<rd:DefaultName>SubTotal1</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
@@ -874,7 +770,8 @@
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Total1">
<Textbox Name="Total">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
@@ -884,7 +781,7 @@
<Style>
<FontSize>7pt</FontSize>
<FontWeight>=iif(Fields!CveCompra.Value = "", "Bold", "Normal")</FontWeight>
<Format>#,0.00;- #,0.00;'-'</Format>
<Format>#,0.00;(#,0.00);'-'</Format>
<Color>=iif(Fields!CveCompra.Value= "", "White", "Black")</Color>
</Style>
</TextRun>
@@ -894,7 +791,116 @@
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Total1</rd:DefaultName>
<rd:DefaultName>Total</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=iif(Fields!CveCompra.Value = "", "#67809F", "Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="SubProyecto">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!SerieFolio.Value</Value>
<Style>
<FontSize>7pt</FontSize>
<FontWeight>=iif(Fields!CveCompra.Value = "", "Bold", "Normal")</FontWeight>
<Format>#,0.00;-#,0.00;'-'</Format>
<Color>=iif(Fields!CveCompra.Value= "", "White", "Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>SubProyecto</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=iif(Fields!CveCompra.Value = "", "#67809F", "Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="RazonSocial1">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!RazonSocial.Value</Value>
<Style>
<FontSize>7pt</FontSize>
<FontWeight>=iif(Fields!CveCompra.Value = "", "Bold", "Normal")</FontWeight>
<Format>#,0.00;- #,0.00;'-'</Format>
<Color>=iif(Fields!CveCompra.Value= "", "White", "Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>RazonSocial1</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=iif(Fields!CveCompra.Value = "", "#67809F", "Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="SubProyecto1">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!SubProyecto.Value</Value>
<Style>
<FontSize>7pt</FontSize>
<FontWeight>=iif(Fields!CveCompra.Value = "", "Bold", "Normal")</FontWeight>
<Color>=iif(Fields!CveCompra.Value= "", "White", "Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>SubProyecto1</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
@@ -942,7 +948,7 @@
<Top>0.70583cm</Top>
<Left>0.06614cm</Left>
<Height>0.90467cm</Height>
<Width>27.51879cm</Width>
<Width>27.59109cm</Width>
<Style>
<Border>
<Style>None</Style>
@@ -1372,6 +1378,10 @@
<DataField>GPO</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="Moneda">
<DataField>Moneda</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DataSet</rd:DataSetName>

433
Empresas/Grales/Formatos/RepVentasUtilidadPadre.rdlc
View File

@@ -51,25 +51,37 @@
<TablixBody>
<TablixColumns>
<TablixColumn>
<Width>2.51027cm</Width>
<Width>1.78756cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.396cm</Width>
<Width>1.7468cm</Width>
</TablixColumn>
<TablixColumn>
<Width>1.01424cm</Width>
<Width>1.87995cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.3007cm</Width>
<Width>1.75936cm</Width>
</TablixColumn>
<TablixColumn>
<Width>0.96542cm</Width>
<Width>1.99234cm</Width>
</TablixColumn>
<TablixColumn>
<Width>2.21367cm</Width>
<Width>0.7279cm</Width>
</TablixColumn>
<TablixColumn>
<Width>0.90371cm</Width>
<Width>2.03612cm</Width>
</TablixColumn>
<TablixColumn>
<Width>0.67438cm</Width>
</TablixColumn>
<TablixColumn>
<Width>1.94909cm</Width>
</TablixColumn>
<TablixColumn>
<Width>0.5862cm</Width>
</TablixColumn>
<TablixColumn>
<Width>1.38875cm</Width>
</TablixColumn>
</TablixColumns>
<TablixRows>
@@ -112,6 +124,114 @@
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Descuento">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Descuento.Value</Value>
<Style>
<FontSize>7pt</FontSize>
<Format>#,0.00</Format>
<Color>=IIF(Fields!GPO.Value="", "White", "Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Descuento</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=IIF(Fields!GPO.Value="", "CornflowerBlue", "Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Bonificacion">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Bonificacion.Value</Value>
<Style>
<FontSize>7pt</FontSize>
<Format>#,0.00</Format>
<Color>=IIF(Fields!GPO.Value="", "White", "Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Bonificacion</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=IIF(Fields!GPO.Value="", "CornflowerBlue", "Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Costo">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Costo.Value</Value>
<Style>
<FontSize>7pt</FontSize>
<Format>#,0.00</Format>
<Color>=IIF(Fields!GPO.Value="", "White", "Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Costo</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=IIF(Fields!GPO.Value="", "CornflowerBlue", "Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Utilidad">
@@ -328,6 +448,42 @@
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Rentabilidad">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Rentabilidad.Value</Value>
<Style>
<FontSize>7pt</FontSize>
<Format>#,0.00</Format>
<Color>=IIF(Fields!GPO.Value="", "White", "Black")</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Rentabilidad</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<BackgroundColor>=IIF(Fields!GPO.Value="", "CornflowerBlue", "Transparent")</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
</TablixCells>
</TablixRow>
</TablixRows>
@@ -373,6 +529,123 @@
</CellContents>
</TablixHeader>
</TablixMember>
<TablixMember>
<TablixHeader>
<Size>0.46771cm</Size>
<CellContents>
<Textbox Name="Textbox25">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Descuento</Value>
<Style>
<FontSize>7pt</FontSize>
<Color>White</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox25</rd:DefaultName>
<Style>
<Border>
<Color>DimGray</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>Gray</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixHeader>
</TablixMember>
<TablixMember>
<TablixHeader>
<Size>0.46771cm</Size>
<CellContents>
<Textbox Name="Textbox20">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Bonificacion</Value>
<Style>
<FontSize>7pt</FontSize>
<Color>White</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox20</rd:DefaultName>
<Style>
<Border>
<Color>DimGray</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>Gray</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixHeader>
</TablixMember>
<TablixMember>
<TablixHeader>
<Size>0.46771cm</Size>
<CellContents>
<Textbox Name="Textbox17">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Costo</Value>
<Style>
<FontSize>7pt</FontSize>
<Color>White</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox17</rd:DefaultName>
<Style>
<Border>
<Color>DimGray</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>Gray</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixHeader>
</TablixMember>
<TablixMember>
<TablixHeader>
<Size>0.46771cm</Size>
@@ -607,6 +880,45 @@
</CellContents>
</TablixHeader>
</TablixMember>
<TablixMember>
<TablixHeader>
<Size>0.46771cm</Size>
<CellContents>
<Textbox Name="Textbox21">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>% Rent.</Value>
<Style>
<FontSize>7pt</FontSize>
<Color>White</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox21</rd:DefaultName>
<Style>
<Border>
<Color>DimGray</Color>
<Style>Solid</Style>
</Border>
<BackgroundColor>Gray</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixHeader>
</TablixMember>
</TablixMembers>
</TablixColumnHierarchy>
<TablixRowHierarchy>
@@ -614,7 +926,7 @@
<TablixMember>
<Group Name="GPO" />
<TablixHeader>
<Size>7.28314cm</Size>
<Size>3.0587cm</Size>
<CellContents>
<Textbox Name="GPO">
<CanGrow>true</CanGrow>
@@ -725,7 +1037,7 @@
</Paragraphs>
<rd:DefaultName>Textbox1</rd:DefaultName>
<Top>1.01452cm</Top>
<Left>6.93622cm</Left>
<Left>5.03122cm</Left>
<Height>1.73771cm</Height>
<Width>5.11444cm</Width>
<ZIndex>2</ZIndex>
@@ -763,7 +1075,7 @@
</Paragraphs>
<rd:DefaultName>Textbox1</rd:DefaultName>
<Top>1.85236cm</Top>
<Left>7.25372cm</Left>
<Left>5.34872cm</Left>
<Height>0.58236cm</Height>
<Width>2.59949cm</Width>
<ZIndex>3</ZIndex>
@@ -800,7 +1112,7 @@
</Paragraphs>
<rd:DefaultName>Textbox1</rd:DefaultName>
<Top>1.85236cm</Top>
<Left>10.04757cm</Left>
<Left>8.14257cm</Left>
<Height>0.58236cm</Height>
<Width>1.68559cm</Width>
<ZIndex>4</ZIndex>
@@ -814,11 +1126,86 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox23">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>= "RENTABILIDAD"</Value>
<MarkupType>HTML</MarkupType>
<Style>
<FontSize>12pt</FontSize>
<FontWeight>Normal</FontWeight>
<Color>White</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox1</rd:DefaultName>
<Top>1.01452cm</Top>
<Left>10.71594cm</Left>
<Height>1.73771cm</Height>
<Width>5.11444cm</Width>
<ZIndex>5</ZIndex>
<Style>
<Border>
<Style>Solid</Style>
</Border>
<BackgroundColor>SeaGreen</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox24">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Parameters!Rentabilidad.Value</Value>
<MarkupType>HTML</MarkupType>
<Style>
<FontSize>9pt</FontSize>
<FontWeight>Normal</FontWeight>
<Color>White</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox1</rd:DefaultName>
<Top>1.85236cm</Top>
<Left>12.93844cm</Left>
<Height>0.58236cm</Height>
<Width>2.59949cm</Width>
<ZIndex>6</ZIndex>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</ReportItems>
<Height>1.667in</Height>
<Style />
</Body>
<Width>7.76343in</Width>
<Width>7.75973in</Width>
<Page>
<PageHeader>
<Height>2.22362cm</Height>
@@ -1153,6 +1540,22 @@
<DataField>Ventas</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="Costo">
<DataField>Costo</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="Rentabilidad">
<DataField>Rentabilidad</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="Descuento">
<DataField>Descuento</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="Bonificacion">
<DataField>Bonificacion</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="PorUtilidad">
<DataField>PorUtilidad</DataField>
<rd:TypeName>System.String</rd:TypeName>
@@ -1223,6 +1626,12 @@
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
<ReportParameter Name="Rentabilidad">
<DataType>String</DataType>
<Nullable>true</Nullable>
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
</ReportParameters>
<rd:ReportUnitType>Cm</rd:ReportUnitType>
<rd:ReportID>40c94aad-a12a-44fb-ab0d-ea36a9656792</rd:ReportID>

10
General/SaldosIniciales.aspx.vb
View File

@@ -1534,7 +1534,7 @@ Partial Class General_SaldosIniciales
Dim listadoMovimientos As String = ""
Dim mensajeError As String = ""
Try
For Each almacenSinRepetir As DataRow In dt.FiltraParametros("", DistinctColumns:={"Almacen"}).Rows
For Each almacenSinRepetir As DataRow In dt.FiltraParametros("Almacen <> ''", DistinctColumns:={"Almacen"}).Rows
Dim almacenActual As String = almacenSinRepetir("Almacen").ToString
'Dim CveAlmacen As Integer = GlobalDTAlmacen(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveAlmacen", $"Almacen = '{almacenActual}'").ToEntero
Dim CveAlmacen As Integer = AlmacenRef.FiltroPrimeroValor("CveAlmacen", $"Almacen = '{almacenActual}'").ToEntero
@@ -1544,10 +1544,9 @@ Partial Class General_SaldosIniciales
contadorMovimientos += 1
For Each nuevaEntrada As DataRow In dt.FiltraParametros($"Almacen = '{almacenActual}'").Rows
Dim RowPS As DataRow = ProductosServiciosRef.FiltroPrimero($"Codigo = '{nuevaEntrada("CodigoPS")}' AND CveEmpresa = {UsuarioActual.CveEmpresa}")
Dim CvePS As Integer = RowPS("CvePS").ToString().ToEntero
Dim CveUM As Integer = RowPS("CveUnidadMedida").ToString().ToEntero
If CvePS > 0 Then
If RowPS IsNot Nothing Then
Dim CvePS As Integer = RowPS("CvePS").ToString().ToEntero
Dim CveUM As Integer = RowPS("CveUnidadMedida").ToString().ToEntero
If CveUM > 0 Then
Dim Cantidad As Decimal = nuevaEntrada("Existencia").ToString.ToDecimal
Dim Valor As Decimal = nuevaEntrada("Valor").ToString.ToDecimal
@@ -1562,7 +1561,6 @@ Partial Class General_SaldosIniciales
End If
Else
mensajeError = $"No se encontró el producto o servicio con código ""{nuevaEntrada("CodigoPS")}"""
Throw New Exception()
End If
Next
Else

112
Ventas/RepVentasUtilidadPadre.aspx
View File

@@ -39,8 +39,10 @@
#chartdiv {
width: 100%;
height: 500px;
height: 600px;
}
</style>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server">
@@ -170,8 +172,9 @@
</asp:UpdatePanel>
<asp:UpdatePanel ID="UpIndicador" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<div class="row" >
<div id="DivNeto" runat="server" class="col-md-offset-4 col-md-3">
<div class="row" >
<div class="col-md-3"></div>
<div id="DivNeto" runat="server" class="col-md-3">
<div id="DivClaseNeto" runat="server" class="dashboard-stat dashboard-stat-v2 green">
<div class="visual"><i class="fa fa-bar-chart-o" '=""></i></div>
<div class="details"><div class="number"><asp:Label ID="LblNombreNeto" runat="server"></asp:Label></div>
@@ -183,6 +186,18 @@
</div>
</div>
</div>
<div id="DivRentabilidad" runat="server" class=" col-md-3">
<div id="DivClaseRentabilidad" runat="server" class="dashboard-stat dashboard-stat-v2 green">
<div class="visual"><i class="fa fa-bar-chart-o" '=""></i></div>
<div class="details"><div class="number"><asp:Label ID="LblNombreRentabilidad" runat="server"></asp:Label></div>
<div class="desc"><label id="LblRentabilidadIndicador" runat="server" class="indicadortipo2 col-md-6 tooltips" data-original-title="Rentabilidad">
<asp:Label ID="LblRentabilidad" runat="server"></asp:Label>%</label>
</div>
</div>
</div>
</div>
</div>
<br />
</ContentTemplate>
@@ -194,12 +209,16 @@
<Columns>
<asp:HyperLinkField ItemStyle-HorizontalAlign="Left" Target="_blank" HeaderText="Grupo" DataTextField="GPO" DataNavigateUrlFields="FechaI,FechaF,CveSubProyecto,CveCliente,CveVendedor,Grupo,GPO,CvePS,CveClasificacion" DataNavigateUrlFormatString="RepVentasUtilidad.aspx?FechaI={0}&FechaF={1}&CveSubProyecto={2}&CveCliente={3}&CveVendedor={4}&Gpo={5}&CveGpo={6}&CvePS={7}&CveClasificacion={8}" />
<asp:BoundField ItemStyle-HorizontalAlign="Right" HeaderText="Ventas" DataField="Ventas" DataFormatString="{0:N2}" />
<asp:BoundField ItemStyle-HorizontalAlign="Right" HeaderText="Descuento" DataField="Descuento" DataFormatString="{0:N2}" />
<asp:BoundField ItemStyle-HorizontalAlign="Right" HeaderText="Bonificacion" DataField="Bonificacion" DataFormatString="{0:N2}" />
<asp:BoundField ItemStyle-HorizontalAlign="Right" HeaderText="Costo" DataField="Costo" DataFormatString="{0:N2}" />
<asp:BoundField ItemStyle-HorizontalAlign="Right" HeaderText="Utilidad" DataField="Utilidad" DataFormatString="{0:N2}" />
<asp:BoundField ItemStyle-HorizontalAlign="Right" HeaderText="%" DataField="PorUtilidad" ItemStyle-Width="7px" DataFormatString="{0:N2}" />
<asp:BoundField ItemStyle-HorizontalAlign="Right" HeaderText="Perdida" DataField="Perdida" DataFormatString="{0:N2}" />
<asp:BoundField ItemStyle-HorizontalAlign="Right" HeaderText="%" DataField="PorPerdida" ItemStyle-Width="7px" DataFormatString="{0:N2}" />
<asp:BoundField ItemStyle-HorizontalAlign="Right" HeaderText="Neto" DataField="Neto" DataFormatString="{0:N2}" />
<asp:BoundField ItemStyle-HorizontalAlign="Right" HeaderText="%" DataField="PorNeto" ItemStyle-Width="7px" DataFormatString="{0:N2}" />
<asp:BoundField ItemStyle-HorizontalAlign="Right" HeaderText="% Rentabilidad" DataField="Rentabilidad" ItemStyle-Width="7px" DataFormatString="{0:N2}" />
</Columns>
</asp:GridView>
</ContentTemplate>
@@ -215,8 +234,20 @@
</h4>
</div>
<div class="modal-body">
<div id="chartdiv"></div>
<div class="row">
<label class="col-md-1 truncate">Ver:</label>
<div class="col-md-2">
<asp:DropDownList ID="DdlVer" runat="server" AutoPostBack="true" OnSelectedIndexChanged="DdlVer_SelectedIndexChanged" AppendDataBoundItems="true" Class="table-group-action-input form-control input-inline input-small input-sm select2me">
<asp:ListItem Selected="True" Text="Neto" Value="1"></asp:ListItem>
<asp:ListItem Text="Rentabilidad" Value="2"></asp:ListItem>
</asp:DropDownList>
</div>
</div>
<br />
<div id="chartdiv"></div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal">Cerrar</button>
</div>
@@ -232,7 +263,7 @@
<link rel="stylesheet" href="https://www.amcharts.com/lib/3/plugins/export/export.css" type="text/css" media="all" />
<script src="https://www.amcharts.com/lib/3/themes/light.js"></script>
<script>
function CargaGraficaCompracion(data) {
function CargaGraficaBarrasNeto(data) {
var chart = AmCharts.makeChart("chartdiv", {
"theme": "light",
"type": "serial",
@@ -251,21 +282,12 @@
"startDuration": 1,
"graphs": [
{
"balloonText": "Perdida [[category]]: <b>[[value]] [[moneda]]</b>",
"balloonText": "Neto [[category]]: <b>[[value]] [[moneda]]</b>",
"fillAlphas": 0.9,
"lineAlpha": 0.2,
"type": "column",
"valueField": "perdida",
"title": "Perdida"
},
{
"balloonText": "Utilidad [[category]]: <b>[[value]] [[moneda]]</b>",
"fillAlphas": 0.9,
"lineAlpha": 0.2,
"type": "column",
"valueField": "utilidad",
"title": "Utilidad"
"valueField": "neto",
"title": "Neto"
}],
"plotAreaFillAlphas": 0.1,
"depth3D": 60,
@@ -295,6 +317,62 @@
chart.validateNow();
});
}
function CargaGraficaBarrasRentabilidad(data) {
var chart = AmCharts.makeChart("chartdiv", {
"theme": "light",
"type": "serial",
"dataProvider": data,
"legend": {
"horizontalGap": 10,
"maxColumns": 1,
"position": "right",
"useGraphSettings": true,
"markerSize": 10
},
"valueAxes": [{
"stackType": "3d",
"position": "left"
}],
"startDuration": 1,
"graphs": [
{
"balloonText": "Rentabilidad [[category]]: <b>[[value]] [[moneda]]</b>",
"fillAlphas": 0.9,
"lineAlpha": 0.2,
"type": "column",
"valueField": "rentabilidad",
"title": "Rentabilidad"
}],
"plotAreaFillAlphas": 0.1,
"depth3D": 60,
"angle": 30,
"categoryField": "gpo",
"categoryAxis": {
"gridPosition": "start",
"labelRotation": 90
},
"export": {
"enabled": true
}
});
jQuery('.chart-input').off().on('input change', function () {
var property = jQuery(this).data('property');
var target = chart;
chart.startDuration = 0;
if (property == 'topRadius') {
target = chart.graphs[0];
if (this.value == 0) {
this.value = undefined;
}
}
target[property] = this.value;
chart.validateNow();
});
}
</script>
</asp:Content>

73
Ventas/RepVentasUtilidadPadre.aspx.vb
View File

@@ -136,6 +136,12 @@ Partial Class Ventas_RepVentasUtilidadPadre
LblNeto.Text = Neto.ToString("N2")
LblPorNeto.Text = PorNeto.ToString("N2")
End If
LblNombreRentabilidad.Text = "Rentabilidad"
DivClaseRentabilidad.Attributes.Add("class", "dashboard-stat dashboard-stat-v2 green")
LblRentabilidadIndicador.Attributes.Add("data-original-title", "Rentabilidad")
LblRentabilidad.Text = DtDatos.Rows(0)("Rentabilidad").ToString.ToDouble.ToString("N2")
End If
ObjVentas.Dispose()
@@ -161,26 +167,52 @@ Partial Class Ventas_RepVentasUtilidadPadre
LblTituloGrafica.Text = $"Agrupado por: {Agrupador}"
RegistraScript("$('#DivModalGrafica').modal('show')")
Dim Dt As New DataTable()
Dt.Columns.Add("gpo")
Dt.Columns.Add("utilidad")
Dt.Columns.Add("perdida")
For Each Dr As DataRow In DtDatos.Rows
If Dr("GPO").ToString <> "" Then
Dim Row As DataRow = Nothing
Row = Dt.NewRow()
Row("gpo") = Dr("GPO").ToString
Row("utilidad") = Dr("Utilidad").ToString.FormatoNumero
Row("perdida") = Dr("Perdida").ToString.FormatoNumero
Dt.Rows.Add(Row)
End If
Next
CargaGrafica()
End Sub
Private Sub CargaGrafica()
If DdlVer.SelectedValue.ToEntero = 1 Then
Dim Dt As New DataTable()
Dt.Columns.Add("gpo")
Dt.Columns.Add("neto")
For Each Dr As DataRow In DtDatos.Rows
If Dr("GPO").ToString <> "" Then
Dim Row As DataRow = Nothing
Row = Dt.NewRow()
Row("gpo") = Dr("GPO").ToString
Row("neto") = Dr("Neto").ToString.FormatoNumero
Dt.Rows.Add(Row)
End If
Next
Dim query = From s In Dt.AsEnumerable() Select New With {.gpo = s("gpo").ToString(), .neto = s("neto").ToString().ToDouble()}
Dim json As String = Newtonsoft.Json.JsonConvert.SerializeObject(query)
RegistraScript($"CargaGraficaBarrasNeto({json})", "22")
ElseIf DdlVer.SelectedValue.ToEntero = 2 Then
Dim Dt2 As New DataTable()
Dt2.Columns.Add("gpo")
Dt2.Columns.Add("rentabilidad")
For Each Dr As DataRow In DtDatos.Rows
If Dr("GPO").ToString <> "" Then
Dim Row As DataRow = Nothing
Row = Dt2.NewRow()
Row("gpo") = Dr("GPO").ToString
Row("rentabilidad") = Dr("Rentabilidad").ToString.FormatoNumero
Dt2.Rows.Add(Row)
End If
Next
Dim query2 = From s In Dt2.AsEnumerable() Select New With {.gpo = s("gpo").ToString(), .rentabilidad = s("rentabilidad").ToString().ToDouble()}
Dim json2 As String = Newtonsoft.Json.JsonConvert.SerializeObject(query2)
RegistraScript($"CargaGraficaBarrasRentabilidad({json2})", "23")
End If
Dim query = From s In Dt.AsEnumerable() Select New With {.gpo = s("gpo").ToString(), .utilidad = s("utilidad").ToString().ToDouble(), .perdida = s("perdida").ToString().ToDouble}
Dim json As String = Newtonsoft.Json.JsonConvert.SerializeObject(query)
RegistraScript($"CargaGraficaCompracion({json})", "22")
UPModalProd.Update()
End Sub
Protected Sub DdlVer_SelectedIndexChanged(sender As Object, e As EventArgs)
CargaGrafica()
End Sub
#End Region
@@ -197,7 +229,12 @@ Partial Class Ventas_RepVentasUtilidadPadre
e.Row.DBCampo("FechaI"), e.Row.DBCampo("FechaF"), e.Row.DBCampo("CveSubProyecto"), e.Row.DBCampo("CveCliente"), e.Row.DBCampo("CveVendedor"),
e.Row.DBCampo("Grupo"), e.Row.DBCampo("GPO"), e.Row.DBCampo("CvePS"), e.Row.DBCampo("CveClasificacion"))
e.Row.Cells(0).Text = "<a class=""" & Css & """ href=""" & Liga & """>" & e.Row.Cells(0).Text & "</a>"
Else
e.Row.Cells(9).BackColor = Drawing.Color.LightGray
End If
End If
End Sub
@@ -234,6 +271,7 @@ Partial Class Ventas_RepVentasUtilidadPadre
params.Add(New ReportParameter("Filtros", StrFiltro.ToString))
params.Add(New ReportParameter("Neto", LblNeto.Text))
params.Add(New ReportParameter("PorNeto", $"{LblPorNeto.Text}%"))
params.Add(New ReportParameter("Rentabilidad", $"{LblRentabilidad.Text}%"))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
@@ -248,4 +286,5 @@ Partial Class Ventas_RepVentasUtilidadPadre
End Class