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:
caudillochon
2025-03-07 09:14:43 -07:00
parent f0ad491391 6ea94bedc5
commit 5ec6a0d39b
4 changed files with 62 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Contabilidad/Reportes/RepSituacionFinanciera.rdlc
View File

@@ -2726,7 +2726,7 @@
<Height>4.77456in</Height> <Height>4.77456in</Height>
<Style /> <Style />
</Body> </Body>
<Width>8.07238in</Width> <Width>8.07239in</Width>
<Page> <Page>
<PageHeader> <PageHeader>
<Height>0.74083cm</Height> <Height>0.74083cm</Height>
@@ -3037,36 +3037,50 @@
</ReportParameters> </ReportParameters>
<Variables> <Variables>
<Variable Name="TotalActivoActual"> <Variable Name="TotalActivoActual">
<Value>=Sum(iif(Fields!Tipo.Value.ToString() = "A" OR Fields!Tipo.Value.ToString() = "B" OR Fields!Tipo.Value.ToString() = "C" OR Cint(Fields!TipoCuenta.Value) = 9 , Fields!ImporteActual.Value, 0) , "DataSet1")</Value> <Value>=Sum(
IIf(
(Fields!Tipo.Value = "A" OR Fields!Tipo.Value = "B" OR Fields!Tipo.Value = "C" OR CInt(Fields!TipoCuenta.Value) = 9)
AND IsNumeric(Fields!ImporteActual.Value),
CDbl(Fields!ImporteActual.Value),
0
),
"DataSet1"
)</Value>
</Variable> </Variable>
<Variable Name="TotalActivoAnterior"> <Variable Name="TotalActivoAnterior">
<Value>=Sum( iif(Fields!Sup.Value = "ACTIVO NO CIRCULANTE" OR Fields!Sup.Value="ACTIVO CIRCULANTE" OR Cint(Fields!TipoCuenta.value) = 9 , Cint(Fields!ImporteAnterior.Value) , 0.0), "DataSet1")</Value> <Value>=Sum( iif(Fields!Sup.Value = "ACTIVO NO CIRCULANTE" OR Fields!Sup.Value="ACTIVO CIRCULANTE" OR Cint(Fields!TipoCuenta.value) = 9 , Cint(Fields!ImporteAnterior.Value) , 0.0), "DataSet1")</Value>
</Variable> </Variable>
<Variable Name="TotalPasivoActual"> <Variable Name="TotalPasivoActual">
<Value>=Sum( iif(Fields!Sup.Value = "PASIVO CIRCULANTE" OR Fields!Sup.Value = "PASIVO NO CIRCULANTE" OR Fields!Sup.Value = "Pasivo a corto plazo" OR Fields!Sup.Value = "Pasivo a largo plazo", <Value>=Sum(
Fields!ImporteActual.Value, 0), "DataSet1")</Value> iif(
(Fields!Sup.Value = "PASIVO CIRCULANTE" OR Fields!Sup.Value = "PASIVO NO CIRCULANTE" OR Fields!Sup.Value = "Pasivo a corto plazo" OR Fields!Sup.Value = "Pasivo a largo plazo")
AND IsNumeric(Fields!ImporteActual.Value),
CDbl(Fields!ImporteActual.Value),
0
), "DataSet1")</Value>
</Variable> </Variable>
<Variable Name="TotalPasivoAnterior"> <Variable Name="TotalPasivoAnterior">
<Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "PASIVO CIRCULANTE" OR Fields!Sup.Value = "PASIVO NO CIRCULANTE" , Cint(Fields!ImporteAnterior.Value), 0),"DataSet1")</Value> <Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "PASIVO CIRCULANTE" OR Fields!Sup.Value = "PASIVO NO CIRCULANTE" , Cint(Fields!ImporteAnterior.Value), 0),"DataSet1")</Value>
<Writable>true</Writable> <Writable>true</Writable>
</Variable> </Variable>
<Variable Name="TotalPatrimonioCActual"> <Variable Name="TotalPatrimonioCActual">
<Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" OR Fields!Sup.Value = "CAPITAL CONTABLE" , Fields!ImporteActual.Value, 0),"DataSet1")</Value> <Value>=Sum( iif( (Fields!Sup.Value = "CAPITAL" OR Fields!Sup.Value = "CAPITAL CONTABLE") AND IsNumeric(Fields!ImporteActual.Value) ,
CDbl(Fields!ImporteActual.Value),0),"DataSet1")</Value>
</Variable> </Variable>
<Variable Name="TotalPatrimonioHActual"> <Variable Name="TotalPatrimonioHActual">
<Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" <Value>=Sum(Microsoft.VisualBasic.Interaction.iif( (Fields!Sup.Value = "CAPITAL"
OR Fields!Sup.Value = "CAPITAL CONTABLE" OR Fields!Sup.Value = "CAPITAL CONTABLE"
OR Fields!Sup.Value = "Capital Contable" OR Fields!Sup.Value = "Capital Contable"
OR Fields!Sup.Value = "Capital Social" OR Fields!Sup.Value = "Capital Social"
OR Fields!Sup.Value = "Capital", OR Fields!Sup.Value = "Capital") AND IsNumeric(Fields!ImporteActual.Value),
Fields!ImporteActual.Value, 0),"DataSet1")</Value> CDbl(Fields!ImporteActual.Value), 0),"DataSet1")</Value>
</Variable> </Variable>
<Variable Name="TotalPatrimonioCAnterior"> <Variable Name="TotalPatrimonioCAnterior">
<Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" OR Fields!Sup.Value = "CAPITAL CONTABLE" , Cint(Fields!ImporteAnterior.Value), 0),"DataSet1")</Value> <Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" OR Fields!Sup.Value = "CAPITAL CONTABLE" , Cint(Fields!ImporteAnterior.Value), 0),"DataSet1")</Value>
<Writable>true</Writable> <Writable>true</Writable>
</Variable> </Variable>
<Variable Name="TotalPatrimonioHAnterior"> <Variable Name="TotalPatrimonioHAnterior">
<Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" OR Fields!Sup.Value = "CAPITAL CONTABLE" , Fields!ImporteActual.Value, 0),"DataSet1")</Value> <Value>=Sum(Microsoft.VisualBasic.Interaction.iif((Fields!Sup.Value = "CAPITAL" OR Fields!Sup.Value = "CAPITAL CONTABLE") AND IsNumeric(Fields!ImporteActual.Value) , CDbl(Fields!ImporteActual.Value), 0),"DataSet1")</Value>
</Variable> </Variable>
<Variable Name="TotalpasivoYHaciendaActual"> <Variable Name="TotalpasivoYHaciendaActual">
<Value>=Variables!TotalPasivoActual.Value+Variables!TotalPatrimonioHActual.Value</Value> <Value>=Variables!TotalPasivoActual.Value+Variables!TotalPatrimonioHActual.Value</Value>

