diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 6fc01b8..3879607 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -1,9 +1,7 @@ { "ExpandedNodes": [ - "", - "\\database", - "\\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 c31e3f9..62ffeba 100644 Binary files a/.vs/compabetoOG/v17/.wsuo and b/.vs/compabetoOG/v17/.wsuo differ diff --git a/Merma/agregarmermas.Designer.cs b/Merma/agregarmermas.Designer.cs index 65f8acc..c11d9e1 100644 --- a/Merma/agregarmermas.Designer.cs +++ b/Merma/agregarmermas.Designer.cs @@ -165,6 +165,7 @@ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "agregarmermas"; + this.Load += new System.EventHandler(this.agregarmermas_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); diff --git a/Merma/agregarmermas.cs b/Merma/agregarmermas.cs index 8476c67..a0345a8 100644 --- a/Merma/agregarmermas.cs +++ b/Merma/agregarmermas.cs @@ -66,5 +66,10 @@ namespace compabetov2 { this.Close (); } + + private void agregarmermas_Load(object sender, EventArgs e) + { + + } } } diff --git a/Ventas/Importe1.Designer.cs b/Ventas/Importe1.Designer.cs index f537f23..c4fecb8 100644 --- a/Ventas/Importe1.Designer.cs +++ b/Ventas/Importe1.Designer.cs @@ -29,37 +29,65 @@ private void InitializeComponent() { this.panelImporte = new System.Windows.Forms.FlowLayoutPanel(); - this.btnAceptar = new System.Windows.Forms.Button(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // panelImporte // - this.panelImporte.Location = new System.Drawing.Point(55, 22); + this.panelImporte.BackColor = System.Drawing.Color.Transparent; + this.panelImporte.Location = new System.Drawing.Point(132, 182); + this.panelImporte.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panelImporte.Name = "panelImporte"; - this.panelImporte.Size = new System.Drawing.Size(677, 364); + this.panelImporte.Size = new System.Drawing.Size(903, 448); this.panelImporte.TabIndex = 1; // - // btnAceptar + // pictureBox2 // - this.btnAceptar.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnAceptar.Location = new System.Drawing.Point(338, 382); - this.btnAceptar.Name = "btnAceptar"; - this.btnAceptar.Size = new System.Drawing.Size(105, 46); - this.btnAceptar.TabIndex = 2; - this.btnAceptar.Text = "Aceptar"; - this.btnAceptar.UseVisualStyleBackColor = true; - this.btnAceptar.Click += new System.EventHandler(this.btnAceptar_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(476, 679); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(100, 69); + this.pictureBox2.TabIndex = 22; + this.pictureBox2.TabStop = false; + this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click_1); + // + // 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(582, 679); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(100, 69); + this.pictureBox1.TabIndex = 21; + this.pictureBox1.TabStop = false; + this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); // // Importe1 // - 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(800, 450); - this.Controls.Add(this.btnAceptar); + 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(1151, 825); + this.ControlBox = false; + this.Controls.Add(this.pictureBox2); + this.Controls.Add(this.pictureBox1); this.Controls.Add(this.panelImporte); + this.DoubleBuffered = true; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "Importe1"; - this.Text = "Importe1"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Load += new System.EventHandler(this.Importe1_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); } @@ -67,6 +95,7 @@ #endregion private System.Windows.Forms.FlowLayoutPanel panelImporte; - private System.Windows.Forms.Button btnAceptar; + private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.PictureBox pictureBox1; } } \ No newline at end of file diff --git a/Ventas/Importe1.cs b/Ventas/Importe1.cs index b4ef03d..6f42eef 100644 --- a/Ventas/Importe1.cs +++ b/Ventas/Importe1.cs @@ -170,5 +170,24 @@ namespace compabetov2.Ventas ventanaPadre.actualizarImporteTotal(); this.Close(); } + + private void pictureBox1_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void pictureBox2_Click(object sender, EventArgs e) + { + ventanaPadre.importes = detalles; + ventanaPadre.actualizarImporteTotal(); + this.Close(); + } + + private void pictureBox2_Click_1(object sender, EventArgs e) + { + ventanaPadre.importes = detalles; + ventanaPadre.actualizarImporteTotal(); + this.Close(); + } } } diff --git a/Ventas/vender.Designer.cs b/Ventas/vender.Designer.cs index 1de6210..76297f3 100644 --- a/Ventas/vender.Designer.cs +++ b/Ventas/vender.Designer.cs @@ -70,10 +70,9 @@ this.lblfecha.AutoSize = true; this.lblfecha.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F); this.lblfecha.ForeColor = System.Drawing.Color.Navy; - this.lblfecha.Location = new System.Drawing.Point(464, 104); - this.lblfecha.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblfecha.Location = new System.Drawing.Point(619, 128); this.lblfecha.Name = "lblfecha"; - this.lblfecha.Size = new System.Drawing.Size(126, 46); + this.lblfecha.Size = new System.Drawing.Size(159, 58); this.lblfecha.TabIndex = 13; this.lblfecha.Text = "label2"; this.lblfecha.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -84,10 +83,9 @@ this.lblhora.AutoSize = true; this.lblhora.Font = new System.Drawing.Font("Microsoft Sans Serif", 60F); this.lblhora.ForeColor = System.Drawing.Color.MediumBlue; - this.lblhora.Location = new System.Drawing.Point(605, 7); - this.lblhora.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblhora.Location = new System.Drawing.Point(807, 9); this.lblhora.Name = "lblhora"; - this.lblhora.Size = new System.Drawing.Size(249, 91); + this.lblhora.Size = new System.Drawing.Size(318, 113); this.lblhora.TabIndex = 12; this.lblhora.Text = "label1"; this.lblhora.Click += new System.EventHandler(this.lblhora_Click); @@ -98,10 +96,10 @@ this.flowLayoutPanel2.Controls.Add(this.panel1); this.flowLayoutPanel2.Controls.Add(this.label1); this.flowLayoutPanel2.Controls.Add(this.labeltotal); - this.flowLayoutPanel2.Location = new System.Drawing.Point(1204, -1); - this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(2); + this.flowLayoutPanel2.Location = new System.Drawing.Point(1605, -1); + this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel2.Name = "flowLayoutPanel2"; - this.flowLayoutPanel2.Size = new System.Drawing.Size(243, 968); + this.flowLayoutPanel2.Size = new System.Drawing.Size(324, 1191); this.flowLayoutPanel2.TabIndex = 11; this.flowLayoutPanel2.Paint += new System.Windows.Forms.PaintEventHandler(this.flowLayoutPanel2_Paint); // @@ -109,17 +107,17 @@ // this.panel1.BackColor = System.Drawing.Color.Transparent; this.panel1.Controls.Add(this.pictureBox9); - this.panel1.Location = new System.Drawing.Point(2, 2); - this.panel1.Margin = new System.Windows.Forms.Padding(2); + this.panel1.Location = new System.Drawing.Point(3, 2); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(234, 214); + this.panel1.Size = new System.Drawing.Size(312, 263); this.panel1.TabIndex = 8; // // pictureBox9 // this.pictureBox9.Image = global::compabetov2.Properties.Resources.HomeroMenu; - this.pictureBox9.Location = new System.Drawing.Point(48, 28); - this.pictureBox9.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox9.Location = new System.Drawing.Point(64, 34); + this.pictureBox9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox9.Name = "pictureBox9"; this.pictureBox9.Size = new System.Drawing.Size(190, 197); this.pictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -132,10 +130,9 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.label1.ForeColor = System.Drawing.Color.AliceBlue; - this.label1.Location = new System.Drawing.Point(2, 218); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Location = new System.Drawing.Point(3, 267); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(66, 25); + this.label1.Size = new System.Drawing.Size(102, 39); this.label1.TabIndex = 17; this.label1.Text = "Total:"; this.label1.Click += new System.EventHandler(this.label1_Click); @@ -146,10 +143,9 @@ this.labeltotal.BackColor = System.Drawing.Color.Transparent; this.labeltotal.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.labeltotal.ForeColor = System.Drawing.Color.AliceBlue; - this.labeltotal.Location = new System.Drawing.Point(71, 174); - this.labeltotal.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.labeltotal.Location = new System.Drawing.Point(111, 267); this.labeltotal.Name = "labeltotal"; - this.labeltotal.Size = new System.Drawing.Size(0, 31); + this.labeltotal.Size = new System.Drawing.Size(0, 39); this.labeltotal.TabIndex = 18; // // flowLayoutPanel1 @@ -161,26 +157,26 @@ this.flowLayoutPanel1.Controls.Add(this.button3); this.flowLayoutPanel1.Controls.Add(this.button5); this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, 2); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(243, 974); + this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1199); this.flowLayoutPanel1.TabIndex = 8; // // panel2 // this.panel2.BackColor = System.Drawing.Color.Transparent; this.panel2.Controls.Add(this.pictureBox7); - this.panel2.Location = new System.Drawing.Point(2, 2); - this.panel2.Margin = new System.Windows.Forms.Padding(2); + this.panel2.Location = new System.Drawing.Point(3, 2); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(234, 214); + this.panel2.Size = new System.Drawing.Size(312, 263); this.panel2.TabIndex = 8; // // pictureBox7 // this.pictureBox7.Image = global::compabetov2.Properties.Resources.HomeroMenu; - this.pictureBox7.Location = new System.Drawing.Point(48, 28); - this.pictureBox7.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox7.Location = new System.Drawing.Point(64, 34); + this.pictureBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox7.Name = "pictureBox7"; this.pictureBox7.Size = new System.Drawing.Size(190, 197); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -196,11 +192,11 @@ this.button1.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button1.Image = global::compabetov2.Properties.Resources.Menui1; this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button1.Location = new System.Drawing.Point(2, 220); - this.button1.Margin = new System.Windows.Forms.Padding(2); + this.button1.Location = new System.Drawing.Point(3, 269); + this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button1.Name = "button1"; - this.button1.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button1.Size = new System.Drawing.Size(234, 93); + this.button1.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button1.Size = new System.Drawing.Size(312, 114); this.button1.TabIndex = 8; this.button1.Text = "Menú"; this.button1.UseVisualStyleBackColor = false; @@ -215,11 +211,11 @@ this.button2.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button2.Image = global::compabetov2.Properties.Resources.estadisticasi; this.button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button2.Location = new System.Drawing.Point(2, 317); - this.button2.Margin = new System.Windows.Forms.Padding(2); + this.button2.Location = new System.Drawing.Point(3, 387); + this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button2.Name = "button2"; - this.button2.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button2.Size = new System.Drawing.Size(234, 93); + this.button2.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button2.Size = new System.Drawing.Size(312, 114); this.button2.TabIndex = 9; this.button2.Text = "Reportes"; this.button2.UseVisualStyleBackColor = false; @@ -234,11 +230,11 @@ this.button3.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button3.Image = global::compabetov2.Properties.Resources.productoi; this.button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button3.Location = new System.Drawing.Point(2, 414); - this.button3.Margin = new System.Windows.Forms.Padding(2); + this.button3.Location = new System.Drawing.Point(3, 505); + this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button3.Name = "button3"; - this.button3.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button3.Size = new System.Drawing.Size(234, 93); + this.button3.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button3.Size = new System.Drawing.Size(312, 114); this.button3.TabIndex = 10; this.button3.Text = "Productos"; this.button3.UseVisualStyleBackColor = false; @@ -252,11 +248,11 @@ this.button5.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button5.Image = global::compabetov2.Properties.Resources.sesionc; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button5.Location = new System.Drawing.Point(2, 511); - this.button5.Margin = new System.Windows.Forms.Padding(2); + this.button5.Location = new System.Drawing.Point(3, 623); + this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button5.Name = "button5"; - this.button5.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button5.Size = new System.Drawing.Size(234, 93); + this.button5.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button5.Size = new System.Drawing.Size(312, 114); this.button5.TabIndex = 12; this.button5.Text = "Salir"; this.button5.UseVisualStyleBackColor = false; @@ -264,20 +260,20 @@ // flowLayoutPanel3 // this.flowLayoutPanel3.AutoScroll = true; - this.flowLayoutPanel3.Location = new System.Drawing.Point(247, 279); - this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(2); + this.flowLayoutPanel3.Location = new System.Drawing.Point(329, 343); + this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel3.Name = "flowLayoutPanel3"; - this.flowLayoutPanel3.Size = new System.Drawing.Size(955, 593); + this.flowLayoutPanel3.Size = new System.Drawing.Size(1273, 730); this.flowLayoutPanel3.TabIndex = 14; this.flowLayoutPanel3.Paint += new System.Windows.Forms.PaintEventHandler(this.flowLayoutPanel3_Paint); // // txtbusqueda // this.txtbusqueda.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtbusqueda.Location = new System.Drawing.Point(247, 178); - this.txtbusqueda.Margin = new System.Windows.Forms.Padding(2); + this.txtbusqueda.Location = new System.Drawing.Point(329, 219); + this.txtbusqueda.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtbusqueda.Name = "txtbusqueda"; - this.txtbusqueda.Size = new System.Drawing.Size(528, 30); + this.txtbusqueda.Size = new System.Drawing.Size(703, 36); this.txtbusqueda.TabIndex = 15; this.txtbusqueda.TextChanged += new System.EventHandler(this.txtbusqueda_TextChanged); // @@ -287,10 +283,10 @@ 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(791, 171); - this.bntImprimir.Margin = new System.Windows.Forms.Padding(2); + this.bntImprimir.Location = new System.Drawing.Point(1055, 210); + this.bntImprimir.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.bntImprimir.Name = "bntImprimir"; - this.bntImprimir.Size = new System.Drawing.Size(113, 44); + this.bntImprimir.Size = new System.Drawing.Size(151, 54); this.bntImprimir.TabIndex = 17; this.bntImprimir.Text = "Vender"; this.bntImprimir.UseVisualStyleBackColor = false; @@ -300,10 +296,10 @@ // this.responsablecb.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); this.responsablecb.FormattingEnabled = true; - this.responsablecb.Location = new System.Drawing.Point(1028, 177); - this.responsablecb.Margin = new System.Windows.Forms.Padding(2); + 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(171, 33); + this.responsablecb.Size = new System.Drawing.Size(227, 37); this.responsablecb.TabIndex = 18; this.responsablecb.SelectedIndexChanged += new System.EventHandler(this.responsablecb_SelectedIndexChanged); // @@ -313,9 +309,10 @@ 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(910, 171); + this.btnFiar.Location = new System.Drawing.Point(1213, 210); + this.btnFiar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnFiar.Name = "btnFiar"; - this.btnFiar.Size = new System.Drawing.Size(113, 44); + this.btnFiar.Size = new System.Drawing.Size(151, 54); this.btnFiar.TabIndex = 19; this.btnFiar.Text = "Cuenta"; this.btnFiar.UseVisualStyleBackColor = false; @@ -327,10 +324,10 @@ 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(852, 219); - this.btnEnviar.Margin = new System.Windows.Forms.Padding(2); + this.btnEnviar.Location = new System.Drawing.Point(1213, 273); + this.btnEnviar.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnEnviar.Name = "btnEnviar"; - this.btnEnviar.Size = new System.Drawing.Size(113, 44); + this.btnEnviar.Size = new System.Drawing.Size(151, 54); this.btnEnviar.TabIndex = 20; this.btnEnviar.Text = "Enviar"; this.btnEnviar.UseVisualStyleBackColor = false; @@ -341,10 +338,10 @@ this.btnImporte.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); this.btnImporte.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); this.btnImporte.ForeColor = System.Drawing.Color.Transparent; - this.btnImporte.Location = new System.Drawing.Point(735, 222); - this.btnImporte.Margin = new System.Windows.Forms.Padding(2); + this.btnImporte.Location = new System.Drawing.Point(1056, 273); + this.btnImporte.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnImporte.Name = "btnImporte"; - this.btnImporte.Size = new System.Drawing.Size(113, 44); + this.btnImporte.Size = new System.Drawing.Size(151, 54); this.btnImporte.TabIndex = 21; this.btnImporte.Text = "Importe"; this.btnImporte.UseVisualStyleBackColor = false; @@ -352,9 +349,9 @@ // // vender // - 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(1325, 627); + this.ClientSize = new System.Drawing.Size(1767, 772); this.ControlBox = false; this.Controls.Add(this.btnImporte); this.Controls.Add(this.btnEnviar); @@ -367,7 +364,7 @@ this.Controls.Add(this.lblhora); this.Controls.Add(this.flowLayoutPanel2); this.Controls.Add(this.flowLayoutPanel1); - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "vender"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.vender_Load); diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index bf7bd95..44bb043 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 64f3d73..1197ade 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 4382aa9..b27a436 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Debug/compabetov2.csproj.AssemblyReference.cache b/obj/Debug/compabetov2.csproj.AssemblyReference.cache index 3e96430..48a4903 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.CoreCompileInputs.cache b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache index 5c110f6..fc987e0 100644 --- a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache +++ b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -afad5b5549ec219a4cd1dcd558a30f10f9712e8d73e654845b31f646b6d12d05 +7b47ab10239919af7b32ed2b287710792024b987ca7846a8d66ef868f8836793 diff --git a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt index 43fb6f0..2ed2a54 100644 --- a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt +++ b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt @@ -98,3 +98,54 @@ C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.e C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.pdb C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.Ventas.Importe.resources C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.Ventas.Importe1.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\SqlServerTypes\x86\SqlServerSpatial140.dll +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\compabetov2.exe.config +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\compabetov2.exe.manifest +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\compabetov2.application +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\compabetov2.exe +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\compabetov2.pdb +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\EntityFramework.dll +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\EntityFramework.SqlServer.dll +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\Microsoft.SqlServer.Types.dll +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\System.Data.SQLite.dll +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\System.Data.SQLite.EF6.dll +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\System.Data.SQLite.Linq.dll +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\EntityFramework.xml +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\EntityFramework.SqlServer.xml +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\System.Data.SQLite.xml +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.csproj.AssemblyReference.cache +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarEmpleado1.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.AgregarLogin1.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Empleados.EditarEmpleado1.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Estadiscticas.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.cuentas.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.envios.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.inventario.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.login.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.MenuPrincipal.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.mermas.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.personal.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Properties.Resources.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Ventas.datosCuenta.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Ventas.datosEnvio.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Ventas.Importe.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Ventas.Importe1.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.vender.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.verMerma.resources +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.csproj.GenerateResource.cache +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.csproj.CoreCompileInputs.cache +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.exe.manifest +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.application +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabet.5C4A9C0C.Up2Date +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.exe +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.pdb diff --git a/obj/Debug/compabetov2.csproj.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache index 21f2586..37286d9 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 bf7bd95..44bb043 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 64f3d73..1197ade 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