From 500be6b1eb898db54c1998278f9d141f454b1201 Mon Sep 17 00:00:00 2001
From: Oscar Irigoyen <rakcsle@outlook.com>
Date: Mon, 30 Jan 2023 17:09:51 -0700
Subject: [PATCH] Proveedores Carga de xml

---
 Compras/Proveedores.aspx.vb                      | 10 +++++++++-
 .../Reportes/RepSituacionFinanciera.rdlc         | 16 ++++++++++------
 Ventas/Clientes.aspx                             |  4 +++-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Compras/Proveedores.aspx.vb b/Compras/Proveedores.aspx.vb
index d6440f523..88340dacc 100644
--- a/Compras/Proveedores.aspx.vb
+++ b/Compras/Proveedores.aspx.vb
@@ -717,7 +717,15 @@ Partial Class Compras_Proveedores
 
             Try
                 Dim dr As DataRow = ObjeFacturas.DtResultados.Rows(0)
-                XMLDoc.Load(UsuarioActual.Empresa.Ruta & "Compras\" & dr("RFCDe").ToString & "\" & dr("XML").ToString)
+
+
+                Dim SXML As String = File.ReadAllText(UsuarioActual.Empresa.Ruta & "Compras\" & dr("RFCDe").ToString & "\" & dr("XML").ToString)
+                'SXML = SXML.TrimStart(vbCr, vbLf, vbNullChar)
+                'SXML = SXML.TrimEnd(vbCr, vbLf, vbNullChar)
+                SXML = SXML.Trim(New Char() {""c})
+                SXML = SXML.Replace("o;?", "")
+
+                XMLDoc.LoadXml(SXML)
                 Dim Prefijo As String = If(XMLDoc.DocumentElement.Prefix = "", "cfd", XMLDoc.DocumentElement.Prefix)
                 Dim cfdVer As String = "http://www.sat.gob.mx/cfd/3"
                 Dim namespaces As New XmlNamespaceManager(XMLDoc.NameTable)
diff --git a/Contabilidad2/Reportes/RepSituacionFinanciera.rdlc b/Contabilidad2/Reportes/RepSituacionFinanciera.rdlc
index c783cb174..8fbc653f0 100644
--- a/Contabilidad2/Reportes/RepSituacionFinanciera.rdlc
+++ b/Contabilidad2/Reportes/RepSituacionFinanciera.rdlc
@@ -3035,32 +3035,36 @@
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
   </ReportParameters>
-  
   <Variables>
     <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>
     </Variable>
     <Variable Name="TotalActivoAnterior">
-        <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!ImporteAnterior.Value, 0)  , "DataSet1")</Value>
+      <Value>=Sum( iif(Fields!Sup.Value  = "ACTIVO NO CIRCULANTE" OR Fields!Sup.Value="ACTIVO CIRCULANTE" OR Cint(Fields!TipoCuenta.value) = 9  , Fields!ImporteAnterior.Value, 0), "DataSet1")</Value>
     </Variable>
     <Variable Name="TotalPasivoActual">
-      <Value>=Sum(iif(Fields!Tipo.Value.ToString() = "D" AND Cint(Fields!TipoCuenta.Value) = 3  , Fields!ImporteActual.Value, 0)  , "DataSet1")</Value>
+      <Value>=Sum( iif(Fields!Sup.Value = "PASIVO CIRCULANTE" OR Fields!Sup.Value = "PASIVO NO CIRCULANTE"  OR Fields!Sup.Value = "Pasivo a corto plazo", 
+Fields!ImporteActual.Value, 0), "DataSet1")</Value>
     </Variable>
     <Variable Name="TotalPasivoAnterior">
-       <Value>=Sum(iif(Fields!Tipo.Value.ToString() = "D" AND Cint(Fields!TipoCuenta.Value) = 3  , Fields!ImporteAnterior.Value, 0)  , "DataSet1")</Value>
+      <Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "PASIVO CIRCULANTE" OR Fields!Sup.Value = "PASIVO NO CIRCULANTE" , Fields!ImporteAnterior.Value, 0),"DataSet1")</Value>
       <Writable>true</Writable>
     </Variable>
     <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>
     </Variable>
     <Variable Name="TotalPatrimonioHActual">
-      <Value>=Sum(iif(Fields!Tipo.Value.ToString() = "F" AND (Cint(Fields!TipoCuenta.Value) = 5 OR Cint(Fields!TipoCuenta.Value) = 6 OR Cint(Fields!TipoCuenta.Value) = 7 OR Cint(Fields!TipoCuenta.Value) = 8)  , Fields!ImporteActual.Value, 0)  , "DataSet1")</Value>
+      <Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" 
+OR Fields!Sup.Value = "CAPITAL CONTABLE"  
+OR Fields!Sup.Value = "Capital Social"
+OR Fields!Sup.Value = "Capital", 
+Fields!ImporteActual.Value, 0),"DataSet1")</Value>
     </Variable>
     <Variable Name="TotalPatrimonioCAnterior">
       <Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" OR Fields!Sup.Value = "CAPITAL CONTABLE" , Fields!ImporteAnterior.Value, 0),"DataSet1")</Value>
     </Variable>
     <Variable Name="TotalPatrimonioHAnterior">
-      <Value>=Sum(iif(Fields!Tipo.Value.ToString() = "F" AND (Cint(Fields!TipoCuenta.Value) = 5 OR Cint(Fields!TipoCuenta.Value) = 6 OR Cint(Fields!TipoCuenta.Value) = 7 OR Cint(Fields!TipoCuenta.Value) = 8)  , Fields!ImporteAnterior.Value, 0)  , "DataSet1")</Value>
+      <Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" OR Fields!Sup.Value = "CAPITAL CONTABLE" , Fields!ImporteActual.Value, 0),"DataSet1")</Value>
     </Variable>
     <Variable Name="TotalpasivoYHaciendaActual">
       <Value>=Variables!TotalPasivoActual.Value+Variables!TotalPatrimonioHActual.Value</Value>
diff --git a/Ventas/Clientes.aspx b/Ventas/Clientes.aspx
index 198088ed9..f23ebb96f 100644
--- a/Ventas/Clientes.aspx
+++ b/Ventas/Clientes.aspx
@@ -677,7 +677,9 @@
                                             </div>
 
                                              <div class="form-group form-md-line-input input-iconright col-md-2" id="DVLnkCambiarVendedor" runat="server" visible="false">
-                                                 <asp:LinkButton runat="server" ID="LnkCambiarVendedor" CssClass="Texto" Text="Actualziar" OnClick="LnkCambiarVendedor_Click">Actualziar</asp:LinkButton>
+                                                 <asp:LinkButton runat="server" ID="LnkCambiarVendedor" CssClass="btn btn-default btn-circle btn-xs" Text="<i class='fa fa-check' style='color:green'></i>"                                                     
+                                                     data-toggle="confirmation" data-popout="true" data-original-title="¿Actualizar Vendedor?" data-btn-ok-label="si" 
+                                                     OnClick="LnkCambiarVendedor_Click"></asp:LinkButton>
                                              </div>
 
                                         </div>