Integracion de Oscar

DAO/DAOGeneral.vb

@@ -399,16 +399,27 @@ Public Class DAOGeneral
     End Function
 
 
-    Public Function ListaInstrumentos() As DataTable
+    Public Function ListaInstrumentos(ByVal TipoFuncion As String) As DataTable
         Dim objCon As New Conexion
 
         Dim ds As New DataSet
         Dim dt As DataTable
         Dim cn As SqlConnection = objCon.Conectar
+
         If cn.State = ConnectionState.Closed Then
             cn.Open()
         End If
-        da = New SqlDataAdapter("SP_ListaInstrumentosFinancieros", cn)
+
+        Dim sql = "SP_ListaInstrumentosFinancieros"
+
+
+        Dim cmd As New SqlCommand(sql, cn)
+        cmd.CommandType = CommandType.StoredProcedure
+
+        cmd.Parameters.Add("@TipoFuncion", SqlDbType.VarChar).Value = TipoFuncion
+
+        da = New SqlDataAdapter(cmd)
+
         da.Fill(ds)
         dt = ds.Tables(0)
 

FRM/frmDetallesPortafolioGeneralRendimiento.vb

@@ -51,7 +51,7 @@
 
     Sub CargarInstrumento()
         Dim dt As New DataTable
-        dt = General.ListaInstrumentos
+        dt = General.ListaInstrumentos("Propuesta")
         dt.Rows.Add("Todos", "Todos")
         chklInstrumentos.DataSource = dt
         chklInstrumentos.DisplayMember = "Descripcion"

FRM/frmPrincipalInicio.vb

@@ -98,4 +98,16 @@
         GraficaRendimientoInstrumentos()
         RendimientoMonto()
     End Sub
+
+    Private Sub charlineal_Click(sender As Object, e As EventArgs) Handles charlineal.Click
+
+    End Sub
+
+    Private Sub pnlRendimientoTotal_Paint(sender As Object, e As PaintEventArgs) Handles pnlRendimientoTotal.Paint
+
+    End Sub
+
+    Private Sub TableLayoutPanel2_Paint(sender As Object, e As PaintEventArgs) Handles TableLayoutPanel2.Paint
+
+    End Sub
 End Class

FRM/frmSeleccionPoolTitulos.vb

@@ -37,7 +37,7 @@
     Sub CargarInstrumentos()
 
         If Me.cboInstrumentos.Items.Count = 0 Or Me.cboInstrumentos.Items.Count = 1 Then
-            Me.cboInstrumentos.DataSource = oDAOGeneral.ListaInstrumentos
+            Me.cboInstrumentos.DataSource = oDAOGeneral.ListaInstrumentos("Propuesta")
             Me.cboInstrumentos.DisplayMember = "Descripcion"
             Me.cboInstrumentos.ValueMember = "Codigo"
             Me.cboInstrumentos.SelectedIndex = 0

FRM/frmSeleccionTitulosReportos.vb

@@ -66,7 +66,7 @@
 
     Sub CargarTitulos()
         Dim dt As New DataTable
-        dt = DAOGeneral.ListaInstrumentos()
+        dt = DAOGeneral.ListaInstrumentos("Propuesta")
 
         For Each Item As DataRow In dt.Rows
             ''GeneracionCheques

frmINV.Designer.vb

@@ -383,6 +383,7 @@ Partial Class frmINV
         'navNuevo
         '
         Me.navNuevo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.navNuevo.Enabled = False
         Me.navNuevo.Image = CType(resources.GetObject("navNuevo.Image"), System.Drawing.Image)
         Me.navNuevo.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.navNuevo.Name = "navNuevo"
@@ -392,6 +393,7 @@ Partial Class frmINV
         'navModificar
         '
         Me.navModificar.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.navModificar.Enabled = False
         Me.navModificar.Image = CType(resources.GetObject("navModificar.Image"), System.Drawing.Image)
         Me.navModificar.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.navModificar.Name = "navModificar"
@@ -401,6 +403,7 @@ Partial Class frmINV
         'navEliminar
         '
         Me.navEliminar.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.navEliminar.Enabled = False
         Me.navEliminar.Image = CType(resources.GetObject("navEliminar.Image"), System.Drawing.Image)
         Me.navEliminar.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.navEliminar.Name = "navEliminar"
@@ -1214,7 +1217,7 @@ Partial Class frmINV
         Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.29703!))
         Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 207.0!))
         Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 213.0!))
-        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 247.0!))
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 250.0!))
         Me.TableLayoutPanel2.Controls.Add(Me.GroupBox6, 3, 0)
         Me.TableLayoutPanel2.Controls.Add(Me.GroupBox5, 2, 0)
         Me.TableLayoutPanel2.Controls.Add(Me.GroupBox4, 1, 0)
