From f6d29355d286eb3a07199fe04d7de03d33c1071d Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Thu, 21 Apr 2022 08:56:42 -0700 Subject: [PATCH] --- Compras/PopUpVerFactura.aspx.vb | 3 + GPS/PalletEtiqueta2.rdlc | 36 ++--- Metronic/assets/admin/layout/css/custom.css | 4 +- RH/Personal.aspx | 154 +++++++++++--------- 4 files changed, 107 insertions(+), 90 deletions(-) diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb index 5abb5359a..633caba71 100644 --- a/Compras/PopUpVerFactura.aspx.vb +++ b/Compras/PopUpVerFactura.aspx.vb @@ -336,6 +336,7 @@ Partial Class PopUpVerFactura Dim Cultivo As String = "" Dim noPallet As String = "" Dim Variedad As String = "" + Dim NoCajas As String = "" 'Envase = "1 1/9" 'Tamano = "Small" @@ -350,6 +351,7 @@ Partial Class PopUpVerFactura Cultivo = row("Cultivo").ToString() noPallet = row("Codigo").ToString() Variedad = row("CultivoVariedad").ToString() + NoCajas = String.Format("{0:N0}", row("NoCajas")) End If @@ -360,6 +362,7 @@ Partial Class PopUpVerFactura params.Add(New ReportParameter("Cultivo", Cultivo)) params.Add(New ReportParameter("noPallet", noPallet)) params.Add(New ReportParameter("Variedad", Variedad)) + params.Add(New ReportParameter("NoCajas", NoCajas)) Dim lrds As New List(Of ReportDataSource) diff --git a/GPS/PalletEtiqueta2.rdlc b/GPS/PalletEtiqueta2.rdlc index 07be03233..e75b2bc6e 100644 --- a/GPS/PalletEtiqueta2.rdlc +++ b/GPS/PalletEtiqueta2.rdlc @@ -657,7 +657,7 @@ - 0.49417cm + 0.25604cm @@ -1101,7 +1101,7 @@ - 0.49417cm + 0.41479cm @@ -1237,7 +1237,7 @@ - 0.54708cm + 0.44125cm @@ -1354,7 +1354,7 @@ - 0.52062cm + 0.38833cm @@ -1492,7 +1492,7 @@ - 0.36187cm + 0.3475cm @@ -1622,7 +1622,7 @@ - 0.38833cm + 0.6cm @@ -1753,7 +1753,7 @@ - 0.52062cm + 0.36187cm @@ -1889,7 +1889,7 @@ - 0.44125cm + 0.17667cm @@ -2144,7 +2144,7 @@ - 0.41479cm + 0.36187cm @@ -2274,7 +2274,7 @@ - 0.41479cm + 0.62646cm @@ -2658,7 +2658,7 @@ - 0.52062cm + 0.38833cm @@ -2796,7 +2796,7 @@ - 0.44125cm + 0.38833cm @@ -2926,7 +2926,7 @@ - 0.38833cm + 0.6cm @@ -3193,7 +3193,7 @@ - 0.38833cm + 0.36187cm @@ -3310,7 +3310,7 @@ - 0.46771cm + 0.44125cm @@ -3448,7 +3448,7 @@ - 0.36187cm + 0.33542cm @@ -3754,7 +3754,7 @@ 0.0762cm 0.10266cm - 13.18458cm + 12.50875cm 9.64969cm - 5.34012in + 4.95471in