Mermas Design

2024-01-22 02:36:18 -07:00
parent 2db5006ebb
commit 38de489250
67 changed files with 364 additions and 186 deletions
@@ -28,8 +28,6 @@
        /// </summary>
        private void InitializeComponent()
        {
-            this.btnCancelar = new System.Windows.Forms.Button();
-            this.btnAgregar = new System.Windows.Forms.Button();
            this.txtResponsable = new System.Windows.Forms.TextBox();
            this.label3 = new System.Windows.Forms.Label();
            this.dtFecha = new System.Windows.Forms.DateTimePicker();
@@ -37,31 +35,12 @@
            this.label2 = new System.Windows.Forms.Label();
            this.label1 = new System.Windows.Forms.Label();
            this.label4 = new System.Windows.Forms.Label();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.pictureBox2 = new System.Windows.Forms.PictureBox();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
            this.SuspendLayout();
            // 
-            // btnCancelar
-            // 
-            this.btnCancelar.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnCancelar.Location = new System.Drawing.Point(585, 695);
-            this.btnCancelar.Margin = new System.Windows.Forms.Padding(4);
-            this.btnCancelar.Name = "btnCancelar";
-            this.btnCancelar.Size = new System.Drawing.Size(124, 55);
-            this.btnCancelar.TabIndex = 15;
-            this.btnCancelar.Text = "Cancelar";
-            this.btnCancelar.UseVisualStyleBackColor = true;
-            // 
-            // btnAgregar
-            // 
-            this.btnAgregar.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnAgregar.Location = new System.Drawing.Point(412, 695);
-            this.btnAgregar.Margin = new System.Windows.Forms.Padding(4);
-            this.btnAgregar.Name = "btnAgregar";
-            this.btnAgregar.Size = new System.Drawing.Size(124, 55);
-            this.btnAgregar.TabIndex = 14;
-            this.btnAgregar.Text = "Editar";
-            this.btnAgregar.UseVisualStyleBackColor = true;
-            this.btnAgregar.Click += new System.EventHandler(this.btnAgregar_Click);
-            // 
            // txtResponsable
            // 
            this.txtResponsable.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -140,6 +119,30 @@
            this.label4.TabIndex = 16;
            this.label4.Text = "Modificar Merma";
            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.BackColor = System.Drawing.Color.Transparent;
+            this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+            this.pictureBox1.Image = global::compabetov2.Properties.Resources.cancel1;
+            this.pictureBox1.Location = new System.Drawing.Point(611, 695);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(100, 69);
+            this.pictureBox1.TabIndex = 17;
+            this.pictureBox1.TabStop = false;
+            this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_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(471, 695);
+            this.pictureBox2.Name = "pictureBox2";
+            this.pictureBox2.Size = new System.Drawing.Size(100, 69);
+            this.pictureBox2.TabIndex = 18;
+            this.pictureBox2.TabStop = false;
+            this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click);
+            // 
            // ActualizarMerma
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
@@ -149,9 +152,9 @@
            this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
            this.ClientSize = new System.Drawing.Size(1102, 776);
            this.ControlBox = false;
+            this.Controls.Add(this.pictureBox2);
+            this.Controls.Add(this.pictureBox1);
            this.Controls.Add(this.label4);
-            this.Controls.Add(this.btnCancelar);
-            this.Controls.Add(this.btnAgregar);
            this.Controls.Add(this.txtResponsable);
            this.Controls.Add(this.label3);
            this.Controls.Add(this.dtFecha);
@@ -162,15 +165,14 @@
            this.Margin = new System.Windows.Forms.Padding(4);
            this.Name = "ActualizarMerma";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();

        }

        #endregion
-
-        private System.Windows.Forms.Button btnCancelar;
-        private System.Windows.Forms.Button btnAgregar;
        private System.Windows.Forms.TextBox txtResponsable;
        private System.Windows.Forms.Label label3;
        private System.Windows.Forms.DateTimePicker dtFecha;
@@ -178,5 +180,7 @@
        private System.Windows.Forms.Label label2;
        private System.Windows.Forms.Label label1;
        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.PictureBox pictureBox2;
    }
 }
@@ -52,5 +52,32 @@ namespace compabetov2
        {

        }