@@ -1243,7 +1246,7 @@ Partial Class frmINV
         '
         Me.GroupBox6.Controls.Add(Me.cboTipoOperacion)
         Me.GroupBox6.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox6.Location = New System.Drawing.Point(581, 3)
+        Me.GroupBox6.Location = New System.Drawing.Point(578, 3)
         Me.GroupBox6.Name = "GroupBox6"
         Me.GroupBox6.Size = New System.Drawing.Size(207, 44)
         Me.GroupBox6.TabIndex = 3
@@ -1266,7 +1269,7 @@ Partial Class frmINV
         '
         Me.GroupBox5.Controls.Add(Me.cboEstadoDocumento)
         Me.GroupBox5.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox5.Location = New System.Drawing.Point(374, 3)
+        Me.GroupBox5.Location = New System.Drawing.Point(371, 3)
         Me.GroupBox5.Name = "GroupBox5"
         Me.GroupBox5.Size = New System.Drawing.Size(201, 44)
         Me.GroupBox5.TabIndex = 2
@@ -1288,9 +1291,9 @@ Partial Class frmINV
         '
         Me.GroupBox4.Controls.Add(Me.cboEmisores)
         Me.GroupBox4.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox4.Location = New System.Drawing.Point(187, 3)
+        Me.GroupBox4.Location = New System.Drawing.Point(186, 3)
         Me.GroupBox4.Name = "GroupBox4"
-        Me.GroupBox4.Size = New System.Drawing.Size(181, 44)
+        Me.GroupBox4.Size = New System.Drawing.Size(179, 44)
         Me.GroupBox4.TabIndex = 1
         Me.GroupBox4.TabStop = False
         Me.GroupBox4.Text = "Emisores"
@@ -1314,7 +1317,7 @@ Partial Class frmINV
         Me.GroupBox3.ForeColor = System.Drawing.Color.Maroon
         Me.GroupBox3.Location = New System.Drawing.Point(3, 3)
         Me.GroupBox3.Name = "GroupBox3"
-        Me.GroupBox3.Size = New System.Drawing.Size(178, 44)
+        Me.GroupBox3.Size = New System.Drawing.Size(177, 44)
         Me.GroupBox3.TabIndex = 0
         Me.GroupBox3.TabStop = False
         Me.GroupBox3.Text = "Empresas *"
@@ -1335,9 +1338,9 @@ Partial Class frmINV
         '
         Me.GroupBox7.Controls.Add(Me.cboOrigenDeFondos)
         Me.GroupBox7.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox7.Location = New System.Drawing.Point(794, 3)
+        Me.GroupBox7.Location = New System.Drawing.Point(791, 3)
         Me.GroupBox7.Name = "GroupBox7"
-        Me.GroupBox7.Size = New System.Drawing.Size(242, 44)
+        Me.GroupBox7.Size = New System.Drawing.Size(245, 44)
         Me.GroupBox7.TabIndex = 4
         Me.GroupBox7.TabStop = False
         Me.GroupBox7.Text = "Origenes de Fondo"
@@ -1361,7 +1364,7 @@ Partial Class frmINV
         Me.GroupBox8.ForeColor = System.Drawing.Color.Maroon
         Me.GroupBox8.Location = New System.Drawing.Point(3, 53)
         Me.GroupBox8.Name = "GroupBox8"
-        Me.GroupBox8.Size = New System.Drawing.Size(178, 42)
+        Me.GroupBox8.Size = New System.Drawing.Size(177, 42)
         Me.GroupBox8.TabIndex = 5
         Me.GroupBox8.TabStop = False
         Me.GroupBox8.Text = "Instrumentos *"
@@ -1393,9 +1396,9 @@ Partial Class frmINV
         '
         Me.GroupBox9.Controls.Add(Me.cboCalificaciones)
         Me.GroupBox9.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox9.Location = New System.Drawing.Point(187, 53)
+        Me.GroupBox9.Location = New System.Drawing.Point(186, 53)
         Me.GroupBox9.Name = "GroupBox9"
-        Me.GroupBox9.Size = New System.Drawing.Size(181, 42)
+        Me.GroupBox9.Size = New System.Drawing.Size(179, 42)
         Me.GroupBox9.TabIndex = 6
         Me.GroupBox9.TabStop = False
         Me.GroupBox9.Text = "Calificacion de Riesgo"
@@ -1416,7 +1419,7 @@ Partial Class frmINV
         '
         Me.GroupBox10.Controls.Add(Me.cboTipoTasa)
         Me.GroupBox10.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox10.Location = New System.Drawing.Point(374, 53)
