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

-

Browse Source
This commit is contained in:
Antonio Gonzalez
2020-08-01 16:30:23 -07:00
parent b5076c6c47
commit e5f47ea154
2 changed files with 64 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Compras/PopUpVerFactura.aspx.vb
View File

@@ -1341,7 +1341,7 @@ Partial Class PopUpVerFactura
EstadoOrigen, PaisOrigen, CPOrigen, CalleDestino, NoExtDestino, ColoniaDestino, LocalidadDestino,
MunicipioDestino, EstadoDestino, PaisDestino, CPDestino, FechaMovimiento, NombreCapturo, PuestoRecibio,
PuestoEnrego, RazonSocial, ResponsableCarga, ResponsableRecibio, NombreCliente,
CantidadProductos:=CantidadProductos, CantidadUsados:=CantidadUsados)
CantidadProductos:=CantidadProductos, CantidadUsados:=CantidadUsados, CveTipoAlmacen:=CveTipoAlmacen)
End Sub
Private Sub PUanacExtr(CveMoneda As Integer) 'preciounitario a moneda nacional o extranjera
@@ -1358,7 +1358,7 @@ Partial Class PopUpVerFactura
Remision As String, Proveedor As String, CalleOrigen As String, NoExtOrigen As String, ColoniaOrigen As String, LocalidadOrigen As String, MunicipioOrigen As String,
EstadoOrigen As String, PaisOrigen As String, CPOrigen As String, CalleDestino As String, NoExtDestino As String, ColoniaDestino As String, LocalidadDestino As String, MunicipioDestino As String,
EstadoDestino As String, PaisDestino As String, CPDestino As String, FechaMovimiento As Date, NombreCapturo As String, PuestoRecibio As String, PuestoEntrego As String,
RazonSocial As String, ResponsableCarga As String, ResponsableRecibio As String, NombreCliente As String, Optional CantidadProductos As Decimal = 0, Optional CantidadUsados As Decimal = 0)
RazonSocial As String, ResponsableCarga As String, ResponsableRecibio As String, NombreCliente As String, Optional CantidadProductos As Decimal = 0, Optional CantidadUsados As Decimal = 0, Optional CveTipoAlmacen As Integer = -1)
Select Case CveConcepto
@@ -1445,6 +1445,7 @@ Partial Class PopUpVerFactura
params.Add(New ReportParameter("Concepto", ConceptoFormato))
params.Add(New ReportParameter("Almacen", Almacen))
params.Add(New ReportParameter("FechaImpresion", DateTime.Now.ToString("dd/MM/yyyy")))
params.Add(New ReportParameter("CveTipoAlmacen", Almacen))
params.Add(New ReportParameter("Folio", Folio))
params.Add(New ReportParameter("FacturaProveedor", If(CveCompra > 0, dr("SerieFolio").ToString, "")))

19
Empresas/72/Formatos/Entradas.rdlc
View File

@@ -702,7 +702,7 @@
<Top>0.17639cm</Top>
<Left>0.12931cm</Left>
<Height>1.03773cm</Height>
<Width>19.16933cm</Width>
<Width>19.16934cm</Width>
<Style>
<Border>
<Style>None</Style>
@@ -1049,11 +1049,14 @@
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>2.3622cm</Top>
<Top>2.6797cm</Top>
<Left>0.18166cm</Left>
<Height>2.46091cm</Height>
<Height>2.14341cm</Height>
<Width>10.47411cm</Width>
<ZIndex>2</ZIndex>
<Visibility>
<Hidden>=Not Parameters!CveTipoAlmacen.Value="19"</Hidden>
</Visibility>
<Style>
<Border>
<Style>None</Style>
@@ -1170,9 +1173,9 @@
</Paragraphs>
<rd:DefaultName>Textbox50</rd:DefaultName>
<Top>0.74112cm</Top>
<Left>10.83216cm</Left>
<Left>3.80525cm</Left>
<Height>1.86797cm</Height>
<Width>8.38745cm</Width>
<Width>15.41436cm</Width>
<ZIndex>3</ZIndex>
<Style>
<Border>
@@ -1819,6 +1822,12 @@
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
<ReportParameter Name="CveTipoAlmacen">
<DataType>String</DataType>
<Nullable>true</Nullable>
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
</ReportParameters>
<EmbeddedImages>
<EmbeddedImage Name="Logo1">