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

General

Browse Source
This commit is contained in:
rakcsle
2022-05-20 10:14:10 -07:00
parent 1dd3fd0343
commit 71f75462f8
7 changed files with 150 additions and 1647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App_Code/ClsPaginas.vb
View File

@@ -5999,7 +5999,7 @@ Public Class ClsPaginas
Dim bdir As String = If(RutaReporte.Contains("Empresas"), ModExtensiones.DirectorioBaseEmpresas, AppDomain.CurrentDomain.BaseDirectory)
'TOMAR LA RUTA BASE PARA EL DIRECTORIO DE LA EMPRESA
If Not String.IsNullOrEmpty(RutaEmpresa) AndAlso Not RutaReporte.Contains("Grales") AndAlso Not RutaReporte.Contains("Contabilidad/Reportes/") AndAlso Not RutaReporte.Contains("AC/Reportes/") Then
If Not String.IsNullOrEmpty(RutaEmpresa) AndAlso Not RutaReporte.Contains("Grales") AndAlso Not RutaReporte.Contains("Contabilidad/Reportes/") AndAlso Not RutaReporte.Contains("Contabilidad2/Reportes/") AndAlso Not RutaReporte.Contains("AC/Reportes/") Then
bdir = RutaEmpresa.Replace($"{CveEmpresa}/", "")
End If

37
Compras/PopUpVerFactura.aspx.vb
View File

@@ -2642,14 +2642,41 @@ Partial Class PopUpVerFactura
Dim Guardar As Boolean = If(GuardarPDF, True, If(AplicaPagare = "1", False, True))
If Not IsNothing(Vta) Then
'04/05/2018 - Se agrega seccion pruebas para generar factura venta .mrt para PyME
If UsuarioActual.Empresa.CvePlataforma = 2 Then
GeneraPDFVtaPyMe(Vta, "PDF")
Dim PathArchivo As String = String.Format("{0}PDF\{1}\{2}.pdf", UsuarioActual.Empresa.Ruta, Vta.TipoDocto, Vta.SerieFolio)
Dim Archivo As New System.IO.FileInfo(PathArchivo)
If Archivo.Exists Then
HttpContext.Current.Response.Clear()
HttpContext.Current.Response.ClearContent()
HttpContext.Current.Response.ContentType = If(IO.Path.GetExtension(Archivo.Name) = ".txt", "text/plain", "application/pdf")
HttpContext.Current.Response.AppendHeader("Content-disposition", "attachment; filename=" & Archivo.Name)
HttpContext.Current.Response.AddHeader("Content-Length", Archivo.Length.ToString())
HttpContext.Current.Response.TransmitFile(PathArchivo)
'HttpContext.Current.Response.Flush()
HttpContext.Current.Response.End()
Archivo = Nothing
Else
ImprimirbytesPDF(PdfFactura(Vta, AplicaPagare:=AplicaPagare, Guardar:=Guardar), Vta.SerieFolio, "PDF")
Vta = Nothing
'04/05/2018 - Se agrega seccion pruebas para generar factura venta .mrt para PyME
If UsuarioActual.Empresa.CvePlataforma = 2 Then
GeneraPDFVtaPyMe(Vta, "PDF")
Else
ImprimirbytesPDF(PdfFactura(Vta, AplicaPagare:=AplicaPagare, Guardar:=Guardar), Vta.SerieFolio, "PDF")
Vta = Nothing
End If
End If
End If
End Sub

15
Contabilidad2/Reportes/RepSituacionFinanciera.rdlc
View File