+        Me.GroupBox10.Location = New System.Drawing.Point(371, 53)
         Me.GroupBox10.Name = "GroupBox10"
         Me.GroupBox10.Size = New System.Drawing.Size(201, 42)
         Me.GroupBox10.TabIndex = 7
@@ -1439,7 +1442,7 @@ Partial Class frmINV
         '
         Me.GroupBox11.Controls.Add(Me.cboCalificadoras)
         Me.GroupBox11.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox11.Location = New System.Drawing.Point(581, 53)
+        Me.GroupBox11.Location = New System.Drawing.Point(578, 53)
         Me.GroupBox11.Name = "GroupBox11"
         Me.GroupBox11.Size = New System.Drawing.Size(207, 42)
         Me.GroupBox11.TabIndex = 8
@@ -1462,9 +1465,9 @@ Partial Class frmINV
         '
         Me.GroupBox12.Controls.Add(Me.cboEstadoProceso)
         Me.GroupBox12.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox12.Location = New System.Drawing.Point(794, 53)
+        Me.GroupBox12.Location = New System.Drawing.Point(791, 53)
         Me.GroupBox12.Name = "GroupBox12"
-        Me.GroupBox12.Size = New System.Drawing.Size(242, 42)
+        Me.GroupBox12.Size = New System.Drawing.Size(245, 42)
         Me.GroupBox12.TabIndex = 9
         Me.GroupBox12.TabStop = False
         Me.GroupBox12.Text = "Estado de Proceso"
@@ -1489,7 +1492,7 @@ Partial Class frmINV
         Me.GroupBox13.ForeColor = System.Drawing.Color.Maroon
         Me.GroupBox13.Location = New System.Drawing.Point(3, 101)
         Me.GroupBox13.Name = "GroupBox13"
-        Me.GroupBox13.Size = New System.Drawing.Size(178, 41)
+        Me.GroupBox13.Size = New System.Drawing.Size(177, 41)
         Me.GroupBox13.TabIndex = 10
         Me.GroupBox13.TabStop = False
         Me.GroupBox13.Text = "Tipo de Mercado *"
@@ -1511,9 +1514,9 @@ Partial Class frmINV
         Me.GroupBox14.Controls.Add(Me.cboPaises)
         Me.GroupBox14.Dock = System.Windows.Forms.DockStyle.Fill
         Me.GroupBox14.ForeColor = System.Drawing.Color.Maroon
-        Me.GroupBox14.Location = New System.Drawing.Point(187, 101)
+        Me.GroupBox14.Location = New System.Drawing.Point(186, 101)
         Me.GroupBox14.Name = "GroupBox14"
-        Me.GroupBox14.Size = New System.Drawing.Size(181, 41)
+        Me.GroupBox14.Size = New System.Drawing.Size(179, 41)
         Me.GroupBox14.TabIndex = 11
         Me.GroupBox14.TabStop = False
         Me.GroupBox14.Text = "Paises *"
@@ -1533,7 +1536,7 @@ Partial Class frmINV
         'GroupBox15
         '
         Me.GroupBox15.Controls.Add(Me.cboPeriodicidad)
-        Me.GroupBox15.Location = New System.Drawing.Point(374, 101)
+        Me.GroupBox15.Location = New System.Drawing.Point(371, 101)
         Me.GroupBox15.Name = "GroupBox15"
         Me.GroupBox15.Size = New System.Drawing.Size(198, 41)
         Me.GroupBox15.TabIndex = 12
@@ -1555,7 +1558,7 @@ Partial Class frmINV
         'GroupBox16
         '
         Me.GroupBox16.Controls.Add(Me.cboTipoRenta)
-        Me.GroupBox16.Location = New System.Drawing.Point(581, 101)
+        Me.GroupBox16.Location = New System.Drawing.Point(578, 101)
         Me.GroupBox16.Name = "GroupBox16"
         Me.GroupBox16.Size = New System.Drawing.Size(207, 41)
         Me.GroupBox16.TabIndex = 13
@@ -1878,7 +1881,6 @@ Partial Class frmINV
         Me.Controls.Add(Me.Panel1)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
         Me.Name = "frmINV"
