diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index c8d07a432..d3c2859a4 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -5161,7 +5161,11 @@ Public Class ClsPaginas Dim ds As New DataSet For Each rpds As ReportDataSource In DataSource Dim dt As DataTable = DirectCast(rpds.Value, Data.DataTable) - dt = dt.Copy() + If dt Is Nothing Then + dt = New DataTable + Else + dt = dt.Copy() + End If dt.TableName = rpds.Name ds.Tables.Add(dt) Next diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb index e66384a6e..131a8528e 100644 --- a/Compras/PopUpVerFactura.aspx.vb +++ b/Compras/PopUpVerFactura.aspx.vb @@ -3572,7 +3572,7 @@ Partial Class PopUpVerFactura #Region "OP = 'CAN' - CANCELACION" Public Sub ImprimeCancelacion(CveVenta As Integer) Dim ObjVentas As New ClsVentas - If ObjVentas.GetVenta(CveVenta, UsuarioActual.CveEmpresa) Then + If ObjVentas.GetVenta(CveVenta, UsuarioActual.CveEmpresa) AndAlso ObjVentas.DtResultados IsNot Nothing AndAlso ObjVentas.DtResultados.Rows.Count > 0 Then Dim drv As DataRow = ObjVentas.DtResultados.Rows(0) Dim FolioFiscal = drv("FolioFiscal").ToString Dim SelloCancelacion = drv("SelloCancelacion").ToString diff --git a/Metronic/assets/admin/layout/css/custom.css b/Metronic/assets/admin/layout/css/custom.css index 480722787..992599c9a 100644 --- a/Metronic/assets/admin/layout/css/custom.css +++ b/Metronic/assets/admin/layout/css/custom.css @@ -1838,7 +1838,7 @@ div.md-checkbox { position: relative; } - .form-group.form-md-line-input .form-control ~ label { + .form-group.form-md-line-input .form-control:not(textarea) ~ label { bottom: auto; padding-bottom: 28px; } diff --git a/OI/RepTareas2.aspx b/OI/RepTareas2.aspx new file mode 100644 index 000000000..b49be0b16 --- /dev/null +++ b/OI/RepTareas2.aspx @@ -0,0 +1,384 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeFile="RepTareas2.aspx.cs" Inherits="OI_RepTareas2" %> + + + + + + + + + + + +
  • + Agregar Tarea +
    • +     + + + + + + + + + + + + diff --git a/OI/RepTareas2.aspx.cs b/OI/RepTareas2.aspx.cs new file mode 100644 index 000000000..6662bf5e9 --- /dev/null +++ b/OI/RepTareas2.aspx.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Extensiones; + +public partial class OI_RepTareas2 : System.Web.UI.Page +{ + public const string iddivAgregar = "divModalAgregarEvento"; + protected void Page_Load(object sender, EventArgs e) + { + + } + + protected void LnkAddEvento_Click(object sender, EventArgs e) + { + + this.RegistraScript(string.Format("$('#{0}').modal()", iddivAgregar)); + } +} \ No newline at end of file