From c4fba42ac08bcece76f8cbfbb9c54204b22fc232 Mon Sep 17 00:00:00 2001 From: rrene Date: Sun, 12 Dec 2021 14:02:44 -0700 Subject: [PATCH] =?UTF-8?q?mejoras=20en=20implementaci=C3=B3n=20carta=20po?= =?UTF-8?q?rte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App_Code/ClsVentas.vb | 18 ++++ Compras/PopUpVerFactura.aspx.vb | 3 - Content/AjaxControlToolkit/Styles/Tabs.css | 2 +- .../AjaxControlToolkit/Styles/Tabs.min.css | 2 +- Inventarios/EntregaAlmacen.aspx | 18 ++-- Inventarios/EntregaAlmacen.aspx.vb | 35 ++++++-- Inventarios/EntregaAlmacenRuta.aspx | 85 ++++++++++++++----- Inventarios/EntregaAlmacenRuta.aspx.cs | 84 +++++++++++++++--- Metronic/assets/admin/layout/css/custom.css | 4 +- RH/CatPersonal.aspx | 2 +- 10 files changed, 195 insertions(+), 58 deletions(-) diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index 44bd17ea6..ad1c04887 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -552,6 +552,24 @@ Public Class ClsVentas End Try Return Retorno End Function + + + Public Function UpdateDireccionEnvioVenta(CveVenta As Integer, CveDireccionEnvio As Integer, CveEmpresa As Integer) As Boolean + Dim Retorno As Boolean = False + DataAdapter("PA_Vta_VentasDireccionEnvioUpdate") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveVenta", SqlDbType.Int).Value = CveVenta + .Add("@CveDireccionEnvio", SqlDbType.Int).Value = CveDireccionEnvio + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al actualizar la dirección de envío de la venta.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + Return Retorno + End Function Public Function AddVta_VentaPago(CveVenta As Integer, CveMetodoPago As Integer, Importe As Double) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_VentasPagoAdd") diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb index b3270bc31..167e85864 100644 --- a/Compras/PopUpVerFactura.aspx.vb +++ b/Compras/PopUpVerFactura.aspx.vb @@ -981,9 +981,6 @@ Partial Class PopUpVerFactura DtUbicaciones.Columns.Add(New DataColumn("Nombre", GetType(String))) DtUbicaciones.Columns.Add(New DataColumn("FechaHoraSalida", GetType(DateTime))) DtUbicaciones.Columns.Add(New DataColumn("Direccion", GetType(String))) - DtUbicaciones.Columns.Add(New DataColumn("TipoUbicacion", GetType(String))) - - Dim DtMercancias As New DataTable() DtMercancias.Columns.Add(New DataColumn("Cantidad", GetType(Decimal))) diff --git a/Content/AjaxControlToolkit/Styles/Tabs.css b/Content/AjaxControlToolkit/Styles/Tabs.css index 8151906c9..5908a0886 100644 --- a/Content/AjaxControlToolkit/Styles/Tabs.css +++ b/Content/AjaxControlToolkit/Styles/Tabs.css @@ -86,7 +86,7 @@ border: 1px solid #999999; border-top: 0; font-family: verdana,tahoma,helvetica; - font-size: 10pt; + font-size: 12px; padding: 8px; } diff --git a/Content/AjaxControlToolkit/Styles/Tabs.min.css b/Content/AjaxControlToolkit/Styles/Tabs.min.css index f6666f315..7eaf91406 100644 --- a/Content/AjaxControlToolkit/Styles/Tabs.min.css +++ b/Content/AjaxControlToolkit/Styles/Tabs.min.css @@ -1 +1 @@ -.ajax__tab_default .ajax__tab_header{white-space:normal !important}.ajax__tab_default .ajax__tab_outer{display:inline-block;display:-moz-inline-box}.ajax__tab_default .ajax__tab_inner{display:inline-block;display:-moz-inline-box}.ajax__tab_default .ajax__tab_tab{display:inline-block;display:-moz-inline-box;overflow:hidden;text-align:center}.ajax__tab_xp .ajax__tab_disabled{color:#a0a0a0;cursor:default}.ajax__tab_xp .ajax__tab_header{background-position:bottom;background-repeat:repeat-x;font-family:verdana,tahoma,helvetica;font-size:11px;height:21px}.ajax__tab_xp .ajax__tab_header .ajax__tab_outer{background-position:right;background-repeat:no-repeat;height:21px;padding-right:4px}.ajax__tab_xp .ajax__tab_header .ajax__tab_inner{background-repeat:no-repeat;padding-left:3px}.ajax__tab_xp .ajax__tab_header .ajax__tab_tab{background-repeat:repeat-x;margin:0;padding:4px}.ajax__tab_xp .ajax__tab_header .ajax__tab_hover .ajax__tab_outer{background-position:right;background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header .ajax__tab_hover .ajax__tab_inner{background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header .ajax__tab_hover .ajax__tab_tab{background-repeat:repeat-x;cursor:pointer}.ajax__tab_xp .ajax__tab_header .ajax__tab_active .ajax__tab_outer{background-position:right;background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header .ajax__tab_active .ajax__tab_inner{background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header .ajax__tab_active .ajax__tab_tab{background-repeat:repeat-x}.ajax__tab_xp .ajax__tab_body{background-color:#fff;border:1px solid #999;border-top:0;font-family:verdana,tahoma,helvetica;font-size:10pt;padding:8px}.ajax__tab_xp .ajax__tab_header_verticalleft{background-position:right;background-repeat:repeat-y;font-family:verdana,tahoma,helvetica;font-size:11px}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_outer{background-position:right;background-repeat:no-repeat;height:21px;padding-right:4px}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_inner{background-repeat:no-repeat;padding-left:3px}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_tab{background-repeat:repeat-x;margin:0;padding:4px}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_hover .ajax__tab_outer{background-position:right;background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_hover .ajax__tab_inner{background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_hover .ajax__tab_tab{background-repeat:repeat-x;cursor:pointer}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_active:not(:first-child){margin-top:1px}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_active .ajax__tab_outer{background-position:right;background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_active .ajax__tab_inner{background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_active .ajax__tab_tab{background-repeat:repeat-x}.ajax__tab_xp .ajax__tab_body_verticalleft{background-color:#fff;border:1px solid #999;border-left:0;font-family:verdana,tahoma,helvetica;font-size:10pt;padding:8px}.ajax__tab_xp .ajax__tab_header_verticalright{background-position:left;background-repeat:repeat-y;font-family:verdana,tahoma,helvetica;font-size:11px}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_outer{background-position:right;background-repeat:no-repeat;height:21px;padding-right:4px}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_inner{background-repeat:no-repeat;padding-left:3px}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_tab{background-repeat:repeat-x;margin:0;padding:4px}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_hover .ajax__tab_outer{background-position:right;background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_hover .ajax__tab_inner{background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_hover .ajax__tab_tab{background-repeat:repeat-x;cursor:pointer}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_active{margin-top:1px}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_active .ajax__tab_outer{background-position:right;background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_active .ajax__tab_inner{background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_active .ajax__tab_tab{background-repeat:repeat-x}.ajax__tab_xp .ajax__tab_body_verticalright{background-color:#fff;border:1px solid #999;border-right:0;font-family:verdana,tahoma,helvetica;font-size:10pt;padding:8px}.ajax__tab_xp .ajax__tab_header_bottom{background-position:top;background-repeat:repeat-x;font-family:verdana,tahoma,helvetica;font-size:11px}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_outer{background-position:right;background-repeat:no-repeat;height:21px;padding-right:4px}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_inner{background-repeat:no-repeat;padding-left:3px}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_tab{background-repeat:repeat-x;height:17px;margin:0;padding:0 4px 4px 4px}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_hover .ajax__tab_outer{background-position:right;background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_hover .ajax__tab_inner{background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_hover .ajax__tab_tab{background-repeat:repeat-x;cursor:pointer}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_active .ajax__tab_outer{background-position:right;background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_active .ajax__tab_inner{background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_active .ajax__tab_tab{background-repeat:repeat-x}.ajax__tab_xp .ajax__tab_body_bottom{background-color:#fff;border:1px solid #999;border-bottom:0;font-family:verdana,tahoma,helvetica;font-size:10pt;padding:8px}.ajax__scroll_horiz{overflow-x:scroll}.ajax__scroll_vert{overflow-y:scroll}.ajax__scroll_both{overflow:scroll}.ajax__scroll_auto{overflow:auto}.ajax__scroll_none{overflow:hidden}.ajax__tab_plain .ajax__tab_outer{border:2px solid #999;text-align:center;vertical-align:middle}.ajax__tab_plain .ajax__tab_inner{text-align:center;vertical-align:middle}.ajax__tab_plain .ajax__tab_body{text-align:center;vertical-align:middle}.ajax__tab_plain .ajax__tab_header{text-align:center;vertical-align:middle}.ajax__tab_plain .ajax__tab_active .ajax__tab_outer{background:#ffffe1} \ No newline at end of file +.ajax__tab_default .ajax__tab_header{white-space:normal !important}.ajax__tab_default .ajax__tab_outer{display:inline-block;display:-moz-inline-box}.ajax__tab_default .ajax__tab_inner{display:inline-block;display:-moz-inline-box}.ajax__tab_default .ajax__tab_tab{display:inline-block;display:-moz-inline-box;overflow:hidden;text-align:center}.ajax__tab_xp .ajax__tab_disabled{color:#a0a0a0;cursor:default}.ajax__tab_xp .ajax__tab_header{background-position:bottom;background-repeat:repeat-x;font-family:verdana,tahoma,helvetica;font-size:11px;height:21px}.ajax__tab_xp .ajax__tab_header .ajax__tab_outer{background-position:right;background-repeat:no-repeat;height:21px;padding-right:4px}.ajax__tab_xp .ajax__tab_header .ajax__tab_inner{background-repeat:no-repeat;padding-left:3px}.ajax__tab_xp .ajax__tab_header .ajax__tab_tab{background-repeat:repeat-x;margin:0;padding:4px}.ajax__tab_xp .ajax__tab_header .ajax__tab_hover .ajax__tab_outer{background-position:right;background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header .ajax__tab_hover .ajax__tab_inner{background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header .ajax__tab_hover .ajax__tab_tab{background-repeat:repeat-x;cursor:pointer}.ajax__tab_xp .ajax__tab_header .ajax__tab_active .ajax__tab_outer{background-position:right;background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header .ajax__tab_active .ajax__tab_inner{background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header .ajax__tab_active .ajax__tab_tab{background-repeat:repeat-x}.ajax__tab_xp .ajax__tab_body{background-color:#fff;border:1px solid #999;border-top:0;font-family:verdana,tahoma,helvetica;font-size:12px;padding:8px}.ajax__tab_xp .ajax__tab_header_verticalleft{background-position:right;background-repeat:repeat-y;font-family:verdana,tahoma,helvetica;font-size:11px}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_outer{background-position:right;background-repeat:no-repeat;height:21px;padding-right:4px}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_inner{background-repeat:no-repeat;padding-left:3px}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_tab{background-repeat:repeat-x;margin:0;padding:4px}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_hover .ajax__tab_outer{background-position:right;background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_hover .ajax__tab_inner{background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_hover .ajax__tab_tab{background-repeat:repeat-x;cursor:pointer}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_active:not(:first-child){margin-top:1px}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_active .ajax__tab_outer{background-position:right;background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_active .ajax__tab_inner{background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header_verticalleft .ajax__tab_active .ajax__tab_tab{background-repeat:repeat-x}.ajax__tab_xp .ajax__tab_body_verticalleft{background-color:#fff;border:1px solid #999;border-left:0;font-family:verdana,tahoma,helvetica;font-size:10pt;padding:8px}.ajax__tab_xp .ajax__tab_header_verticalright{background-position:left;background-repeat:repeat-y;font-family:verdana,tahoma,helvetica;font-size:11px}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_outer{background-position:right;background-repeat:no-repeat;height:21px;padding-right:4px}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_inner{background-repeat:no-repeat;padding-left:3px}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_tab{background-repeat:repeat-x;margin:0;padding:4px}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_hover .ajax__tab_outer{background-position:right;background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_hover .ajax__tab_inner{background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_hover .ajax__tab_tab{background-repeat:repeat-x;cursor:pointer}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_active{margin-top:1px}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_active .ajax__tab_outer{background-position:right;background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_active .ajax__tab_inner{background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header_verticalright .ajax__tab_active .ajax__tab_tab{background-repeat:repeat-x}.ajax__tab_xp .ajax__tab_body_verticalright{background-color:#fff;border:1px solid #999;border-right:0;font-family:verdana,tahoma,helvetica;font-size:10pt;padding:8px}.ajax__tab_xp .ajax__tab_header_bottom{background-position:top;background-repeat:repeat-x;font-family:verdana,tahoma,helvetica;font-size:11px}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_outer{background-position:right;background-repeat:no-repeat;height:21px;padding-right:4px}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_inner{background-repeat:no-repeat;padding-left:3px}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_tab{background-repeat:repeat-x;height:17px;margin:0;padding:0 4px 4px 4px}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_hover .ajax__tab_outer{background-position:right;background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_hover .ajax__tab_inner{background-repeat:no-repeat;cursor:pointer}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_hover .ajax__tab_tab{background-repeat:repeat-x;cursor:pointer}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_active .ajax__tab_outer{background-position:right;background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_active .ajax__tab_inner{background-repeat:no-repeat}.ajax__tab_xp .ajax__tab_header_bottom .ajax__tab_active .ajax__tab_tab{background-repeat:repeat-x}.ajax__tab_xp .ajax__tab_body_bottom{background-color:#fff;border:1px solid #999;border-bottom:0;font-family:verdana,tahoma,helvetica;font-size:10pt;padding:8px}.ajax__scroll_horiz{overflow-x:scroll}.ajax__scroll_vert{overflow-y:scroll}.ajax__scroll_both{overflow:scroll}.ajax__scroll_auto{overflow:auto}.ajax__scroll_none{overflow:hidden}.ajax__tab_plain .ajax__tab_outer{border:2px solid #999;text-align:center;vertical-align:middle}.ajax__tab_plain .ajax__tab_inner{text-align:center;vertical-align:middle}.ajax__tab_plain .ajax__tab_body{text-align:center;vertical-align:middle}.ajax__tab_plain .ajax__tab_header{text-align:center;vertical-align:middle}.ajax__tab_plain .ajax__tab_active .ajax__tab_outer{background:#ffffe1} \ No newline at end of file diff --git a/Inventarios/EntregaAlmacen.aspx b/Inventarios/EntregaAlmacen.aspx index 69a853562..92c12c3b0 100644 --- a/Inventarios/EntregaAlmacen.aspx +++ b/Inventarios/EntregaAlmacen.aspx @@ -147,18 +147,24 @@ <%----%> - + Observaciones Grales: - - + + Observaciones Almacén: + + Dirección Envío: + + + + @@ -218,7 +224,7 @@ - + Guía: @@ -227,7 +233,7 @@ Observaciones: - + @@ -941,7 +947,7 @@ Observaciones: - + diff --git a/Inventarios/EntregaAlmacen.aspx.vb b/Inventarios/EntregaAlmacen.aspx.vb index f696edd7f..fe7e8b337 100644 --- a/Inventarios/EntregaAlmacen.aspx.vb +++ b/Inventarios/EntregaAlmacen.aspx.vb @@ -343,8 +343,8 @@ Partial Class Inventarios_EntregaAlmacen If ObjInventarios.GetSucursalesAlmacenUsuario(UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) Then DdlSubProyectos.DataSource = ObjInventarios.DtResultados End If - ObjInventarios.Dispose() - Else + ObjInventarios.Dispose() + Else DdlSubProyectos.DataSource = GlobalDTSubProyectos(-1, CveEmpresa:=UsuarioActual.CveEmpresa) End If DdlSubProyectos.DataBind() @@ -573,14 +573,15 @@ Partial Class Inventarios_EntregaAlmacen DtDatosDetalleLote = Nothing CreaDtDetalleLote() - If DtDatos.Rows(0) IsNot Nothing Then - EsDevolucionVenta = DtDatos.Rows(0)("EsDevolucionVenta").ToString().ToEntero() + If DtDatos.Rows(0) IsNot Nothing Then + Dim drE As DataRow = DtDatos.Rows(0) + + EsDevolucionVenta = drE("EsDevolucionVenta").ToString().ToEntero() TipoDocto = DtDatos.Rows(0)("TipoDocto").ToString() TipoMovimiento = If(TipoDocto.Contiene({"Rem", "Ing", "Ped", "PeC", "Ant"}) And (EsDevolucionVenta = 0 Or CveVentaAD > 0), 1, 2) LbCliente.Text = DtDatos.Rows(0)("Nombre").ToString() - 'LbFolio.Text = DtDatos.Rows(0)("SerieFolio").ToString() - HLFolio.Text = DtDatos.Rows(0)("SerieFolio").ToString() + HLFolio.Text = drE("SerieFolio").ToString() If UsuarioActual.TienePermisoProceso(201) Then HLFolio.NavigateUrl = $"/Ventas/Ventas.aspx?CveVenta={CveVenta}" End If @@ -592,8 +593,10 @@ Partial Class Inventarios_EntregaAlmacen StrAlmacenes = String.Format("{0} AND NOT (Almacen like '%Domicilio%') ", StrAlmacenes) End If + trObsGral.Visible = drE("Observaciones").ToString() <> "" LbObservaciones.Text = DtDatos.Rows(0)("Observaciones").ToString() - LbObservacionesAlmacen.Text = DtDatos.Rows(0)("ObservacionesAlmacen").ToString() + trObsAlmacen.Visible = drE("ObservacionesAlmacen").ToString() <> "" + LbObservacionesAlmacen.Text = drE("ObservacionesAlmacen").ToString() CveVentaSurtir = CveVenta CveAlmacenTraspasoDestino = DtDatos.Rows(0)(If(EsDevolucionVenta = 1 And TipoDocto <> "Rem", "CveAlmacenTraspasoOrigen", "CveAlmacenTraspasoDestino")).ToString().ToEntero() CveAlmacenTraspasoOrigen = DtDatos.Rows(0)(If(EsDevolucionVenta = 1 And TipoDocto <> "Rem", "CveAlmacenTraspasoDestino", "CveAlmacenTraspasoOrigen")).ToString().ToEntero() @@ -602,8 +605,22 @@ Partial Class Inventarios_EntregaAlmacen CveCliente = DtDatos.Rows(0)("CveCliente").ToString().ToEntero() ClienteEntregaPersonal(CveCliente) CveSubProyecto = DtDatos.Rows(0)("CveSubProyecto").ToString().ToEntero() - EsInterno = CBool(DtDatos.Rows(0)("EsInterno").ToString()) - + EsInterno = CBool(DtDatos.Rows(0)("EsInterno").ToString()) + + If drE("CveDireccionEnvio").ToString.ToEntero > 0 Then + trDireccionEnvio.Visible = True + 'carga la dirección de envío + Dim ObjClientes As New ClsClientes + If ObjClientes.DireccionEnvioGet(drE("CveDireccionEnvio").ToString.ToEntero, CveCliente, -1) Then + Dim drenvio As DataRow = ObjClientes.DtResultados.FiltroPrimero("") + LblDirEnvio.Text = drenvio("SucursalClienteVentaDireccion").ToString + End If + + ObjClientes.Dispose() + Else + trDireccionEnvio.Visible = False + End If + If DtDatos.SUM("CantidadS") <= 0 Then GvDatos.CssClass = "table table-striped table-hover Widthall ScrollAD gvInventario gvEscondeColumna" Else diff --git a/Inventarios/EntregaAlmacenRuta.aspx b/Inventarios/EntregaAlmacenRuta.aspx index 458246fe2..7308c9c4f 100644 --- a/Inventarios/EntregaAlmacenRuta.aspx +++ b/Inventarios/EntregaAlmacenRuta.aspx @@ -95,7 +95,7 @@ - Recoleccion + @@ -114,28 +114,25 @@
- -
- Chofer: -
-
- + +
+ + + +
-
- Unidad: -
-
+ +
+ +
- -
- F. Entrega: -
-
+ +
@@ -145,10 +142,14 @@ + +
-
+
+ +
@@ -169,7 +170,7 @@ - + + +   + + + @@ -284,7 +290,7 @@ - + Recoleccion @@ -293,7 +299,7 @@
+ + diff --git a/Inventarios/EntregaAlmacenRuta.aspx.cs b/Inventarios/EntregaAlmacenRuta.aspx.cs index 763e9c45a..ee4fa7878 100644 --- a/Inventarios/EntregaAlmacenRuta.aspx.cs +++ b/Inventarios/EntregaAlmacenRuta.aspx.cs @@ -283,7 +283,7 @@ public partial class Inventarios_EntregaAlmacenRuta : ClsPaginas if (CveEntregaAlmacen > 0) { - int CveTimbre = ObjGeneral.AddGralTimbre("Rec", row.DataKey("CveSubProyectoDestino").ToEntero(), TxtFechaEntrega.Text.ToDate(), UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveEntregaAlmacen:CveEntregaAlmacen , AplicaCP: ChkEmitirCartaPorte.Checked); + int CveTimbre = ObjGeneral.AddGralTimbre("Rec", row.DataKey("CveSubProyecto").ToEntero(), TxtFechaEntrega.Text.ToDate(), UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveEntregaAlmacen:CveEntregaAlmacen , AplicaCP: ChkEmitirCartaPorte.Checked); if (CveTimbre <= 0) { @@ -547,21 +547,21 @@ public partial class Inventarios_EntregaAlmacenRuta : ClsPaginas private void OcultarmostarDatosEntrega(bool mostrar ) { - DVDatosEntrega1.Visible = mostrar; + //DVDatosEntrega1.Visible = mostrar; DVDatosEntrega2.Visible = mostrar; - DVDatosEntrega3.Visible = mostrar; + //DVDatosEntrega3.Visible = mostrar; DVDatosEntrega4.Visible = mostrar; - DVDatosEntrega5.Visible = mostrar; + //DVDatosEntrega5.Visible = mostrar; DVDatosEntrega6.Visible = mostrar; - if (mostrar) - { - DVDatosEntrega7.Attributes.Add("class", "col-md-1"); - } - else - { - DVDatosEntrega7.Attributes.Add("class", "col-md-9"); - } + //if (mostrar) + //{ + // DVDatosEntrega7.Attributes.Add("class", "col-md-1"); + //} + //else + //{ + // DVDatosEntrega7.Attributes.Add("class", "col-md-9"); + //} if (UsuarioActual.Empresa.Funcionalidad(161).ToEntero() == 1) { @@ -833,9 +833,9 @@ public partial class Inventarios_EntregaAlmacenRuta : ClsPaginas RegistraScript("$('#DivModalRecoleccion').modal('hide');"); } else - { - CveEntregaAlmacen = -1; + { ObjGenerales.RollBack(); + Alert("Ocurrió un error.",ModExtensiones.TipoMensaje.MsgError); } ObjGenerales.Dispose(); @@ -948,6 +948,62 @@ public partial class Inventarios_EntregaAlmacenRuta : ClsPaginas OcultarmostarDatosEntrega(true); } } + + private void CargaModalCombosDirecciones(int CveCliente, int CveDireccionEnvio) + { + + DdlModalDireccionEnvio.Items.Clear(); + + DataTable dtt = new DataTable(); + ClsClientes ObjClientes = new ClsClientes(); + if (ObjClientes.DireccionEnvioGet(-1, CveCliente, -1)) + { + dtt = ObjClientes.DtResultados; + } + ObjClientes.Dispose(); + + DdlModalDireccionEnvio.DataSource = dtt; + DdlModalDireccionEnvio.DataBind(); + DdlModalDireccionEnvio.SelectedValueExist(CveDireccionEnvio); + + dtt.Dispose(); + } + + + protected void LnkEditarDir_Click(object sender, EventArgs e) + { + GridViewRow GvRow = (GridViewRow)(((LinkButton)sender).NamingContainer); + + int CveCliente = GvRow.DataKey("CveCliente").ToEntero(); + int CveDireccion = GvRow.DataKey("CveDireccionEnvio").ToEntero(); + + HdnCveVenta.Value = GvRow.DataKey("CveVenta"); + CargaModalCombosDirecciones(CveCliente, CveDireccion); + + UpModalEditarentrega.Update(); + this.RegistraScript("$('#DivEditarEntrega').modal('show');"); + } + + protected void BtnModalEditarentrega_Click(object sender, EventArgs e) + { + + bool ProcesoOK = true; + + ClsVentas ObjVentas = new ClsVentas(); + if (!ObjVentas.UpdateDireccionEnvioVenta(HdnCveVenta.Value.ToEntero(), DdlModalDireccionEnvio.SelectedValue.ToEntero(), UsuarioActual.CveEmpresa)) + { + ProcesoOK = false; + } + ObjVentas.Dispose(); + + if (ProcesoOK) + { + this.RegistraScript("$('#DivEditarEntrega').modal('hide');"); + Alert("Dirección Actualizada correctamente.",ModExtensiones.TipoMensaje.ToastInformacion); + CargaDatos(); + } + + } } \ No newline at end of file diff --git a/Metronic/assets/admin/layout/css/custom.css b/Metronic/assets/admin/layout/css/custom.css index 17923b83c..7a24daa06 100644 --- a/Metronic/assets/admin/layout/css/custom.css +++ b/Metronic/assets/admin/layout/css/custom.css @@ -1630,7 +1630,7 @@ div.md-checkbox { .ajax__tab_xp .ajax__tab_body { border: 1px solid #ddd !important; border-top-color: transparent !important; - padding: 15px !important; + padding: 10px !important; padding-top: 5px !important; } @@ -1662,7 +1662,7 @@ div.md-checkbox { color: #5b9bd1 !important; line-height: 1.42857143 !important; font-family: "Open Sans", sans-serif !important; - font-size: 14px !important; + font-size: 12px !important; position: relative !important; display: block !important; padding: 10px 15px !important; diff --git a/RH/CatPersonal.aspx b/RH/CatPersonal.aspx index 26a9b0b02..0e9b885e3 100644 --- a/RH/CatPersonal.aspx +++ b/RH/CatPersonal.aspx @@ -887,7 +887,7 @@
- +