-        Me.Text = "0"
         Me.Panel1.ResumeLayout(False)
         CType(Me.Navegador, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Navegador.ResumeLayout(False)

frmINV.vb

@@ -57,6 +57,7 @@
         Me.DicDatos = DicDatos
         GenerarReportoVenta = True
         Variables.TrasladarCMVTA = Nothing
+        navNuevo.Enabled = True
     End Sub
 
     Sub ConfigurarReportoVenta()
@@ -368,7 +369,7 @@
 
     End Sub
     Private Sub CargarInstrumentosFinancieros()
-        Me.cboInstrumentos.DataSource = oDAOGeneral.ListaInstrumentos
+        Me.cboInstrumentos.DataSource = oDAOGeneral.ListaInstrumentos("Inversion")
         Me.cboInstrumentos.DisplayMember = "Descripcion"
         Me.cboInstrumentos.ValueMember = "Codigo"
         Col_Instrumento = AgregarCheckbox(cboInstrumentos, flpInstrumentos)
@@ -3737,7 +3738,7 @@
 
         End If
         If Estado = "R" Or Estado = "A" Or Estado = "P" Or Estado = "I" Or Estado = "F" Then
-            navNuevo.Enabled = True
+            navNuevo.Enabled = False
             navModificar.Enabled = False
             navEliminar.Enabled = False
             navBuscar.Enabled = True
@@ -3746,7 +3747,7 @@
 
         ElseIf Estado = "C" Then
 
-            navNuevo.Enabled = True
+            navNuevo.Enabled = False
             navModificar.Enabled = True
             navEliminar.Enabled = False
             navBuscar.Enabled = True

frmIngresosConsulta.vb

@@ -138,7 +138,7 @@
 
     End Sub
     Private Sub CargarTiposInstrumentos()
-        Me.lstInstrumentos.DataSource = oDAOGeneral.ListaInstrumentos
+        Me.lstInstrumentos.DataSource = oDAOGeneral.ListaInstrumentos("Propuesta")
         Me.lstInstrumentos.DisplayMember = "Descripcion"
         Me.lstInstrumentos.ValueMember = "Codigo"
 

frmPIN.vb

@@ -819,7 +819,7 @@ Public Class frmPIN
     Private Sub CargarInstrumentosFinancieros()
         Dim vTipoTransaccion As String = TipoTransaccion
         TipoTransaccion = "X"
-        Me.cboInstrumentosFinancieros.DataSource = oDAOGeneral.ListaInstrumentos
+        Me.cboInstrumentosFinancieros.DataSource = oDAOGeneral.ListaInstrumentos("Propuesta")
         Me.cboInstrumentosFinancieros.DisplayMember = "Descripcion"
         Me.cboInstrumentosFinancieros.ValueMember = "Codigo"
         AgregarCheckbox(cboInstrumentosFinancieros, flpInstrumentos)

frmPrincipal.Designer.vb

@@ -25,17 +25,18 @@ Partial Class frmPrincipal
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmPrincipal))
-        Me.MenuStrip = New System.Windows.Forms.MenuStrip()
-        Me.ToolStrip = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
         Me.ToolTip = New System.Windows.Forms.ToolTip(Me.components)
         Me.PanelMenu = New System.Windows.Forms.Panel()
-        Me.Button1 = New System.Windows.Forms.Button()
         Me.mnuPrincipal = New System.Windows.Forms.MenuStrip()
         Me.lblInversionesTXT = New System.Windows.Forms.Label()
         Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
         Me.pnlPrincipal = New System.Windows.Forms.Panel()
+        Me.lblTitulo = New System.Windows.Forms.Label()
+        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStrip = New System.Windows.Forms.ToolStrip()
+        Me.MenuStrip = New System.Windows.Forms.MenuStrip()
+        Me.Button1 = New System.Windows.Forms.Button()
         Me.mnuInicio = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnuPropuestas = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnuInversiones = New System.Windows.Forms.ToolStripMenuItem()
@@ -67,46 +68,16 @@ Partial Class frmPrincipal
         Me.PrintToolStripButton = New System.Windows.Forms.ToolStripButton()
         Me.PrintPreviewToolStripButton = New System.Windows.Forms.ToolStripButton()
         Me.HelpToolStripButton = New System.Windows.Forms.ToolStripButton()
-        Me.lblTitulo = New System.Windows.Forms.Label()
-        Me.ToolStrip.SuspendLayout()
         Me.PanelMenu.SuspendLayout()
         Me.mnuPrincipal.SuspendLayout()
         Me.pnlPrincipal.SuspendLayout()