+
+        private void pictureBox2_Click(object sender, EventArgs e)
+        {
+            // Mostrar mensaje de confirmación
+            DialogResult result = MessageBox.Show("¿En realidad quieres hacer esta modificación a esta merma?", "Confirmar Modificación", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
+
+            // Verificar la respuesta del usuario
+            if (result == DialogResult.Yes)
+            {
+                // Si el usuario hace clic en "Sí", proceder con la actualización
+                Merma nuevaMerma = new Merma(merma.idMerma, dtFecha.Text, txtResponsable.Text, txtDescripcion.Text);
+
+                if (service.actualizarMerma(nuevaMerma))
+                {
+                    MessageBox.Show("Merma actualizada");
+                    ventanaPadre.llenarPanel();
+                    Close();
+                }
+            }
+            // Si el usuario hace clic en "No" o cierra la advertencia, no se realiza la actualización
+        }
+
+
+        private void pictureBox1_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
    }
 }
@@ -34,29 +34,34 @@
            this.dtFecha = new System.Windows.Forms.DateTimePicker();
            this.label3 = new System.Windows.Forms.Label();
            this.txtResponsable = new System.Windows.Forms.TextBox();
-            this.btnAgregar = new System.Windows.Forms.Button();
-            this.btnCancelar = new System.Windows.Forms.Button();
+            this.pictureBox2 = new System.Windows.Forms.PictureBox();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.label4 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
            this.SuspendLayout();
            // 
            // label1
            // 
            this.label1.AutoSize = true;
+            this.label1.BackColor = System.Drawing.Color.Transparent;
            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label1.Location = new System.Drawing.Point(167, 96);
-            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1.ForeColor = System.Drawing.Color.Transparent;
+            this.label1.Location = new System.Drawing.Point(203, 319);
            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(69, 24);
+            this.label1.Size = new System.Drawing.Size(86, 29);
            this.label1.TabIndex = 0;
            this.label1.Text = "Fecha:";
            // 
            // label2
            // 
            this.label2.AutoSize = true;
+            this.label2.BackColor = System.Drawing.Color.Transparent;
            this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label2.Location = new System.Drawing.Point(11, 92);
-            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label2.ForeColor = System.Drawing.Color.Transparent;
+            this.label2.Location = new System.Drawing.Point(475, 381);
            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(115, 24);
+            this.label2.Size = new System.Drawing.Size(147, 29);
            this.label2.TabIndex = 1;
            this.label2.Text = "Descripcion:";
            this.label2.Click += new System.EventHandler(this.label2_Click);
@@ -64,77 +69,103 @@
            // txtDescripcion
            // 
            this.txtDescripcion.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtDescripcion.Location = new System.Drawing.Point(11, 126);
-            this.txtDescripcion.Margin = new System.Windows.Forms.Padding(2);
+            this.txtDescripcion.Location = new System.Drawing.Point(198, 423);
+            this.txtDescripcion.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.txtDescripcion.Multiline = true;
            this.txtDescripcion.Name = "txtDescripcion";
-            this.txtDescripcion.Size = new System.Drawing.Size(578, 195);
+            this.txtDescripcion.Size = new System.Drawing.Size(769, 239);
            this.txtDescripcion.TabIndex = 2;
            // 
            // dtFecha
            // 
            this.dtFecha.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.dtFecha.Location = new System.Drawing.Point(241, 92);
+            this.dtFecha.Location = new System.Drawing.Point(371, 314);
+            this.dtFecha.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.dtFecha.Name = "dtFecha";
-            this.dtFecha.Size = new System.Drawing.Size(348, 29);
+            this.dtFecha.Size = new System.Drawing.Size(463, 34);
            this.dtFecha.TabIndex = 3;
            // 
            // label3
            // 
            this.label3.AutoSize = true;
+            this.label3.BackColor = System.Drawing.Color.Transparent;
            this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label3.Location = new System.Drawing.Point(110, 17);
-            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label3.ForeColor = System.Drawing.Color.Transparent;
+            this.label3.Location = new System.Drawing.Point(193, 233);
            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(126, 24);
+            this.label3.Size = new System.Drawing.Size(162, 29);
            this.label3.TabIndex = 4;
            this.label3.Text = "Responsable:";
            // 
            // txtResponsable
            // 
            this.txtResponsable.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtResponsable.Location = new System.Drawing.Point(241, 17);