3
Empresas/Grales/Formatos/CartaPorteTimbrado.rdlc
View File

@@ -4256,7 +4256,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>="3. Página " &amp; Code.PageNumber &amp; " de " &amp; Code.TotalPages</Value> <Value>3. Página 1 de 1 Páginas</Value>
<Style> <Style>
<FontFamily>Myriad Pro</FontFamily> <FontFamily>Myriad Pro</FontFamily>
<FontSize>8pt</FontSize> <FontSize>8pt</FontSize>
@@ -6636,6 +6636,7 @@ Se ha recibido el número arriba indicado de bultos/contenedores/remolques/autot
</Paragraph> </Paragraph>
</Paragraphs> </Paragraphs>
<rd:DefaultName>Textbox14</rd:DefaultName> <rd:DefaultName>Textbox14</rd:DefaultName>
<Top>0cm</Top>
<Left>14.75588cm</Left> <Left>14.75588cm</Left>
<Height>0.54708cm</Height> <Height>0.54708cm</Height>
<Width>4.70062cm</Width> <Width>4.70062cm</Width>

12
Inventarios/PrestamosdeProveedor.aspx
View File

@@ -10,6 +10,18 @@
<asp:Content ID="Content4" ContentPlaceHolderID="HB" runat="Server"> <asp:Content ID="Content4" ContentPlaceHolderID="HB" runat="Server">
</asp:Content> </asp:Content>
<asp:Content ID="Content5" ContentPlaceHolderID="H" runat="Server"> <asp:Content ID="Content5" ContentPlaceHolderID="H" runat="Server">
<asp:UpdatePanel runat="server" UpdateMode="Conditional" ID="UpAcciones">
<ContentTemplate>
<li>
<asp:LinkButton ID="LnkExportar" runat="server" Visible="true"><i class="fa fa-ad-excel"></i> Generar Excel</asp:LinkButton>
</li>
</ContentTemplate>
<Triggers>
<asp:PostBackTrigger ControlID="LnkExportar" />
</Triggers>
</asp:UpdatePanel>
</asp:Content> </asp:Content>
<asp:Content ID="Content6" ContentPlaceHolderID="HA" runat="Server"> <asp:Content ID="Content6" ContentPlaceHolderID="HA" runat="Server">
</asp:Content> </asp:Content>

22
Inventarios/PrestamosdeProveedor.aspx.vb
View File

@@ -307,5 +307,27 @@ Partial Class Inventarios_PrestamosdeProveedor
Private Sub BtnCargaPendientes_Click(sender As Object, e As EventArgs) Handles BtnCargaPendientes.Click Private Sub BtnCargaPendientes_Click(sender As Object, e As EventArgs) Handles BtnCargaPendientes.Click
CargaDatos() CargaDatos()
End Sub
Private Sub LnkExportar_Click(sender As Object, e As EventArgs) Handles LnkExportar.Click
Dim SbFiltros As New StringBuilder()
'SbFiltros.AppendFormat("Fecha Inicio: {0} Fecha Fin: {1}|", $"01/01/{DdlEjercicio.SelectedValue}", $"31/12/{DdlEjercicio.SelectedValue}")
SbFiltros.AppendFormat("SubProyecto : {0}|", DdlSubProyecto.SelectedItem.Text)
SbFiltros.AppendFormat("Proveedor : {0}|", ddlProveedor.txtText.Value)
SbFiltros.AppendFormat("Folio : {0}|", TxtFolioEntrega.Text)
'If DdlDivisor.SelectedValue <> "1" Then SbFiltros.AppendFormat("Divisor : {0}|", DdlDivisor.SelectedItem.Text)
'SbFiltros.AppendFormat("Ejercicio : {0} Periodo : {1}|", DdlEjercicio.SelectedItem.Text, DdlPeriodo.SelectedItem.Text)
GvD.Columns(1).Visible = False
UppEntrega.Update()
GvD.ExportToExcelGembox("PrestamosProveedores", UsuarioActual, $"Préstamos de Proveedores", DatoTituloExtra:="", DatosFiltros:=SbFiltros.ToString())
GvD.Columns(1).Visible = True
UppEntrega.Update()
End Sub
Public Overrides Sub VerifyRenderingInServerForm(ByVal control As Control)
End Sub End Sub
End Class End Class