From 0fb7fbc07d39b8987a3dca3964d1536987cc8556 Mon Sep 17 00:00:00 2001
From: rakcsle <rakcsle.rakcsle@gmail.com>
Date: Wed, 6 Apr 2022 11:27:03 -0700
Subject: [PATCH] Balance General Conta 2 Impresion  logo,   total pasivo y
 patrimonio

---
 Contabilidad2/RepSituacionFinanciera.aspx.vb  | 20 +++++++++++++++----
 .../Reportes/RepSituacionFinanciera.rdlc      |  7 ++++---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Contabilidad2/RepSituacionFinanciera.aspx.vb b/Contabilidad2/RepSituacionFinanciera.aspx.vb
index f3f16dacf..fb092acf1 100644
--- a/Contabilidad2/RepSituacionFinanciera.aspx.vb
+++ b/Contabilidad2/RepSituacionFinanciera.aspx.vb
@@ -587,18 +587,30 @@ Partial Class AC2_SituacionFinanciera
     Private Sub ImprimirReporte(Optional Formato As String = "PDF")
         Dim FechaI = String.Format("01/{0}/{1}", DdlPeriodo.SelectedValue.PadLeft(2, CChar("0")), DdlEjercicio.SelectedValue)
         Dim FechaF = DateAdd(DateInterval.Day, -1, DateAdd(DateInterval.Month, 1, CDate(FechaI))).ToString("dd/MM/yyyy")
-        'nombre del archivo a generar
+
         Dim fileName As String = "EdoSituacionFinanciera"
-        'ubicacion del rdlc
+
         Dim reportpath As String = "Contabilidad2/Reportes/RepSituacionFinanciera.rdlc"
 
-        'parametros a enviar al reporte                     
+
         Dim params As New List(Of ReportParameter)
         params.Add(New ReportParameter("pEmp", UsuarioActual.Empresa.Empresa))
-        params.Add(New ReportParameter("pImg", New Uri(Server.MapPath(String.Format("~/Empresas/{0}/Logo.png", UsuarioActual.CveEmpresa))).AbsoluteUri))
+
+
+        Dim ImgLogoInfo As New IO.FileInfo($"{UsuarioActual.Empresa.Ruta}\Logo.png")
+
+
+        If ImgLogoInfo.Exists Then
+            params.Add(New ReportParameter("pImg", $"file://{ImgLogoInfo.FullName}"))
+        Else
+            params.Add(New ReportParameter("pImg", ""))
+        End If
+
+
         params.Add(New ReportParameter("pFirma1", If(ChkFirma.Checked, String.Format("{0}", vbCrLf), "")))
         params.Add(New ReportParameter("pFirma2", If(ChkFirma.Checked, String.Format("{0}l", vbCrLf), "")))
         params.Add(New ReportParameter("pFechaFin", FechaF))
+
         params.Add(New ReportParameter("periodo", String.Format("de {0} {1}", DdlPeriodo.SelectedItem.ToString, DdlEjercicio.SelectedItem.ToString)))
         ImprimirPDF(reportpath, DtDatos, params, fileName, Formato)
     End Sub
diff --git a/Contabilidad2/Reportes/RepSituacionFinanciera.rdlc b/Contabilidad2/Reportes/RepSituacionFinanciera.rdlc
index 840e67f08..6c35c1cfe 100644
--- a/Contabilidad2/Reportes/RepSituacionFinanciera.rdlc
+++ b/Contabilidad2/Reportes/RepSituacionFinanciera.rdlc
@@ -3048,16 +3048,17 @@
       <Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL"  , Fields!ImporteActual.Value, 0),"DataSet1")</Value>
     </Variable>
     <Variable Name="TotalPatrimonioHActual">
-      <Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL CONTABLE"  , Fields!ImporteActual.Value, 0),"DataSet1")</Value>
+      <Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL"  , Fields!ImporteActual.Value, 0),"DataSet1")</Value>
     </Variable>
     <Variable Name="TotalPatrimonioCAnterior">
-      <Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL CONTABLE"  , Fields!ImporteAnterior.Value, 0),"DataSet1")</Value>
+      <Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL"  , Fields!ImporteAnterior.Value, 0),"DataSet1")</Value>
     </Variable>
     <Variable Name="TotalPatrimonioHAnterior">
-      <Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL CONTABLE"  , Fields!ImporteActual.Value, 0),"DataSet1")</Value>
+      <Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL"  , Fields!ImporteActual.Value, 0),"DataSet1")</Value>
     </Variable>
     <Variable Name="TotalpasivoYHaciendaActual">
       <Value>=Variables!TotalPasivoActual.Value+Variables!TotalPatrimonioHActual.Value</Value>
+      <Writable>true</Writable>
     </Variable>
     <Variable Name="TotalpasivoYHaciendaAnterior">
       <Value>=Variables!TotalPatrimonioHAnterior.Value+ Variables!TotalPasivoAnterior.Value</Value>