+        Me.ToolStrip.SuspendLayout()
         CType(Me.picLogo, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
-        'MenuStrip
-        '
-        Me.MenuStrip.BackColor = System.Drawing.Color.FromArgb(CType(CType(35, Byte), Integer), CType(CType(39, Byte), Integer), CType(CType(45, Byte), Integer))
-        Me.MenuStrip.Location = New System.Drawing.Point(0, 0)
-        Me.MenuStrip.Name = "MenuStrip"
-        Me.MenuStrip.Size = New System.Drawing.Size(1370, 24)
-        Me.MenuStrip.TabIndex = 5
-        Me.MenuStrip.Text = "MenuStrip"
-        '
-        'ToolStrip
-        '
-        Me.ToolStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NewToolStripButton, Me.OpenToolStripButton, Me.SaveToolStripButton, Me.ToolStripSeparator1, Me.PrintToolStripButton, Me.PrintPreviewToolStripButton, Me.ToolStripSeparator2, Me.HelpToolStripButton})
-        Me.ToolStrip.Location = New System.Drawing.Point(0, 24)
-        Me.ToolStrip.Name = "ToolStrip"
-        Me.ToolStrip.Size = New System.Drawing.Size(1370, 25)
-        Me.ToolStrip.TabIndex = 6
-        Me.ToolStrip.Text = "ToolStrip"
-        '
-        'ToolStripSeparator1
-        '
-        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
-        '
-        'ToolStripSeparator2
-        '
-        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25)
-        '
         'PanelMenu
         '
         Me.PanelMenu.BackColor = System.Drawing.Color.FromArgb(CType(CType(35, Byte), Integer), CType(CType(39, Byte), Integer), CType(CType(45, Byte), Integer))
-        Me.PanelMenu.Controls.Add(Me.Button1)
         Me.PanelMenu.Controls.Add(Me.mnuPrincipal)
         Me.PanelMenu.Controls.Add(Me.picLogo)
         Me.PanelMenu.Controls.Add(Me.lblInversionesTXT)
@@ -116,15 +87,6 @@ Partial Class frmPrincipal
         Me.PanelMenu.Size = New System.Drawing.Size(254, 677)
         Me.PanelMenu.TabIndex = 10
         '
-        'Button1
-        '
-        Me.Button1.Location = New System.Drawing.Point(3, 87)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(37, 30)
-        Me.Button1.TabIndex = 14
-        Me.Button1.Text = "Button1"
-        Me.Button1.UseVisualStyleBackColor = True
-        '
         'mnuPrincipal
         '
         Me.mnuPrincipal.AutoSize = False
@@ -137,7 +99,7 @@ Partial Class frmPrincipal
         Me.mnuPrincipal.Name = "mnuPrincipal"
         Me.mnuPrincipal.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
         Me.mnuPrincipal.ShowItemToolTips = True
-        Me.mnuPrincipal.Size = New System.Drawing.Size(250, 524)
+        Me.mnuPrincipal.Size = New System.Drawing.Size(250, 557)
         Me.mnuPrincipal.TabIndex = 15
         Me.mnuPrincipal.Text = "MenuStrip1"
         '
@@ -147,7 +109,7 @@ Partial Class frmPrincipal
         Me.lblInversionesTXT.Font = New System.Drawing.Font("Century Gothic", 12.0!, System.Drawing.FontStyle.Bold)
         Me.lblInversionesTXT.ForeColor = System.Drawing.Color.White
         Me.lblInversionesTXT.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.lblInversionesTXT.Location = New System.Drawing.Point(78, 87)
+        Me.lblInversionesTXT.Location = New System.Drawing.Point(76, 101)
         Me.lblInversionesTXT.Name = "lblInversionesTXT"
         Me.lblInversionesTXT.Size = New System.Drawing.Size(93, 19)
         Me.lblInversionesTXT.TabIndex = 5
@@ -163,15 +125,73 @@ Partial Class frmPrincipal
         '
         'pnlPrincipal
         '
-        Me.pnlPrincipal.BackgroundImage = Global.Inversiones.My.Resources.Resources.fondo1
+        Me.pnlPrincipal.BackColor = System.Drawing.Color.White
         Me.pnlPrincipal.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.pnlPrincipal.Controls.Add(Me.Button1)
         Me.pnlPrincipal.Controls.Add(Me.lblTitulo)
         Me.pnlPrincipal.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnlPrincipal.Location = New System.Drawing.Point(254, 49)
+        Me.pnlPrincipal.Margin = New System.Windows.Forms.Padding(3, 15, 3, 3)
         Me.pnlPrincipal.Name = "pnlPrincipal"
+        Me.pnlPrincipal.Padding = New System.Windows.Forms.Padding(0, 50, 0, 0)
         Me.pnlPrincipal.Size = New System.Drawing.Size(1116, 655)
         Me.pnlPrincipal.TabIndex = 14
         '
