diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 7b1ceaa..7bc366a 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -5,6 +5,6 @@ "\\Principal", "\\Ventas" ], - "SelectedNode": "\\Ventas\\vender.cs", + "SelectedNode": "\\Solution.sln", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/compabetoOG/v17/.wsuo b/.vs/compabetoOG/v17/.wsuo index 10b54de..c7abfb7 100644 Binary files a/.vs/compabetoOG/v17/.wsuo and b/.vs/compabetoOG/v17/.wsuo differ diff --git a/Estadiscticas.Designer.cs b/Estadiscticas.Designer.cs index 21c999c..5835f2e 100644 --- a/Estadiscticas.Designer.cs +++ b/Estadiscticas.Designer.cs @@ -48,15 +48,17 @@ this.lbTotalMes = new System.Windows.Forms.Label(); this.lbVendedorMes = new System.Windows.Forms.Label(); this.lbProductoMes = new System.Windows.Forms.Label(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); ((System.ComponentModel.ISupportInitialize)(this.dgvDia)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvMes)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // // dtpBuscar // this.dtpBuscar.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.dtpBuscar.Location = new System.Drawing.Point(16, 15); - this.dtpBuscar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dtpBuscar.Location = new System.Drawing.Point(36, 191); + this.dtpBuscar.Margin = new System.Windows.Forms.Padding(4); this.dtpBuscar.Name = "dtpBuscar"; this.dtpBuscar.Size = new System.Drawing.Size(341, 26); this.dtpBuscar.TabIndex = 0; @@ -69,8 +71,8 @@ this.Precio, this.Cantidad, this.Total}); - this.dgvDia.Location = new System.Drawing.Point(12, 69); - this.dgvDia.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dgvDia.Location = new System.Drawing.Point(32, 245); + this.dgvDia.Margin = new System.Windows.Forms.Padding(4); this.dgvDia.Name = "dgvDia"; this.dgvDia.RowHeadersWidth = 51; this.dgvDia.Size = new System.Drawing.Size(591, 185); @@ -109,11 +111,11 @@ // // btnBuscar // - this.btnBuscar.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnBuscar.Location = new System.Drawing.Point(399, 14); - this.btnBuscar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnBuscar.Font = new System.Drawing.Font("Poppins", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnBuscar.Location = new System.Drawing.Point(384, 190); + this.btnBuscar.Margin = new System.Windows.Forms.Padding(4); this.btnBuscar.Name = "btnBuscar"; - this.btnBuscar.Size = new System.Drawing.Size(100, 28); + this.btnBuscar.Size = new System.Drawing.Size(92, 27); this.btnBuscar.TabIndex = 2; this.btnBuscar.Text = "Buscar"; this.btnBuscar.UseVisualStyleBackColor = true; @@ -122,22 +124,26 @@ // label1 // this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(16, 46); + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.ForeColor = System.Drawing.Color.Transparent; + this.label1.Location = new System.Drawing.Point(36, 222); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(134, 20); + this.label1.Size = new System.Drawing.Size(156, 30); this.label1.TabIndex = 3; this.label1.Text = "Resumen del dia"; // // label2 // this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(20, 330); + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.ForeColor = System.Drawing.Color.Transparent; + this.label2.Location = new System.Drawing.Point(36, 476); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(144, 20); + this.label2.Size = new System.Drawing.Size(168, 30); this.label2.TabIndex = 4; this.label2.Text = "Resumen del mes"; // @@ -149,8 +155,8 @@ this.dataGridViewTextBoxColumn2, this.dataGridViewTextBoxColumn3, this.dataGridViewTextBoxColumn4}); - this.dgvMes.Location = new System.Drawing.Point(16, 354); - this.dgvMes.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dgvMes.Location = new System.Drawing.Point(32, 500); + this.dgvMes.Margin = new System.Windows.Forms.Padding(4); this.dgvMes.Name = "dgvMes"; this.dgvMes.RowHeadersWidth = 51; this.dgvMes.Size = new System.Drawing.Size(591, 185); @@ -190,74 +196,107 @@ // lbProductDia // this.lbProductDia.AutoSize = true; - this.lbProductDia.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbProductDia.Location = new System.Drawing.Point(669, 110); + this.lbProductDia.BackColor = System.Drawing.Color.Transparent; + this.lbProductDia.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbProductDia.ForeColor = System.Drawing.Color.Transparent; + this.lbProductDia.Location = new System.Drawing.Point(862, 245); this.lbProductDia.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbProductDia.Name = "lbProductDia"; - this.lbProductDia.Size = new System.Drawing.Size(180, 20); + this.lbProductDia.Size = new System.Drawing.Size(210, 30); this.lbProductDia.TabIndex = 6; this.lbProductDia.Text = "Producto mas vendido:"; + this.lbProductDia.Click += new System.EventHandler(this.lbProductDia_Click); // // lbVendedorDia // this.lbVendedorDia.AutoSize = true; - this.lbVendedorDia.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbVendedorDia.Location = new System.Drawing.Point(669, 183); + this.lbVendedorDia.BackColor = System.Drawing.Color.Transparent; + this.lbVendedorDia.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbVendedorDia.ForeColor = System.Drawing.Color.Transparent; + this.lbVendedorDia.Location = new System.Drawing.Point(862, 318); this.lbVendedorDia.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbVendedorDia.Name = "lbVendedorDia"; - this.lbVendedorDia.Size = new System.Drawing.Size(132, 20); + this.lbVendedorDia.Size = new System.Drawing.Size(154, 30); this.lbVendedorDia.TabIndex = 7; this.lbVendedorDia.Text = "Mejor vendedos:"; + this.lbVendedorDia.Click += new System.EventHandler(this.lbVendedorDia_Click); // // lbTotalDia // this.lbTotalDia.AutoSize = true; - this.lbTotalDia.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbTotalDia.Location = new System.Drawing.Point(424, 262); + this.lbTotalDia.BackColor = System.Drawing.Color.Transparent; + this.lbTotalDia.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbTotalDia.ForeColor = System.Drawing.Color.Transparent; + this.lbTotalDia.Location = new System.Drawing.Point(444, 438); this.lbTotalDia.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbTotalDia.Name = "lbTotalDia"; - this.lbTotalDia.Size = new System.Drawing.Size(105, 20); + this.lbTotalDia.Size = new System.Drawing.Size(120, 30); this.lbTotalDia.TabIndex = 8; this.lbTotalDia.Text = "Total del dia:"; // // lbTotalMes // this.lbTotalMes.AutoSize = true; - this.lbTotalMes.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbTotalMes.Location = new System.Drawing.Point(424, 543); + this.lbTotalMes.BackColor = System.Drawing.Color.Transparent; + this.lbTotalMes.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbTotalMes.ForeColor = System.Drawing.Color.Transparent; + this.lbTotalMes.Location = new System.Drawing.Point(440, 689); this.lbTotalMes.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbTotalMes.Name = "lbTotalMes"; - this.lbTotalMes.Size = new System.Drawing.Size(115, 20); + this.lbTotalMes.Size = new System.Drawing.Size(129, 30); this.lbTotalMes.TabIndex = 9; this.lbTotalMes.Text = "Total del Mes:"; // // lbVendedorMes // this.lbVendedorMes.AutoSize = true; - this.lbVendedorMes.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbVendedorMes.Location = new System.Drawing.Point(669, 471); + this.lbVendedorMes.BackColor = System.Drawing.Color.Transparent; + this.lbVendedorMes.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbVendedorMes.ForeColor = System.Drawing.Color.Transparent; + this.lbVendedorMes.Location = new System.Drawing.Point(865, 561); this.lbVendedorMes.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbVendedorMes.Name = "lbVendedorMes"; - this.lbVendedorMes.Size = new System.Drawing.Size(132, 20); + this.lbVendedorMes.Size = new System.Drawing.Size(151, 30); this.lbVendedorMes.TabIndex = 11; - this.lbVendedorMes.Text = "Mejor vendedos:"; + this.lbVendedorMes.Text = "Mejor vendedor:"; + this.lbVendedorMes.Click += new System.EventHandler(this.lbVendedorMes_Click); // // lbProductoMes // this.lbProductoMes.AutoSize = true; - this.lbProductoMes.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbProductoMes.Location = new System.Drawing.Point(669, 399); + this.lbProductoMes.BackColor = System.Drawing.Color.Transparent; + this.lbProductoMes.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbProductoMes.ForeColor = System.Drawing.Color.Transparent; + this.lbProductoMes.Location = new System.Drawing.Point(865, 489); this.lbProductoMes.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbProductoMes.Name = "lbProductoMes"; - this.lbProductoMes.Size = new System.Drawing.Size(180, 20); + this.lbProductoMes.Size = new System.Drawing.Size(210, 30); this.lbProductoMes.TabIndex = 10; this.lbProductoMes.Text = "Producto mas vendido:"; + this.lbProductoMes.Click += new System.EventHandler(this.lbProductoMes_Click); + // + // pictureBox2 + // + this.pictureBox2.BackColor = System.Drawing.Color.Transparent; + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox2.Image = global::compabetov2.Properties.Resources.check1; + this.pictureBox2.Location = new System.Drawing.Point(1047, 689); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(100, 69); + this.pictureBox2.TabIndex = 28; + this.pictureBox2.TabStop = false; + this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click); // // Estadiscticas // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1067, 593); + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); + this.BackgroundImage = global::compabetov2.Properties.Resources.Form; + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.ClientSize = new System.Drawing.Size(1147, 758); + this.ControlBox = false; + this.Controls.Add(this.pictureBox2); this.Controls.Add(this.lbVendedorMes); this.Controls.Add(this.lbProductoMes); this.Controls.Add(this.lbTotalMes); @@ -265,17 +304,19 @@ this.Controls.Add(this.lbVendedorDia); this.Controls.Add(this.lbProductDia); this.Controls.Add(this.dgvMes); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); this.Controls.Add(this.btnBuscar); this.Controls.Add(this.dgvDia); this.Controls.Add(this.dtpBuscar); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); + this.DoubleBuffered = true; + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "Estadiscticas"; - this.Text = "Estadiscticas"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Load += new System.EventHandler(this.Estadiscticas_Load); ((System.ComponentModel.ISupportInitialize)(this.dgvDia)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvMes)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -303,5 +344,6 @@ private System.Windows.Forms.Label lbTotalMes; private System.Windows.Forms.Label lbVendedorMes; private System.Windows.Forms.Label lbProductoMes; + private System.Windows.Forms.PictureBox pictureBox2; } } \ No newline at end of file diff --git a/Estadiscticas.cs b/Estadiscticas.cs index a54d5bf..13ed97e 100644 --- a/Estadiscticas.cs +++ b/Estadiscticas.cs @@ -309,5 +309,30 @@ namespace compabetov2 { } + + private void lbVendedorMes_Click(object sender, EventArgs e) + { + + } + + private void lbProductoMes_Click(object sender, EventArgs e) + { + + } + + private void lbVendedorDia_Click(object sender, EventArgs e) + { + + } + + private void lbProductDia_Click(object sender, EventArgs e) + { + + } + + private void pictureBox2_Click(object sender, EventArgs e) + { + this.Close(); + } } } diff --git a/Estadiscticas.resx b/Estadiscticas.resx index 3d753bc..61e5f8b 100644 --- a/Estadiscticas.resx +++ b/Estadiscticas.resx @@ -129,6 +129,30 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True diff --git a/Ventas/vender.Designer.cs b/Ventas/vender.Designer.cs index f538912..171ed8e 100644 --- a/Ventas/vender.Designer.cs +++ b/Ventas/vender.Designer.cs @@ -278,6 +278,7 @@ // bntImprimir // this.bntImprimir.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); + this.bntImprimir.Enabled = false; this.bntImprimir.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); this.bntImprimir.ForeColor = System.Drawing.Color.Transparent; this.bntImprimir.Location = new System.Drawing.Point(1055, 210); @@ -293,7 +294,7 @@ // this.responsablecb.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); this.responsablecb.FormattingEnabled = true; - this.responsablecb.Location = new System.Drawing.Point(1371, 220); + this.responsablecb.Location = new System.Drawing.Point(1371, 218); this.responsablecb.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.responsablecb.Name = "responsablecb"; this.responsablecb.Size = new System.Drawing.Size(227, 37); @@ -303,10 +304,11 @@ // btnFiar // this.btnFiar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); + this.btnFiar.Enabled = false; this.btnFiar.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); this.btnFiar.ForeColor = System.Drawing.Color.Transparent; this.btnFiar.Location = new System.Drawing.Point(1213, 210); - this.btnFiar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnFiar.Margin = new System.Windows.Forms.Padding(4); this.btnFiar.Name = "btnFiar"; this.btnFiar.Size = new System.Drawing.Size(151, 54); this.btnFiar.TabIndex = 19; @@ -317,9 +319,10 @@ // btnEnviar // this.btnEnviar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); + this.btnEnviar.Enabled = false; this.btnEnviar.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); this.btnEnviar.ForeColor = System.Drawing.Color.Transparent; - this.btnEnviar.Location = new System.Drawing.Point(1055, 137); + this.btnEnviar.Location = new System.Drawing.Point(1136, 270); this.btnEnviar.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnEnviar.Name = "btnEnviar"; this.btnEnviar.Size = new System.Drawing.Size(151, 54); @@ -332,7 +335,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1370, 627); + this.ClientSize = new System.Drawing.Size(1828, 627); this.ControlBox = false; this.Controls.Add(this.btnEnviar); this.Controls.Add(this.btnFiar); diff --git a/Ventas/vender.cs b/Ventas/vender.cs index 9cad6b1..f95b80f 100644 --- a/Ventas/vender.cs +++ b/Ventas/vender.cs @@ -702,7 +702,23 @@ namespace compabetov2 private void responsablecb_SelectedIndexChanged(object sender, EventArgs e) { - bntImprimir.Enabled = responsablecb.SelectedIndex != -1; + // Verificar si hay un elemento seleccionado en el ComboBox + if (responsablecb.SelectedItem != null) + { + // Habilitar los botones + bntImprimir.Enabled = true; + btnFiar.Enabled = true; + btnEnviar.Enabled = true; + } + else { + + bntImprimir.Enabled = false; + btnFiar.Enabled = false; + btnEnviar.Enabled = false; + + + } + } diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index 328831c..2790b6e 100644 Binary files a/bin/Debug/compabetov2.exe and b/bin/Debug/compabetov2.exe differ diff --git a/bin/Debug/compabetov2.pdb b/bin/Debug/compabetov2.pdb index 5fe49f1..80ff388 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/bin/Debug/data.db b/bin/Debug/data.db index e17629b..aea5672 100644 Binary files a/bin/Debug/data.db and b/bin/Debug/data.db differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 4382aa9..10a1a65 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d031cc8..5f3125c 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 9bf445e..39bc854 100644 Binary files a/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/obj/Debug/compabetov2.csproj.AssemblyReference.cache b/obj/Debug/compabetov2.csproj.AssemblyReference.cache index 9e7d08c..a853f99 100644 Binary files a/obj/Debug/compabetov2.csproj.AssemblyReference.cache and b/obj/Debug/compabetov2.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/compabetov2.csproj.CopyComplete b/obj/Debug/compabetov2.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 diff --git a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt index 4952edf..63a6ce5 100644 --- a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt +++ b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt @@ -1,63 +1,7 @@ -C:\Users\Googl\Documents\compabetov2\bin\Debug\compabetov2.exe.config -C:\Users\Googl\Documents\compabetov2\bin\Debug\compabetov2.exe -C:\Users\Googl\Documents\compabetov2\bin\Debug\compabetov2.pdb -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.csproj.AssemblyReference.cache -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.Properties.Resources.resources -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.csproj.GenerateResource.cache -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.csproj.CoreCompileInputs.cache -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.exe -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.pdb -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.login.resources -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.MenuPrincipal.resources -C:\Users\Googl\Documents\compabetov2\bin\Debug\EntityFramework.dll -C:\Users\Googl\Documents\compabetov2\bin\Debug\EntityFramework.SqlServer.dll -C:\Users\Googl\Documents\compabetov2\bin\Debug\System.Data.SQLite.dll -C:\Users\Googl\Documents\compabetov2\bin\Debug\System.Data.SQLite.EF6.dll -C:\Users\Googl\Documents\compabetov2\bin\Debug\System.Data.SQLite.Linq.dll -C:\Users\Googl\Documents\compabetov2\bin\Debug\EntityFramework.xml -C:\Users\Googl\Documents\compabetov2\bin\Debug\EntityFramework.SqlServer.xml -C:\Users\Googl\Documents\compabetov2\bin\Debug\System.Data.SQLite.xml -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.csproj.CopyComplete -C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.exe.config -C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.exe -C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.pdb -C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\EntityFramework.dll -C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\EntityFramework.SqlServer.dll -C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\System.Data.SQLite.dll -C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\System.Data.SQLite.EF6.dll -C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\System.Data.SQLite.Linq.dll -C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\EntityFramework.xml -C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\EntityFramework.SqlServer.xml -C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\System.Data.SQLite.xml -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.AssemblyReference.cache -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.login.resources -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.MenuPrincipal.resources -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Properties.Resources.resources -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.GenerateResource.cache -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.CoreCompileInputs.cache -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.CopyComplete -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.exe -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.pdb -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.inventario.resources -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.cuentas.resources -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.mermas.resources -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.personal.resources -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.vender.resources -C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.cuentas.resources -C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.inventario.resources -C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.mermas.resources -C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.personal.resources -C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.vender.resources -C:\Users\Googl\Documents\compabetov2\bin\Debug\compabetov2.exe.manifest -C:\Users\Googl\Documents\compabetov2\bin\Debug\compabetov2.application -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.exe.manifest -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.application -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.envios.resources -C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.exe.manifest -C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.application -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.exe.manifest -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.application -C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.envios.resources +C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll +C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll +C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll +C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\SqlServerSpatial140.dll C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe.config C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe.manifest C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.application @@ -65,6 +9,7 @@ C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.pdb C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.dll C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.SqlServer.dll +C:\Users\Googl\Documents\compabetoOG\bin\Debug\Microsoft.SqlServer.Types.dll C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.dll C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.EF6.dll C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.Linq.dll @@ -72,15 +17,27 @@ C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.xml C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.SqlServer.xml C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.xml C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.AssemblyReference.cache +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarEmpleado1.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin1.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.EditarEmpleado1.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Estadiscticas.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.cuentas.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.envios.resources C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.inventario.resources C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.login.resources C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.MenuPrincipal.resources C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.mermas.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.personal.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Properties.Resources.resources C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.vender.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.verMerma.resources C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.GenerateResource.cache C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.CoreCompileInputs.cache C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.exe.manifest @@ -88,43 +45,3 @@ C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.application C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.CopyComplete C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.exe C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.pdb -C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources -C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources -C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources -C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources -<<<<<<< HEAD -======= -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources ->>>>>>> c224b1f121cf870873d6bc2414ec92b69d8a3668 -C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources -C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.verMerma.resources -C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.verMerma.resources -C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\SqlServerSpatial140.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\Microsoft.SqlServer.Types.dll -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.verproductos.resources -C:\Users\carsu\source\repos\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll -C:\Users\carsu\source\repos\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll -C:\Users\carsu\source\repos\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll -C:\Users\carsu\source\repos\compabetoOG\bin\Debug\SqlServerTypes\x86\SqlServerSpatial140.dll -C:\Users\carsu\source\repos\compabetoOG\bin\Debug\Microsoft.SqlServer.Types.dll -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarEmpleado1.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarLogin1.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.EditarEmpleado1.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin1.resources -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarEmpleado1.resources -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.AgregarLogin1.resources -C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Empleados.EditarEmpleado1.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Estadiscticas.resources -C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.Estadiscticas.resources ->>>>>>> 50722c223445e6db2543329a4b1d825e6fc26343 diff --git a/obj/Debug/compabetov2.csproj.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache index 4648636..8b980ce 100644 Binary files a/obj/Debug/compabetov2.csproj.GenerateResource.cache and b/obj/Debug/compabetov2.csproj.GenerateResource.cache differ diff --git a/obj/Debug/compabetov2.exe b/obj/Debug/compabetov2.exe index 328831c..2790b6e 100644 Binary files a/obj/Debug/compabetov2.exe and b/obj/Debug/compabetov2.exe differ diff --git a/obj/Debug/compabetov2.pdb b/obj/Debug/compabetov2.pdb index 5fe49f1..80ff388 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