@@ -2138,7 +2138,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Iif( Round(Math.Abs(Variables!TotalActivoActual.Value-Variables!TotalpasivoYHaciendaActual.Value),2) &lt;.005,"" ,"La suma de los totales estan descuadradas." &amp; round(Math.Abs(Variables!TotalActivoAnterior.Value-Variables!TotalpasivoYHaciendaAnterior.Value),2))</Value>
<Value>=Iif( Round(Math.Abs(Variables!TotalActivoActual.Value-Variables!TotalpasivoYHaciendaActual.Value),2) &lt;.005,"" ,"La suma de los totales estan descuadradas." &amp; Round(Math.Abs(Variables!TotalActivoActual.Value-Variables!TotalpasivoYHaciendaActual.Value),2))</Value>
<Style>
<FontFamily>Verdana</FontFamily>
<FontSize>7pt</FontSize>
@@ -2994,20 +2994,25 @@
<ReportParameters>
<ReportParameter Name="pEmp">
<DataType>String</DataType>
<Nullable>true</Nullable>
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
<ReportParameter Name="pImg">
<DataType>String</DataType>
<Nullable>true</Nullable>
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
<ReportParameter Name="pFirma1">
<DataType>String</DataType>
<Nullable>true</Nullable>
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
<ReportParameter Name="pFirma2">
<DataType>String</DataType>
<Nullable>true</Nullable>
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
@@ -3045,16 +3050,16 @@
<Writable>true</Writable>
</Variable>
<Variable Name="TotalPatrimonioCActual">
<Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" , Fields!ImporteActual.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="TotalPatrimonioHActual">
<Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" , Fields!ImporteActual.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="TotalPatrimonioCAnterior">
<Value>=Sum(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" , Fields!ImporteAnterior.Value, 0),"DataSet1")</Value>
<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(Microsoft.VisualBasic.Interaction.iif(Fields!Sup.Value = "CAPITAL" , Fields!ImporteActual.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>

157
Empresas/15/Formatos/Factura.rdlc
View File

@@ -532,52 +532,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>R.F.C ENO970305TL4</Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>8pt</FontSize>
<FontWeight>Normal</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Camelia, #346, Col.:Luis Encinas,</Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>8pt</FontSize>
<FontWeight>Normal</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
<Paragraph>
<TextRuns>
<TextRun>
<Value> C.P. 83138 Hermosillo</Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>8pt</FontSize>
<FontWeight>Normal</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
<Paragraph>
<TextRuns>
<TextRun>
<Value xml:space="preserve"> </Value>
<Value>R.F.C ENO970305TL4 </Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>8pt</FontSize>
@@ -1429,7 +1384,7 @@
</Line>
</ReportItems>
<KeepTogether>true</KeepTogether>
<Top>20.79018cm</Top>
<Top>20.85368cm</Top>
<Left>0.0208cm</Left>
<Height>2.10099cm</Height>
<Width>20.06179cm</Width>
@@ -2750,7 +2705,7 @@
</TablixMembers>
</TablixRowHierarchy>
<DataSetName>DsOC</DataSetName>
<Top>4.08065cm</Top>
<Top>4.14415cm</Top>
<Left>0.11516cm</Left>
<Height>2.29418cm</Height>
<Width>19.97108cm</Width>
@@ -3175,7 +3130,7 @@
</Textbox>
</ReportItems>
<KeepTogether>true</KeepTogether>
<Top>13.38771cm</Top>
<Top>13.45121cm</Top>
<Left>0.04257cm</Left>
<Height>3.74574cm</Height>
<Width>20.109cm</Width>
@@ -4241,7 +4196,7 @@
</Tablix>
</ReportItems>
<KeepTogether>true</KeepTogether>
<Top>6.54857cm</Top>
<Top>6.61207cm</Top>
<Left>0.11516cm</Left>
<Height>6.80033cm</Height>
<Width>20.03641cm</Width>
@@ -4288,7 +4243,7 @@
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox8</rd:DefaultName>
<Top>19.59752cm</Top>
<Top>19.66102cm</Top>
<Left>0.07003cm</Left>
<Height>1.01627cm</Height>
<Width>5.45089cm</Width>
@@ -4749,7 +4704,7 @@
</Tablix>
</ReportItems>
<KeepTogether>true</KeepTogether>
<Top>17.14756cm</Top>
<Top>17.21106cm</Top>
<Left>0.00547cm</Left>
<Height>2.25247cm</Height>
<Width>20.1554cm</Width>
@@ -4763,6 +4718,92 @@
</Border>
</Style>
</Rectangle>
<Textbox Name="Textbox19">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Nombre:</Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>9pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox19</rd:DefaultName>
<Top>1.38294in</Top>
<Left>0.12202cm</Left>
<Height>0.22222in</Height>
<Width>0.792in</Width>
<ZIndex>16</ZIndex>
<Style>
<Border>
<Color>#c4d79b</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Style>None</Style>
</TopBorder>
<LeftBorder>
<Style>None</Style>
</LeftBorder>
<RightBorder>
<Style>None</Style>
</RightBorder>
<BackgroundColor>#c4d79b</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox20">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Parameters!ClienteNombre.Value</Value>
<Style>
<FontFamily>Calibri</FontFamily>
<FontSize>7pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox19</rd:DefaultName>
<Top>1.38294in</Top>
<Left>0.84004in</Left>
<Height>0.22222in</Height>
<Width>4.7649in</Width>
<ZIndex>17</ZIndex>
<Style>
<Border>
<Color>#c4d79b</Color>
<Style>Solid</Style>
</Border>
<TopBorder>
<Style>None</Style>
</TopBorder>
<LeftBorder>
<Style>None</Style>
</LeftBorder>
<RightBorder>
<Style>None</Style>
</RightBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox32">
<KeepTogether>true</KeepTogether>
<Paragraphs>
@@ -4792,11 +4833,11 @@
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox19</rd:DefaultName>
<Top>1.37495in</Top>
<Left>5.662in</Left>
<Height>0.23161in</Height>
<Width>2.24597in</Width>
<ZIndex>16</ZIndex>
<Top>1.38745in</Top>
<Left>5.61883in</Left>
<Height>0.2092in</Height>
<Width>2.26391in</Width>
<ZIndex>18</ZIndex>
<Style>
<Border>
<Color>#c4d79b</Color>
@@ -4818,7 +4859,7 @@
</Style>
</Textbox>
</ReportItems>
<Height>22.89117cm</Height>
<Height>23.58967cm</Height>
<Style />
</Body>
<Width>20.16633cm</Width>

1578
Empresas/160/Formatos/Factura.rdlc
View File

File diff suppressed because it is too large Load Diff

6
Nomina/Nomina.aspx.cs
View File

@@ -8842,6 +8842,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
if (!ErrorProceso)
{
sb.AppendLine("");
}
}

2
Ventas/RepProductosServiciosDetalle.aspx
View File

@@ -412,7 +412,7 @@
<%--17--%>
<asp:BoundField HeaderText="Forma de Pago" DataField="FormaPago" ItemStyle-Width="5%" Visible="false" />
<%--18--%>
<asp:BoundField HeaderText="F. Emisión" DataField="FechaIng" DataFormatString="{0:d}" ItemStyle-Width="5%" ItemStyle-HorizontalAlign="Center" Visible="false" />
<asp:BoundField HeaderText="Fecha Hora de Emisión" DataField="FechaIng" ItemStyle-Width="200px" ItemStyle-HorizontalAlign="Center" Visible="false" />
</Columns>