+        'lblTitulo
+        '
+        Me.lblTitulo.BackColor = System.Drawing.Color.White
+        Me.lblTitulo.Dock = System.Windows.Forms.DockStyle.Top
+        Me.lblTitulo.Font = New System.Drawing.Font("Century Gothic", 24.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblTitulo.ForeColor = System.Drawing.Color.FromArgb(CType(CType(21, Byte), Integer), CType(CType(37, Byte), Integer), CType(CType(60, Byte), Integer))
+        Me.lblTitulo.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.lblTitulo.Location = New System.Drawing.Point(0, 50)
+        Me.lblTitulo.Name = "lblTitulo"
+        Me.lblTitulo.RightToLeft = System.Windows.Forms.RightToLeft.Yes
+        Me.lblTitulo.Size = New System.Drawing.Size(1116, 33)
+        Me.lblTitulo.TabIndex = 2
+        Me.lblTitulo.Text = "SISTEMA DE INVERSIONES INVERLEC"
+        Me.lblTitulo.TextAlign = System.Drawing.ContentAlignment.TopCenter
+        '
+        'ToolStripSeparator1
+        '
+        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
+        '
+        'ToolStripSeparator2
+        '
+        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25)
+        '
+        'ToolStrip
+        '
+        Me.ToolStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NewToolStripButton, Me.OpenToolStripButton, Me.SaveToolStripButton, Me.ToolStripSeparator1, Me.PrintToolStripButton, Me.PrintPreviewToolStripButton, Me.ToolStripSeparator2, Me.HelpToolStripButton})
+        Me.ToolStrip.Location = New System.Drawing.Point(0, 24)
+        Me.ToolStrip.Name = "ToolStrip"
+        Me.ToolStrip.Size = New System.Drawing.Size(1370, 25)
+        Me.ToolStrip.TabIndex = 6
+        Me.ToolStrip.Text = "ToolStrip"
+        '
+        'MenuStrip
+        '
+        Me.MenuStrip.BackColor = System.Drawing.Color.FromArgb(CType(CType(35, Byte), Integer), CType(CType(39, Byte), Integer), CType(CType(45, Byte), Integer))
+        Me.MenuStrip.Location = New System.Drawing.Point(0, 0)
+        Me.MenuStrip.Name = "MenuStrip"
+        Me.MenuStrip.Size = New System.Drawing.Size(1370, 24)
+        Me.MenuStrip.TabIndex = 5
+        Me.MenuStrip.Text = "MenuStrip"
+        '
+        'Button1
+        '
+        Me.Button1.BackColor = System.Drawing.Color.Transparent
+        Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button1.Location = New System.Drawing.Point(6, 3)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(50, 35)
+        Me.Button1.TabIndex = 14
+        Me.Button1.Text = "≡"
+        Me.Button1.TextAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.Button1.UseVisualStyleBackColor = False
+        '
         'mnuInicio
         '
         Me.mnuInicio.AutoSize = False
@@ -182,8 +202,9 @@ Partial Class frmPrincipal
         Me.mnuInicio.Margin = New System.Windows.Forms.Padding(0, 0, 0, 6)
         Me.mnuInicio.Name = "mnuInicio"
         Me.mnuInicio.Size = New System.Drawing.Size(250, 40)
-        Me.mnuInicio.Text = "Inicio"
+        Me.mnuInicio.Text = "  Inicio"
         Me.mnuInicio.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.mnuInicio.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal
         Me.mnuInicio.ToolTipText = "Inicio"
         '
         'mnuPropuestas
@@ -196,7 +217,7 @@ Partial Class frmPrincipal
         Me.mnuPropuestas.Margin = New System.Windows.Forms.Padding(0, 0, 0, 6)
         Me.mnuPropuestas.Name = "mnuPropuestas"
         Me.mnuPropuestas.Size = New System.Drawing.Size(250, 40)
-        Me.mnuPropuestas.Text = "Propuestas de Inversión"
+        Me.mnuPropuestas.Text = "  Propuestas de Inversión"
         Me.mnuPropuestas.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.mnuPropuestas.ToolTipText = "Propuestas de Inversión"
         '
@@ -210,7 +231,7 @@ Partial Class frmPrincipal
         Me.mnuInversiones.Margin = New System.Windows.Forms.Padding(0, 0, 0, 6)
         Me.mnuInversiones.Name = "mnuInversiones"
         Me.mnuInversiones.Size = New System.Drawing.Size(250, 40)
-        Me.mnuInversiones.Text = "Inversiones"
+        Me.mnuInversiones.Text = "  Inversiones"
         Me.mnuInversiones.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.mnuInversiones.ToolTipText = "Inventario de Inversiones"
         '
@@ -225,7 +246,7 @@ Partial Class frmPrincipal
         Me.mnuIngresos.Margin = New System.Windows.Forms.Padding(0, 0, 0, 6)
         Me.mnuIngresos.Name = "mnuIngresos"
         Me.mnuIngresos.Size = New System.Drawing.Size(250, 40)
-        Me.mnuIngresos.Text = "Ingresos"
+        Me.mnuIngresos.Text = "  Ingresos"
         Me.mnuIngresos.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.mnuIngresos.ToolTipText = "Ingresos"
         '