+            this.txtResponsable.Location = new System.Drawing.Point(371, 233);
+            this.txtResponsable.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtResponsable.Name = "txtResponsable";
-            this.txtResponsable.Size = new System.Drawing.Size(348, 29);
+            this.txtResponsable.Size = new System.Drawing.Size(463, 34);
            this.txtResponsable.TabIndex = 5;
            // 
-            // btnAgregar
+            // pictureBox2
            // 
-            this.btnAgregar.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnAgregar.Location = new System.Drawing.Point(375, 347);
-            this.btnAgregar.Name = "btnAgregar";
-            this.btnAgregar.Size = new System.Drawing.Size(93, 45);
-            this.btnAgregar.TabIndex = 6;
-            this.btnAgregar.Text = "Agregar";
-            this.btnAgregar.UseVisualStyleBackColor = true;
-            this.btnAgregar.Click += new System.EventHandler(this.btnAgregar_Click);
+            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(475, 684);
+            this.pictureBox2.Name = "pictureBox2";
+            this.pictureBox2.Size = new System.Drawing.Size(100, 69);
+            this.pictureBox2.TabIndex = 20;
+            this.pictureBox2.TabStop = false;
+            this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click);
            // 
-            // btnCancelar
+            // pictureBox1
            // 
-            this.btnCancelar.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnCancelar.Location = new System.Drawing.Point(483, 347);
-            this.btnCancelar.Name = "btnCancelar";
-            this.btnCancelar.Size = new System.Drawing.Size(93, 45);
-            this.btnCancelar.TabIndex = 7;
-            this.btnCancelar.Text = "Cancelar";
-            this.btnCancelar.UseVisualStyleBackColor = true;
+            this.pictureBox1.BackColor = System.Drawing.Color.Transparent;
+            this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+            this.pictureBox1.Image = global::compabetov2.Properties.Resources.cancel1;
+            this.pictureBox1.Location = new System.Drawing.Point(581, 684);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(100, 69);
+            this.pictureBox1.TabIndex = 19;
+            this.pictureBox1.TabStop = false;
+            this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.BackColor = System.Drawing.Color.Transparent;
+            this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label4.ForeColor = System.Drawing.Color.Transparent;
+            this.label4.Location = new System.Drawing.Point(455, 161);
+            this.label4.Name = "label4";
+            this.label4.RightToLeft = System.Windows.Forms.RightToLeft.No;
+            this.label4.Size = new System.Drawing.Size(180, 29);
+            this.label4.TabIndex = 21;
+            this.label4.Text = "Agregar Merma";
            // 
            // agregarmermas
            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(600, 404);
-            this.Controls.Add(this.btnCancelar);
-            this.Controls.Add(this.btnAgregar);
+            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(1102, 747);
+            this.ControlBox = false;
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.pictureBox2);
+            this.Controls.Add(this.pictureBox1);
            this.Controls.Add(this.txtResponsable);
            this.Controls.Add(this.label3);
            this.Controls.Add(this.dtFecha);
            this.Controls.Add(this.txtDescripcion);
            this.Controls.Add(this.label2);
            this.Controls.Add(this.label1);
-            this.Margin = new System.Windows.Forms.Padding(2);
+            this.DoubleBuffered = true;
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.Name = "agregarmermas";
-            this.Text = "Agregar Merma";
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();

@@ -148,7 +179,8 @@
        private System.Windows.Forms.DateTimePicker dtFecha;
        private System.Windows.Forms.Label label3;
        private System.Windows.Forms.TextBox txtResponsable;
-        private System.Windows.Forms.Button btnAgregar;
-        private System.Windows.Forms.Button btnCancelar;
+        private System.Windows.Forms.PictureBox pictureBox2;
+        private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.Label label4;
    }
 }
