diff --git a/Empresas/Grales/Formatos/RepProductosServiciosDetalle.rdlc b/Empresas/Grales/Formatos/RepProductosServiciosDetalle.rdlc
index ce7fb0e14..c9bcd8e99 100644
--- a/Empresas/Grales/Formatos/RepProductosServiciosDetalle.rdlc
+++ b/Empresas/Grales/Formatos/RepProductosServiciosDetalle.rdlc
@@ -456,7 +456,7 @@
@@ -468,7 +468,7 @@
- =iif(Fields!CveVenta.Value = "", "#67809F", "Transparent")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","#67809F","#cccccc"), "Transparent")
2pt
2pt
2pt
@@ -490,7 +490,7 @@
8pt
=iif(Fields!CveVenta.Value = "", "Bold", "Normal")
dd/MM/yyyy
- =iif(Fields!CveVenta.Value= "", "White", "Black")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","White","#67809F"), "Black")
@@ -504,7 +504,7 @@
- =iif(Fields!CveVenta.Value = "", "#67809F", "Transparent")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","#67809F","#cccccc"), "Transparent")
2pt
2pt
2pt
@@ -525,7 +525,7 @@
@@ -537,7 +537,7 @@
- =iif(Fields!CveVenta.Value = "", "#67809F", "Transparent")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","#67809F","#cccccc"), "Transparent")
2pt
2pt
2pt
@@ -555,11 +555,11 @@
- =Fields!Nombre.Value
+ =IIf(Fields!Nombre.Value = "", IIf(Fields!Gpo.Value = "", Fields!Moneda.Value, Fields!Gpo.Value), Fields!Nombre.Value)
@@ -571,13 +571,14 @@
- =iif(Fields!CveVenta.Value = "", "#67809F", "Transparent")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","#67809F","#cccccc"), "Transparent")
2pt
2pt
2pt
2pt
+ true
@@ -592,7 +593,7 @@
@@ -606,7 +607,7 @@
- =iif(Fields!CveVenta.Value = "", "#67809F", "Transparent")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","#67809F","#cccccc"), "Transparent")
2pt
2pt
2pt
@@ -629,7 +630,7 @@
8pt
=iif(Fields!CveVenta.Value = "", "Bold", "Normal")
f2
- =iif(Fields!CveVenta.Value= "", "White", "Black")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","White","#67809F"), "Black")
@@ -641,7 +642,7 @@
- =iif(Fields!CveVenta.Value = "", "#67809F", "Transparent")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","#67809F","#cccccc"), "Transparent")
2pt
2pt
2pt
@@ -664,7 +665,7 @@
8pt
=iif(Fields!CveVenta.Value = "", "Bold", "Normal")
#,0.00;- #,0.00;'-'
- =iif(Fields!CveVenta.Value= "", "White", "Black")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","White","#67809F"), "Black")
@@ -678,7 +679,7 @@
- =iif(Fields!CveVenta.Value = "", "#67809F", "Transparent")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","#67809F","#cccccc"), "Transparent")
2pt
2pt
2pt
@@ -701,7 +702,7 @@
8pt
=iif(Fields!CveVenta.Value = "", "Bold", "Normal")
#,0.00;- #,0.00;'-'
- =iif(Fields!CveVenta.Value= "", "White", "Black")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","White","#67809F"), "Black")
@@ -715,7 +716,7 @@
- =iif(Fields!CveVenta.Value = "", "#67809F", "Transparent")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","#67809F","#cccccc"), "Transparent")
2pt
2pt
2pt
@@ -737,7 +738,7 @@
8pt
=iif(Fields!CveVenta.Value = "", "Bold", "Normal")
#,0.00;-#,0.00;'-'
- =iif(Fields!CveVenta.Value= "", "White", "Black")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","White","#67809F"), "Black")
@@ -751,7 +752,7 @@
- =iif(Fields!CveVenta.Value = "", "#67809F", "Transparent")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","#67809F","#cccccc"), "Transparent")
2pt
2pt
2pt
@@ -773,7 +774,7 @@
8pt
=iif(Fields!CveVenta.Value = "", "Bold", "Normal")
#,0.00;- #,0.00;'-'
- =iif(Fields!CveVenta.Value= "", "White", "Black")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","White","#67809F"), "Black")
@@ -787,7 +788,7 @@
- =iif(Fields!CveVenta.Value = "", "#67809F", "Transparent")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","#67809F","#cccccc"), "Transparent")
2pt
2pt
2pt
@@ -810,7 +811,7 @@
8pt
=iif(Fields!CveVenta.Value = "", "Bold", "Normal")
#,0.00;-#,0.00;'-'
- =iif(Fields!CveVenta.Value= "", "White", "Black")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","White","#67809F"), "Black")
@@ -824,7 +825,7 @@
- =iif(Fields!CveVenta.Value = "", "#67809F", "Transparent")
+ =iif(Fields!CveVenta.Value = "",IIf(Fields!Gpo.Value = "","#67809F","#cccccc"), "Transparent")
2pt
2pt
2pt
@@ -896,14 +897,16 @@
-
+
Textbox1
0.18521cm
- 2.8349cm
+ 3.37444cm
0.6cm
- 12.60299cm
+ 21.20747cm
@@ -949,9 +952,9 @@
Textbox2
1.10271cm
- 8.17404cm
+ 9.22743cm
0.52945cm
- 10.36447cm
+ 10.12635cm
1
- 0.58209cm
+ 1.04773cm
true
true
@@ -1140,9 +1143,9 @@
Textbox10
0.0829cm
- 9.84544cm
+ 10.83183cm
0.38981cm
- 2.92333cm
+ 2.91804cm
3
+
+
+
+
+
+ Textbox11
+ 0.0829cm
+ 13.56466cm
+ 0.38981cm
+ 6.47703cm
+ 4
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ IMPRESO EN SIG, Rep. Productos Servicios
- Textbox11
- 0.0829cm
- 12.75466cm
+ Textbox9
+ 0.50799cm
+ 0.06614cm
0.38981cm
- 4.32745cm
- 4
+ 6.69369cm
+ 5
@@ -1272,6 +1309,14 @@
Nombre
System.String
+
+ Gpo
+ System.String
+
+
+ Moneda
+ System.String
+
Codigo
System.String
@@ -1331,6 +1376,7 @@
ReportParameter1
+ es-MX
Cm
40c94aad-a12a-44fb-ab0d-ea36a9656792
\ No newline at end of file
diff --git a/Ventas/RepProductosServiciosDetalle.aspx.vb b/Ventas/RepProductosServiciosDetalle.aspx.vb
index c6af54b8b..47ff0cc89 100644
--- a/Ventas/RepProductosServiciosDetalle.aspx.vb
+++ b/Ventas/RepProductosServiciosDetalle.aspx.vb
@@ -661,6 +661,7 @@ Partial Class Ventas_RepProductosServiciosDetalle
params.Add(New ReportParameter("LogoPath", ""))
End If
+ params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
params.Add(New ReportParameter("FechaImpresion", DateTime.Now.ToString("dd/MM/yyyy")))
params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa))
ImprimirPDF("Empresas/Grales/Formatos/RepProductosServiciosDetalle.rdlc", TmpDT, params, "ReportePS")