@@ -251,7 +272,7 @@ Partial Class frmPrincipal
         Me.mnuDisponibilidades.Margin = New System.Windows.Forms.Padding(0, 0, 0, 6)
         Me.mnuDisponibilidades.Name = "mnuDisponibilidades"
         Me.mnuDisponibilidades.Size = New System.Drawing.Size(250, 40)
-        Me.mnuDisponibilidades.Text = "Disponibilidades"
+        Me.mnuDisponibilidades.Text = "   Disponibilidades"
         Me.mnuDisponibilidades.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.mnuDisponibilidades.ToolTipText = "Disponibilidades"
         '
@@ -265,7 +286,7 @@ Partial Class frmPrincipal
         Me.mnuPresupuesto.Margin = New System.Windows.Forms.Padding(0, 0, 0, 6)
         Me.mnuPresupuesto.Name = "mnuPresupuesto"
         Me.mnuPresupuesto.Size = New System.Drawing.Size(250, 40)
-        Me.mnuPresupuesto.Text = "Presupuesto"
+        Me.mnuPresupuesto.Text = "   Presupuesto"
         Me.mnuPresupuesto.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.mnuPresupuesto.ToolTipText = "Presupuesto"
         '
@@ -279,7 +300,7 @@ Partial Class frmPrincipal
         Me.mnuInformes.Margin = New System.Windows.Forms.Padding(0, 0, 0, 6)
         Me.mnuInformes.Name = "mnuInformes"
         Me.mnuInformes.Size = New System.Drawing.Size(250, 40)
-        Me.mnuInformes.Text = "Informes"
+        Me.mnuInformes.Text = "  Informes"
         Me.mnuInformes.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.mnuInformes.ToolTipText = "Informes"
         '
@@ -293,7 +314,7 @@ Partial Class frmPrincipal
         Me.mnuConfiguracion.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuConfiguracion.Name = "mnuConfiguracion"
         Me.mnuConfiguracion.Size = New System.Drawing.Size(250, 40)
-        Me.mnuConfiguracion.Text = "Configuración"
+        Me.mnuConfiguracion.Text = "  Configuración"
         Me.mnuConfiguracion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.mnuConfiguracion.ToolTipText = "Configuración"
         '
@@ -372,7 +393,7 @@ Partial Class frmPrincipal
         Me.mnuRendimientos.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuRendimientos.Name = "mnuRendimientos"
         Me.mnuRendimientos.Size = New System.Drawing.Size(250, 40)
-        Me.mnuRendimientos.Text = "Rendimientos"
+        Me.mnuRendimientos.Text = "  Rendimientos"
         Me.mnuRendimientos.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'FToolStripMenuItem
@@ -384,7 +405,7 @@ Partial Class frmPrincipal
         Me.FToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.FToolStripMenuItem.Name = "FToolStripMenuItem"
         Me.FToolStripMenuItem.Size = New System.Drawing.Size(250, 40)
-        Me.FToolStripMenuItem.Text = "Costos Financieros"
+        Me.FToolStripMenuItem.Text = "  Costos Financieros"
         Me.FToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'ArbitrajeToolStripMenuItem
@@ -394,8 +415,9 @@ Partial Class frmPrincipal
         Me.ArbitrajeToolStripMenuItem.Image = Global.Inversiones.My.Resources.Resources.btnInicio_Image
         Me.ArbitrajeToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.ArbitrajeToolStripMenuItem.Name = "ArbitrajeToolStripMenuItem"
+        Me.ArbitrajeToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No
         Me.ArbitrajeToolStripMenuItem.Size = New System.Drawing.Size(250, 40)
-        Me.ArbitrajeToolStripMenuItem.Text = "Arbitraje"
+        Me.ArbitrajeToolStripMenuItem.Text = "   Arbitraje"
         Me.ArbitrajeToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'picLogo
@@ -404,7 +426,7 @@ Partial Class frmPrincipal
         Me.picLogo.ImeMode = System.Windows.Forms.ImeMode.NoControl
         Me.picLogo.Location = New System.Drawing.Point(0, 0)
         Me.picLogo.Name = "picLogo"
-        Me.picLogo.Size = New System.Drawing.Size(250, 81)
+        Me.picLogo.Size = New System.Drawing.Size(254, 84)
         Me.picLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
         Me.picLogo.TabIndex = 0
         Me.picLogo.TabStop = False
@@ -463,18 +485,6 @@ Partial Class frmPrincipal
         Me.HelpToolStripButton.Size = New System.Drawing.Size(23, 22)
         Me.HelpToolStripButton.Text = "Ayuda"
         '