@@ -0,0 +1,70 @@
+using compabetov2.database;
+using compabetov2.database.modelos;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace compabetov2
+{
+    public partial class agregarmermas : Form
+    {
+        private mermas ventanaPadre;
+        public agregarmermas(mermas ventanaPadre)
+        {
+            InitializeComponent();
+            this.ventanaPadre = ventanaPadre;
+        }
+
+        private void label2_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void btnAgregar_Click(object sender, EventArgs e)
+        {
+            string descripcion = txtDescripcion.Text;
+            string fecha = dtFecha.Text;
+            string responsable = txtResponsable.Text;
+            Merma merma = new Merma(-1,fecha,responsable,descripcion);
+            if (service.insertarMerma(merma)) {
+                ventanaPadre.llenarPanel();
+                Close();
+            }
+        }
+
+        private void pictureBox2_Click(object sender, EventArgs e)
+        {
+            // Mostrar mensaje de confirmación
+            DialogResult result = MessageBox.Show("¿En realidad quieres agregar esta nueva merma?", "Confirmar Agregar", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
+
+            // Verificar la respuesta del usuario
+            if (result == DialogResult.Yes)
+            {
+                // Si el usuario hace clic en "Sí", proceder con la inserción
+                string descripcion = txtDescripcion.Text;
+                string fecha = dtFecha.Text;
+                string responsable = txtResponsable.Text;
+
+                Merma nuevaMerma = new Merma(-1, fecha, responsable, descripcion);
+
+                if (service.insertarMerma(nuevaMerma))
+                {
+                    MessageBox.Show("Nueva merma agregada");
+                    ventanaPadre.llenarPanel();
+                    Close();
+                }
+            }
+        }
+
+        private void pictureBox1_Click(object sender, EventArgs e)
+        {
+            this.Close  (); 
+        }
+    }
+}
@@ -186,7 +186,7 @@
            // mermaPanel
            // 
            this.mermaPanel.Location = new System.Drawing.Point(572, 348);
-            this.mermaPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.mermaPanel.Margin = new System.Windows.Forms.Padding(4);
            this.mermaPanel.Name = "mermaPanel";
            this.mermaPanel.Size = new System.Drawing.Size(1039, 495);
            this.mermaPanel.TabIndex = 16;
@@ -196,7 +196,7 @@
            // 
            this.btnAgregar.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
            this.btnAgregar.Location = new System.Drawing.Point(1049, 270);
-            this.btnAgregar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnAgregar.Margin = new System.Windows.Forms.Padding(4);
            this.btnAgregar.Name = "btnAgregar";
            this.btnAgregar.Size = new System.Drawing.Size(119, 34);
            this.btnAgregar.TabIndex = 17;
@@ -35,13 +35,15 @@
            this.label2 = new System.Windows.Forms.Label();
            this.label1 = new System.Windows.Forms.Label();
            this.label4 = new System.Windows.Forms.Label();
+            this.cerrarlabel = new System.Windows.Forms.PictureBox();
+            ((System.ComponentModel.ISupportInitialize)(this.cerrarlabel)).BeginInit();
            this.SuspendLayout();
            // 
            // txtResponsable
            // 
            this.txtResponsable.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
            this.txtResponsable.Location = new System.Drawing.Point(371, 233);
-            this.txtResponsable.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtResponsable.Margin = new System.Windows.Forms.Padding(4);
            this.txtResponsable.Name = "txtResponsable";
            this.txtResponsable.Size = new System.Drawing.Size(463, 34);
            this.txtResponsable.TabIndex = 11;
@@ -62,7 +64,7 @@
            // 
            this.dtFecha.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
            this.dtFecha.Location = new System.Drawing.Point(371, 314);
-            this.dtFecha.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dtFecha.Margin = new System.Windows.Forms.Padding(4);
            this.dtFecha.Name = "dtFecha";
            this.dtFecha.Size = new System.Drawing.Size(463, 34);
            this.dtFecha.TabIndex = 9;
@@ -107,20 +109,34 @@
            this.label4.BackColor = System.Drawing.Color.Transparent;
            this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
            this.label4.ForeColor = System.Drawing.Color.Transparent;
-            this.label4.Location = new System.Drawing.Point(448, 169);
+            this.label4.Location = new System.Drawing.Point(491, 178);
            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(193, 29);
+            this.label4.Size = new System.Drawing.Size(131, 29);
            this.label4.TabIndex = 17;
-            this.label4.Text = "Modificar Merma";
+            this.label4.Text = "Ver Merma";
+            // 
+            // cerrarlabel
+            // 
+            this.cerrarlabel.BackColor = System.Drawing.Color.Transparent;
+            this.cerrarlabel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.cerrarlabel.Image = global::compabetov2.Properties.Resources.cancel1;
+            this.cerrarlabel.Location = new System.Drawing.Point(541, 720);
+            this.cerrarlabel.Name = "cerrarlabel";
+            this.cerrarlabel.Size = new System.Drawing.Size(125, 76);
+            this.cerrarlabel.TabIndex = 18;
+            this.cerrarlabel.TabStop = false;
+            this.cerrarlabel.Click += new System.EventHandler(this.pictureBox1_Click);
            // 
            // verMerma
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            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(1102, 747);
+            this.ClientSize = new System.Drawing.Size(1102, 808);
            this.ControlBox = false;
+            this.Controls.Add(this.cerrarlabel);
            this.Controls.Add(this.label4);
            this.Controls.Add(this.txtResponsable);
            this.Controls.Add(this.label3);
@@ -129,9 +145,11 @@
            this.Controls.Add(this.label2);
            this.Controls.Add(this.label1);
            this.DoubleBuffered = true;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
            this.Name = "verMerma";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
            this.Load += new System.EventHandler(this.verMerma_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.cerrarlabel)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();

@@ -146,5 +164,6 @@
        private System.Windows.Forms.Label label2;
        private System.Windows.Forms.Label label1;
        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.PictureBox cerrarlabel;
    }
 }