-        'lblTitulo
-        '
-        Me.lblTitulo.AutoSize = True
-        Me.lblTitulo.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.lblTitulo.Font = New System.Drawing.Font("Microsoft Sans Serif", 21.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblTitulo.ForeColor = System.Drawing.SystemColors.ActiveCaption
-        Me.lblTitulo.Location = New System.Drawing.Point(338, 293)
-        Me.lblTitulo.Name = "lblTitulo"
-        Me.lblTitulo.Size = New System.Drawing.Size(546, 33)
-        Me.lblTitulo.TabIndex = 2
-        Me.lblTitulo.Text = "SISTEMA DE INVERSIONES INVERLEC"
-        '
         'frmPrincipal
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -491,30 +501,19 @@ Partial Class frmPrincipal
         Me.Name = "frmPrincipal"
         Me.Text = "Inversiones"
         Me.WindowState = System.Windows.Forms.FormWindowState.Maximized
-        Me.ToolStrip.ResumeLayout(False)
-        Me.ToolStrip.PerformLayout()
         Me.PanelMenu.ResumeLayout(False)
         Me.PanelMenu.PerformLayout()
         Me.mnuPrincipal.ResumeLayout(False)
         Me.mnuPrincipal.PerformLayout()
         Me.pnlPrincipal.ResumeLayout(False)
-        Me.pnlPrincipal.PerformLayout()
+        Me.ToolStrip.ResumeLayout(False)
+        Me.ToolStrip.PerformLayout()
         CType(Me.picLogo, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     End Sub
-    Friend WithEvents HelpToolStripButton As System.Windows.Forms.ToolStripButton
-    Friend WithEvents ToolStripSeparator2 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents PrintPreviewToolStripButton As System.Windows.Forms.ToolStripButton
     Friend WithEvents ToolTip As System.Windows.Forms.ToolTip
-    Friend WithEvents PrintToolStripButton As System.Windows.Forms.ToolStripButton
-    Friend WithEvents NewToolStripButton As System.Windows.Forms.ToolStripButton
-    Friend WithEvents ToolStrip As System.Windows.Forms.ToolStrip
-    Friend WithEvents OpenToolStripButton As System.Windows.Forms.ToolStripButton
-    Friend WithEvents SaveToolStripButton As System.Windows.Forms.ToolStripButton
-    Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents MenuStrip As System.Windows.Forms.MenuStrip
     Friend WithEvents PanelMenu As Panel
     Friend WithEvents picLogo As PictureBox
     Friend WithEvents lblInversionesTXT As Label
@@ -547,4 +546,14 @@ Partial Class frmPrincipal
     Friend WithEvents FToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ArbitrajeToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents lblTitulo As Label
+    Friend WithEvents NewToolStripButton As ToolStripButton
+    Friend WithEvents OpenToolStripButton As ToolStripButton
+    Friend WithEvents SaveToolStripButton As ToolStripButton
+    Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
+    Friend WithEvents PrintToolStripButton As ToolStripButton
+    Friend WithEvents PrintPreviewToolStripButton As ToolStripButton
+    Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
+    Friend WithEvents HelpToolStripButton As ToolStripButton
+    Friend WithEvents ToolStrip As ToolStrip
+    Friend WithEvents MenuStrip As MenuStrip
 End Class

frmPrincipal.resx

@@ -117,12 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="ToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>125, 17</value>
-  </metadata>
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>336, 17</value>
   </metadata>
@@ -135,6 +129,12 @@
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>428, 17</value>
   </metadata>
+  <metadata name="ToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>125, 17</value>
+  </metadata>
+  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="picLogo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

frmPrincipal.vb

@@ -88,9 +88,7 @@ Public Class frmPrincipal
 
     Private m_ChildFormNumber As Integer
 
-    Private Sub btnPropuestaDeInversion_Click(sender As Object, e As EventArgs)
 
-    End Sub
 
     Private Sub frmPrincipal_Load(sender As Object, e As EventArgs) Handles MyBase.Load
 
@@ -407,4 +405,8 @@ Public Class frmPrincipal
     Private Sub lblTitulo_Click(sender As Object, e As EventArgs) Handles lblTitulo.Click
 
     End Sub
+
+    Private Sub pnlPrincipal_Paint(sender As Object, e As PaintEventArgs) Handles pnlPrincipal.Paint
+
+    End Sub
 End Class

frmPropuestasDeInversion.vb

@@ -255,7 +255,7 @@
         Me.cboEmpresas.SelectedIndex = -1
     End Sub
     Sub CargarInstrumentosFinancieros()
-        Me.cboInstrumentosFinancieros.DataSource = oDAOGeneral.ListaInstrumentos
+        Me.cboInstrumentosFinancieros.DataSource = oDAOGeneral.ListaInstrumentos("Propuesta")
         Me.cboInstrumentosFinancieros.DisplayMember = "Descripcion"
         Me.cboInstrumentosFinancieros.ValueMember = "Codigo"
         Me.cboInstrumentosFinancieros.SelectedIndex = -1