@@ -19,8 +19,12 @@ namespace compabetov2
            InitializeComponent();
            this.merma = merma;
            llenarComponentes();
+            
        }

+
+
+
        private void llenarComponentes()
        {
            txtDescripcion.Text = merma.razon;
@@ -28,9 +32,16 @@ namespace compabetov2
            dtFecha.Text = merma.fecha;
        }

+       
+
        private void verMerma_Load(object sender, EventArgs e)
        {

        }
+
+        private void pictureBox1_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
    }
 }
@@ -80,6 +80,46 @@ namespace compabetov2.Properties {
            }
        }
        
+        /// <summary>
+        ///   Busca un recurso adaptado de tipo System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap cancel {
+            get {
+                object obj = ResourceManager.GetObject("cancel", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Busca un recurso adaptado de tipo System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap cancel1 {
+            get {
+                object obj = ResourceManager.GetObject("cancel1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Busca un recurso adaptado de tipo System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap check {
+            get {
+                object obj = ResourceManager.GetObject("check", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Busca un recurso adaptado de tipo System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap check1 {
+            get {
+                object obj = ResourceManager.GetObject("check1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
        /// <summary>
        ///   Busca un recurso adaptado de tipo System.Drawing.Bitmap.
        /// </summary>
@@ -124,6 +124,9 @@
  <data name="Cuadro" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Cuadro.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="Form" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Form.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="Cuentas" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Cuentas.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -139,6 +142,9 @@
  <data name="Rectangle 1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Rectangle 1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="Envios" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Envios.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -154,12 +160,6 @@
  <data name="cua1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\cua1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="Personal" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Personal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Menui" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Menui.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="mermas" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\mermas.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -178,6 +178,9 @@
  <data name="cua" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\cua.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="check" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\check.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="LoginOriginal" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\LoginOriginal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -187,11 +190,14 @@
  <data name="mas" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\mas.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="HomeroMenu" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\HomeroMenu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="productoi" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\productoi.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="Menui1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Menui1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Menui" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Menui.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="rec" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\rec.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -202,16 +208,22 @@
  <data name="Modelo" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Modelo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="HomeroMenu" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\HomeroMenu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="reportesi" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\reportesi.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Menui1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Menui1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bg" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="Form" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Form.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="reportesi" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\reportesi.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Personal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Personal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="cancel1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cancel1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="check1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\check1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
 </root>
@@ -1,41 +0,0 @@
-using compabetov2.database;
-using compabetov2.database.modelos;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace compabetov2
-{
-    public partial class agregarmermas : Form
-    {
-        private mermas ventanaPadre;
-        public agregarmermas(mermas ventanaPadre)
-        {
-            InitializeComponent();
-            this.ventanaPadre = ventanaPadre;
-        }
-
-        private void label2_Click(object sender, EventArgs e)
-        {
-
-        }
-
-        private void btnAgregar_Click(object sender, EventArgs e)
-        {
-            string descripcion = txtDescripcion.Text;
-            string fecha = dtFecha.Text;
-            string responsable = txtResponsable.Text;
-            Merma merma = new Merma(-1,fecha,responsable,descripcion);
-            if (service.insertarMerma(merma)) {
-                ventanaPadre.llenarPanel();
-                Close();
-            }
-        }
-    }
-}
@@ -106,34 +106,34 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="ActualizarMerma.cs">
+    <Compile Include="Merma\ActualizarMerma.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="ActualizarMerma.Designer.cs">
+    <Compile Include="Merma\ActualizarMerma.Designer.cs">
      <DependentUpon>ActualizarMerma.cs</DependentUpon>
    </Compile>
-    <Compile Include="AgregarEmpleado.cs">
+    <Compile Include="Empleados\AgregarEmpleado.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="AgregarEmpleado.Designer.cs">
+    <Compile Include="Empleados\AgregarEmpleado.Designer.cs">
      <DependentUpon>AgregarEmpleado.cs</DependentUpon>
    </Compile>
-    <Compile Include="AgregarLogin.cs">
+    <Compile Include="Empleados\AgregarLogin.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="AgregarLogin.Designer.cs">
+    <Compile Include="Empleados\AgregarLogin.Designer.cs">
      <DependentUpon>AgregarLogin.cs</DependentUpon>
    </Compile>
-    <Compile Include="agregarmermas.cs">
+    <Compile Include="Merma\agregarmermas.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="agregarmermas.Designer.cs">
+    <Compile Include="Merma\agregarmermas.Designer.cs">
      <DependentUpon>agregarmermas.cs</DependentUpon>
    </Compile>
-    <Compile Include="cuentas.cs">
+    <Compile Include="Cuentas\cuentas.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="cuentas.Designer.cs">
+    <Compile Include="Cuentas\cuentas.Designer.cs">
      <DependentUpon>cuentas.cs</DependentUpon>
    </Compile>
    <Compile Include="database\conexion.cs" />
@@ -150,118 +150,118 @@
    <Compile Include="database\modelos\usuario.cs" />
    <Compile Include="database\modelos\VentaModel.cs" />
    <Compile Include="database\service.cs" />
-    <Compile Include="EditarEmpleado.cs">
+    <Compile Include="Empleados\EditarEmpleado.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="EditarEmpleado.Designer.cs">
+    <Compile Include="Empleados\EditarEmpleado.Designer.cs">
      <DependentUpon>EditarEmpleado.cs</DependentUpon>
    </Compile>
-    <Compile Include="envios.cs">
+    <Compile Include="Envios\envios.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="envios.Designer.cs">
+    <Compile Include="Envios\envios.Designer.cs">
      <DependentUpon>envios.cs</DependentUpon>
    </Compile>
-    <Compile Include="inventario.cs">
+    <Compile Include="Inventario\inventario.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="inventario.Designer.cs">
+    <Compile Include="Inventario\inventario.Designer.cs">
      <DependentUpon>inventario.cs</DependentUpon>
    </Compile>
-    <Compile Include="login.cs">
+    <Compile Include="Principal\login.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="login.Designer.cs">
+    <Compile Include="Principal\login.Designer.cs">
      <DependentUpon>login.cs</DependentUpon>
    </Compile>
-    <Compile Include="MenuPrincipal.cs">
+    <Compile Include="Principal\MenuPrincipal.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="MenuPrincipal.Designer.cs">
+    <Compile Include="Principal\MenuPrincipal.Designer.cs">
      <DependentUpon>MenuPrincipal.cs</DependentUpon>
    </Compile>
-    <Compile Include="mermas.cs">
+    <Compile Include="Merma\mermas.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="mermas.Designer.cs">
+    <Compile Include="Merma\mermas.Designer.cs">
      <DependentUpon>mermas.cs</DependentUpon>
    </Compile>
-    <Compile Include="ModificarContra.cs">
+    <Compile Include="Empleados\ModificarContra.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="ModificarContra.Designer.cs">
+    <Compile Include="Empleados\ModificarContra.Designer.cs">
      <DependentUpon>ModificarContra.cs</DependentUpon>
    </Compile>
-    <Compile Include="personal.cs">
+    <Compile Include="Empleados\personal.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="personal.Designer.cs">
+    <Compile Include="Empleados\personal.Designer.cs">
      <DependentUpon>personal.cs</DependentUpon>
    </Compile>
-    <Compile Include="preguntaLogin.cs">
+    <Compile Include="Empleados\preguntaLogin.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="preguntaLogin.Designer.cs">
+    <Compile Include="Empleados\preguntaLogin.Designer.cs">
      <DependentUpon>preguntaLogin.cs</DependentUpon>
    </Compile>
    <Compile Include="Program.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="SqlServerTypes\Loader.cs" />
-    <Compile Include="vender.cs">
+    <Compile Include="Ventas\vender.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="vender.Designer.cs">
+    <Compile Include="Ventas\vender.Designer.cs">
      <DependentUpon>vender.cs</DependentUpon>
    </Compile>
-    <Compile Include="verMerma.cs">
+    <Compile Include="Merma\verMerma.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="verMerma.Designer.cs">
+    <Compile Include="Merma\verMerma.Designer.cs">
      <DependentUpon>verMerma.cs</DependentUpon>
    </Compile>
-    <EmbeddedResource Include="ActualizarMerma.resx">
+    <EmbeddedResource Include="Merma\ActualizarMerma.resx">
      <DependentUpon>ActualizarMerma.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="AgregarEmpleado.resx">
+    <EmbeddedResource Include="Empleados\AgregarEmpleado.resx">
      <DependentUpon>AgregarEmpleado.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
-    <EmbeddedResource Include="AgregarLogin.resx">
+    <EmbeddedResource Include="Empleados\AgregarLogin.resx">
      <DependentUpon>AgregarLogin.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
-    <EmbeddedResource Include="agregarmermas.resx">
+    <EmbeddedResource Include="Merma\agregarmermas.resx">
      <DependentUpon>agregarmermas.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="cuentas.resx">
+    <EmbeddedResource Include="Cuentas\cuentas.resx">
      <DependentUpon>cuentas.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
-    <EmbeddedResource Include="EditarEmpleado.resx">
+    <EmbeddedResource Include="Empleados\EditarEmpleado.resx">
      <DependentUpon>EditarEmpleado.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="envios.resx">
+    <EmbeddedResource Include="Envios\envios.resx">
      <DependentUpon>envios.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="inventario.resx">
+    <EmbeddedResource Include="Inventario\inventario.resx">
      <DependentUpon>inventario.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="login.resx">
+    <EmbeddedResource Include="Principal\login.resx">
      <DependentUpon>login.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="MenuPrincipal.resx">
+    <EmbeddedResource Include="Principal\MenuPrincipal.resx">
      <DependentUpon>MenuPrincipal.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="mermas.resx">
+    <EmbeddedResource Include="Merma\mermas.resx">
      <DependentUpon>mermas.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="ModificarContra.resx">
+    <EmbeddedResource Include="Empleados\ModificarContra.resx">
      <DependentUpon>ModificarContra.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="personal.resx">
+    <EmbeddedResource Include="Empleados\personal.resx">
      <DependentUpon>personal.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="preguntaLogin.resx">
+    <EmbeddedResource Include="Empleados\preguntaLogin.resx">
      <DependentUpon>preguntaLogin.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Properties\Resources.resx">
@@ -274,10 +274,10 @@
      <DependentUpon>Resources.resx</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
-    <EmbeddedResource Include="vender.resx">
+    <EmbeddedResource Include="Ventas\vender.resx">
      <DependentUpon>vender.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="verMerma.resx">
+    <EmbeddedResource Include="Merma\verMerma.resx">
      <DependentUpon>verMerma.cs</DependentUpon>
    </EmbeddedResource>
    <None Include="compabetov2_TemporaryKey.pfx" />
@@ -382,6 +382,10 @@
    <Content Include="icono.ico" />
    <None Include="Resources\Barra.png" />
    <None Include="Resources\Form.png" />
+    <None Include="Resources\cancel.png" />
+    <None Include="Resources\check.png" />
+    <None Include="Resources\cancel1.png" />
+    <None Include="Resources\check1.png" />
    <Content Include="SqlServerTypes\readme.htm" />
    <Content Include="SqlServerTypes\x64\msvcr120.dll">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>