Recorrido interfaz
Revert "Recorrido interfaz"

This reverts commit 57a0ed8e4ce21995801e7e55c697b961869c0c41.
From 33878b0808b21881a9a0a6fe409bb812f61932c4 Mon Sep 17 00:00:00 2001
From: Alberto <Alberto@Alberto-PC>
Date: 10-may-2012 1:06:09

Revert "Recorrido interfaz"

This reverts commit 57a0ed8e4ce21995801e7e55c697b961869c0c41.

diff --git a/Diaketas-Manage/src/Controlador/ControladorC_Empresa.java b/Diaketas-Manage/src/Controlador/ControladorC_Empresa.java
index ec04e9c..f49f3b6 100644
--- a/Diaketas-Manage/src/Controlador/ControladorC_Empresa.java
+++ b/Diaketas-Manage/src/Controlador/ControladorC_Empresa.java
@@ -60,13 +60,6 @@
 
     public ControladorC_Empresa(VentanaPrincipal vista) {
         this.vista = vista;
-        vista.anadirListenerbtNuevaEmpresa(new ListenerBtNuevaEmpresa());
-        vista.anadirListenerbtBuscarEmpresa(new ListenerBtBuscarEmpresa());
-        vista.anadirListenerNavToColaboradoresFromEmpresa(new ListenerNavToColaboradores());
-        vista.anadirListenerNavToColaboradoresFromDatosEmpresa(new ListenerNavToColaboradores());
-        vista.anadirListenerNavToColaboradoresFromBuscarEmpresa(new ListenerNavToColaboradores());
-        vista.anadirListenerNavToEmpresaFromBuscarEmpresa(new ListenerNavToEmpresa());
-        vista.anadirListenerNavToEmpresaFromDatosEmpresa(new ListenerNavToEmpresa());
     }
     
     
@@ -217,48 +210,7 @@
         
         return true;
     }
-    
-    	/**
-	 * Clase interna para manejar los eventos de btBuscarEmpresa
-	 */
-    
-	private class ListenerBtBuscarEmpresa implements ActionListener{
 
-		@Override
-		public void actionPerformed(ActionEvent ae) {
-			vista.mostrarVistaEmpresaBuscar();
-		}
-	}
-	
-	
-	/**
-	 * Clase interna para manejar los eventos de btNuevoEmpresa
-	 */
-    	private class ListenerBtNuevaEmpresa implements ActionListener{
-
-		@Override
-		public void actionPerformed(ActionEvent ae) {
-                        vista.mostrarVistaEmpresaDatos();
-		}
-	}
-        
-        private class ListenerNavToEmpresa implements ActionListener{
-
-		@Override
-		public void actionPerformed(ActionEvent ae) {
-                    vista.mostrarVistaEmpresa();
-		}
-		
-	}
-        private class ListenerNavToColaboradores implements ActionListener{
-
-		@Override
-		public void actionPerformed(ActionEvent ae) {
-                    vista.mostrarVistaColaboradores();
-		}
-		
-	}
-        
     @Override
     public void actionPerformed(ActionEvent ae) {
         if (ae.getActionCommand().equalsIgnoreCase("salvar")) {
diff --git a/Diaketas-Manage/src/Controlador/ControladorC_Persona.java b/Diaketas-Manage/src/Controlador/ControladorC_Persona.java
index a46a9fd..96ec6eb 100644
--- a/Diaketas-Manage/src/Controlador/ControladorC_Persona.java
+++ b/Diaketas-Manage/src/Controlador/ControladorC_Persona.java
@@ -63,14 +63,6 @@
 
     public ControladorC_Persona(VentanaPrincipal vista) {
         this.vista = vista;
-        
-        vista.anadirListenerbtNuevaColaborador(new ListenerBtNuevaColaborador());
-        vista.anadirListenerbtBuscarColaborador(new ListenerBtBuscarColaborador());
-        vista.anadirListenerNavToColaboradoresFromColaborador(new ListenerNavToColaboradores());
-        vista.anadirListenerNavToColaboradoresFromDatosColaborador(new ListenerNavToColaboradores());
-        vista.anadirListenerNavToColaboradoresFromBuscarColaborador(new ListenerNavToColaboradores());
-        vista.anadirListenerNavToColaboradorFromBuscarColaborador(new ListenerNavToColaborador());
-        vista.anadirListenerNavToColaboradorFromDatosColaborador(new ListenerNavToColaborador());
     }
     
     
@@ -229,47 +221,6 @@
         
         return true;
     }
-    
-         /**
-	 * Clase interna para manejar los eventos de btBuscarColaborador
-	 */
-    
-	private class ListenerBtBuscarColaborador implements ActionListener{
-
-		@Override
-		public void actionPerformed(ActionEvent ae) {
-			vista.mostrarVistaColaboradorBuscar();
-		}
-	}
-	
-	
-	/**
-	 * Clase interna para manejar los eventos de btNuevoColaborador
-	 */
-    	private class ListenerBtNuevaColaborador implements ActionListener{
-
-		@Override
-		public void actionPerformed(ActionEvent ae) {
-                        vista.mostrarVistaColaboradorDatos();
-		}
-	}
-        
-        private class ListenerNavToColaborador implements ActionListener{
-
-		@Override
-		public void actionPerformed(ActionEvent ae) {
-                    vista.mostrarVistaColaborador();
-		}
-		
-	}
-        private class ListenerNavToColaboradores implements ActionListener{
-
-		@Override
-		public void actionPerformed(ActionEvent ae) {
-                    vista.mostrarVistaColaboradores();
-		}
-		
-	}
 
     @Override
     public void actionPerformed(ActionEvent ae) {
diff --git a/Diaketas-Manage/src/Controlador/ControladorColaboracion.java b/Diaketas-Manage/src/Controlador/ControladorColaboracion.java
index 5592f84..2830630 100644
--- a/Diaketas-Manage/src/Controlador/ControladorColaboracion.java
+++ b/Diaketas-Manage/src/Controlador/ControladorColaboracion.java
@@ -62,9 +62,6 @@
 
     public ControladorColaboracion(VentanaPrincipal vista) {
         this.vista = vista;
-        
-        vista.anadirListenerBtAnadirColaboracion(new ListenerBtAnadirColaboracion());
-        vista.anadirListenerBtComprobarPagos(new ListenerBtComprobarPagos());
     }
     
     
@@ -124,31 +121,9 @@
         
         return true;
     }
-    
-
 
     @Override
     public void actionPerformed(ActionEvent ae) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
-    
-        
-        private class ListenerBtAnadirColaboracion implements ActionListener{
-
-                @Override
-                public void actionPerformed(ActionEvent ae) {
-                        vista.mostrarVistaAnadirColaboracion();
-                }
-
-        }
-
-        private class ListenerBtComprobarPagos implements ActionListener{
-
-                @Override
-                public void actionPerformed(ActionEvent ae) {
-                        vista.mostrarVistaComprobarPagos();
-                }
-
-        }
-
 }
diff --git a/Diaketas-Manage/src/Controlador/ControladorPrincipal.java b/Diaketas-Manage/src/Controlador/ControladorPrincipal.java
index e182ceb..829ea85 100644
--- a/Diaketas-Manage/src/Controlador/ControladorPrincipal.java
+++ b/Diaketas-Manage/src/Controlador/ControladorPrincipal.java
@@ -73,10 +73,7 @@
 		vista.anadirListenerBtConectarse(new ListenerBtConectarse());
 		vista.anadirListenerBtBeneficiario(new ListenerBtBeneficiario());
 		vista.anadirListenerBtBolsaTrabajo(new ListenerBtBolsaTrabajo());
-		vista.anadirListenerBtColaboradores(new ListenerBtColaboradores());
-                vista.anadirListenerBtSocio(new ListenerBtSocio());
-                vista.anadirListenerBtColaborador(new ListenerBtColaborador());
-                vista.anadirListenerBtEmpresa(new ListenerBtEmpresa());
+		vista.anadirListenerBtSocio(new ListenerBtSocio());
 		vista.anadirListenerBtVoluntario(new ListenerBtVoluntario());
 		vista.anadirListenerNavToMainFromBeneficiarios(new ListenerNavToMain());
 		vista.anadirListenerNavToMainFromContabilidad(new ListenerNavToMain());
@@ -89,13 +86,6 @@
                 vista.anadirListenernavToMainFromSocio(new ListenerNavToMain());
 		vista.anadirListenernavToMainFromBuscarSocio(new ListenerNavToMain());
                 vista.anadirListenernavToMainFromNuevoSocio(new ListenerNavToMain());
-                vista.anadirListenernavToMainFromColaboradores(new ListenerNavToMain());
-                vista.anadirListenernavToMainFromEmpresa(new ListenerNavToMain());
-		vista.anadirListenernavToMainFromBuscarEmpresa(new ListenerNavToMain());
-                vista.anadirListenernavToMainFromNuevoEmpresa(new ListenerNavToMain());
-                vista.anadirListenernavToMainFromColaborador(new ListenerNavToMain());
-		vista.anadirListenernavToMainFromBuscarColaborador(new ListenerNavToMain());
-                vista.anadirListenernavToMainFromNuevoColaborador(new ListenerNavToMain());
 		vista.mostrarVistaIdentificacion();
 		
     }
@@ -201,19 +191,6 @@
 	 * Clase interna para manejar los eventos de btSocio
 	 */
 	
-	private class ListenerBtColaboradores implements ActionListener{
-
-		@Override
-		public void actionPerformed(ActionEvent ae) {
-                    vista.mostrarVistaColaboradores();
-		}
-		
-	}
-	
-        	/**
-	 * Clase interna para manejar los eventos de btSocio
-	 */
-	
 	private class ListenerBtSocio implements ActionListener{
 
 		@Override
@@ -223,35 +200,7 @@
 		}
 		
 	}
-        
-        	
-        	/**
-	 * Clase interna para manejar los eventos de btColaborador
-	 */
 	
-	private class ListenerBtColaborador implements ActionListener{
-
-		@Override
-		public void actionPerformed(ActionEvent ae) {
-			ControladorC_Persona.getInstance(vista);
-			vista.mostrarVistaColaborador();
-		}
-	}
-        
-        	
-        	/**
-	 * Clase interna para manejar los eventos de btEmpresa
-	 */
-	
-	private class ListenerBtEmpresa implements ActionListener{
-
-		@Override
-		public void actionPerformed(ActionEvent ae) {
-			ControladorC_Empresa.getInstance(vista);
-			vista.mostrarVistaEmpresa();
-		}
-		
-	}
 	/**
 	 * Clase interna para manejar los eventos de btVoluntario
 	 */
diff --git a/Diaketas-Manage/src/Controlador/ControladorSocio.java b/Diaketas-Manage/src/Controlador/ControladorSocio.java
index 9ad3f1e..58faa10 100644
--- a/Diaketas-Manage/src/Controlador/ControladorSocio.java
+++ b/Diaketas-Manage/src/Controlador/ControladorSocio.java
@@ -63,9 +63,6 @@
         this.vista = vista;
         vista.anadirListenerbtNuevoSocio(new ListenerBtNuevoSocio());
         vista.anadirListenerbtBuscarSocio(new ListenerBtBuscarSocio());
-        vista.anadirListenerNavToColaboradoresFromSocio(new ListenerNavToColaboradores());
-        vista.anadirListenerNavToColaboradoresFromDatosSocio(new ListenerNavToColaboradores());
-        vista.anadirListenerNavToColaboradoresFromBuscarSocio(new ListenerNavToColaboradores());
         vista.anadirListenerNavToSocioFromBuscarSocio(new ListenerNavToSocio());
         vista.anadirListenerNavToSocioFromDatosSocio(new ListenerNavToSocio());
     }
@@ -239,15 +236,6 @@
 		@Override
 		public void actionPerformed(ActionEvent ae) {
                     vista.mostrarVistaSocio();
-		}
-		
-	}
-        
-        private class ListenerNavToColaboradores implements ActionListener{
-
-		@Override
-		public void actionPerformed(ActionEvent ae) {
-                    vista.mostrarVistaColaboradores();
 		}
 		
 	}
diff --git a/Diaketas-Manage/src/Controlador/ControladorVoluntarios.java b/Diaketas-Manage/src/Controlador/ControladorVoluntarios.java
index ed555f3..193f7f3 100644
--- a/Diaketas-Manage/src/Controlador/ControladorVoluntarios.java
+++ b/Diaketas-Manage/src/Controlador/ControladorVoluntarios.java
@@ -103,8 +103,7 @@
 		vista.anadirListenerNavToVoluntariosFromAyudas(new ListenerNavToVoluntarios());
 		vista.anadirListenerNavToVoluntariosFromBuscarVoluntario(new ListenerNavToVoluntarios());
 		vista.anadirListenerNavToVoluntariosFromDatosVoluntario(new ListenerNavToVoluntarios());
-
-
+		
     }
 	
 	private boolean insertarVoluntario(Voluntario volun,String password){
@@ -369,6 +368,5 @@
 		}
 		
 	}
-        
-    
+	
 }
diff --git a/Diaketas-Manage/src/Vista/VentanaPrincipal.form b/Diaketas-Manage/src/Vista/VentanaPrincipal.form
index 59282b0..0c80432 100644
--- a/Diaketas-Manage/src/Vista/VentanaPrincipal.form
+++ b/Diaketas-Manage/src/Vista/VentanaPrincipal.form
@@ -134,12 +134,12 @@
                               <Component id="labelUsuario" alignment="1" min="-2" max="-2" attributes="0"/>
                               <Component id="labelContrasena" alignment="1" min="-2" max="-2" attributes="0"/>
                           </Group>
-                          <EmptySpace pref="78" max="32767" attributes="0"/>
+                          <EmptySpace pref="77" max="32767" attributes="0"/>
                           <Group type="103" groupAlignment="1" attributes="0">
                               <Component id="textFieldIdUsuario" alignment="1" max="32767" attributes="0"/>
                               <Component id="textFieldContrasena" alignment="1" max="32767" attributes="0"/>
                               <Group type="102" alignment="1" attributes="0">
-                                  <EmptySpace pref="150" max="32767" attributes="0"/>
+                                  <EmptySpace pref="151" max="32767" attributes="0"/>
                                   <Component id="btConectarse" min="-2" pref="134" max="-2" attributes="0"/>
                               </Group>
                           </Group>
@@ -164,7 +164,7 @@
               <Group type="102" alignment="1" attributes="0">
                   <EmptySpace min="-2" pref="148" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="imgLogo" alignment="0" pref="329" max="32767" attributes="0"/>
+                      <Component id="imgLogo" alignment="0" pref="327" max="32767" attributes="0"/>
                       <Group type="102" alignment="0" attributes="0">
                           <Component id="labelTitulo" pref="69" max="32767" attributes="0"/>
                           <EmptySpace min="-2" pref="135" max="-2" attributes="0"/>
@@ -267,7 +267,7 @@
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace min="-2" pref="99" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="1" attributes="0">
-                      <Component id="btColaboradores" min="-2" pref="215" max="-2" attributes="0"/>
+                      <Component id="btSocio" min="-2" pref="215" max="-2" attributes="0"/>
                       <Component id="btVoluntario" min="-2" pref="215" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace pref="361" max="32767" attributes="0"/>
@@ -286,7 +286,7 @@
                   <Component id="jLabel21" min="-2" max="-2" attributes="0"/>
                   <EmptySpace pref="84" max="32767" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="btColaboradores" linkSize="8" min="-2" max="-2" attributes="0"/>
+                      <Component id="btSocio" linkSize="8" min="-2" max="-2" attributes="0"/>
                       <Component id="btBeneficiario" linkSize="8" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace min="-2" pref="72" max="-2" attributes="0"/>
@@ -300,7 +300,7 @@
         </DimensionLayout>
       </Layout>
       <SubComponents>
-        <Component class="javax.swing.JButton" name="btColaboradores">
+        <Component class="javax.swing.JButton" name="btSocio">
           <Properties>
             <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
               <Font name="Lucida Grande" size="14" style="1"/>
@@ -308,7 +308,7 @@
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
               <Image iconType="3" name="/Vista/images/socio.png"/>
             </Property>
-            <Property name="text" type="java.lang.String" value="Colaboradores"/>
+            <Property name="text" type="java.lang.String" value="SOCIOS"/>
             <Property name="toolTipText" type="java.lang.String" value="Acceso a Socios"/>
             <Property name="actionCommand" type="java.lang.String" value="entrarAPanelSocios"/>
             <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
@@ -2608,6 +2608,152 @@
         </Component>
       </SubComponents>
     </Container>
+    <Container class="javax.swing.JPanel" name="PanelVoluntarioColaboraciones">
+      <Properties>
+        <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+          <Color blue="ff" green="ff" red="ff" type="rgb"/>
+        </Property>
+        <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[1000, 600]"/>
+        </Property>
+        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[1000, 600]"/>
+        </Property>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
+          <CardConstraints cardName="card4"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout>
+        <DimensionLayout dim="0">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="102" alignment="0" attributes="0">
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Component id="separadorBeneficiario4" alignment="0" max="32767" attributes="0"/>
+                      <Group type="102" alignment="0" attributes="0">
+                          <Component id="navToMainFromBeneficiarios1" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="senalaBeneficiario7" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="navToMainFromBeneficiarios2" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="senalaBeneficiario8" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="labSBenef1" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                      </Group>
+                  </Group>
+                  <EmptySpace max="-2" attributes="0"/>
+              </Group>
+              <Group type="102" alignment="1" attributes="0">
+                  <EmptySpace min="-2" pref="152" max="-2" attributes="0"/>
+                  <Component id="btNuevoBeneficiario1" min="-2" pref="229" max="-2" attributes="0"/>
+                  <EmptySpace pref="225" max="32767" attributes="0"/>
+                  <Component id="btBuscarBeneficiario1" min="-2" pref="229" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="165" max="-2" attributes="0"/>
+              </Group>
+          </Group>
+        </DimensionLayout>
+        <DimensionLayout dim="1">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="102" alignment="0" attributes="0">
+                  <EmptySpace min="-2" pref="11" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="senalaBeneficiario7" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="navToMainFromBeneficiarios1" alignment="3" min="-2" pref="16" max="-2" attributes="0"/>
+                      <Component id="senalaBeneficiario8" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="navToMainFromBeneficiarios2" alignment="3" min="-2" pref="16" max="-2" attributes="0"/>
+                      <Component id="labSBenef1" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Component id="separadorBeneficiario4" min="-2" pref="10" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="174" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Component id="btBuscarBeneficiario1" min="-2" pref="203" max="-2" attributes="0"/>
+                      <Component id="btNuevoBeneficiario1" min="-2" pref="203" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace pref="225" max="32767" attributes="0"/>
+              </Group>
+          </Group>
+        </DimensionLayout>
+      </Layout>
+      <SubComponents>
+        <Component class="javax.swing.JSeparator" name="separadorBeneficiario4">
+        </Component>
+        <Component class="javax.swing.JLabel" name="senalaBeneficiario7">
+          <Properties>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="99" green="99" red="99" type="rgb"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="&gt;"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="labSBenef1">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Colaboraciones"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="btNuevoBeneficiario1">
+          <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="Lucida Grande" size="14" style="1"/>
+            </Property>
+            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/Vista/images/colaborador_1.jpg"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="A&#xf1;adir Colaboraciones"/>
+            <Property name="actionCommand" type="java.lang.String" value="nuevoBeneficiario"/>
+            <Property name="horizontalTextPosition" type="int" value="0"/>
+            <Property name="verticalTextPosition" type="int" value="3"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="btBuscarBeneficiario1">
+          <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="Lucida Grande" size="14" style="1"/>
+            </Property>
+            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/Vista/images/formadepago_1.jpg"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="Comprobar Pagos"/>
+            <Property name="actionCommand" type="java.lang.String" value="buscarBeneficiario"/>
+            <Property name="horizontalTextPosition" type="int" value="0"/>
+            <Property name="verticalTextPosition" type="int" value="3"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="navToMainFromBeneficiarios1">
+          <Properties>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="ff" green="0" red="0" type="rgb"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="DIAKETAS"/>
+            <Property name="actionCommand" type="java.lang.String" value="navToMainFromBeneficiarios"/>
+            <Property name="borderPainted" type="boolean" value="false"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="navToMainFromBeneficiarios2">
+          <Properties>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="ff" green="0" red="0" type="rgb"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="Voluntario"/>
+            <Property name="actionCommand" type="java.lang.String" value="navToMainFromBeneficiarios"/>
+            <Property name="borderPainted" type="boolean" value="false"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="senalaBeneficiario8">
+          <Properties>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="99" green="99" red="99" type="rgb"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="&gt;"/>
+          </Properties>
+        </Component>
+      </SubComponents>
+    </Container>
     <Container class="javax.swing.JPanel" name="PanelVoluntarioAyudas">
       <Properties>
         <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
@@ -2879,733 +3025,6 @@
         </Container>
       </SubComponents>
     </Container>
-    <Container class="javax.swing.JPanel" name="PanelVoluntarioColaboraciones">
-      <Properties>
-        <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-          <Color blue="ff" green="ff" red="ff" type="rgb"/>
-        </Property>
-        <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[1000, 600]"/>
-        </Property>
-        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[1000, 600]"/>
-        </Property>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
-          <CardConstraints cardName="card4"/>
-        </Constraint>
-      </Constraints>
-
-      <Layout>
-        <DimensionLayout dim="0">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="0" attributes="0">
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="separadorBeneficiario4" alignment="0" max="32767" attributes="0"/>
-                      <Group type="102" alignment="0" attributes="0">
-                          <Component id="navToMainFromBeneficiarios1" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaBeneficiario7" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToMainFromBeneficiarios2" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaBeneficiario8" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="labSBenef1" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                      </Group>
-                  </Group>
-                  <EmptySpace max="-2" attributes="0"/>
-              </Group>
-              <Group type="102" alignment="1" attributes="0">
-                  <EmptySpace min="-2" pref="152" max="-2" attributes="0"/>
-                  <Component id="btAnadirColaboracion" min="-2" pref="229" max="-2" attributes="0"/>
-                  <EmptySpace pref="252" max="32767" attributes="0"/>
-                  <Component id="btComprobarPagos" min="-2" pref="229" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" pref="165" max="-2" attributes="0"/>
-              </Group>
-          </Group>
-        </DimensionLayout>
-        <DimensionLayout dim="1">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="0" attributes="0">
-                  <EmptySpace min="-2" pref="11" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="senalaBeneficiario7" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToMainFromBeneficiarios1" alignment="3" min="-2" pref="16" max="-2" attributes="0"/>
-                      <Component id="senalaBeneficiario8" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToMainFromBeneficiarios2" alignment="3" min="-2" pref="16" max="-2" attributes="0"/>
-                      <Component id="labSBenef1" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Component id="separadorBeneficiario4" min="-2" pref="10" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" pref="174" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="btComprobarPagos" min="-2" pref="203" max="-2" attributes="0"/>
-                      <Component id="btAnadirColaboracion" min="-2" pref="203" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace pref="198" max="32767" attributes="0"/>
-              </Group>
-          </Group>
-        </DimensionLayout>
-      </Layout>
-      <SubComponents>
-        <Component class="javax.swing.JSeparator" name="separadorBeneficiario4">
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaBeneficiario7">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="labSBenef1">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Colaboraciones"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btAnadirColaboracion">
-          <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Lucida Grande" size="14" style="1"/>
-            </Property>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/colaborador_1.jpg"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="A&#xf1;adir Colaboraciones"/>
-            <Property name="actionCommand" type="java.lang.String" value="nuevoBeneficiario"/>
-            <Property name="horizontalTextPosition" type="int" value="0"/>
-            <Property name="verticalTextPosition" type="int" value="3"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btComprobarPagos">
-          <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Lucida Grande" size="14" style="1"/>
-            </Property>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/formadepago_1.jpg"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Comprobar Pagos"/>
-            <Property name="actionCommand" type="java.lang.String" value="buscarBeneficiario"/>
-            <Property name="horizontalTextPosition" type="int" value="0"/>
-            <Property name="verticalTextPosition" type="int" value="3"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToMainFromBeneficiarios1">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="DIAKETAS"/>
-            <Property name="actionCommand" type="java.lang.String" value="navToMainFromBeneficiarios"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToMainFromBeneficiarios2">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Voluntario"/>
-            <Property name="actionCommand" type="java.lang.String" value="navToMainFromBeneficiarios"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaBeneficiario8">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-      </SubComponents>
-    </Container>
-    <Container class="javax.swing.JPanel" name="PanelVoluntarioColaboracionesAnadirColaboraciones">
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
-          <CardConstraints cardName="card14"/>
-        </Constraint>
-      </Constraints>
-
-      <Layout>
-        <DimensionLayout dim="0">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" attributes="0">
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="102" alignment="0" attributes="0">
-                          <Component id="navToMainFromAnadirColaboraciones" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario7" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToVoluntarioFromAnadirColaboraciones" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario8" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToColaboracionesFromAnadirColaboraciones" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario9" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="labSVolunt1" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="32767" attributes="0"/>
-                      </Group>
-                      <Group type="102" alignment="1" attributes="0">
-                          <EmptySpace min="0" pref="161" max="32767" attributes="0"/>
-                          <Group type="103" groupAlignment="1" attributes="0">
-                              <Group type="103" alignment="1" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel76" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Group type="102" alignment="0" attributes="0">
-                                      <Group type="103" groupAlignment="0" attributes="0">
-                                          <Group type="102" alignment="0" attributes="0">
-                                              <EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
-                                              <Component id="jLabel79" min="-2" max="-2" attributes="0"/>
-                                              <EmptySpace min="-2" pref="59" max="-2" attributes="0"/>
-                                          </Group>
-                                          <Group type="102" alignment="1" attributes="0">
-                                              <Group type="103" groupAlignment="0" attributes="0">
-                                                  <Component id="jLabel78" min="-2" max="-2" attributes="0"/>
-                                                  <Component id="jLabel77" min="-2" max="-2" attributes="0"/>
-                                              </Group>
-                                              <EmptySpace type="separate" max="-2" attributes="0"/>
-                                          </Group>
-                                      </Group>
-                                      <Group type="103" groupAlignment="0" max="-2" attributes="0">
-                                          <Group type="102" alignment="0" attributes="0">
-                                              <Component id="textAnadirCantidadEmpresa" min="-2" pref="111" max="-2" attributes="0"/>
-                                              <EmptySpace min="-2" pref="125" max="-2" attributes="0"/>
-                                              <Component id="jLabel80" min="-2" max="-2" attributes="0"/>
-                                              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                                              <Component id="textAnadirFechaEmpresa" max="32767" attributes="0"/>
-                                          </Group>
-                                          <Component id="textAnadirConceptoEmpresa" alignment="0" min="-2" pref="430" max="-2" attributes="0"/>
-                                          <Component id="textAnadirCIFEmpresa" alignment="0" min="-2" pref="162" max="-2" attributes="0"/>
-                                      </Group>
-                                      <EmptySpace min="-2" pref="99" max="-2" attributes="0"/>
-                                      <Component id="btGuardarAnadirEmpresa" min="-2" pref="25" max="-2" attributes="0"/>
-                                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                                      <Component id="btLimpiarAnadirEmpresa" min="-2" pref="27" max="-2" attributes="0"/>
-                                  </Group>
-                              </Group>
-                              <Group type="103" alignment="1" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel71" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Group type="102" alignment="0" attributes="0">
-                                      <EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
-                                      <Group type="103" groupAlignment="0" attributes="0">
-                                          <Component id="jLabel72" alignment="0" min="-2" max="-2" attributes="0"/>
-                                          <Component id="jLabel73" alignment="0" min="-2" max="-2" attributes="0"/>
-                                          <Component id="jLabel74" alignment="0" min="-2" max="-2" attributes="0"/>
-                                      </Group>
-                                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                                      <Group type="103" groupAlignment="0" max="-2" attributes="0">
-                                          <Group type="102" alignment="0" attributes="0">
-                                              <Component id="textAnadirCantidadColaborador" min="-2" pref="111" max="-2" attributes="0"/>
-                                              <EmptySpace min="-2" pref="125" max="-2" attributes="0"/>
-                                              <Component id="jLabel75" min="-2" max="-2" attributes="0"/>
-                                              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                                              <Component id="textAnadirFechaColaborador" max="32767" attributes="0"/>
-                                          </Group>
-                                          <Component id="textAnadirConceptoColaborador" min="-2" pref="430" max="-2" attributes="0"/>
-                                          <Component id="textAnadirDNIColaborador" alignment="0" min="-2" pref="162" max="-2" attributes="0"/>
-                                      </Group>
-                                      <EmptySpace min="-2" pref="99" max="-2" attributes="0"/>
-                                      <Component id="btGuardarAnadirColaborador" min="-2" pref="25" max="-2" attributes="0"/>
-                                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                                      <Component id="btLimpiarAnadirColaborador" min="-2" pref="27" max="-2" attributes="0"/>
-                                  </Group>
-                              </Group>
-                          </Group>
-                          <EmptySpace min="-2" pref="131" max="-2" attributes="0"/>
-                      </Group>
-                  </Group>
-              </Group>
-          </Group>
-        </DimensionLayout>
-        <DimensionLayout dim="1">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="0" attributes="0">
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="navToMainFromAnadirColaboraciones" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario7" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="labSVolunt1" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToVoluntarioFromAnadirColaboraciones" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="navToColaboracionesFromAnadirColaboraciones" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario8" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario9" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace min="-2" pref="106" max="-2" attributes="0"/>
-                  <Component id="jLabel71" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="jLabel72" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="textAnadirDNIColaborador" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="btLimpiarAnadirColaborador" min="-2" pref="30" max="-2" attributes="0"/>
-                      <Component id="btGuardarAnadirColaborador" min="-2" pref="26" max="-2" attributes="0"/>
-                      <Group type="102" attributes="0">
-                          <Group type="103" groupAlignment="3" attributes="0">
-                              <Component id="jLabel73" alignment="3" min="-2" max="-2" attributes="0"/>
-                              <Component id="textAnadirCantidadColaborador" alignment="3" min="-2" max="-2" attributes="0"/>
-                              <Component id="jLabel75" alignment="3" min="-2" max="-2" attributes="0"/>
-                              <Component id="textAnadirFechaColaborador" alignment="3" min="-2" max="-2" attributes="0"/>
-                          </Group>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Group type="103" groupAlignment="3" attributes="0">
-                              <Component id="jLabel74" alignment="3" min="-2" max="-2" attributes="0"/>
-                              <Component id="textAnadirConceptoColaborador" alignment="3" min="-2" max="-2" attributes="0"/>
-                          </Group>
-                      </Group>
-                  </Group>
-                  <EmptySpace min="-2" pref="45" max="-2" attributes="0"/>
-                  <Component id="jLabel76" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="jLabel77" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="textAnadirCIFEmpresa" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="102" alignment="0" attributes="0">
-                          <Group type="103" groupAlignment="0" attributes="0">
-                              <Group type="103" alignment="0" groupAlignment="3" attributes="0">
-                                  <Component id="jLabel80" alignment="3" min="-2" max="-2" attributes="0"/>
-                                  <Component id="textAnadirFechaEmpresa" alignment="3" min="-2" max="-2" attributes="0"/>
-                              </Group>
-                              <Group type="102" alignment="0" attributes="0">
-                                  <EmptySpace max="-2" attributes="0"/>
-                                  <Group type="103" groupAlignment="3" attributes="0">
-                                      <Component id="textAnadirCantidadEmpresa" alignment="3" min="-2" max="-2" attributes="0"/>
-                                      <Component id="jLabel78" alignment="3" min="-2" max="-2" attributes="0"/>
-                                  </Group>
-                              </Group>
-                          </Group>
-                          <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                          <Group type="103" groupAlignment="0" attributes="0">
-                              <Component id="textAnadirConceptoEmpresa" min="-2" max="-2" attributes="0"/>
-                              <Component id="jLabel79" alignment="0" min="-2" max="-2" attributes="0"/>
-                          </Group>
-                      </Group>
-                      <Group type="102" alignment="0" attributes="0">
-                          <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
-                          <Group type="103" groupAlignment="0" attributes="0">
-                              <Component id="btLimpiarAnadirEmpresa" alignment="0" min="-2" pref="30" max="-2" attributes="0"/>
-                              <Component id="btGuardarAnadirEmpresa" alignment="0" min="-2" pref="26" max="-2" attributes="0"/>
-                          </Group>
-                      </Group>
-                  </Group>
-                  <EmptySpace pref="245" max="32767" attributes="0"/>
-              </Group>
-          </Group>
-        </DimensionLayout>
-      </Layout>
-      <SubComponents>
-        <Component class="javax.swing.JLabel" name="labSVolunt1">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="A&#xf1;adir Colaboraciones"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario7">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToMainFromAnadirColaboraciones">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="DIAKETAS"/>
-            <Property name="actionCommand" type="java.lang.String" value="navToMainFromVoluntarios"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToVoluntarioFromAnadirColaboraciones">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Voluntario"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToColaboracionesFromAnadirColaboraciones">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Colaboraciones"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario8">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario9">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel71">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="0" green="0" red="ff" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="A&#xf1;adir en colaborador"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel72">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="DNI del colaborador"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JTextField" name="textAnadirDNIColaborador">
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel73">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Cantidad"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JTextField" name="textAnadirCantidadColaborador">
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel74">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Concepto"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JTextField" name="textAnadirConceptoColaborador">
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel75">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Fecha"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JTextField" name="textAnadirFechaColaborador">
-        </Component>
-        <Component class="javax.swing.JButton" name="btGuardarAnadirColaborador">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/guardar.png"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btLimpiarAnadirColaborador">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/limpiar.png"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel76">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="0" green="0" red="ff" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="A&#xf1;adir en empresa"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel77">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="CIF de la empresa"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel78">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Cantidad"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel79">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Concepto"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JTextField" name="textAnadirCIFEmpresa">
-        </Component>
-        <Component class="javax.swing.JTextField" name="textAnadirCantidadEmpresa">
-        </Component>
-        <Component class="javax.swing.JTextField" name="textAnadirConceptoEmpresa">
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel80">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Fecha"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JTextField" name="textAnadirFechaEmpresa">
-        </Component>
-        <Component class="javax.swing.JButton" name="btGuardarAnadirEmpresa">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/guardar.png"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btLimpiarAnadirEmpresa">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/limpiar.png"/>
-            </Property>
-          </Properties>
-        </Component>
-      </SubComponents>
-    </Container>
-    <Container class="javax.swing.JPanel" name="PanelVoluntarioColaboracionesComprobarPagos">
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
-          <CardConstraints cardName="card14"/>
-        </Constraint>
-      </Constraints>
-
-      <Layout>
-        <DimensionLayout dim="0">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" attributes="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="102" alignment="0" attributes="0">
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToMainFromComprobarCuotas" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario19" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToVoluntarioFromComprobarCuotas" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario20" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToColaboracionesFromComprobarCuotas" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario21" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="labSVolunt5" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <Group type="102" alignment="0" attributes="0">
-                          <EmptySpace min="-2" pref="34" max="-2" attributes="0"/>
-                          <Group type="103" groupAlignment="0" attributes="0">
-                              <Component id="jLabel92" min="-2" max="-2" attributes="0"/>
-                              <Component id="jLabel82" alignment="0" min="-2" max="-2" attributes="0"/>
-                              <Group type="102" attributes="0">
-                                  <EmptySpace min="10" pref="10" max="-2" attributes="0"/>
-                                  <Group type="103" groupAlignment="0" max="-2" attributes="0">
-                                      <Component id="jScrollPane15" min="-2" pref="872" max="-2" attributes="0"/>
-                                      <Group type="102" alignment="0" attributes="0">
-                                          <Group type="103" groupAlignment="0" attributes="0">
-                                              <Component id="jLabel83" alignment="0" min="-2" max="-2" attributes="0"/>
-                                              <Component id="jLabel84" alignment="0" min="-2" max="-2" attributes="0"/>
-                                              <Component id="jLabel85" alignment="0" min="-2" max="-2" attributes="0"/>
-                                          </Group>
-                                          <EmptySpace type="separate" max="-2" attributes="0"/>
-                                          <Group type="103" groupAlignment="0" attributes="0">
-                                              <Component id="textAnadirPagoConcepto" alignment="0" min="-2" pref="611" max="-2" attributes="0"/>
-                                              <Component id="textAnadirPagoDNISocio" alignment="0" min="-2" pref="125" max="-2" attributes="0"/>
-                                              <Group type="102" alignment="0" attributes="0">
-                                                  <Component id="textAnadirPagoCantidad" min="-2" pref="197" max="-2" attributes="0"/>
-                                                  <EmptySpace min="-2" pref="74" max="-2" attributes="0"/>
-                                                  <Component id="jLabel86" min="-2" max="-2" attributes="0"/>
-                                                  <EmptySpace type="separate" max="-2" attributes="0"/>
-                                                  <Component id="textAnadirPagoFecha" min="-2" pref="150" max="-2" attributes="0"/>
-                                              </Group>
-                                          </Group>
-                                          <EmptySpace max="32767" attributes="0"/>
-                                          <Component id="btGuardarPago" min="-2" pref="27" max="-2" attributes="0"/>
-                                          <EmptySpace min="-2" pref="63" max="-2" attributes="0"/>
-                                      </Group>
-                                  </Group>
-                              </Group>
-                          </Group>
-                      </Group>
-                  </Group>
-                  <EmptySpace pref="111" max="32767" attributes="0"/>
-              </Group>
-          </Group>
-        </DimensionLayout>
-        <DimensionLayout dim="1">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="0" attributes="0">
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="navToMainFromComprobarCuotas" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario19" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="labSVolunt5" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToVoluntarioFromComprobarCuotas" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="navToColaboracionesFromComprobarCuotas" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario20" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario21" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
-                  <Component id="jLabel92" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Component id="jScrollPane15" min="-2" pref="301" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" pref="27" max="-2" attributes="0"/>
-                  <Component id="jLabel82" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="jLabel83" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="textAnadirPagoDNISocio" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="102" attributes="0">
-                          <Group type="103" groupAlignment="0" attributes="0">
-                              <Group type="103" groupAlignment="3" attributes="0">
-                                  <Component id="textAnadirPagoCantidad" alignment="3" min="-2" max="-2" attributes="0"/>
-                                  <Component id="jLabel86" alignment="3" min="-2" max="-2" attributes="0"/>
-                                  <Component id="textAnadirPagoFecha" alignment="3" min="-2" max="-2" attributes="0"/>
-                              </Group>
-                              <Component id="jLabel84" alignment="0" min="-2" max="-2" attributes="0"/>
-                          </Group>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Group type="103" groupAlignment="3" attributes="0">
-                              <Component id="jLabel85" alignment="3" min="-2" max="-2" attributes="0"/>
-                              <Component id="textAnadirPagoConcepto" alignment="3" min="-2" max="-2" attributes="0"/>
-                          </Group>
-                      </Group>
-                      <Component id="btGuardarPago" min="-2" pref="30" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace pref="122" max="32767" attributes="0"/>
-              </Group>
-          </Group>
-        </DimensionLayout>
-      </Layout>
-      <SubComponents>
-        <Component class="javax.swing.JLabel" name="labSVolunt5">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="ComprobarCuotas"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario19">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToMainFromComprobarCuotas">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="DIAKETAS"/>
-            <Property name="actionCommand" type="java.lang.String" value="navToMainFromVoluntarios"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToVoluntarioFromComprobarCuotas">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Voluntario"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToColaboracionesFromComprobarCuotas">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Colaboraciones"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario20">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario21">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel92">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="0" green="0" red="ff" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Cuotas"/>
-          </Properties>
-        </Component>
-        <Container class="javax.swing.JScrollPane" name="jScrollPane15">
-
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-          <SubComponents>
-            <Component class="javax.swing.JTable" name="tableComprobarPagos">
-              <Properties>
-                <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
-                  <Table columnCount="5" rowCount="4">
-                    <Column editable="true" title="DNI" type="java.lang.Object"/>
-                    <Column editable="true" title="Cantidad de cuota" type="java.lang.Object"/>
-                    <Column editable="true" title="Cantidad que debe" type="java.lang.Object"/>
-                    <Column editable="true" title="Intervalo de pagos" type="java.lang.Object"/>
-                    <Column editable="true" title="Fecha ultimo pago" type="java.lang.Object"/>
-                  </Table>
-                </Property>
-              </Properties>
-            </Component>
-          </SubComponents>
-        </Container>
-        <Component class="javax.swing.JLabel" name="jLabel82">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="0" green="0" red="ff" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="A&#xf1;adir pago"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel83">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="DNI del socio"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel84">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Cantidad"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel85">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Concepto"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JTextField" name="textAnadirPagoDNISocio">
-        </Component>
-        <Component class="javax.swing.JTextField" name="textAnadirPagoCantidad">
-        </Component>
-        <Component class="javax.swing.JTextField" name="textAnadirPagoConcepto">
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel86">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Fecha"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JTextField" name="textAnadirPagoFecha">
-        </Component>
-        <Component class="javax.swing.JButton" name="btGuardarPago">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/guardar.png"/>
-            </Property>
-          </Properties>
-        </Component>
-      </SubComponents>
-    </Container>
     <Container class="javax.swing.JPanel" name="PanelSocioInicio">
       <Properties>
         <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
@@ -3634,11 +3053,7 @@
                           <Component id="navToMainFromSocio" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
                           <Component id="senalaVoluntario22" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToColaboradoresFromSocio" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario23" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
+                          <EmptySpace min="-2" pref="32" max="-2" attributes="0"/>
                           <Component id="labSVolunt6" min="-2" max="-2" attributes="0"/>
                           <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                       </Group>
@@ -3663,8 +3078,6 @@
                       <Component id="navToMainFromSocio" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
                       <Component id="senalaVoluntario22" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="labSVolunt6" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToColaboradoresFromSocio" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario23" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
                   <Component id="separadorVoluntario4" min="-2" pref="10" max="-2" attributes="0"/>
@@ -3735,24 +3148,6 @@
             <Property name="borderPainted" type="boolean" value="false"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JButton" name="navToColaboradoresFromSocio">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Colaboradores"/>
-            <Property name="actionCommand" type="java.lang.String" value="navToMainFromVoluntarios"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario23">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="PanelSocioDatos">
@@ -3774,12 +3169,8 @@
                           <EmptySpace type="unrelated" max="-2" attributes="0"/>
                           <Component id="senalaSocio8" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToColaboradoresFromDatosSocio" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario34" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
                           <Component id="navToMainFromDatosSocio" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
+                          <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
                           <Component id="senalaSocio7" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
                           <Component id="jLabel64" min="-2" max="-2" attributes="0"/>
@@ -3798,14 +3189,12 @@
                       <Group type="103" alignment="0" groupAlignment="3" attributes="0">
                           <Component id="senalaSocio7" alignment="3" min="-2" max="-2" attributes="0"/>
                           <Component id="jLabel64" alignment="3" min="-2" max="-2" attributes="0"/>
-                          <Component id="navToMainFromDatosSocio" alignment="3" pref="0" max="32767" attributes="0"/>
                       </Group>
                       <Group type="103" alignment="0" groupAlignment="3" attributes="0">
-                          <Component id="navToColaboradoresFromDatosSocio" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario34" alignment="3" min="-2" max="-2" attributes="0"/>
+                          <Component id="navToMainFromNuevoSocio" alignment="3" min="-2" pref="12" max="-2" attributes="0"/>
+                          <Component id="senalaSocio8" alignment="0" max="32767" attributes="0"/>
+                          <Component id="navToMainFromDatosSocio" alignment="3" pref="0" max="32767" attributes="0"/>
                       </Group>
-                      <Component id="senalaSocio8" alignment="0" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToMainFromNuevoSocio" alignment="0" min="-2" pref="12" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="jTabbedPane2" min="-2" pref="450" max="-2" attributes="0"/>
@@ -4760,24 +4149,6 @@
             </Container>
           </SubComponents>
         </Container>
-        <Component class="javax.swing.JButton" name="navToColaboradoresFromDatosSocio">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Colaboradores"/>
-            <Property name="actionCommand" type="java.lang.String" value="navToMainFromVoluntarios"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario34">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="PanelSocioBuscar">
@@ -4796,17 +4167,11 @@
                       <Group type="102" alignment="1" attributes="0">
                           <EmptySpace min="0" pref="105" max="32767" attributes="0"/>
                           <Group type="103" groupAlignment="0" attributes="0">
-                              <Group type="102" alignment="0" attributes="0">
-                                  <Component id="textBuscarSocio" min="-2" pref="214" max="-2" attributes="0"/>
-                                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                                  <Component id="btBuscar" min="-2" pref="29" max="-2" attributes="0"/>
-                              </Group>
-                              <Group type="102" alignment="0" attributes="0">
-                                  <Component id="jLabel81" min="-2" max="-2" attributes="0"/>
-                                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                                  <Component id="cbTextSocio" min="-2" pref="162" max="-2" attributes="0"/>
-                              </Group>
+                              <Component id="jLabel81" min="-2" max="-2" attributes="0"/>
+                              <Component id="textBuscarSocio" min="-2" pref="214" max="-2" attributes="0"/>
                           </Group>
+                          <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                          <Component id="btBuscar" min="-2" pref="29" max="-2" attributes="0"/>
                           <EmptySpace min="-2" pref="659" max="-2" attributes="0"/>
                       </Group>
                       <Group type="102" alignment="1" attributes="0">
@@ -4814,12 +4179,8 @@
                           <EmptySpace max="-2" attributes="0"/>
                           <Component id="senalaVoluntario10" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToColaboradoresFromBuscarSocio" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario11" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
                           <Component id="navToSocioFromBuscarSocio" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
                           <Component id="senalaVoluntario12" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
                           <Component id="labSVolunt2" min="-2" max="-2" attributes="0"/>
@@ -4829,6 +4190,10 @@
               </Group>
               <Group type="102" attributes="0">
                   <Group type="103" groupAlignment="0" attributes="0">
+                      <Group type="102" alignment="0" attributes="0">
+                          <EmptySpace min="-2" pref="182" max="-2" attributes="0"/>
+                          <Component id="cbTextSocio" min="-2" pref="162" max="-2" attributes="0"/>
+                      </Group>
                       <Group type="102" alignment="0" attributes="0">
                           <EmptySpace min="-2" pref="85" max="-2" attributes="0"/>
                           <Component id="jScrollPane12" min="-2" pref="797" max="-2" attributes="0"/>
@@ -4848,18 +4213,12 @@
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="103" alignment="0" groupAlignment="3" attributes="0">
-                          <Component id="navToColaboradoresFromBuscarSocio" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario11" alignment="3" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <Group type="103" groupAlignment="3" attributes="0">
-                          <Component id="navToMainFromBuscarSocio" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario10" alignment="3" min="-2" max="-2" attributes="0"/>
-                          <Component id="labSVolunt2" alignment="3" min="-2" max="-2" attributes="0"/>
-                          <Component id="navToSocioFromBuscarSocio" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario12" alignment="3" min="-2" max="-2" attributes="0"/>
-                      </Group>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="navToMainFromBuscarSocio" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="senalaVoluntario10" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="labSVolunt2" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="navToSocioFromBuscarSocio" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="senalaVoluntario12" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
@@ -4983,24 +4342,6 @@
             </Property>
           </Properties>
         </Component>
-        <Component class="javax.swing.JButton" name="navToColaboradoresFromBuscarSocio">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Colaboradores"/>
-            <Property name="actionCommand" type="java.lang.String" value="navToMainFromVoluntarios"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario11">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="PanelColaboradores">
@@ -5020,31 +4361,17 @@
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
+                  <Component id="navToMainFromSocioDatos2" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Group type="102" attributes="0">
-                          <Component id="navToMainFromColaboradores" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
                           <Component id="senalaSocio9" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Group type="103" groupAlignment="0" attributes="0">
-                              <Group type="102" attributes="0">
-                                  <Component id="btColaborador" min="-2" pref="229" max="-2" attributes="0"/>
-                                  <EmptySpace max="32767" attributes="0"/>
-                                  <Component id="btSocio" min="-2" pref="229" max="-2" attributes="0"/>
-                                  <EmptySpace min="-2" pref="30" max="-2" attributes="0"/>
-                              </Group>
-                              <Group type="102" attributes="0">
-                                  <Component id="jLabel70" min="-2" max="-2" attributes="0"/>
-                                  <EmptySpace pref="848" max="32767" attributes="0"/>
-                              </Group>
-                          </Group>
+                          <Component id="jLabel70" min="-2" max="-2" attributes="0"/>
                       </Group>
-                      <Group type="102" alignment="1" attributes="0">
-                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                          <Component id="btEmpresa" min="-2" pref="229" max="-2" attributes="0"/>
-                          <EmptySpace min="-2" pref="365" max="-2" attributes="0"/>
-                      </Group>
+                      <Component id="jButton9" min="-2" pref="283" max="-2" attributes="0"/>
                   </Group>
+                  <EmptySpace pref="647" max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -5053,24 +4380,19 @@
               <Group type="102" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="navToMainFromColaboradores" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="navToMainFromSocioDatos2" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="jLabel70" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="senalaSocio9" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace min="-2" pref="75" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="btSocio" min="-2" pref="203" max="-2" attributes="0"/>
-                      <Component id="btColaborador" min="-2" pref="203" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
-                  <Component id="btEmpresa" min="-2" pref="203" max="-2" attributes="0"/>
-                  <EmptySpace pref="99" max="32767" attributes="0"/>
+                  <EmptySpace min="-2" pref="64" max="-2" attributes="0"/>
+                  <Component id="jButton9" min="-2" pref="185" max="-2" attributes="0"/>
+                  <EmptySpace pref="335" max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
       </Layout>
       <SubComponents>
-        <Component class="javax.swing.JButton" name="navToMainFromColaboradores">
+        <Component class="javax.swing.JButton" name="navToMainFromSocioDatos2">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="ff" green="0" red="0" type="rgb"/>
@@ -5093,99 +4415,120 @@
             <Property name="text" type="java.lang.String" value="Colaboradores"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JButton" name="btEmpresa">
+        <Component class="javax.swing.JButton" name="jButton9">
           <Properties>
+            <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="ff" green="ff" red="ff" type="rgb"/>
+            </Property>
             <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Lucida Grande" size="14" style="1"/>
+              <Font name="Lucida Bright" size="14" style="1"/>
             </Property>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/colaborador_1.jpg"/>
+              <Image iconType="3" name="/Vista/images/monigotes-6-.png"/>
             </Property>
-            <Property name="text" type="java.lang.String" value="EMPRESA"/>
-            <Property name="actionCommand" type="java.lang.String" value="nuevoBeneficiario"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btSocio">
-          <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Lucida Grande" size="14" style="1"/>
-            </Property>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/formadepago_1.jpg"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="SOCIO"/>
-            <Property name="actionCommand" type="java.lang.String" value="buscarBeneficiario"/>
-            <Property name="horizontalTextPosition" type="int" value="0"/>
-            <Property name="verticalTextPosition" type="int" value="3"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btColaborador">
-          <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Lucida Grande" size="14" style="1"/>
-            </Property>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/colaborador_1.jpg"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="COLABORADOR"/>
-            <Property name="actionCommand" type="java.lang.String" value="nuevoBeneficiario"/>
-            <Property name="horizontalTextPosition" type="int" value="0"/>
-            <Property name="verticalTextPosition" type="int" value="3"/>
-          </Properties>
-          <Events>
-            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btColaboradorActionPerformed"/>
-          </Events>
         </Component>
       </SubComponents>
     </Container>
-    <Container class="javax.swing.JPanel" name="PanelColaboradorInicio">
-      <Properties>
-        <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-          <Color blue="ff" green="ff" red="ff" type="rgb"/>
-        </Property>
-        <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[1000, 600]"/>
-        </Property>
-        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[1000, 600]"/>
-        </Property>
-      </Properties>
+    <Container class="javax.swing.JPanel" name="PanelA&#xf1;adirColaboraciones">
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
-          <CardConstraints cardName="card7"/>
+          <CardConstraints cardName="card14"/>
         </Constraint>
       </Constraints>
 
       <Layout>
         <DimensionLayout dim="0">
           <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="0" attributes="0">
+              <Group type="102" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Group type="102" alignment="0" attributes="0">
-                          <Component id="navToMainFromColaborador" min="-2" max="-2" attributes="0"/>
+                          <Component id="navToMainFromVoluntarios1" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario26" min="-2" max="-2" attributes="0"/>
+                          <Component id="senalaVoluntario7" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToColaboradoresFromColaborador" min="-2" max="-2" attributes="0"/>
+                          <Component id="jButton8" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario27" min="-2" max="-2" attributes="0"/>
+                          <Component id="senalaVoluntario8" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="labSVolunt8" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                          <Component id="jButton10" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="senalaVoluntario9" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="labSVolunt1" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="32767" attributes="0"/>
                       </Group>
-                      <Component id="separadorVoluntario6" alignment="0" max="32767" attributes="0"/>
+                      <Group type="102" alignment="1" attributes="0">
+                          <EmptySpace min="0" pref="161" max="32767" attributes="0"/>
+                          <Group type="103" groupAlignment="1" attributes="0">
+                              <Group type="103" alignment="1" groupAlignment="0" attributes="0">
+                                  <Component id="jLabel76" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Group type="102" alignment="0" attributes="0">
+                                      <Group type="103" groupAlignment="0" attributes="0">
+                                          <Group type="102" alignment="0" attributes="0">
+                                              <EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
+                                              <Component id="jLabel79" min="-2" max="-2" attributes="0"/>
+                                              <EmptySpace min="-2" pref="59" max="-2" attributes="0"/>
+                                          </Group>
+                                          <Group type="102" alignment="1" attributes="0">
+                                              <Group type="103" groupAlignment="0" attributes="0">
+                                                  <Component id="jLabel78" min="-2" max="-2" attributes="0"/>
+                                                  <Component id="jLabel77" min="-2" max="-2" attributes="0"/>
+                                              </Group>
+                                              <EmptySpace type="separate" max="-2" attributes="0"/>
+                                          </Group>
+                                      </Group>
+                                      <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                                          <Group type="102" alignment="0" attributes="0">
+                                              <Component id="jTextField10" min="-2" pref="111" max="-2" attributes="0"/>
+                                              <EmptySpace min="-2" pref="125" max="-2" attributes="0"/>
+                                              <Component id="jLabel80" min="-2" max="-2" attributes="0"/>
+                                              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                                              <Component id="jTextField12" max="32767" attributes="0"/>
+                                          </Group>
+                                          <Component id="jTextField11" alignment="0" min="-2" pref="430" max="-2" attributes="0"/>
+                                          <Component id="jTextField9" alignment="0" min="-2" pref="162" max="-2" attributes="0"/>
+                                      </Group>
+                                      <EmptySpace min="-2" pref="99" max="-2" attributes="0"/>
+                                      <Component id="jButton13" min="-2" pref="25" max="-2" attributes="0"/>
+                                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                                      <Component id="jButton14" min="-2" pref="27" max="-2" attributes="0"/>
+                                  </Group>
+                              </Group>
+                              <Group type="103" alignment="1" groupAlignment="0" attributes="0">
+                                  <Component id="jLabel71" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Group type="102" alignment="0" attributes="0">
+                                      <EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
+                                      <Group type="103" groupAlignment="0" attributes="0">
+                                          <Component id="jLabel72" alignment="0" min="-2" max="-2" attributes="0"/>
+                                          <Component id="jLabel73" alignment="0" min="-2" max="-2" attributes="0"/>
+                                          <Component id="jLabel74" alignment="0" min="-2" max="-2" attributes="0"/>
+                                      </Group>
+                                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                                      <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                                          <Group type="102" alignment="0" attributes="0">
+                                              <Component id="jTextField6" min="-2" pref="111" max="-2" attributes="0"/>
+                                              <EmptySpace min="-2" pref="125" max="-2" attributes="0"/>
+                                              <Component id="jLabel75" min="-2" max="-2" attributes="0"/>
+                                              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                                              <Component id="jTextField8" max="32767" attributes="0"/>
+                                          </Group>
+                                          <Component id="jTextField7" min="-2" pref="430" max="-2" attributes="0"/>
+                                          <Component id="jTextField5" alignment="0" min="-2" pref="162" max="-2" attributes="0"/>
+                                      </Group>
+                                      <EmptySpace min="-2" pref="99" max="-2" attributes="0"/>
+                                      <Component id="jButton11" min="-2" pref="25" max="-2" attributes="0"/>
+                                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                                      <Component id="jButton12" min="-2" pref="27" max="-2" attributes="0"/>
+                                  </Group>
+                              </Group>
+                          </Group>
+                          <EmptySpace min="-2" pref="131" max="-2" attributes="0"/>
+                      </Group>
                   </Group>
-                  <EmptySpace max="-2" attributes="0"/>
-              </Group>
-              <Group type="102" alignment="0" attributes="0">
-                  <EmptySpace min="-2" pref="107" max="-2" attributes="0"/>
-                  <Component id="btNuevoColaborador" min="-2" pref="265" max="-2" attributes="0"/>
-                  <EmptySpace pref="255" max="32767" attributes="0"/>
-                  <Component id="btBuscarColaborador" min="-2" pref="263" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" pref="137" max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -5194,28 +4537,91 @@
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="navToMainFromColaborador" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario26" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="labSVolunt8" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToColaboradoresFromColaborador" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario27" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="navToMainFromVoluntarios1" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="senalaVoluntario7" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="labSVolunt1" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="jButton8" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="jButton10" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="senalaVoluntario8" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="senalaVoluntario9" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
-                  <Component id="separadorVoluntario6" min="-2" pref="10" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" pref="139" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="106" max="-2" attributes="0"/>
+                  <Component id="jLabel71" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="jLabel72" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="jTextField5" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
                   <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="btBuscarColaborador" alignment="0" min="-2" pref="244" max="-2" attributes="0"/>
-                      <Component id="btNuevoColaborador" alignment="0" min="-2" pref="244" max="-2" attributes="0"/>
+                      <Group type="102" alignment="0" attributes="0">
+                          <Group type="103" groupAlignment="3" attributes="0">
+                              <Component id="jLabel73" alignment="3" min="-2" max="-2" attributes="0"/>
+                              <Component id="jTextField6" alignment="3" min="-2" max="-2" attributes="0"/>
+                              <Component id="jLabel75" alignment="3" min="-2" max="-2" attributes="0"/>
+                              <Component id="jTextField8" alignment="3" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="3" attributes="0">
+                              <Component id="jLabel74" alignment="3" min="-2" max="-2" attributes="0"/>
+                              <Component id="jTextField7" alignment="3" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                      </Group>
+                      <Group type="102" alignment="0" attributes="0">
+                          <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Component id="jButton12" min="-2" pref="30" max="-2" attributes="0"/>
+                              <Component id="jButton11" min="-2" pref="26" max="-2" attributes="0"/>
+                          </Group>
+                      </Group>
                   </Group>
-                  <EmptySpace pref="196" max="32767" attributes="0"/>
+                  <EmptySpace min="-2" pref="49" max="-2" attributes="0"/>
+                  <Component id="jLabel76" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="jLabel77" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="jTextField9" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Group type="102" alignment="0" attributes="0">
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Group type="103" alignment="0" groupAlignment="3" attributes="0">
+                                  <Component id="jLabel80" alignment="3" min="-2" max="-2" attributes="0"/>
+                                  <Component id="jTextField12" alignment="3" min="-2" max="-2" attributes="0"/>
+                              </Group>
+                              <Group type="102" alignment="0" attributes="0">
+                                  <EmptySpace max="-2" attributes="0"/>
+                                  <Group type="103" groupAlignment="3" attributes="0">
+                                      <Component id="jTextField10" alignment="3" min="-2" max="-2" attributes="0"/>
+                                      <Component id="jLabel78" alignment="3" min="-2" max="-2" attributes="0"/>
+                                  </Group>
+                              </Group>
+                          </Group>
+                          <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Component id="jTextField11" min="-2" max="-2" attributes="0"/>
+                              <Component id="jLabel79" alignment="0" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                      </Group>
+                      <Group type="102" alignment="0" attributes="0">
+                          <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Component id="jButton14" alignment="0" min="-2" pref="30" max="-2" attributes="0"/>
+                              <Component id="jButton13" alignment="0" min="-2" pref="26" max="-2" attributes="0"/>
+                          </Group>
+                      </Group>
+                  </Group>
+                  <EmptySpace pref="245" max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
       </Layout>
       <SubComponents>
-        <Component class="javax.swing.JSeparator" name="separadorVoluntario6">
+        <Component class="javax.swing.JLabel" name="labSVolunt1">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="A&#xf1;adir Colaboraciones"/>
+          </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario26">
+        <Component class="javax.swing.JLabel" name="senalaVoluntario7">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="99" green="99" red="99" type="rgb"/>
@@ -5223,43 +4629,7 @@
             <Property name="text" type="java.lang.String" value="&gt;"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="labSVolunt8">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Colaborador"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btBuscarColaborador">
-          <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Lucida Grande" size="14" style="1"/>
-            </Property>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/lupa.png"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="BUSCAR"/>
-            <Property name="actionCommand" type="java.lang.String" value="buscarVoluntario"/>
-            <Property name="horizontalTextPosition" type="int" value="0"/>
-            <Property name="verticalTextPosition" type="int" value="3"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btNuevoColaborador">
-          <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Lucida Grande" size="14" style="1"/>
-            </Property>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/usu.png"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Nuevo Socio"/>
-            <Property name="actionCommand" type="java.lang.String" value="contabilidad"/>
-            <Property name="horizontalTextPosition" type="int" value="0"/>
-            <Property name="verticalTextPosition" type="int" value="3"/>
-          </Properties>
-          <AuxValues>
-            <AuxValue name="JavaCodeGenerator_SerializeTo" type="java.lang.String" value="VentanaPrincipal_btNuevoSocio"/>
-          </AuxValues>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToMainFromColaborador">
+        <Component class="javax.swing.JButton" name="navToMainFromVoluntarios1">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="ff" green="0" red="0" type="rgb"/>
@@ -5269,17 +4639,23 @@
             <Property name="borderPainted" type="boolean" value="false"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JButton" name="navToColaboradoresFromColaborador">
+        <Component class="javax.swing.JButton" name="jButton8">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="ff" green="0" red="0" type="rgb"/>
             </Property>
-            <Property name="text" type="java.lang.String" value="Colaboradores"/>
-            <Property name="actionCommand" type="java.lang.String" value="navToMainFromVoluntarios"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
+            <Property name="text" type="java.lang.String" value="Voluntario"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario27">
+        <Component class="javax.swing.JButton" name="jButton10">
+          <Properties>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="ff" green="0" red="0" type="rgb"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="Colaboraciones"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="senalaVoluntario8">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="99" green="99" red="99" type="rgb"/>
@@ -5287,9 +4663,117 @@
             <Property name="text" type="java.lang.String" value="&gt;"/>
           </Properties>
         </Component>
+        <Component class="javax.swing.JLabel" name="senalaVoluntario9">
+          <Properties>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="99" green="99" red="99" type="rgb"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="&gt;"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel71">
+          <Properties>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="0" green="0" red="ff" type="rgb"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="A&#xf1;adir en colaborador"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel72">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="DNI del colaborador"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField5">
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel73">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Cantidad"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField6">
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel74">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Concepto"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField7">
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel75">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Fecha"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField8">
+        </Component>
+        <Component class="javax.swing.JButton" name="jButton11">
+          <Properties>
+            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/Vista/images/guardar.png"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="jButton12">
+          <Properties>
+            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/Vista/images/limpiar.png"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel76">
+          <Properties>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="0" green="0" red="ff" type="rgb"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="A&#xf1;adir en empresa"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel77">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="CIF de la empresa"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel78">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Cantidad"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel79">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Concepto"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField9">
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField10">
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField11">
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel80">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Fecha"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField12">
+        </Component>
+        <Component class="javax.swing.JButton" name="jButton13">
+          <Properties>
+            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/Vista/images/guardar.png"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="jButton14">
+          <Properties>
+            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/Vista/images/limpiar.png"/>
+            </Property>
+          </Properties>
+        </Component>
       </SubComponents>
     </Container>
-    <Container class="javax.swing.JPanel" name="PanelColaboradorDatos">
+    <Container class="javax.swing.JPanel" name="PanelColaborador">
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
           <CardConstraints cardName="card15"/>
@@ -5301,15 +4785,15 @@
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace pref="14" max="32767" attributes="0"/>
-                  <Component id="navToMainFromColaboradorDatos" min="-2" max="-2" attributes="0"/>
+                  <Component id="navToMainFromVoluntarios3" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="senalaVoluntario13" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Component id="navToColaboradoresFromColaboradorDatos" min="-2" max="-2" attributes="0"/>
+                  <Component id="jButton20" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="senalaVoluntario14" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Component id="navToColaboradorFromColaboradorDatos" min="-2" max="-2" attributes="0"/>
+                  <Component id="jButton21" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="senalaVoluntario15" min="-2" max="-2" attributes="0"/>
                   <EmptySpace type="unrelated" max="-2" attributes="0"/>
@@ -5328,11 +4812,11 @@
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="navToMainFromColaboradorDatos" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="navToMainFromVoluntarios3" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
                       <Component id="senalaVoluntario13" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="labSVolunt3" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToColaboradoresFromColaboradorDatos" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="navToColaboradorFromColaboradorDatos" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="jButton20" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="jButton21" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
                       <Component id="senalaVoluntario14" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="senalaVoluntario15" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
@@ -5344,7 +4828,7 @@
         </DimensionLayout>
       </Layout>
       <SubComponents>
-        <Component class="javax.swing.JButton" name="navToMainFromColaboradorDatos">
+        <Component class="javax.swing.JButton" name="navToMainFromVoluntarios3">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="ff" green="0" red="0" type="rgb"/>
@@ -5362,7 +4846,7 @@
             <Property name="text" type="java.lang.String" value="&gt;"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JButton" name="navToColaboradoresFromColaboradorDatos">
+        <Component class="javax.swing.JButton" name="jButton20">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="ff" green="0" red="0" type="rgb"/>
@@ -5378,7 +4862,7 @@
             <Property name="text" type="java.lang.String" value="&gt;"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JButton" name="navToColaboradorFromColaboradorDatos">
+        <Component class="javax.swing.JButton" name="jButton21">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="ff" green="0" red="0" type="rgb"/>
@@ -5403,7 +4887,7 @@
 
           <Layout class="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"/>
           <SubComponents>
-            <Container class="javax.swing.JPanel" name="PanelDatosColaborador">
+            <Container class="javax.swing.JPanel" name="PanelColaboradorDatos">
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
                   <JTabbedPaneConstraints tabName="Datos">
@@ -5781,7 +5265,7 @@
                 </Component>
               </SubComponents>
             </Container>
-            <Container class="javax.swing.JPanel" name="PanelColaboracionesColaborador">
+            <Container class="javax.swing.JPanel" name="PanelColaboradorColaboraciones">
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
                   <JTabbedPaneConstraints tabName="Colaboraciones">
@@ -5995,7 +5479,7 @@
         </Container>
       </SubComponents>
     </Container>
-    <Container class="javax.swing.JPanel" name="PanelColaboradorBuscar">
+    <Container class="javax.swing.JPanel" name="PanelEmpresa">
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
           <CardConstraints cardName="card15"/>
@@ -6007,380 +5491,15 @@
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="1" attributes="0">
-                      <Group type="102" alignment="1" attributes="0">
-                          <EmptySpace min="0" pref="105" max="32767" attributes="0"/>
-                          <Component id="textBuscarSocio2" min="-2" pref="214" max="-2" attributes="0"/>
-                          <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                          <Component id="btBuscar2" min="-2" pref="29" max="-2" attributes="0"/>
-                          <EmptySpace min="-2" pref="659" max="-2" attributes="0"/>
-                      </Group>
-                      <Group type="102" alignment="1" attributes="0">
-                          <Component id="navToMainFromColaboradorBuscar" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario31" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToColaboradoresFromBuscarColaborador" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario33" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToColaboradorFromBuscarColaborador" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario32" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="labSVolunt10" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                      </Group>
-                  </Group>
-              </Group>
-              <Group type="102" alignment="0" attributes="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="102" alignment="0" attributes="0">
-                          <EmptySpace min="-2" pref="117" max="-2" attributes="0"/>
-                          <Component id="jLabel88" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="cbTextSocio2" min="-2" pref="162" max="-2" attributes="0"/>
-                      </Group>
-                      <Group type="102" alignment="0" attributes="0">
-                          <EmptySpace min="-2" pref="85" max="-2" attributes="0"/>
-                          <Component id="jScrollPane17" min="-2" pref="797" max="-2" attributes="0"/>
-                      </Group>
-                      <Group type="102" alignment="0" attributes="0">
-                          <EmptySpace min="-2" pref="458" max="-2" attributes="0"/>
-                          <Component id="btConsultar2" min="-2" pref="26" max="-2" attributes="0"/>
-                          <EmptySpace type="separate" max="-2" attributes="0"/>
-                          <Component id="btEliminar2" min="-2" pref="24" max="-2" attributes="0"/>
-                      </Group>
-                  </Group>
-                  <EmptySpace max="32767" attributes="0"/>
-              </Group>
-          </Group>
-        </DimensionLayout>
-        <DimensionLayout dim="1">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="0" attributes="0">
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="navToMainFromColaboradorBuscar" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario31" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="labSVolunt10" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToColaboradorFromBuscarColaborador" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario32" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToColaboradoresFromBuscarColaborador" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario33" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="btBuscar2" alignment="0" min="-2" pref="29" max="-2" attributes="0"/>
-                      <Component id="textBuscarSocio2" alignment="0" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace min="-2" pref="14" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="jLabel88" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="cbTextSocio2" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace min="-2" pref="41" max="-2" attributes="0"/>
-                  <Component id="jScrollPane17" pref="369" max="32767" attributes="0"/>
-                  <EmptySpace type="separate" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="btConsultar2" alignment="1" min="-2" pref="25" max="-2" attributes="0"/>
-                      <Component id="btEliminar2" alignment="1" min="-2" pref="25" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace min="-2" pref="57" max="-2" attributes="0"/>
-              </Group>
-          </Group>
-        </DimensionLayout>
-      </Layout>
-      <SubComponents>
-        <Component class="javax.swing.JButton" name="navToMainFromColaboradorBuscar">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="DIAKETAS"/>
-            <Property name="actionCommand" type="java.lang.String" value="navToMainFromVoluntarios"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario31">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToColaboradorFromBuscarColaborador">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Colaborador"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="labSVolunt10">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Buscar"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario32">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JTextField" name="textBuscarSocio2">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Buscar"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btBuscar2">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/buscar.png"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="jLabel88">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Buscar por:"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JComboBox" name="cbTextSocio2">
-          <Properties>
-            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-              <StringArray count="2">
-                <StringItem index="0" value="Tipo de busqueda"/>
-                <StringItem index="1" value=" "/>
-              </StringArray>
-            </Property>
-          </Properties>
-        </Component>
-        <Container class="javax.swing.JScrollPane" name="jScrollPane17">
-
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-          <SubComponents>
-            <Component class="javax.swing.JTable" name="tableBuscarSocio2">
-              <Properties>
-                <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
-                  <Table columnCount="5" rowCount="4">
-                    <Column editable="true" title="DNI" type="java.lang.String"/>
-                    <Column editable="true" title="Nombre" type="java.lang.String"/>
-                    <Column editable="true" title="Apellidos" type="java.lang.String"/>
-                    <Column editable="true" title="Localidad" type="java.lang.String"/>
-                    <Column editable="true" title="Fecha Nacimiento" type="java.lang.Object"/>
-                  </Table>
-                </Property>
-              </Properties>
-            </Component>
-          </SubComponents>
-        </Container>
-        <Component class="javax.swing.JButton" name="btConsultar2">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/modificar.png"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btEliminar2">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/borrar.png"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToColaboradoresFromBuscarColaborador">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Colaboradores"/>
-            <Property name="actionCommand" type="java.lang.String" value="navToMainFromVoluntarios"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario33">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-      </SubComponents>
-    </Container>
-    <Container class="javax.swing.JPanel" name="PanelEmpresaInicio">
-      <Properties>
-        <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-          <Color blue="ff" green="ff" red="ff" type="rgb"/>
-        </Property>
-        <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[1000, 600]"/>
-        </Property>
-        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[1000, 600]"/>
-        </Property>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
-          <CardConstraints cardName="card7"/>
-        </Constraint>
-      </Constraints>
-
-      <Layout>
-        <DimensionLayout dim="0">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="0" attributes="0">
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="102" alignment="0" attributes="0">
-                          <Component id="navToMainFromEmpresa" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario24" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToColaboradoresFromEmpresa" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario25" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="labSVolunt7" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                      </Group>
-                      <Component id="separadorVoluntario5" alignment="0" max="32767" attributes="0"/>
-                  </Group>
-                  <EmptySpace max="-2" attributes="0"/>
-              </Group>
-              <Group type="102" alignment="0" attributes="0">
-                  <EmptySpace min="-2" pref="107" max="-2" attributes="0"/>
-                  <Component id="btNuevoEmpresa" min="-2" pref="265" max="-2" attributes="0"/>
-                  <EmptySpace pref="255" max="32767" attributes="0"/>
-                  <Component id="btBuscarEmpresa" min="-2" pref="263" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" pref="137" max="-2" attributes="0"/>
-              </Group>
-          </Group>
-        </DimensionLayout>
-        <DimensionLayout dim="1">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="0" attributes="0">
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="navToMainFromEmpresa" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario24" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="labSVolunt7" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToColaboradoresFromEmpresa" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario25" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
-                  <Component id="separadorVoluntario5" min="-2" pref="10" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" pref="139" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="btBuscarEmpresa" alignment="0" min="-2" pref="244" max="-2" attributes="0"/>
-                      <Component id="btNuevoEmpresa" alignment="0" min="-2" pref="244" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace pref="196" max="32767" attributes="0"/>
-              </Group>
-          </Group>
-        </DimensionLayout>
-      </Layout>
-      <SubComponents>
-        <Component class="javax.swing.JSeparator" name="separadorVoluntario5">
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario24">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="labSVolunt7">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Empresa"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btBuscarEmpresa">
-          <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Lucida Grande" size="14" style="1"/>
-            </Property>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/lupa.png"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="BUSCAR"/>
-            <Property name="actionCommand" type="java.lang.String" value="buscarVoluntario"/>
-            <Property name="horizontalTextPosition" type="int" value="0"/>
-            <Property name="verticalTextPosition" type="int" value="3"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btNuevoEmpresa">
-          <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Lucida Grande" size="14" style="1"/>
-            </Property>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/usu.png"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="NUEVA EMPRESA"/>
-            <Property name="actionCommand" type="java.lang.String" value="contabilidad"/>
-            <Property name="horizontalTextPosition" type="int" value="0"/>
-            <Property name="verticalTextPosition" type="int" value="3"/>
-          </Properties>
-          <AuxValues>
-            <AuxValue name="JavaCodeGenerator_SerializeTo" type="java.lang.String" value="VentanaPrincipal_btNuevoSocio"/>
-          </AuxValues>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToMainFromEmpresa">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="DIAKETAS"/>
-            <Property name="actionCommand" type="java.lang.String" value="navToMainFromVoluntarios"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToColaboradoresFromEmpresa">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="Colaboradores"/>
-            <Property name="actionCommand" type="java.lang.String" value="navToMainFromVoluntarios"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario25">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-      </SubComponents>
-    </Container>
-    <Container class="javax.swing.JPanel" name="PanelEmpresaDatos">
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
-          <CardConstraints cardName="card15"/>
-        </Constraint>
-      </Constraints>
-
-      <Layout>
-        <DimensionLayout dim="0">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="0" attributes="0">
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Component id="navToMainFromDatosEmpresa" min="-2" max="-2" attributes="0"/>
+                  <Component id="navToMainFromVoluntarios4" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="senalaVoluntario16" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace pref="12" max="32767" attributes="0"/>
-                  <Component id="navToColaboradoresFromDatosEmpresa" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace pref="8" max="32767" attributes="0"/>
+                  <Component id="jButton27" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="senalaVoluntario17" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Component id="navToEmpresaFromDatosEmpresa" min="-2" max="-2" attributes="0"/>
+                  <Component id="jButton28" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="senalaVoluntario18" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
@@ -6399,11 +5518,11 @@
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="navToMainFromDatosEmpresa" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="navToMainFromVoluntarios4" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
                       <Component id="senalaVoluntario16" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="labSVolunt4" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToColaboradoresFromDatosEmpresa" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="navToEmpresaFromDatosEmpresa" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="jButton27" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="jButton28" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
                       <Component id="senalaVoluntario17" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="senalaVoluntario18" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
@@ -6415,7 +5534,7 @@
         </DimensionLayout>
       </Layout>
       <SubComponents>
-        <Component class="javax.swing.JButton" name="navToMainFromDatosEmpresa">
+        <Component class="javax.swing.JButton" name="navToMainFromVoluntarios4">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="ff" green="0" red="0" type="rgb"/>
@@ -6433,7 +5552,7 @@
             <Property name="text" type="java.lang.String" value="&gt;"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JButton" name="navToColaboradoresFromDatosEmpresa">
+        <Component class="javax.swing.JButton" name="jButton27">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="ff" green="0" red="0" type="rgb"/>
@@ -6449,7 +5568,7 @@
             <Property name="text" type="java.lang.String" value="&gt;"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JButton" name="navToEmpresaFromDatosEmpresa">
+        <Component class="javax.swing.JButton" name="jButton28">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="ff" green="0" red="0" type="rgb"/>
@@ -6459,7 +5578,7 @@
         </Component>
         <Component class="javax.swing.JLabel" name="labSVolunt4">
           <Properties>
-            <Property name="text" type="java.lang.String" value="Datos"/>
+            <Property name="text" type="java.lang.String" value="Buscar"/>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="senalaVoluntario18">
@@ -6474,7 +5593,7 @@
 
           <Layout class="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"/>
           <SubComponents>
-            <Container class="javax.swing.JPanel" name="PanelDatosEmpresa">
+            <Container class="javax.swing.JPanel" name="PanelEmpresaDatos">
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
                   <JTabbedPaneConstraints tabName="Datos">
@@ -6809,7 +5928,7 @@
                 </Component>
               </SubComponents>
             </Container>
-            <Container class="javax.swing.JPanel" name="PanelColaboracionesEmpresa">
+            <Container class="javax.swing.JPanel" name="PanelEmpresaColaboraciones">
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
                   <JTabbedPaneConstraints tabName="Colaboraciones">
@@ -7023,67 +6142,71 @@
         </Container>
       </SubComponents>
     </Container>
-    <Container class="javax.swing.JPanel" name="PanelEmpresaBuscar">
+    <Container class="javax.swing.JPanel" name="PanelCuotasNoPagadas">
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignCardLayout" value="org.netbeans.modules.form.compat2.layouts.DesignCardLayout$CardConstraintsDescription">
-          <CardConstraints cardName="card15"/>
+          <CardConstraints cardName="card14"/>
         </Constraint>
       </Constraints>
 
       <Layout>
         <DimensionLayout dim="0">
           <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="0" attributes="0">
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="1" attributes="0">
-                      <Group type="102" alignment="1" attributes="0">
-                          <EmptySpace min="0" pref="105" max="32767" attributes="0"/>
-                          <Group type="103" groupAlignment="0" attributes="0">
-                              <Group type="102" alignment="0" attributes="0">
-                                  <Component id="textBuscarSocio1" min="-2" pref="214" max="-2" attributes="0"/>
-                                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                                  <Component id="btBuscar1" min="-2" pref="29" max="-2" attributes="0"/>
-                              </Group>
-                              <Group type="102" alignment="0" attributes="0">
-                                  <Component id="jLabel87" min="-2" max="-2" attributes="0"/>
-                                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                                  <Component id="cbTextSocio1" min="-2" pref="162" max="-2" attributes="0"/>
-                              </Group>
-                          </Group>
-                          <EmptySpace min="-2" pref="659" max="-2" attributes="0"/>
-                      </Group>
-                      <Group type="102" alignment="1" attributes="0">
-                          <Component id="navToMainFromBuscarEmpresa" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario28" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToColaboradoresFromBuscarEmpresa" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario30" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="navToEmpresaFromBuscarEmpresa" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                          <Component id="senalaVoluntario29" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="labSVolunt9" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                      </Group>
-                  </Group>
-              </Group>
-              <Group type="102" alignment="0" attributes="0">
+              <Group type="102" attributes="0">
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Group type="102" alignment="0" attributes="0">
-                          <EmptySpace min="-2" pref="85" max="-2" attributes="0"/>
-                          <Component id="jScrollPane16" min="-2" pref="797" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="navToMainFromVoluntarios5" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="senalaVoluntario19" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="jButton34" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="senalaVoluntario20" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="jButton35" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="senalaVoluntario21" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="labSVolunt5" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <Group type="102" alignment="0" attributes="0">
-                          <EmptySpace min="-2" pref="458" max="-2" attributes="0"/>
-                          <Component id="btConsultar1" min="-2" pref="26" max="-2" attributes="0"/>
-                          <EmptySpace type="separate" max="-2" attributes="0"/>
-                          <Component id="btEliminar1" min="-2" pref="24" max="-2" attributes="0"/>
+                          <EmptySpace min="-2" pref="34" max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Component id="jLabel92" min="-2" max="-2" attributes="0"/>
+                              <Component id="jLabel82" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Group type="102" attributes="0">
+                                  <EmptySpace min="10" pref="10" max="-2" attributes="0"/>
+                                  <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                                      <Component id="jScrollPane15" min="-2" pref="872" max="-2" attributes="0"/>
+                                      <Group type="102" alignment="0" attributes="0">
+                                          <Group type="103" groupAlignment="0" attributes="0">
+                                              <Component id="jLabel83" alignment="0" min="-2" max="-2" attributes="0"/>
+                                              <Component id="jLabel84" alignment="0" min="-2" max="-2" attributes="0"/>
+                                              <Component id="jLabel85" alignment="0" min="-2" max="-2" attributes="0"/>
+                                          </Group>
+                                          <EmptySpace type="separate" max="-2" attributes="0"/>
+                                          <Group type="103" groupAlignment="0" attributes="0">
+                                              <Component id="jTextField16" alignment="0" min="-2" pref="611" max="-2" attributes="0"/>
+                                              <Component id="jTextField14" alignment="0" min="-2" pref="125" max="-2" attributes="0"/>
+                                              <Group type="102" alignment="0" attributes="0">
+                                                  <Component id="jTextField15" min="-2" pref="197" max="-2" attributes="0"/>
+                                                  <EmptySpace min="-2" pref="74" max="-2" attributes="0"/>
+                                                  <Component id="jLabel86" min="-2" max="-2" attributes="0"/>
+                                                  <EmptySpace type="separate" max="-2" attributes="0"/>
+                                                  <Component id="jTextField17" min="-2" pref="150" max="-2" attributes="0"/>
+                                              </Group>
+                                          </Group>
+                                          <EmptySpace max="32767" attributes="0"/>
+                                          <Component id="jButton36" min="-2" pref="27" max="-2" attributes="0"/>
+                                          <EmptySpace min="-2" pref="63" max="-2" attributes="0"/>
+                                      </Group>
+                                  </Group>
+                              </Group>
+                          </Group>
                       </Group>
                   </Group>
-                  <EmptySpace max="32767" attributes="0"/>
+                  <EmptySpace pref="111" max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -7092,38 +6215,64 @@
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="navToMainFromBuscarEmpresa" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario28" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="labSVolunt9" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToEmpresaFromBuscarEmpresa" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario29" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="navToColaboradoresFromBuscarEmpresa" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
-                      <Component id="senalaVoluntario30" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="navToMainFromVoluntarios5" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="senalaVoluntario19" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="labSVolunt5" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="jButton34" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="jButton35" alignment="3" min="-2" pref="14" max="-2" attributes="0"/>
+                      <Component id="senalaVoluntario20" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="senalaVoluntario21" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="btBuscar1" alignment="0" min="-2" pref="29" max="-2" attributes="0"/>
-                      <Component id="textBuscarSocio1" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
+                  <Component id="jLabel92" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Component id="jScrollPane15" min="-2" pref="301" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="27" max="-2" attributes="0"/>
+                  <Component id="jLabel82" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="jLabel83" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="jTextField14" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="jLabel87" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="cbTextSocio1" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace min="-2" pref="50" max="-2" attributes="0"/>
-                  <Component id="jScrollPane16" pref="368" max="32767" attributes="0"/>
-                  <EmptySpace type="separate" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="btConsultar1" alignment="1" min="-2" pref="25" max="-2" attributes="0"/>
-                      <Component id="btEliminar1" alignment="1" min="-2" pref="25" max="-2" attributes="0"/>
+                      <Group type="102" attributes="0">
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Group type="103" groupAlignment="3" attributes="0">
+                                  <Component id="jTextField15" alignment="3" min="-2" max="-2" attributes="0"/>
+                                  <Component id="jLabel86" alignment="3" min="-2" max="-2" attributes="0"/>
+                                  <Component id="jTextField17" alignment="3" min="-2" max="-2" attributes="0"/>
+                              </Group>
+                              <Component id="jLabel84" alignment="0" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="3" attributes="0">
+                              <Component id="jLabel85" alignment="3" min="-2" max="-2" attributes="0"/>
+                              <Component id="jTextField16" alignment="3" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                      </Group>
+                      <Component id="jButton36" min="-2" pref="30" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace min="-2" pref="57" max="-2" attributes="0"/>
+                  <EmptySpace pref="122" max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
       </Layout>
       <SubComponents>
-        <Component class="javax.swing.JButton" name="navToMainFromBuscarEmpresa">
+        <Component class="javax.swing.JLabel" name="labSVolunt5">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="ComprobarCuotas"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="senalaVoluntario19">
+          <Properties>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="99" green="99" red="99" type="rgb"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="&gt;"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="navToMainFromVoluntarios5">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="ff" green="0" red="0" type="rgb"/>
@@ -7133,28 +6282,23 @@
             <Property name="borderPainted" type="boolean" value="false"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario28">
-          <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
-            </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToEmpresaFromBuscarEmpresa">
+        <Component class="javax.swing.JButton" name="jButton34">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="ff" green="0" red="0" type="rgb"/>
             </Property>
-            <Property name="text" type="java.lang.String" value="Empresa"/>
+            <Property name="text" type="java.lang.String" value="Voluntario"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="labSVolunt9">
+        <Component class="javax.swing.JButton" name="jButton35">
           <Properties>
-            <Property name="text" type="java.lang.String" value="Buscar"/>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="ff" green="0" red="0" type="rgb"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="Colaboraciones"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario29">
+        <Component class="javax.swing.JLabel" name="senalaVoluntario20">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="99" green="99" red="99" type="rgb"/>
@@ -7162,82 +6306,82 @@
             <Property name="text" type="java.lang.String" value="&gt;"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JTextField" name="textBuscarSocio1">
+        <Component class="javax.swing.JLabel" name="senalaVoluntario21">
           <Properties>
-            <Property name="text" type="java.lang.String" value="Buscar"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btBuscar1">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/buscar.png"/>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="99" green="99" red="99" type="rgb"/>
             </Property>
+            <Property name="text" type="java.lang.String" value="&gt;"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="jLabel87">
+        <Component class="javax.swing.JLabel" name="jLabel92">
           <Properties>
-            <Property name="text" type="java.lang.String" value="Buscar por:"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JComboBox" name="cbTextSocio1">
-          <Properties>
-            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-              <StringArray count="2">
-                <StringItem index="0" value="Tipo de busqueda"/>
-                <StringItem index="1" value=" "/>
-              </StringArray>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="0" green="0" red="ff" type="rgb"/>
             </Property>
+            <Property name="text" type="java.lang.String" value="Cuotas"/>
           </Properties>
         </Component>
-        <Container class="javax.swing.JScrollPane" name="jScrollPane16">
+        <Container class="javax.swing.JScrollPane" name="jScrollPane15">
 
           <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
           <SubComponents>
-            <Component class="javax.swing.JTable" name="tableBuscarSocio1">
+            <Component class="javax.swing.JTable" name="jTable9">
               <Properties>
                 <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
                   <Table columnCount="5" rowCount="4">
-                    <Column editable="true" title="DNI" type="java.lang.String"/>
-                    <Column editable="true" title="Nombre" type="java.lang.String"/>
-                    <Column editable="true" title="Apellidos" type="java.lang.String"/>
-                    <Column editable="true" title="Localidad" type="java.lang.String"/>
-                    <Column editable="true" title="Fecha Nacimiento" type="java.lang.Object"/>
+                    <Column editable="true" title="DNI" type="java.lang.Object"/>
+                    <Column editable="true" title="Cantidad de cuota" type="java.lang.Object"/>
+                    <Column editable="true" title="Cantidad que debe" type="java.lang.Object"/>
+                    <Column editable="true" title="Intervalo de pagos" type="java.lang.Object"/>
+                    <Column editable="true" title="Fecha ultimo pago" type="java.lang.Object"/>
                   </Table>
                 </Property>
               </Properties>
             </Component>
           </SubComponents>
         </Container>
-        <Component class="javax.swing.JButton" name="btConsultar1">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/modificar.png"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btEliminar1">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/Vista/images/borrar.png"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="navToColaboradoresFromBuscarEmpresa">
+        <Component class="javax.swing.JLabel" name="jLabel82">
           <Properties>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="ff" green="0" red="0" type="rgb"/>
+              <Color blue="0" green="0" red="ff" type="rgb"/>
             </Property>
-            <Property name="text" type="java.lang.String" value="Colaboradores"/>
-            <Property name="actionCommand" type="java.lang.String" value="navToMainFromVoluntarios"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
+            <Property name="text" type="java.lang.String" value="A&#xf1;adir pago"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="senalaVoluntario30">
+        <Component class="javax.swing.JLabel" name="jLabel83">
           <Properties>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="99" green="99" red="99" type="rgb"/>
+            <Property name="text" type="java.lang.String" value="DNI del socio"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel84">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Cantidad"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel85">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Concepto"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField14">
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField15">
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField16">
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel86">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Fecha"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField17">
+        </Component>
+        <Component class="javax.swing.JButton" name="jButton36">
+          <Properties>
+            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/Vista/images/guardar.png"/>
             </Property>
-            <Property name="text" type="java.lang.String" value="&gt;"/>
           </Properties>
         </Component>
       </SubComponents>
diff --git a/Diaketas-Manage/src/Vista/VentanaPrincipal.java b/Diaketas-Manage/src/Vista/VentanaPrincipal.java
index d762477..edaffc1 100644
--- a/Diaketas-Manage/src/Vista/VentanaPrincipal.java
+++ b/Diaketas-Manage/src/Vista/VentanaPrincipal.java
@@ -101,7 +101,7 @@
         textFieldContrasena = new javax.swing.JPasswordField();
         textErrorLogin = new javax.swing.JLabel();
         PanelInicio = new javax.swing.JPanel();
-        btColaboradores = new javax.swing.JButton();
+        btSocio = new javax.swing.JButton();
         btBeneficiario = new javax.swing.JButton();
         btVoluntario = new javax.swing.JButton();
         btBolsaTrabajo = new javax.swing.JButton();
@@ -282,6 +282,15 @@
         jScrollPane6 = new javax.swing.JScrollPane();
         tablaBusquedaVoluntario = new javax.swing.JTable();
         btVerVoluntarioBusqueda = new javax.swing.JButton();
+        PanelVoluntarioColaboraciones = new javax.swing.JPanel();
+        separadorBeneficiario4 = new javax.swing.JSeparator();
+        senalaBeneficiario7 = new javax.swing.JLabel();
+        labSBenef1 = new javax.swing.JLabel();
+        btNuevoBeneficiario1 = new javax.swing.JButton();
+        btBuscarBeneficiario1 = new javax.swing.JButton();
+        navToMainFromBeneficiarios1 = new javax.swing.JButton();
+        navToMainFromBeneficiarios2 = new javax.swing.JButton();
+        senalaBeneficiario8 = new javax.swing.JLabel();
         PanelVoluntarioAyudas = new javax.swing.JPanel();
         separadorVoluntario3 = new javax.swing.JSeparator();
         senalaVoluntario5 = new javax.swing.JLabel();
@@ -302,66 +311,6 @@
         btnGuardarTipoAyuda = new javax.swing.JButton();
         jScrollPane4 = new javax.swing.JScrollPane();
         jTable2 = new javax.swing.JTable();
-        PanelVoluntarioColaboraciones = new javax.swing.JPanel();
-        separadorBeneficiario4 = new javax.swing.JSeparator();
-        senalaBeneficiario7 = new javax.swing.JLabel();
-        labSBenef1 = new javax.swing.JLabel();
-        btAnadirColaboracion = new javax.swing.JButton();
-        btComprobarPagos = new javax.swing.JButton();
-        navToMainFromBeneficiarios1 = new javax.swing.JButton();
-        navToMainFromBeneficiarios2 = new javax.swing.JButton();
-        senalaBeneficiario8 = new javax.swing.JLabel();
-        PanelVoluntarioColaboracionesAnadirColaboraciones = new javax.swing.JPanel();
-        labSVolunt1 = new javax.swing.JLabel();
-        senalaVoluntario7 = new javax.swing.JLabel();
-        navToMainFromAnadirColaboraciones = new javax.swing.JButton();
-        navToVoluntarioFromAnadirColaboraciones = new javax.swing.JButton();
-        navToColaboracionesFromAnadirColaboraciones = new javax.swing.JButton();
-        senalaVoluntario8 = new javax.swing.JLabel();
-        senalaVoluntario9 = new javax.swing.JLabel();
-        jLabel71 = new javax.swing.JLabel();
-        jLabel72 = new javax.swing.JLabel();
-        textAnadirDNIColaborador = new javax.swing.JTextField();
-        jLabel73 = new javax.swing.JLabel();
-        textAnadirCantidadColaborador = new javax.swing.JTextField();
-        jLabel74 = new javax.swing.JLabel();
-        textAnadirConceptoColaborador = new javax.swing.JTextField();
-        jLabel75 = new javax.swing.JLabel();
-        textAnadirFechaColaborador = new javax.swing.JTextField();
-        btGuardarAnadirColaborador = new javax.swing.JButton();
-        btLimpiarAnadirColaborador = new javax.swing.JButton();
-        jLabel76 = new javax.swing.JLabel();
-        jLabel77 = new javax.swing.JLabel();
-        jLabel78 = new javax.swing.JLabel();
-        jLabel79 = new javax.swing.JLabel();
-        textAnadirCIFEmpresa = new javax.swing.JTextField();
-        textAnadirCantidadEmpresa = new javax.swing.JTextField();
-        textAnadirConceptoEmpresa = new javax.swing.JTextField();
-        jLabel80 = new javax.swing.JLabel();
-        textAnadirFechaEmpresa = new javax.swing.JTextField();
-        btGuardarAnadirEmpresa = new javax.swing.JButton();
-        btLimpiarAnadirEmpresa = new javax.swing.JButton();
-        PanelVoluntarioColaboracionesComprobarPagos = new javax.swing.JPanel();
-        labSVolunt5 = new javax.swing.JLabel();
-        senalaVoluntario19 = new javax.swing.JLabel();
-        navToMainFromComprobarCuotas = new javax.swing.JButton();
-        navToVoluntarioFromComprobarCuotas = new javax.swing.JButton();
-        navToColaboracionesFromComprobarCuotas = new javax.swing.JButton();
-        senalaVoluntario20 = new javax.swing.JLabel();
-        senalaVoluntario21 = new javax.swing.JLabel();
-        jLabel92 = new javax.swing.JLabel();
-        jScrollPane15 = new javax.swing.JScrollPane();
-        tableComprobarPagos = new javax.swing.JTable();
-        jLabel82 = new javax.swing.JLabel();
-        jLabel83 = new javax.swing.JLabel();
-        jLabel84 = new javax.swing.JLabel();
-        jLabel85 = new javax.swing.JLabel();
-        textAnadirPagoDNISocio = new javax.swing.JTextField();
-        textAnadirPagoCantidad = new javax.swing.JTextField();
-        textAnadirPagoConcepto = new javax.swing.JTextField();
-        jLabel86 = new javax.swing.JLabel();
-        textAnadirPagoFecha = new javax.swing.JTextField();
-        btGuardarPago = new javax.swing.JButton();
         PanelSocioInicio = new javax.swing.JPanel();
         separadorVoluntario4 = new javax.swing.JSeparator();
         senalaVoluntario22 = new javax.swing.JLabel();
@@ -369,8 +318,6 @@
         btBuscarSocio = new javax.swing.JButton();
         btNuevoSocio = new javax.swing.JButton();
         navToMainFromSocio = new javax.swing.JButton();
-        navToColaboradoresFromSocio = new javax.swing.JButton();
-        senalaVoluntario23 = new javax.swing.JLabel();
         PanelSocioDatos = new javax.swing.JPanel();
         navToMainFromNuevoSocio = new javax.swing.JButton();
         senalaSocio7 = new javax.swing.JLabel();
@@ -451,8 +398,6 @@
         textFechaFinalCuotaSocio = new javax.swing.JTextField();
         btGuardarCuotaSocio = new javax.swing.JButton();
         btEliminarCuotaSocio = new javax.swing.JButton();
-        navToColaboradoresFromDatosSocio = new javax.swing.JButton();
-        senalaVoluntario34 = new javax.swing.JLabel();
         PanelSocioBuscar = new javax.swing.JPanel();
         navToMainFromBuscarSocio = new javax.swing.JButton();
         senalaVoluntario10 = new javax.swing.JLabel();
@@ -467,34 +412,51 @@
         tableBuscarSocio = new javax.swing.JTable();
         btConsultar = new javax.swing.JButton();
         btEliminar = new javax.swing.JButton();
-        navToColaboradoresFromBuscarSocio = new javax.swing.JButton();
-        senalaVoluntario11 = new javax.swing.JLabel();
         PanelColaboradores = new javax.swing.JPanel();
-        navToMainFromColaboradores = new javax.swing.JButton();
+        navToMainFromSocioDatos2 = new javax.swing.JButton();
         senalaSocio9 = new javax.swing.JLabel();
         jLabel70 = new javax.swing.JLabel();
-        btEmpresa = new javax.swing.JButton();
-        btSocio = new javax.swing.JButton();
-        btColaborador = new javax.swing.JButton();
-        PanelColaboradorInicio = new javax.swing.JPanel();
-        separadorVoluntario6 = new javax.swing.JSeparator();
-        senalaVoluntario26 = new javax.swing.JLabel();
-        labSVolunt8 = new javax.swing.JLabel();
-        btBuscarColaborador = new javax.swing.JButton();
-        btNuevoColaborador = new javax.swing.JButton();
-        navToMainFromColaborador = new javax.swing.JButton();
-        navToColaboradoresFromColaborador = new javax.swing.JButton();
-        senalaVoluntario27 = new javax.swing.JLabel();
-        PanelColaboradorDatos = new javax.swing.JPanel();
-        navToMainFromColaboradorDatos = new javax.swing.JButton();
+        jButton9 = new javax.swing.JButton();
+        PanelAÃ±adirColaboraciones = new javax.swing.JPanel();
+        labSVolunt1 = new javax.swing.JLabel();
+        senalaVoluntario7 = new javax.swing.JLabel();
+        navToMainFromVoluntarios1 = new javax.swing.JButton();
+        jButton8 = new javax.swing.JButton();
+        jButton10 = new javax.swing.JButton();
+        senalaVoluntario8 = new javax.swing.JLabel();
+        senalaVoluntario9 = new javax.swing.JLabel();
+        jLabel71 = new javax.swing.JLabel();
+        jLabel72 = new javax.swing.JLabel();
+        jTextField5 = new javax.swing.JTextField();
+        jLabel73 = new javax.swing.JLabel();
+        jTextField6 = new javax.swing.JTextField();
+        jLabel74 = new javax.swing.JLabel();
+        jTextField7 = new javax.swing.JTextField();
+        jLabel75 = new javax.swing.JLabel();
+        jTextField8 = new javax.swing.JTextField();
+        jButton11 = new javax.swing.JButton();
+        jButton12 = new javax.swing.JButton();
+        jLabel76 = new javax.swing.JLabel();
+        jLabel77 = new javax.swing.JLabel();
+        jLabel78 = new javax.swing.JLabel();
+        jLabel79 = new javax.swing.JLabel();
+        jTextField9 = new javax.swing.JTextField();
+        jTextField10 = new javax.swing.JTextField();
+        jTextField11 = new javax.swing.JTextField();
+        jLabel80 = new javax.swing.JLabel();
+        jTextField12 = new javax.swing.JTextField();
+        jButton13 = new javax.swing.JButton();
+        jButton14 = new javax.swing.JButton();
+        PanelColaborador = new javax.swing.JPanel();
+        navToMainFromVoluntarios3 = new javax.swing.JButton();
         senalaVoluntario13 = new javax.swing.JLabel();
-        navToColaboradoresFromColaboradorDatos = new javax.swing.JButton();
+        jButton20 = new javax.swing.JButton();
         senalaVoluntario14 = new javax.swing.JLabel();
-        navToColaboradorFromColaboradorDatos = new javax.swing.JButton();
+        jButton21 = new javax.swing.JButton();
         labSVolunt3 = new javax.swing.JLabel();
         senalaVoluntario15 = new javax.swing.JLabel();
         jTabbedPane3 = new javax.swing.JTabbedPane();
-        PanelDatosColaborador = new javax.swing.JPanel();
+        PanelColaboradorDatos = new javax.swing.JPanel();
         label27 = new java.awt.Label();
         label28 = new java.awt.Label();
         textField19 = new java.awt.TextField();
@@ -528,7 +490,7 @@
         label42 = new java.awt.Label();
         jButton22 = new javax.swing.JButton();
         jButton23 = new javax.swing.JButton();
-        PanelColaboracionesColaborador = new javax.swing.JPanel();
+        PanelColaboradorColaboraciones = new javax.swing.JPanel();
         label43 = new java.awt.Label();
         jScrollPane13 = new javax.swing.JScrollPane();
         jTable6 = new javax.swing.JTable();
@@ -544,41 +506,16 @@
         jButton26 = new javax.swing.JButton();
         jComboBox5 = new javax.swing.JComboBox();
         jComboBox6 = new javax.swing.JComboBox();
-        PanelColaboradorBuscar = new javax.swing.JPanel();
-        navToMainFromColaboradorBuscar = new javax.swing.JButton();
-        senalaVoluntario31 = new javax.swing.JLabel();
-        navToColaboradorFromBuscarColaborador = new javax.swing.JButton();
-        labSVolunt10 = new javax.swing.JLabel();
-        senalaVoluntario32 = new javax.swing.JLabel();
-        textBuscarSocio2 = new javax.swing.JTextField();
-        btBuscar2 = new javax.swing.JButton();
-        jLabel88 = new javax.swing.JLabel();
-        cbTextSocio2 = new javax.swing.JComboBox();
-        jScrollPane17 = new javax.swing.JScrollPane();
-        tableBuscarSocio2 = new javax.swing.JTable();
-        btConsultar2 = new javax.swing.JButton();
-        btEliminar2 = new javax.swing.JButton();
-        navToColaboradoresFromBuscarColaborador = new javax.swing.JButton();
-        senalaVoluntario33 = new javax.swing.JLabel();
-        PanelEmpresaInicio = new javax.swing.JPanel();
-        separadorVoluntario5 = new javax.swing.JSeparator();
-        senalaVoluntario24 = new javax.swing.JLabel();
-        labSVolunt7 = new javax.swing.JLabel();
-        btBuscarEmpresa = new javax.swing.JButton();
-        btNuevoEmpresa = new javax.swing.JButton();
-        navToMainFromEmpresa = new javax.swing.JButton();
-        navToColaboradoresFromEmpresa = new javax.swing.JButton();
-        senalaVoluntario25 = new javax.swing.JLabel();
-        PanelEmpresaDatos = new javax.swing.JPanel();
-        navToMainFromDatosEmpresa = new javax.swing.JButton();
+        PanelEmpresa = new javax.swing.JPanel();
+        navToMainFromVoluntarios4 = new javax.swing.JButton();
         senalaVoluntario16 = new javax.swing.JLabel();
-        navToColaboradoresFromDatosEmpresa = new javax.swing.JButton();
+        jButton27 = new javax.swing.JButton();
         senalaVoluntario17 = new javax.swing.JLabel();
-        navToEmpresaFromDatosEmpresa = new javax.swing.JButton();
+        jButton28 = new javax.swing.JButton();
         labSVolunt4 = new javax.swing.JLabel();
         senalaVoluntario18 = new javax.swing.JLabel();
         jTabbedPane4 = new javax.swing.JTabbedPane();
-        PanelDatosEmpresa = new javax.swing.JPanel();
+        PanelEmpresaDatos = new javax.swing.JPanel();
         label48 = new java.awt.Label();
         label49 = new java.awt.Label();
         textField35 = new java.awt.TextField();
@@ -605,7 +542,7 @@
         fax = new java.awt.TextField();
         label58 = new java.awt.Label();
         textField42 = new java.awt.TextField();
-        PanelColaboracionesEmpresa = new javax.swing.JPanel();
+        PanelEmpresaColaboraciones = new javax.swing.JPanel();
         label64 = new java.awt.Label();
         jScrollPane14 = new javax.swing.JScrollPane();
         jTable8 = new javax.swing.JTable();
@@ -621,22 +558,27 @@
         jButton33 = new javax.swing.JButton();
         jComboBox7 = new javax.swing.JComboBox();
         jComboBox8 = new javax.swing.JComboBox();
-        PanelEmpresaBuscar = new javax.swing.JPanel();
-        navToMainFromBuscarEmpresa = new javax.swing.JButton();
-        senalaVoluntario28 = new javax.swing.JLabel();
-        navToEmpresaFromBuscarEmpresa = new javax.swing.JButton();
-        labSVolunt9 = new javax.swing.JLabel();
-        senalaVoluntario29 = new javax.swing.JLabel();
-        textBuscarSocio1 = new javax.swing.JTextField();
-        btBuscar1 = new javax.swing.JButton();
-        jLabel87 = new javax.swing.JLabel();
-        cbTextSocio1 = new javax.swing.JComboBox();
-        jScrollPane16 = new javax.swing.JScrollPane();
-        tableBuscarSocio1 = new javax.swing.JTable();
-        btConsultar1 = new javax.swing.JButton();
-        btEliminar1 = new javax.swing.JButton();
-        navToColaboradoresFromBuscarEmpresa = new javax.swing.JButton();
-        senalaVoluntario30 = new javax.swing.JLabel();
+        PanelCuotasNoPagadas = new javax.swing.JPanel();
+        labSVolunt5 = new javax.swing.JLabel();
+        senalaVoluntario19 = new javax.swing.JLabel();
+        navToMainFromVoluntarios5 = new javax.swing.JButton();
+        jButton34 = new javax.swing.JButton();
+        jButton35 = new javax.swing.JButton();
+        senalaVoluntario20 = new javax.swing.JLabel();
+        senalaVoluntario21 = new javax.swing.JLabel();
+        jLabel92 = new javax.swing.JLabel();
+        jScrollPane15 = new javax.swing.JScrollPane();
+        jTable9 = new javax.swing.JTable();
+        jLabel82 = new javax.swing.JLabel();
+        jLabel83 = new javax.swing.JLabel();
+        jLabel84 = new javax.swing.JLabel();
+        jLabel85 = new javax.swing.JLabel();
+        jTextField14 = new javax.swing.JTextField();
+        jTextField15 = new javax.swing.JTextField();
+        jTextField16 = new javax.swing.JTextField();
+        jLabel86 = new javax.swing.JLabel();
+        jTextField17 = new javax.swing.JTextField();
+        jButton36 = new javax.swing.JButton();
 
         DiagPassVoluntario.setTitle("ContraseÃ±a Voluntario");
         DiagPassVoluntario.setLocationByPlatform(true);
@@ -721,12 +663,12 @@
                         .add(PanelIdentificacionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                             .add(org.jdesktop.layout.GroupLayout.TRAILING, labelUsuario)
                             .add(org.jdesktop.layout.GroupLayout.TRAILING, labelContrasena))
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 78, Short.MAX_VALUE)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 77, Short.MAX_VALUE)
                         .add(PanelIdentificacionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                             .add(textFieldIdUsuario)
                             .add(textFieldContrasena)
                             .add(PanelIdentificacionLayout.createSequentialGroup()
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 150, Short.MAX_VALUE)
+                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 151, Short.MAX_VALUE)
                                 .add(btConectarse, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 134, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
                     .add(PanelIdentificacionLayout.createSequentialGroup()
                         .add(464, 464, 464)
@@ -742,7 +684,7 @@
             .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelIdentificacionLayout.createSequentialGroup()
                 .add(148, 148, 148)
                 .add(PanelIdentificacionLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(imgLogo, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 329, Short.MAX_VALUE)
+                    .add(imgLogo, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 327, Short.MAX_VALUE)
                     .add(PanelIdentificacionLayout.createSequentialGroup()
                         .add(labelTitulo, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 69, Short.MAX_VALUE)
                         .add(135, 135, 135)
@@ -767,15 +709,15 @@
         PanelInicio.setMaximumSize(new java.awt.Dimension(1000, 600));
         PanelInicio.setPreferredSize(new java.awt.Dimension(1000, 600));
 
-        btColaboradores.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
-        btColaboradores.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/socio.png"))); // NOI18N
-        btColaboradores.setText("Colaboradores");
-        btColaboradores.setToolTipText("Acceso a Socios");
-        btColaboradores.setActionCommand("entrarAPanelSocios");
-        btColaboradores.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
-        btColaboradores.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btColaboradores.setVerticalAlignment(javax.swing.SwingConstants.TOP);
-        btColaboradores.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        btSocio.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
+        btSocio.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/socio.png"))); // NOI18N
+        btSocio.setText("SOCIOS");
+        btSocio.setToolTipText("Acceso a Socios");
+        btSocio.setActionCommand("entrarAPanelSocios");
+        btSocio.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
+        btSocio.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btSocio.setVerticalAlignment(javax.swing.SwingConstants.TOP);
+        btSocio.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
 
         btBeneficiario.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
         btBeneficiario.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/bene.png"))); // NOI18N
@@ -812,7 +754,7 @@
             .add(PanelInicioLayout.createSequentialGroup()
                 .add(99, 99, 99)
                 .add(PanelInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                    .add(btColaboradores, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 215, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(btSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 215, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                     .add(btVoluntario, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 215, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 361, Short.MAX_VALUE)
                 .add(PanelInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -827,7 +769,7 @@
                 .add(jLabel21)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 84, Short.MAX_VALUE)
                 .add(PanelInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(btColaboradores)
+                    .add(btSocio)
                     .add(btBeneficiario))
                 .add(72, 72, 72)
                 .add(PanelInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
@@ -836,7 +778,7 @@
                 .add(55, 55, 55))
         );
 
-        PanelInicioLayout.linkSize(new java.awt.Component[] {btBeneficiario, btBolsaTrabajo, btColaboradores, btVoluntario}, org.jdesktop.layout.GroupLayout.VERTICAL);
+        PanelInicioLayout.linkSize(new java.awt.Component[] {btBeneficiario, btBolsaTrabajo, btSocio, btVoluntario}, org.jdesktop.layout.GroupLayout.VERTICAL);
 
         getContentPane().add(PanelInicio, "card3");
 
@@ -2095,6 +2037,90 @@
 
         getContentPane().add(PanelVoluntarioBuscar, "card8");
 
+        PanelVoluntarioColaboraciones.setBackground(new java.awt.Color(255, 255, 255));
+        PanelVoluntarioColaboraciones.setMaximumSize(new java.awt.Dimension(1000, 600));
+        PanelVoluntarioColaboraciones.setPreferredSize(new java.awt.Dimension(1000, 600));
+
+        senalaBeneficiario7.setForeground(new java.awt.Color(153, 153, 153));
+        senalaBeneficiario7.setText(">");
+
+        labSBenef1.setText("Colaboraciones");
+
+        btNuevoBeneficiario1.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
+        btNuevoBeneficiario1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/colaborador_1.jpg"))); // NOI18N
+        btNuevoBeneficiario1.setText("AÃ±adir Colaboraciones");
+        btNuevoBeneficiario1.setActionCommand("nuevoBeneficiario");
+        btNuevoBeneficiario1.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btNuevoBeneficiario1.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+
+        btBuscarBeneficiario1.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
+        btBuscarBeneficiario1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/formadepago_1.jpg"))); // NOI18N
+        btBuscarBeneficiario1.setText("Comprobar Pagos");
+        btBuscarBeneficiario1.setActionCommand("buscarBeneficiario");
+        btBuscarBeneficiario1.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btBuscarBeneficiario1.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+
+        navToMainFromBeneficiarios1.setForeground(new java.awt.Color(0, 0, 255));
+        navToMainFromBeneficiarios1.setText("DIAKETAS");
+        navToMainFromBeneficiarios1.setActionCommand("navToMainFromBeneficiarios");
+        navToMainFromBeneficiarios1.setBorderPainted(false);
+
+        navToMainFromBeneficiarios2.setForeground(new java.awt.Color(0, 0, 255));
+        navToMainFromBeneficiarios2.setText("Voluntario");
+        navToMainFromBeneficiarios2.setActionCommand("navToMainFromBeneficiarios");
+        navToMainFromBeneficiarios2.setBorderPainted(false);
+
+        senalaBeneficiario8.setForeground(new java.awt.Color(153, 153, 153));
+        senalaBeneficiario8.setText(">");
+
+        org.jdesktop.layout.GroupLayout PanelVoluntarioColaboracionesLayout = new org.jdesktop.layout.GroupLayout(PanelVoluntarioColaboraciones);
+        PanelVoluntarioColaboraciones.setLayout(PanelVoluntarioColaboracionesLayout);
+        PanelVoluntarioColaboracionesLayout.setHorizontalGroup(
+            PanelVoluntarioColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(PanelVoluntarioColaboracionesLayout.createSequentialGroup()
+                .addContainerGap()
+                .add(PanelVoluntarioColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(separadorBeneficiario4)
+                    .add(PanelVoluntarioColaboracionesLayout.createSequentialGroup()
+                        .add(navToMainFromBeneficiarios1)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(senalaBeneficiario7)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(navToMainFromBeneficiarios2)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(senalaBeneficiario8)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(labSBenef1)
+                        .add(0, 0, Short.MAX_VALUE)))
+                .addContainerGap())
+            .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelVoluntarioColaboracionesLayout.createSequentialGroup()
+                .add(152, 152, 152)
+                .add(btNuevoBeneficiario1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 229, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 225, Short.MAX_VALUE)
+                .add(btBuscarBeneficiario1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 229, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .add(165, 165, 165))
+        );
+        PanelVoluntarioColaboracionesLayout.setVerticalGroup(
+            PanelVoluntarioColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(PanelVoluntarioColaboracionesLayout.createSequentialGroup()
+                .add(11, 11, 11)
+                .add(PanelVoluntarioColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(senalaBeneficiario7)
+                    .add(navToMainFromBeneficiarios1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 16, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(senalaBeneficiario8)
+                    .add(navToMainFromBeneficiarios2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 16, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(labSBenef1))
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                .add(separadorBeneficiario4, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .add(174, 174, 174)
+                .add(PanelVoluntarioColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(btBuscarBeneficiario1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 203, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(btNuevoBeneficiario1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 203, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(225, Short.MAX_VALUE))
+        );
+
+        getContentPane().add(PanelVoluntarioColaboraciones, "card4");
+
         PanelVoluntarioAyudas.setBackground(new java.awt.Color(255, 255, 255));
         PanelVoluntarioAyudas.setMaximumSize(new java.awt.Dimension(1000, 600));
         PanelVoluntarioAyudas.setMinimumSize(new java.awt.Dimension(1000, 600));
@@ -2254,422 +2280,6 @@
 
         getContentPane().add(PanelVoluntarioAyudas, "card9");
 
-        PanelVoluntarioColaboraciones.setBackground(new java.awt.Color(255, 255, 255));
-        PanelVoluntarioColaboraciones.setMaximumSize(new java.awt.Dimension(1000, 600));
-        PanelVoluntarioColaboraciones.setPreferredSize(new java.awt.Dimension(1000, 600));
-
-        senalaBeneficiario7.setForeground(new java.awt.Color(153, 153, 153));
-        senalaBeneficiario7.setText(">");
-
-        labSBenef1.setText("Colaboraciones");
-
-        btAnadirColaboracion.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
-        btAnadirColaboracion.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/colaborador_1.jpg"))); // NOI18N
-        btAnadirColaboracion.setText("AÃ±adir Colaboraciones");
-        btAnadirColaboracion.setActionCommand("nuevoBeneficiario");
-        btAnadirColaboracion.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btAnadirColaboracion.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-
-        btComprobarPagos.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
-        btComprobarPagos.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/formadepago_1.jpg"))); // NOI18N
-        btComprobarPagos.setText("Comprobar Pagos");
-        btComprobarPagos.setActionCommand("buscarBeneficiario");
-        btComprobarPagos.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btComprobarPagos.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-
-        navToMainFromBeneficiarios1.setForeground(new java.awt.Color(0, 0, 255));
-        navToMainFromBeneficiarios1.setText("DIAKETAS");
-        navToMainFromBeneficiarios1.setActionCommand("navToMainFromBeneficiarios");
-        navToMainFromBeneficiarios1.setBorderPainted(false);
-
-        navToMainFromBeneficiarios2.setForeground(new java.awt.Color(0, 0, 255));
-        navToMainFromBeneficiarios2.setText("Voluntario");
-        navToMainFromBeneficiarios2.setActionCommand("navToMainFromBeneficiarios");
-        navToMainFromBeneficiarios2.setBorderPainted(false);
-
-        senalaBeneficiario8.setForeground(new java.awt.Color(153, 153, 153));
-        senalaBeneficiario8.setText(">");
-
-        org.jdesktop.layout.GroupLayout PanelVoluntarioColaboracionesLayout = new org.jdesktop.layout.GroupLayout(PanelVoluntarioColaboraciones);
-        PanelVoluntarioColaboraciones.setLayout(PanelVoluntarioColaboracionesLayout);
-        PanelVoluntarioColaboracionesLayout.setHorizontalGroup(
-            PanelVoluntarioColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelVoluntarioColaboracionesLayout.createSequentialGroup()
-                .addContainerGap()
-                .add(PanelVoluntarioColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(separadorBeneficiario4)
-                    .add(PanelVoluntarioColaboracionesLayout.createSequentialGroup()
-                        .add(navToMainFromBeneficiarios1)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaBeneficiario7)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToMainFromBeneficiarios2)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaBeneficiario8)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(labSBenef1)
-                        .add(0, 0, Short.MAX_VALUE)))
-                .addContainerGap())
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelVoluntarioColaboracionesLayout.createSequentialGroup()
-                .add(152, 152, 152)
-                .add(btAnadirColaboracion, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 229, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 252, Short.MAX_VALUE)
-                .add(btComprobarPagos, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 229, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .add(165, 165, 165))
-        );
-        PanelVoluntarioColaboracionesLayout.setVerticalGroup(
-            PanelVoluntarioColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelVoluntarioColaboracionesLayout.createSequentialGroup()
-                .add(11, 11, 11)
-                .add(PanelVoluntarioColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(senalaBeneficiario7)
-                    .add(navToMainFromBeneficiarios1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 16, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaBeneficiario8)
-                    .add(navToMainFromBeneficiarios2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 16, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(labSBenef1))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(separadorBeneficiario4, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .add(174, 174, 174)
-                .add(PanelVoluntarioColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(btComprobarPagos, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 203, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(btAnadirColaboracion, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 203, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(198, Short.MAX_VALUE))
-        );
-
-        getContentPane().add(PanelVoluntarioColaboraciones, "card4");
-
-        labSVolunt1.setText("AÃ±adir Colaboraciones");
-
-        senalaVoluntario7.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario7.setText(">");
-
-        navToMainFromAnadirColaboraciones.setForeground(new java.awt.Color(0, 0, 255));
-        navToMainFromAnadirColaboraciones.setText("DIAKETAS");
-        navToMainFromAnadirColaboraciones.setActionCommand("navToMainFromVoluntarios");
-        navToMainFromAnadirColaboraciones.setBorderPainted(false);
-
-        navToVoluntarioFromAnadirColaboraciones.setForeground(new java.awt.Color(0, 0, 255));
-        navToVoluntarioFromAnadirColaboraciones.setText("Voluntario");
-
-        navToColaboracionesFromAnadirColaboraciones.setForeground(new java.awt.Color(0, 0, 255));
-        navToColaboracionesFromAnadirColaboraciones.setText("Colaboraciones");
-
-        senalaVoluntario8.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario8.setText(">");
-
-        senalaVoluntario9.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario9.setText(">");
-
-        jLabel71.setForeground(new java.awt.Color(255, 0, 0));
-        jLabel71.setText("AÃ±adir en colaborador");
-
-        jLabel72.setText("DNI del colaborador");
-
-        jLabel73.setText("Cantidad");
-
-        jLabel74.setText("Concepto");
-
-        jLabel75.setText("Fecha");
-
-        btGuardarAnadirColaborador.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/guardar.png"))); // NOI18N
-
-        btLimpiarAnadirColaborador.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/limpiar.png"))); // NOI18N
-
-        jLabel76.setForeground(new java.awt.Color(255, 0, 0));
-        jLabel76.setText("AÃ±adir en empresa");
-
-        jLabel77.setText("CIF de la empresa");
-
-        jLabel78.setText("Cantidad");
-
-        jLabel79.setText("Concepto");
-
-        jLabel80.setText("Fecha");
-
-        btGuardarAnadirEmpresa.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/guardar.png"))); // NOI18N
-
-        btLimpiarAnadirEmpresa.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/limpiar.png"))); // NOI18N
-
-        org.jdesktop.layout.GroupLayout PanelVoluntarioColaboracionesAnadirColaboracionesLayout = new org.jdesktop.layout.GroupLayout(PanelVoluntarioColaboracionesAnadirColaboraciones);
-        PanelVoluntarioColaboracionesAnadirColaboraciones.setLayout(PanelVoluntarioColaboracionesAnadirColaboracionesLayout);
-        PanelVoluntarioColaboracionesAnadirColaboracionesLayout.setHorizontalGroup(
-            PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                .addContainerGap()
-                .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                        .add(navToMainFromAnadirColaboraciones)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario7)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToVoluntarioFromAnadirColaboraciones)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario8)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToColaboracionesFromAnadirColaboraciones)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario9)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(labSVolunt1)
-                        .addContainerGap())
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                        .add(0, 161, Short.MAX_VALUE)
-                        .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                            .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                                .add(jLabel76)
-                                .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                                    .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                                        .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                                            .add(29, 29, 29)
-                                            .add(jLabel79)
-                                            .add(59, 59, 59))
-                                        .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                                            .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                                                .add(jLabel78)
-                                                .add(jLabel77))
-                                            .add(18, 18, 18)))
-                                    .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
-                                        .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                                            .add(textAnadirCantidadEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 111, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                            .add(125, 125, 125)
-                                            .add(jLabel80)
-                                            .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                                            .add(textAnadirFechaEmpresa))
-                                        .add(textAnadirConceptoEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 430, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                        .add(textAnadirCIFEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 162, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                                    .add(99, 99, 99)
-                                    .add(btGuardarAnadirEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 25, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                    .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                                    .add(btLimpiarAnadirEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                            .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                                .add(jLabel71)
-                                .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                                    .add(29, 29, 29)
-                                    .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                                        .add(jLabel72)
-                                        .add(jLabel73)
-                                        .add(jLabel74))
-                                    .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                                    .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
-                                        .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                                            .add(textAnadirCantidadColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 111, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                            .add(125, 125, 125)
-                                            .add(jLabel75)
-                                            .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                                            .add(textAnadirFechaColaborador))
-                                        .add(textAnadirConceptoColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 430, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                        .add(textAnadirDNIColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 162, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                                    .add(99, 99, 99)
-                                    .add(btGuardarAnadirColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 25, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                    .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                                    .add(btLimpiarAnadirColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
-                        .add(131, 131, 131))))
-        );
-        PanelVoluntarioColaboracionesAnadirColaboracionesLayout.setVerticalGroup(
-            PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                .addContainerGap()
-                .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(navToMainFromAnadirColaboraciones, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario7)
-                    .add(labSVolunt1)
-                    .add(navToVoluntarioFromAnadirColaboraciones, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(navToColaboracionesFromAnadirColaboraciones, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario8)
-                    .add(senalaVoluntario9))
-                .add(106, 106, 106)
-                .add(jLabel71)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel72)
-                    .add(textAnadirDNIColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .add(4, 4, 4)
-                .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(btLimpiarAnadirColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(btGuardarAnadirColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 26, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                        .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                            .add(jLabel73)
-                            .add(textAnadirCantidadColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                            .add(jLabel75)
-                            .add(textAnadirFechaColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                            .add(jLabel74)
-                            .add(textAnadirConceptoColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
-                .add(45, 45, 45)
-                .add(jLabel76)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel77)
-                    .add(textAnadirCIFEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                        .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                                .add(jLabel80)
-                                .add(textAnadirFechaEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                            .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                                .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                                    .add(textAnadirCantidadEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                    .add(jLabel78))))
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                        .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(textAnadirConceptoEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                            .add(jLabel79)))
-                    .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createSequentialGroup()
-                        .add(4, 4, 4)
-                        .add(PanelVoluntarioColaboracionesAnadirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(btLimpiarAnadirEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                            .add(btGuardarAnadirEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 26, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
-                .addContainerGap(245, Short.MAX_VALUE))
-        );
-
-        getContentPane().add(PanelVoluntarioColaboracionesAnadirColaboraciones, "card14");
-
-        labSVolunt5.setText("ComprobarCuotas");
-
-        senalaVoluntario19.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario19.setText(">");
-
-        navToMainFromComprobarCuotas.setForeground(new java.awt.Color(0, 0, 255));
-        navToMainFromComprobarCuotas.setText("DIAKETAS");
-        navToMainFromComprobarCuotas.setActionCommand("navToMainFromVoluntarios");
-        navToMainFromComprobarCuotas.setBorderPainted(false);
-
-        navToVoluntarioFromComprobarCuotas.setForeground(new java.awt.Color(0, 0, 255));
-        navToVoluntarioFromComprobarCuotas.setText("Voluntario");
-
-        navToColaboracionesFromComprobarCuotas.setForeground(new java.awt.Color(0, 0, 255));
-        navToColaboracionesFromComprobarCuotas.setText("Colaboraciones");
-
-        senalaVoluntario20.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario20.setText(">");
-
-        senalaVoluntario21.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario21.setText(">");
-
-        jLabel92.setForeground(new java.awt.Color(255, 0, 0));
-        jLabel92.setText("Cuotas");
-
-        tableComprobarPagos.setModel(new javax.swing.table.DefaultTableModel(
-            new Object [][] {
-                {null, null, null, null, null},
-                {null, null, null, null, null},
-                {null, null, null, null, null},
-                {null, null, null, null, null}
-            },
-            new String [] {
-                "DNI", "Cantidad de cuota", "Cantidad que debe", "Intervalo de pagos", "Fecha ultimo pago"
-            }
-        ));
-        jScrollPane15.setViewportView(tableComprobarPagos);
-
-        jLabel82.setForeground(new java.awt.Color(255, 0, 0));
-        jLabel82.setText("AÃ±adir pago");
-
-        jLabel83.setText("DNI del socio");
-
-        jLabel84.setText("Cantidad");
-
-        jLabel85.setText("Concepto");
-
-        jLabel86.setText("Fecha");
-
-        btGuardarPago.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/guardar.png"))); // NOI18N
-
-        org.jdesktop.layout.GroupLayout PanelVoluntarioColaboracionesComprobarPagosLayout = new org.jdesktop.layout.GroupLayout(PanelVoluntarioColaboracionesComprobarPagos);
-        PanelVoluntarioColaboracionesComprobarPagos.setLayout(PanelVoluntarioColaboracionesComprobarPagosLayout);
-        PanelVoluntarioColaboracionesComprobarPagosLayout.setHorizontalGroup(
-            PanelVoluntarioColaboracionesComprobarPagosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createSequentialGroup()
-                .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createSequentialGroup()
-                        .addContainerGap()
-                        .add(navToMainFromComprobarCuotas)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario19)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToVoluntarioFromComprobarCuotas)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario20)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToColaboracionesFromComprobarCuotas)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario21)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(labSVolunt5))
-                    .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createSequentialGroup()
-                        .add(34, 34, 34)
-                        .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(jLabel92)
-                            .add(jLabel82)
-                            .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createSequentialGroup()
-                                .add(10, 10, 10)
-                                .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
-                                    .add(jScrollPane15, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 872, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                    .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createSequentialGroup()
-                                        .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                                            .add(jLabel83)
-                                            .add(jLabel84)
-                                            .add(jLabel85))
-                                        .add(18, 18, 18)
-                                        .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                                            .add(textAnadirPagoConcepto, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 611, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                            .add(textAnadirPagoDNISocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 125, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                            .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createSequentialGroup()
-                                                .add(textAnadirPagoCantidad, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 197, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                                .add(74, 74, 74)
-                                                .add(jLabel86)
-                                                .add(18, 18, 18)
-                                                .add(textAnadirPagoFecha, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 150, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                        .add(btGuardarPago, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                        .add(63, 63, 63)))))))
-                .addContainerGap(111, Short.MAX_VALUE))
-        );
-        PanelVoluntarioColaboracionesComprobarPagosLayout.setVerticalGroup(
-            PanelVoluntarioColaboracionesComprobarPagosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createSequentialGroup()
-                .addContainerGap()
-                .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(navToMainFromComprobarCuotas, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario19)
-                    .add(labSVolunt5)
-                    .add(navToVoluntarioFromComprobarCuotas, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(navToColaboracionesFromComprobarCuotas, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario20)
-                    .add(senalaVoluntario21))
-                .add(26, 26, 26)
-                .add(jLabel92)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(jScrollPane15, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 301, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .add(27, 27, 27)
-                .add(jLabel82)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel83)
-                    .add(textAnadirPagoDNISocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createSequentialGroup()
-                        .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                                .add(textAnadirPagoCantidad, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                .add(jLabel86)
-                                .add(textAnadirPagoFecha, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                            .add(jLabel84))
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(PanelVoluntarioColaboracionesComprobarPagosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                            .add(jLabel85)
-                            .add(textAnadirPagoConcepto, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                    .add(btGuardarPago, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(122, Short.MAX_VALUE))
-        );
-
-        getContentPane().add(PanelVoluntarioColaboracionesComprobarPagos, "card14");
-
         PanelSocioInicio.setBackground(new java.awt.Color(255, 255, 255));
         PanelSocioInicio.setMaximumSize(new java.awt.Dimension(1000, 600));
         PanelSocioInicio.setMinimumSize(new java.awt.Dimension(1000, 600));
@@ -2698,14 +2308,6 @@
         navToMainFromSocio.setActionCommand("navToMainFromVoluntarios");
         navToMainFromSocio.setBorderPainted(false);
 
-        navToColaboradoresFromSocio.setForeground(new java.awt.Color(0, 0, 255));
-        navToColaboradoresFromSocio.setText("Colaboradores");
-        navToColaboradoresFromSocio.setActionCommand("navToMainFromVoluntarios");
-        navToColaboradoresFromSocio.setBorderPainted(false);
-
-        senalaVoluntario23.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario23.setText(">");
-
         org.jdesktop.layout.GroupLayout PanelSocioInicioLayout = new org.jdesktop.layout.GroupLayout(PanelSocioInicio);
         PanelSocioInicio.setLayout(PanelSocioInicioLayout);
         PanelSocioInicioLayout.setHorizontalGroup(
@@ -2717,11 +2319,7 @@
                         .add(navToMainFromSocio)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(senalaVoluntario22)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToColaboradoresFromSocio)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario23)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(32, 32, 32)
                         .add(labSVolunt6)
                         .add(0, 0, Short.MAX_VALUE))
                     .add(separadorVoluntario4))
@@ -2740,9 +2338,7 @@
                 .add(PanelSocioInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(navToMainFromSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                     .add(senalaVoluntario22)
-                    .add(labSVolunt6)
-                    .add(navToColaboradoresFromSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario23))
+                    .add(labSVolunt6))
                 .add(4, 4, 4)
                 .add(separadorVoluntario4, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .add(139, 139, 139)
@@ -3267,14 +2863,6 @@
 
         jTabbedPane2.addTab("Cuotas", PanelCuotasSocio);
 
-        navToColaboradoresFromDatosSocio.setForeground(new java.awt.Color(0, 0, 255));
-        navToColaboradoresFromDatosSocio.setText("Colaboradores");
-        navToColaboradoresFromDatosSocio.setActionCommand("navToMainFromVoluntarios");
-        navToColaboradoresFromDatosSocio.setBorderPainted(false);
-
-        senalaVoluntario34.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario34.setText(">");
-
         org.jdesktop.layout.GroupLayout PanelSocioDatosLayout = new org.jdesktop.layout.GroupLayout(PanelSocioDatos);
         PanelSocioDatos.setLayout(PanelSocioDatosLayout);
         PanelSocioDatosLayout.setHorizontalGroup(
@@ -3288,12 +2876,8 @@
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
                         .add(senalaSocio8)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToColaboradoresFromDatosSocio)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario34)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(navToMainFromDatosSocio)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(10, 10, 10)
                         .add(senalaSocio7)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(jLabel64)
@@ -3307,13 +2891,11 @@
                 .add(PanelSocioDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
                     .add(org.jdesktop.layout.GroupLayout.LEADING, PanelSocioDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                         .add(senalaSocio7)
-                        .add(jLabel64)
-                        .add(navToMainFromDatosSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
+                        .add(jLabel64))
                     .add(org.jdesktop.layout.GroupLayout.LEADING, PanelSocioDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                        .add(navToColaboradoresFromDatosSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .add(senalaVoluntario34))
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, senalaSocio8)
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, navToMainFromNuevoSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 12, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                        .add(navToMainFromNuevoSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 12, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                        .add(senalaSocio8, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .add(navToMainFromDatosSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)))
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(jTabbedPane2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 450, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap(137, Short.MAX_VALUE))
@@ -3370,14 +2952,6 @@
 
         btEliminar.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/borrar.png"))); // NOI18N
 
-        navToColaboradoresFromBuscarSocio.setForeground(new java.awt.Color(0, 0, 255));
-        navToColaboradoresFromBuscarSocio.setText("Colaboradores");
-        navToColaboradoresFromBuscarSocio.setActionCommand("navToMainFromVoluntarios");
-        navToColaboradoresFromBuscarSocio.setBorderPainted(false);
-
-        senalaVoluntario11.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario11.setText(">");
-
         org.jdesktop.layout.GroupLayout PanelSocioBuscarLayout = new org.jdesktop.layout.GroupLayout(PanelSocioBuscar);
         PanelSocioBuscar.setLayout(PanelSocioBuscarLayout);
         PanelSocioBuscarLayout.setHorizontalGroup(
@@ -3388,32 +2962,27 @@
                     .add(PanelSocioBuscarLayout.createSequentialGroup()
                         .add(0, 105, Short.MAX_VALUE)
                         .add(PanelSocioBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(PanelSocioBuscarLayout.createSequentialGroup()
-                                .add(textBuscarSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 214, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                                .add(btBuscar, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                            .add(PanelSocioBuscarLayout.createSequentialGroup()
-                                .add(jLabel81)
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                                .add(cbTextSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 162, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+                            .add(jLabel81)
+                            .add(textBuscarSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 214, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                        .add(btBuscar, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(659, 659, 659))
                     .add(PanelSocioBuscarLayout.createSequentialGroup()
                         .add(navToMainFromBuscarSocio)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(senalaVoluntario10)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToColaboradoresFromBuscarSocio)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario11)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(navToSocioFromBuscarSocio)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(senalaVoluntario12)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(labSVolunt2)
                         .add(0, 0, Short.MAX_VALUE))))
             .add(PanelSocioBuscarLayout.createSequentialGroup()
                 .add(PanelSocioBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelSocioBuscarLayout.createSequentialGroup()
+                        .add(182, 182, 182)
+                        .add(cbTextSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 162, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                     .add(PanelSocioBuscarLayout.createSequentialGroup()
                         .add(85, 85, 85)
                         .add(jScrollPane12, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 797, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
@@ -3428,16 +2997,12 @@
             PanelSocioBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(PanelSocioBuscarLayout.createSequentialGroup()
                 .addContainerGap()
-                .add(PanelSocioBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelSocioBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                        .add(navToColaboradoresFromBuscarSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .add(senalaVoluntario11))
-                    .add(PanelSocioBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                        .add(navToMainFromBuscarSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .add(senalaVoluntario10)
-                        .add(labSVolunt2)
-                        .add(navToSocioFromBuscarSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .add(senalaVoluntario12)))
+                .add(PanelSocioBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(navToMainFromBuscarSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(senalaVoluntario10)
+                    .add(labSVolunt2)
+                    .add(navToSocioFromBuscarSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(senalaVoluntario12))
                 .add(20, 20, 20)
                 .add(PanelSocioBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                     .add(btBuscar, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
@@ -3459,41 +3024,21 @@
 
         PanelColaboradores.setBackground(new java.awt.Color(255, 255, 255));
 
-        navToMainFromColaboradores.setForeground(new java.awt.Color(0, 0, 255));
-        navToMainFromColaboradores.setText("DIAKETAS");
-        navToMainFromColaboradores.setActionCommand("navToMainFromBeneficiarioDatos");
-        navToMainFromColaboradores.setBorderPainted(false);
+        navToMainFromSocioDatos2.setForeground(new java.awt.Color(0, 0, 255));
+        navToMainFromSocioDatos2.setText("DIAKETAS");
+        navToMainFromSocioDatos2.setActionCommand("navToMainFromBeneficiarioDatos");
+        navToMainFromSocioDatos2.setBorderPainted(false);
 
         senalaSocio9.setForeground(new java.awt.Color(153, 153, 153));
         senalaSocio9.setText(">");
 
         jLabel70.setText("Colaboradores");
 
-        btEmpresa.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
-        btEmpresa.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/colaborador_1.jpg"))); // NOI18N
-        btEmpresa.setText("EMPRESA");
-        btEmpresa.setActionCommand("nuevoBeneficiario");
-        btEmpresa.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btEmpresa.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-
-        btSocio.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
-        btSocio.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/formadepago_1.jpg"))); // NOI18N
-        btSocio.setText("SOCIO");
-        btSocio.setActionCommand("buscarBeneficiario");
-        btSocio.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btSocio.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-
-        btColaborador.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
-        btColaborador.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/colaborador_1.jpg"))); // NOI18N
-        btColaborador.setText("COLABORADOR");
-        btColaborador.setActionCommand("nuevoBeneficiario");
-        btColaborador.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btColaborador.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-        btColaborador.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btColaboradorActionPerformed(evt);
-            }
-        });
+        jButton9.setBackground(new java.awt.Color(255, 255, 255));
+        jButton9.setFont(new java.awt.Font("Lucida Bright", 1, 14)); // NOI18N
+        jButton9.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/monigotes-6-.png"))); // NOI18N
+        jButton9.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        jButton9.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
 
         org.jdesktop.layout.GroupLayout PanelColaboradoresLayout = new org.jdesktop.layout.GroupLayout(PanelColaboradores);
         PanelColaboradores.setLayout(PanelColaboradoresLayout);
@@ -3501,145 +3046,239 @@
             PanelColaboradoresLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(PanelColaboradoresLayout.createSequentialGroup()
                 .addContainerGap()
+                .add(navToMainFromSocioDatos2)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(PanelColaboradoresLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                     .add(PanelColaboradoresLayout.createSequentialGroup()
-                        .add(navToMainFromColaboradores)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(senalaSocio9)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(PanelColaboradoresLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(PanelColaboradoresLayout.createSequentialGroup()
-                                .add(btColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 229, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                .add(btSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 229, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                .add(30, 30, 30))
-                            .add(PanelColaboradoresLayout.createSequentialGroup()
-                                .add(jLabel70)
-                                .addContainerGap(848, Short.MAX_VALUE))))
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelColaboradoresLayout.createSequentialGroup()
-                        .add(0, 0, Short.MAX_VALUE)
-                        .add(btEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 229, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .add(365, 365, 365))))
+                        .add(jLabel70))
+                    .add(jButton9, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 283, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(647, Short.MAX_VALUE))
         );
         PanelColaboradoresLayout.setVerticalGroup(
             PanelColaboradoresLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(PanelColaboradoresLayout.createSequentialGroup()
                 .addContainerGap()
                 .add(PanelColaboradoresLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(navToMainFromColaboradores)
+                    .add(navToMainFromSocioDatos2)
                     .add(jLabel70)
                     .add(senalaSocio9))
-                .add(75, 75, 75)
-                .add(PanelColaboradoresLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(btSocio, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 203, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(btColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 203, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .add(4, 4, 4)
-                .add(btEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 203, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(99, Short.MAX_VALUE))
+                .add(64, 64, 64)
+                .add(jButton9, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 185, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .addContainerGap(335, Short.MAX_VALUE))
         );
 
         getContentPane().add(PanelColaboradores, "card13");
 
-        PanelColaboradorInicio.setBackground(new java.awt.Color(255, 255, 255));
-        PanelColaboradorInicio.setMaximumSize(new java.awt.Dimension(1000, 600));
-        PanelColaboradorInicio.setMinimumSize(new java.awt.Dimension(1000, 600));
+        labSVolunt1.setText("AÃ±adir Colaboraciones");
 
-        senalaVoluntario26.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario26.setText(">");
+        senalaVoluntario7.setForeground(new java.awt.Color(153, 153, 153));
+        senalaVoluntario7.setText(">");
 
-        labSVolunt8.setText("Colaborador");
+        navToMainFromVoluntarios1.setForeground(new java.awt.Color(0, 0, 255));
+        navToMainFromVoluntarios1.setText("DIAKETAS");
+        navToMainFromVoluntarios1.setActionCommand("navToMainFromVoluntarios");
+        navToMainFromVoluntarios1.setBorderPainted(false);
 
-        btBuscarColaborador.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
-        btBuscarColaborador.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/lupa.png"))); // NOI18N
-        btBuscarColaborador.setText("BUSCAR");
-        btBuscarColaborador.setActionCommand("buscarVoluntario");
-        btBuscarColaborador.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btBuscarColaborador.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        jButton8.setForeground(new java.awt.Color(0, 0, 255));
+        jButton8.setText("Voluntario");
 
-        btNuevoColaborador.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
-        btNuevoColaborador.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/usu.png"))); // NOI18N
-        btNuevoColaborador.setText("Nuevo Socio");
-        btNuevoColaborador.setActionCommand("contabilidad");
-        btNuevoColaborador.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btNuevoColaborador.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        jButton10.setForeground(new java.awt.Color(0, 0, 255));
+        jButton10.setText("Colaboraciones");
 
-        navToMainFromColaborador.setForeground(new java.awt.Color(0, 0, 255));
-        navToMainFromColaborador.setText("DIAKETAS");
-        navToMainFromColaborador.setActionCommand("navToMainFromVoluntarios");
-        navToMainFromColaborador.setBorderPainted(false);
+        senalaVoluntario8.setForeground(new java.awt.Color(153, 153, 153));
+        senalaVoluntario8.setText(">");
 
-        navToColaboradoresFromColaborador.setForeground(new java.awt.Color(0, 0, 255));
-        navToColaboradoresFromColaborador.setText("Colaboradores");
-        navToColaboradoresFromColaborador.setActionCommand("navToMainFromVoluntarios");
-        navToColaboradoresFromColaborador.setBorderPainted(false);
+        senalaVoluntario9.setForeground(new java.awt.Color(153, 153, 153));
+        senalaVoluntario9.setText(">");
 
-        senalaVoluntario27.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario27.setText(">");
+        jLabel71.setForeground(new java.awt.Color(255, 0, 0));
+        jLabel71.setText("AÃ±adir en colaborador");
 
-        org.jdesktop.layout.GroupLayout PanelColaboradorInicioLayout = new org.jdesktop.layout.GroupLayout(PanelColaboradorInicio);
-        PanelColaboradorInicio.setLayout(PanelColaboradorInicioLayout);
-        PanelColaboradorInicioLayout.setHorizontalGroup(
-            PanelColaboradorInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelColaboradorInicioLayout.createSequentialGroup()
+        jLabel72.setText("DNI del colaborador");
+
+        jLabel73.setText("Cantidad");
+
+        jLabel74.setText("Concepto");
+
+        jLabel75.setText("Fecha");
+
+        jButton11.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/guardar.png"))); // NOI18N
+
+        jButton12.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/limpiar.png"))); // NOI18N
+
+        jLabel76.setForeground(new java.awt.Color(255, 0, 0));
+        jLabel76.setText("AÃ±adir en empresa");
+
+        jLabel77.setText("CIF de la empresa");
+
+        jLabel78.setText("Cantidad");
+
+        jLabel79.setText("Concepto");
+
+        jLabel80.setText("Fecha");
+
+        jButton13.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/guardar.png"))); // NOI18N
+
+        jButton14.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/limpiar.png"))); // NOI18N
+
+        org.jdesktop.layout.GroupLayout PanelAÃ±adirColaboracionesLayout = new org.jdesktop.layout.GroupLayout(PanelAÃ±adirColaboraciones);
+        PanelAÃ±adirColaboraciones.setLayout(PanelAÃ±adirColaboracionesLayout);
+        PanelAÃ±adirColaboracionesLayout.setHorizontalGroup(
+            PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
                 .addContainerGap()
-                .add(PanelColaboradorInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelColaboradorInicioLayout.createSequentialGroup()
-                        .add(navToMainFromColaborador)
+                .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
+                        .add(navToMainFromVoluntarios1)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario26)
+                        .add(senalaVoluntario7)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToColaboradoresFromColaborador)
+                        .add(jButton8)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario27)
+                        .add(senalaVoluntario8)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(labSVolunt8)
-                        .add(0, 0, Short.MAX_VALUE))
-                    .add(separadorVoluntario6))
-                .addContainerGap())
-            .add(PanelColaboradorInicioLayout.createSequentialGroup()
-                .add(107, 107, 107)
-                .add(btNuevoColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 265, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 255, Short.MAX_VALUE)
-                .add(btBuscarColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 263, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .add(137, 137, 137))
+                        .add(jButton10)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(senalaVoluntario9)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(labSVolunt1)
+                        .addContainerGap())
+                    .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
+                        .add(0, 161, Short.MAX_VALUE)
+                        .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                            .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                                .add(jLabel76)
+                                .add(PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
+                                    .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                                        .add(PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
+                                            .add(29, 29, 29)
+                                            .add(jLabel79)
+                                            .add(59, 59, 59))
+                                        .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
+                                            .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                                                .add(jLabel78)
+                                                .add(jLabel77))
+                                            .add(18, 18, 18)))
+                                    .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                                        .add(PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
+                                            .add(jTextField10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 111, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                            .add(125, 125, 125)
+                                            .add(jLabel80)
+                                            .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                                            .add(jTextField12))
+                                        .add(jTextField11, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 430, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                        .add(jTextField9, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 162, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                                    .add(99, 99, 99)
+                                    .add(jButton13, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 25, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                    .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                                    .add(jButton14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+                            .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                                .add(jLabel71)
+                                .add(PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
+                                    .add(29, 29, 29)
+                                    .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                                        .add(jLabel72)
+                                        .add(jLabel73)
+                                        .add(jLabel74))
+                                    .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                                    .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                                        .add(PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
+                                            .add(jTextField6, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 111, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                            .add(125, 125, 125)
+                                            .add(jLabel75)
+                                            .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                                            .add(jTextField8))
+                                        .add(jTextField7, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 430, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                        .add(jTextField5, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 162, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                                    .add(99, 99, 99)
+                                    .add(jButton11, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 25, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                    .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                                    .add(jButton12, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
+                        .add(131, 131, 131))))
         );
-        PanelColaboradorInicioLayout.setVerticalGroup(
-            PanelColaboradorInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelColaboradorInicioLayout.createSequentialGroup()
+        PanelAÃ±adirColaboracionesLayout.setVerticalGroup(
+            PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
                 .addContainerGap()
-                .add(PanelColaboradorInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(navToMainFromColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario26)
-                    .add(labSVolunt8)
-                    .add(navToColaboradoresFromColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario27))
-                .add(4, 4, 4)
-                .add(separadorVoluntario6, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .add(139, 139, 139)
-                .add(PanelColaboradorInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(btBuscarColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 244, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(btNuevoColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 244, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(196, Short.MAX_VALUE))
+                .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(navToMainFromVoluntarios1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(senalaVoluntario7)
+                    .add(labSVolunt1)
+                    .add(jButton8, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(jButton10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(senalaVoluntario8)
+                    .add(senalaVoluntario9))
+                .add(106, 106, 106)
+                .add(jLabel71)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(jLabel72)
+                    .add(jTextField5, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
+                        .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                            .add(jLabel73)
+                            .add(jTextField6, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                            .add(jLabel75)
+                            .add(jTextField8, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                            .add(jLabel74)
+                            .add(jTextField7, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+                    .add(PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
+                        .add(4, 4, 4)
+                        .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(jButton12, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                            .add(jButton11, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 26, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
+                .add(49, 49, 49)
+                .add(jLabel76)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(jLabel77)
+                    .add(jTextField9, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
+                        .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                                .add(jLabel80)
+                                .add(jTextField12, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                            .add(PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
+                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                                .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                                    .add(jTextField10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                    .add(jLabel78))))
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                        .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(jTextField11, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                            .add(jLabel79)))
+                    .add(PanelAÃ±adirColaboracionesLayout.createSequentialGroup()
+                        .add(4, 4, 4)
+                        .add(PanelAÃ±adirColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(jButton14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                            .add(jButton13, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 26, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
+                .addContainerGap(245, Short.MAX_VALUE))
         );
 
-        getContentPane().add(PanelColaboradorInicio, "card7");
+        getContentPane().add(PanelAÃ±adirColaboraciones, "card14");
 
-        navToMainFromColaboradorDatos.setForeground(new java.awt.Color(0, 0, 255));
-        navToMainFromColaboradorDatos.setText("DIAKETAS");
-        navToMainFromColaboradorDatos.setActionCommand("navToMainFromVoluntarios");
-        navToMainFromColaboradorDatos.setBorderPainted(false);
+        navToMainFromVoluntarios3.setForeground(new java.awt.Color(0, 0, 255));
+        navToMainFromVoluntarios3.setText("DIAKETAS");
+        navToMainFromVoluntarios3.setActionCommand("navToMainFromVoluntarios");
+        navToMainFromVoluntarios3.setBorderPainted(false);
 
         senalaVoluntario13.setForeground(new java.awt.Color(153, 153, 153));
         senalaVoluntario13.setText(">");
 
-        navToColaboradoresFromColaboradorDatos.setForeground(new java.awt.Color(0, 0, 255));
-        navToColaboradoresFromColaboradorDatos.setText("Colaboradores");
+        jButton20.setForeground(new java.awt.Color(0, 0, 255));
+        jButton20.setText("Colaboradores");
 
         senalaVoluntario14.setForeground(new java.awt.Color(153, 153, 153));
         senalaVoluntario14.setText(">");
 
-        navToColaboradorFromColaboradorDatos.setForeground(new java.awt.Color(0, 0, 255));
-        navToColaboradorFromColaboradorDatos.setText("Colaborador");
+        jButton21.setForeground(new java.awt.Color(0, 0, 255));
+        jButton21.setText("Colaborador");
 
         labSVolunt3.setText("Datos");
 
@@ -3715,16 +3354,16 @@
 
         jButton23.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/limpiar.png"))); // NOI18N
 
-        org.jdesktop.layout.GroupLayout PanelDatosColaboradorLayout = new org.jdesktop.layout.GroupLayout(PanelDatosColaborador);
-        PanelDatosColaborador.setLayout(PanelDatosColaboradorLayout);
-        PanelDatosColaboradorLayout.setHorizontalGroup(
-            PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+        org.jdesktop.layout.GroupLayout PanelColaboradorDatosLayout = new org.jdesktop.layout.GroupLayout(PanelColaboradorDatos);
+        PanelColaboradorDatos.setLayout(PanelColaboradorDatosLayout);
+        PanelColaboradorDatosLayout.setHorizontalGroup(
+            PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(0, 911, Short.MAX_VALUE)
-            .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                .add(PanelDatosColaboradorLayout.createSequentialGroup()
+            .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                .add(PanelColaboradorDatosLayout.createSequentialGroup()
                     .add(47, 47, 47)
-                    .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                        .add(PanelDatosColaboradorLayout.createSequentialGroup()
+                    .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                        .add(PanelColaboradorDatosLayout.createSequentialGroup()
                             .add(label35, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(207, 207, 207)
                             .add(label42, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
@@ -3732,48 +3371,48 @@
                             .add(textField31, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 127, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                         .add(label31, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(label27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .add(PanelDatosColaboradorLayout.createSequentialGroup()
-                            .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
-                                .add(PanelDatosColaboradorLayout.createSequentialGroup()
+                        .add(PanelColaboradorDatosLayout.createSequentialGroup()
+                            .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
+                                .add(PanelColaboradorDatosLayout.createSequentialGroup()
                                     .add(label32, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                     .add(38, 38, 38)
                                     .add(textField25, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                                .add(org.jdesktop.layout.GroupLayout.LEADING, PanelDatosColaboradorLayout.createSequentialGroup()
-                                    .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                                .add(org.jdesktop.layout.GroupLayout.LEADING, PanelColaboradorDatosLayout.createSequentialGroup()
+                                    .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                         .add(label28, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                         .add(label29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                         .add(label30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                                     .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                                    .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                                    .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                         .add(textField19, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 315, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                        .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                                        .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
                                             .add(textField20, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 315, Short.MAX_VALUE)
                                             .add(textField21, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
-                                .add(org.jdesktop.layout.GroupLayout.LEADING, PanelDatosColaboradorLayout.createSequentialGroup()
+                                .add(org.jdesktop.layout.GroupLayout.LEADING, PanelColaboradorDatosLayout.createSequentialGroup()
                                     .add(label33, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                     .add(36, 36, 36)
                                     .add(textField23, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                                .add(org.jdesktop.layout.GroupLayout.LEADING, PanelDatosColaboradorLayout.createSequentialGroup()
+                                .add(org.jdesktop.layout.GroupLayout.LEADING, PanelColaboradorDatosLayout.createSequentialGroup()
                                     .add(label34, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                     .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                                    .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                                    .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                         .add(textField24, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                         .add(textField22, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 131, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
                             .add(52, 52, 52)
-                            .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                 .add(label36, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(label37, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(label39, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(label41, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                             .add(23, 23, 23)
-                            .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                 .add(textField30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                .add(PanelDatosColaboradorLayout.createSequentialGroup()
+                                .add(PanelColaboradorDatosLayout.createSequentialGroup()
                                     .add(jRadioButton4)
                                     .add(18, 18, 18)
                                     .add(jRadioButton3))
-                                .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
-                                    .add(PanelDatosColaboradorLayout.createSequentialGroup()
+                                .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                                    .add(PanelColaboradorDatosLayout.createSequentialGroup()
                                         .add(textField27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                         .add(16, 16, 16)
                                         .add(label38, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
@@ -3784,86 +3423,86 @@
                                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                                         .add(textField29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 56, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                                     .add(textField26, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
-                        .add(PanelDatosColaboradorLayout.createSequentialGroup()
+                        .add(PanelColaboradorDatosLayout.createSequentialGroup()
                             .add(398, 398, 398)
                             .add(jButton22, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(18, 18, 18)
                             .add(jButton23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 33, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
                     .addContainerGap(47, Short.MAX_VALUE)))
         );
-        PanelDatosColaboradorLayout.setVerticalGroup(
-            PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+        PanelColaboradorDatosLayout.setVerticalGroup(
+            PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(0, 466, Short.MAX_VALUE)
-            .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                .add(PanelDatosColaboradorLayout.createSequentialGroup()
+            .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                .add(PanelColaboradorDatosLayout.createSequentialGroup()
                     .add(50, 50, 50)
-                    .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                        .add(PanelDatosColaboradorLayout.createSequentialGroup()
+                    .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                        .add(PanelColaboradorDatosLayout.createSequentialGroup()
                             .add(label27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                            .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                            .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                                 .add(label28, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(textField19, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(label36, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
                         .add(textField26, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                     .add(13, 13, 13)
-                    .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                         .add(textField29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(label40, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .add(PanelDatosColaboradorLayout.createSequentialGroup()
-                            .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                        .add(PanelColaboradorDatosLayout.createSequentialGroup()
+                            .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                 .add(label29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(textField20, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                             .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                            .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                 .add(textField21, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(label30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                        .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
-                            .add(PanelDatosColaboradorLayout.createSequentialGroup()
-                                .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                        .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
+                            .add(PanelColaboradorDatosLayout.createSequentialGroup()
+                                .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                     .add(textField28, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                     .add(textField27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                     .add(label38, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                                .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                                     .add(jRadioButton4)
                                     .add(jRadioButton3)))
-                            .add(PanelDatosColaboradorLayout.createSequentialGroup()
+                            .add(PanelColaboradorDatosLayout.createSequentialGroup()
                                 .add(label37, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                                 .add(label39, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
                     .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                    .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                        .add(PanelDatosColaboradorLayout.createSequentialGroup()
+                    .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                        .add(PanelColaboradorDatosLayout.createSequentialGroup()
                             .add(label31, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                            .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                            .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                                 .add(label32, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(textField25, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                             .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                            .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                            .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                                 .add(label33, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(textField23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
                         .add(label41, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(textField30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                     .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                    .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                    .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                         .add(label34, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(textField24, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                     .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                    .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                         .add(label42, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(label35, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(textField22, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(textField31, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                     .add(60, 60, 60)
-                    .add(PanelDatosColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                    .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
                         .add(jButton23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(jButton22, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
                     .addContainerGap(61, Short.MAX_VALUE)))
         );
 
-        jTabbedPane3.addTab("Datos", PanelDatosColaborador);
+        jTabbedPane3.addTab("Datos", PanelColaboradorDatos);
 
         label43.setForeground(new java.awt.Color(255, 0, 0));
         label43.setText("Colaboraciones");
@@ -3904,121 +3543,121 @@
 
         jComboBox6.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Fecha inicial" }));
 
-        org.jdesktop.layout.GroupLayout PanelColaboracionesColaboradorLayout = new org.jdesktop.layout.GroupLayout(PanelColaboracionesColaborador);
-        PanelColaboracionesColaborador.setLayout(PanelColaboracionesColaboradorLayout);
-        PanelColaboracionesColaboradorLayout.setHorizontalGroup(
-            PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelColaboracionesColaboradorLayout.createSequentialGroup()
+        org.jdesktop.layout.GroupLayout PanelColaboradorColaboracionesLayout = new org.jdesktop.layout.GroupLayout(PanelColaboradorColaboraciones);
+        PanelColaboradorColaboraciones.setLayout(PanelColaboradorColaboracionesLayout);
+        PanelColaboradorColaboracionesLayout.setHorizontalGroup(
+            PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelColaboradorColaboracionesLayout.createSequentialGroup()
                 .addContainerGap(18, Short.MAX_VALUE)
-                .add(PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelColaboracionesColaboradorLayout.createSequentialGroup()
-                        .add(PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                .add(PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelColaboradorColaboracionesLayout.createSequentialGroup()
+                        .add(PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
                             .add(label44, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(label43, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                            .add(PanelColaboracionesColaboradorLayout.createSequentialGroup()
-                                .add(PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(PanelColaboradorColaboracionesLayout.createSequentialGroup()
+                                .add(PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                     .add(label45, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                     .add(label46, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                                 .add(29, 29, 29)
-                                .add(PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
-                                    .add(PanelColaboracionesColaboradorLayout.createSequentialGroup()
+                                .add(PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                                    .add(PanelColaboradorColaboracionesLayout.createSequentialGroup()
                                         .add(textField32, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 111, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                         .add(76, 76, 76)
                                         .add(label47, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                                         .add(textField34, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 139, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                         .add(272, 272, 272))
-                                    .add(PanelColaboracionesColaboradorLayout.createSequentialGroup()
+                                    .add(PanelColaboradorColaboracionesLayout.createSequentialGroup()
                                         .add(textField33, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                         .add(60, 60, 60)))))
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                        .add(PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                             .add(jButton25, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 32, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(jButton24, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                         .add(18, 18, 18)
                         .add(jButton26, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                    .add(PanelColaboracionesColaboradorLayout.createSequentialGroup()
+                    .add(PanelColaboradorColaboracionesLayout.createSequentialGroup()
                         .add(jScrollPane13, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 672, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(29, 29, 29)
-                        .add(PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                        .add(PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                             .add(jComboBox6, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 144, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(jComboBox5, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 144, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
                 .add(58, 58, 58))
         );
-        PanelColaboracionesColaboradorLayout.setVerticalGroup(
-            PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelColaboracionesColaboradorLayout.createSequentialGroup()
+        PanelColaboradorColaboracionesLayout.setVerticalGroup(
+            PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(PanelColaboradorColaboracionesLayout.createSequentialGroup()
                 .add(40, 40, 40)
                 .add(label43, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelColaboracionesColaboradorLayout.createSequentialGroup()
+                .add(PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelColaboradorColaboracionesLayout.createSequentialGroup()
                         .add(12, 12, 12)
                         .add(jComboBox6, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(18, 18, 18)
                         .add(jComboBox5, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(28, 28, 28)
-                        .add(PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                        .add(PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                             .add(jButton25, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 33, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(jButton26, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 31, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                    .add(PanelColaboracionesColaboradorLayout.createSequentialGroup()
+                    .add(PanelColaboradorColaboracionesLayout.createSequentialGroup()
                         .add(jScrollPane13, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 183, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(21, 21, 21)
-                        .add(PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                            .add(PanelColaboracionesColaboradorLayout.createSequentialGroup()
+                        .add(PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                            .add(PanelColaboradorColaboracionesLayout.createSequentialGroup()
                                 .add(label44, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                                .add(PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                                .add(PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                                     .add(label45, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                     .add(textField32, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
                             .add(label47, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                            .add(PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                 .add(jButton24, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 26, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(textField34, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
                         .add(20, 20, 20)
-                        .add(PanelColaboracionesColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                        .add(PanelColaboradorColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                             .add(label46, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(textField33, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
                 .addContainerGap(102, Short.MAX_VALUE))
         );
 
-        jTabbedPane3.addTab("Colaboraciones", PanelColaboracionesColaborador);
+        jTabbedPane3.addTab("Colaboraciones", PanelColaboradorColaboraciones);
 
-        org.jdesktop.layout.GroupLayout PanelColaboradorDatosLayout = new org.jdesktop.layout.GroupLayout(PanelColaboradorDatos);
-        PanelColaboradorDatos.setLayout(PanelColaboradorDatosLayout);
-        PanelColaboradorDatosLayout.setHorizontalGroup(
-            PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelColaboradorDatosLayout.createSequentialGroup()
+        org.jdesktop.layout.GroupLayout PanelColaboradorLayout = new org.jdesktop.layout.GroupLayout(PanelColaborador);
+        PanelColaborador.setLayout(PanelColaboradorLayout);
+        PanelColaboradorLayout.setHorizontalGroup(
+            PanelColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(PanelColaboradorLayout.createSequentialGroup()
                 .addContainerGap(14, Short.MAX_VALUE)
-                .add(navToMainFromColaboradorDatos)
+                .add(navToMainFromVoluntarios3)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(senalaVoluntario13)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(navToColaboradoresFromColaboradorDatos)
+                .add(jButton20)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(senalaVoluntario14)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(navToColaboradorFromColaboradorDatos)
+                .add(jButton21)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(senalaVoluntario15)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
                 .add(labSVolunt3)
                 .add(656, 656, 656))
-            .add(PanelColaboradorDatosLayout.createSequentialGroup()
+            .add(PanelColaboradorLayout.createSequentialGroup()
                 .add(41, 41, 41)
                 .add(jTabbedPane3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 916, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap())
         );
-        PanelColaboradorDatosLayout.setVerticalGroup(
-            PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelColaboradorDatosLayout.createSequentialGroup()
+        PanelColaboradorLayout.setVerticalGroup(
+            PanelColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(PanelColaboradorLayout.createSequentialGroup()
                 .addContainerGap()
-                .add(PanelColaboradorDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(navToMainFromColaboradorDatos, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .add(PanelColaboradorLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(navToMainFromVoluntarios3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                     .add(senalaVoluntario13)
                     .add(labSVolunt3)
-                    .add(navToColaboradoresFromColaboradorDatos, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(navToColaboradorFromColaboradorDatos, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(jButton20, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(jButton21, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                     .add(senalaVoluntario14)
                     .add(senalaVoluntario15))
                 .add(18, 18, 18)
@@ -4026,243 +3665,26 @@
                 .addContainerGap(81, Short.MAX_VALUE))
         );
 
-        getContentPane().add(PanelColaboradorDatos, "card15");
+        getContentPane().add(PanelColaborador, "card15");
 
-        navToMainFromColaboradorBuscar.setForeground(new java.awt.Color(0, 0, 255));
-        navToMainFromColaboradorBuscar.setText("DIAKETAS");
-        navToMainFromColaboradorBuscar.setActionCommand("navToMainFromVoluntarios");
-        navToMainFromColaboradorBuscar.setBorderPainted(false);
-
-        senalaVoluntario31.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario31.setText(">");
-
-        navToColaboradorFromBuscarColaborador.setForeground(new java.awt.Color(0, 0, 255));
-        navToColaboradorFromBuscarColaborador.setText("Colaborador");
-
-        labSVolunt10.setText("Buscar");
-
-        senalaVoluntario32.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario32.setText(">");
-
-        textBuscarSocio2.setText("Buscar");
-
-        btBuscar2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/buscar.png"))); // NOI18N
-
-        jLabel88.setText("Buscar por:");
-
-        cbTextSocio2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Tipo de busqueda", " " }));
-
-        tableBuscarSocio2.setModel(new javax.swing.table.DefaultTableModel(
-            new Object [][] {
-                {null, null, null, null, null},
-                {null, null, null, null, null},
-                {null, null, null, null, null},
-                {null, null, null, null, null}
-            },
-            new String [] {
-                "DNI", "Nombre", "Apellidos", "Localidad", "Fecha Nacimiento"
-            }
-        ) {
-            Class[] types = new Class [] {
-                java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.Object.class
-            };
-
-            public Class getColumnClass(int columnIndex) {
-                return types [columnIndex];
-            }
-        });
-        jScrollPane17.setViewportView(tableBuscarSocio2);
-
-        btConsultar2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/modificar.png"))); // NOI18N
-
-        btEliminar2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/borrar.png"))); // NOI18N
-
-        navToColaboradoresFromBuscarColaborador.setForeground(new java.awt.Color(0, 0, 255));
-        navToColaboradoresFromBuscarColaborador.setText("Colaboradores");
-        navToColaboradoresFromBuscarColaborador.setActionCommand("navToMainFromVoluntarios");
-        navToColaboradoresFromBuscarColaborador.setBorderPainted(false);
-
-        senalaVoluntario33.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario33.setText(">");
-
-        org.jdesktop.layout.GroupLayout PanelColaboradorBuscarLayout = new org.jdesktop.layout.GroupLayout(PanelColaboradorBuscar);
-        PanelColaboradorBuscar.setLayout(PanelColaboradorBuscarLayout);
-        PanelColaboradorBuscarLayout.setHorizontalGroup(
-            PanelColaboradorBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelColaboradorBuscarLayout.createSequentialGroup()
-                .addContainerGap()
-                .add(PanelColaboradorBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                    .add(PanelColaboradorBuscarLayout.createSequentialGroup()
-                        .add(0, 105, Short.MAX_VALUE)
-                        .add(textBuscarSocio2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 214, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                        .add(btBuscar2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .add(659, 659, 659))
-                    .add(PanelColaboradorBuscarLayout.createSequentialGroup()
-                        .add(navToMainFromColaboradorBuscar)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario31)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToColaboradoresFromBuscarColaborador)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario33)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToColaboradorFromBuscarColaborador)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                        .add(senalaVoluntario32)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(labSVolunt10)
-                        .add(0, 0, Short.MAX_VALUE))))
-            .add(PanelColaboradorBuscarLayout.createSequentialGroup()
-                .add(PanelColaboradorBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelColaboradorBuscarLayout.createSequentialGroup()
-                        .add(117, 117, 117)
-                        .add(jLabel88)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(cbTextSocio2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 162, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                    .add(PanelColaboradorBuscarLayout.createSequentialGroup()
-                        .add(85, 85, 85)
-                        .add(jScrollPane17, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 797, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                    .add(PanelColaboradorBuscarLayout.createSequentialGroup()
-                        .add(458, 458, 458)
-                        .add(btConsultar2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 26, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .add(18, 18, 18)
-                        .add(btEliminar2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 24, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                .addContainerGap())
-        );
-        PanelColaboradorBuscarLayout.setVerticalGroup(
-            PanelColaboradorBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelColaboradorBuscarLayout.createSequentialGroup()
-                .addContainerGap()
-                .add(PanelColaboradorBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(navToMainFromColaboradorBuscar, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario31)
-                    .add(labSVolunt10)
-                    .add(navToColaboradorFromBuscarColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario32)
-                    .add(navToColaboradoresFromBuscarColaborador, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario33))
-                .add(20, 20, 20)
-                .add(PanelColaboradorBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(btBuscar2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(textBuscarSocio2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .add(14, 14, 14)
-                .add(PanelColaboradorBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel88)
-                    .add(cbTextSocio2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .add(41, 41, 41)
-                .add(jScrollPane17, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 369, Short.MAX_VALUE)
-                .add(18, 18, 18)
-                .add(PanelColaboradorBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, btConsultar2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 25, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, btEliminar2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 25, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .add(57, 57, 57))
-        );
-
-        getContentPane().add(PanelColaboradorBuscar, "card15");
-
-        PanelEmpresaInicio.setBackground(new java.awt.Color(255, 255, 255));
-        PanelEmpresaInicio.setMaximumSize(new java.awt.Dimension(1000, 600));
-        PanelEmpresaInicio.setMinimumSize(new java.awt.Dimension(1000, 600));
-
-        senalaVoluntario24.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario24.setText(">");
-
-        labSVolunt7.setText("Empresa");
-
-        btBuscarEmpresa.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
-        btBuscarEmpresa.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/lupa.png"))); // NOI18N
-        btBuscarEmpresa.setText("BUSCAR");
-        btBuscarEmpresa.setActionCommand("buscarVoluntario");
-        btBuscarEmpresa.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btBuscarEmpresa.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-
-        btNuevoEmpresa.setFont(new java.awt.Font("Lucida Grande", 1, 14)); // NOI18N
-        btNuevoEmpresa.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/usu.png"))); // NOI18N
-        btNuevoEmpresa.setText("NUEVA EMPRESA");
-        btNuevoEmpresa.setActionCommand("contabilidad");
-        btNuevoEmpresa.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btNuevoEmpresa.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-
-        navToMainFromEmpresa.setForeground(new java.awt.Color(0, 0, 255));
-        navToMainFromEmpresa.setText("DIAKETAS");
-        navToMainFromEmpresa.setActionCommand("navToMainFromVoluntarios");
-        navToMainFromEmpresa.setBorderPainted(false);
-
-        navToColaboradoresFromEmpresa.setForeground(new java.awt.Color(0, 0, 255));
-        navToColaboradoresFromEmpresa.setText("Colaboradores");
-        navToColaboradoresFromEmpresa.setActionCommand("navToMainFromVoluntarios");
-        navToColaboradoresFromEmpresa.setBorderPainted(false);
-
-        senalaVoluntario25.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario25.setText(">");
-
-        org.jdesktop.layout.GroupLayout PanelEmpresaInicioLayout = new org.jdesktop.layout.GroupLayout(PanelEmpresaInicio);
-        PanelEmpresaInicio.setLayout(PanelEmpresaInicioLayout);
-        PanelEmpresaInicioLayout.setHorizontalGroup(
-            PanelEmpresaInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelEmpresaInicioLayout.createSequentialGroup()
-                .addContainerGap()
-                .add(PanelEmpresaInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelEmpresaInicioLayout.createSequentialGroup()
-                        .add(navToMainFromEmpresa)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario24)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToColaboradoresFromEmpresa)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario25)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(labSVolunt7)
-                        .add(0, 0, Short.MAX_VALUE))
-                    .add(separadorVoluntario5))
-                .addContainerGap())
-            .add(PanelEmpresaInicioLayout.createSequentialGroup()
-                .add(107, 107, 107)
-                .add(btNuevoEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 265, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 255, Short.MAX_VALUE)
-                .add(btBuscarEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 263, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .add(137, 137, 137))
-        );
-        PanelEmpresaInicioLayout.setVerticalGroup(
-            PanelEmpresaInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelEmpresaInicioLayout.createSequentialGroup()
-                .addContainerGap()
-                .add(PanelEmpresaInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(navToMainFromEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario24)
-                    .add(labSVolunt7)
-                    .add(navToColaboradoresFromEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario25))
-                .add(4, 4, 4)
-                .add(separadorVoluntario5, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .add(139, 139, 139)
-                .add(PanelEmpresaInicioLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(btBuscarEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 244, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(btNuevoEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 244, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(196, Short.MAX_VALUE))
-        );
-
-        getContentPane().add(PanelEmpresaInicio, "card7");
-
-        navToMainFromDatosEmpresa.setForeground(new java.awt.Color(0, 0, 255));
-        navToMainFromDatosEmpresa.setText("DIAKETAS");
-        navToMainFromDatosEmpresa.setActionCommand("navToMainFromVoluntarios");
-        navToMainFromDatosEmpresa.setBorderPainted(false);
+        navToMainFromVoluntarios4.setForeground(new java.awt.Color(0, 0, 255));
+        navToMainFromVoluntarios4.setText("DIAKETAS");
+        navToMainFromVoluntarios4.setActionCommand("navToMainFromVoluntarios");
+        navToMainFromVoluntarios4.setBorderPainted(false);
 
         senalaVoluntario16.setForeground(new java.awt.Color(153, 153, 153));
         senalaVoluntario16.setText(">");
 
-        navToColaboradoresFromDatosEmpresa.setForeground(new java.awt.Color(0, 0, 255));
-        navToColaboradoresFromDatosEmpresa.setText("Colaboradores");
+        jButton27.setForeground(new java.awt.Color(0, 0, 255));
+        jButton27.setText("Colaboradores");
 
         senalaVoluntario17.setForeground(new java.awt.Color(153, 153, 153));
         senalaVoluntario17.setText(">");
 
-        navToEmpresaFromDatosEmpresa.setForeground(new java.awt.Color(0, 0, 255));
-        navToEmpresaFromDatosEmpresa.setText("Empresa");
+        jButton28.setForeground(new java.awt.Color(0, 0, 255));
+        jButton28.setText("Empresa");
 
-        labSVolunt4.setText("Datos");
+        labSVolunt4.setText("Buscar");
 
         senalaVoluntario18.setForeground(new java.awt.Color(153, 153, 153));
         senalaVoluntario18.setText(">");
@@ -4322,145 +3744,145 @@
 
         textField42.setText("e-Mail");
 
-        org.jdesktop.layout.GroupLayout PanelDatosEmpresaLayout = new org.jdesktop.layout.GroupLayout(PanelDatosEmpresa);
-        PanelDatosEmpresa.setLayout(PanelDatosEmpresaLayout);
-        PanelDatosEmpresaLayout.setHorizontalGroup(
-            PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelDatosEmpresaLayout.createSequentialGroup()
-                .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelDatosEmpresaLayout.createSequentialGroup()
+        org.jdesktop.layout.GroupLayout PanelEmpresaDatosLayout = new org.jdesktop.layout.GroupLayout(PanelEmpresaDatos);
+        PanelEmpresaDatos.setLayout(PanelEmpresaDatosLayout);
+        PanelEmpresaDatosLayout.setHorizontalGroup(
+            PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(PanelEmpresaDatosLayout.createSequentialGroup()
+                .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelEmpresaDatosLayout.createSequentialGroup()
                         .add(47, 47, 47)
-                        .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                        .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                             .add(label57, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(label56, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                         .add(40, 40, 40))
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelDatosEmpresaLayout.createSequentialGroup()
+                    .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelEmpresaDatosLayout.createSequentialGroup()
                         .addContainerGap()
-                        .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                        .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                             .add(label54, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(label55, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(label53, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)))
-                .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelDatosEmpresaLayout.createSequentialGroup()
+                .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelEmpresaDatosLayout.createSequentialGroup()
                         .add(textField39, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 315, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 85, Short.MAX_VALUE)
                         .add(label62, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(18, 18, 18)
                         .add(textField46, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 202, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(98, 98, 98))
-                    .add(PanelDatosEmpresaLayout.createSequentialGroup()
-                        .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelEmpresaDatosLayout.createSequentialGroup()
+                        .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                             .add(textField40, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                            .add(PanelDatosEmpresaLayout.createSequentialGroup()
+                            .add(PanelEmpresaDatosLayout.createSequentialGroup()
                                 .add(fax, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(145, 145, 145)
-                                .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                                .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                     .add(label58, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                     .add(label63, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                                .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                                .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                     .add(textField47, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 127, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                     .add(textField42, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 299, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
                         .addContainerGap())
-                    .add(PanelDatosEmpresaLayout.createSequentialGroup()
-                        .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelEmpresaDatosLayout.createSequentialGroup()
+                        .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                             .add(textField38, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 131, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(textField41, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 677, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                         .add(0, 0, Short.MAX_VALUE))))
-            .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                .add(PanelDatosEmpresaLayout.createSequentialGroup()
+            .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                .add(PanelEmpresaDatosLayout.createSequentialGroup()
                     .add(47, 47, 47)
-                    .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                         .add(label52, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(label48, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .add(PanelDatosEmpresaLayout.createSequentialGroup()
-                            .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                        .add(PanelEmpresaDatosLayout.createSequentialGroup()
+                            .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                 .add(label49, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(label50, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(label51, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                             .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                            .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                 .add(textField35, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 315, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                                .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
                                     .add(textField36, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 315, Short.MAX_VALUE)
                                     .add(textField37, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
-                        .add(PanelDatosEmpresaLayout.createSequentialGroup()
+                        .add(PanelEmpresaDatosLayout.createSequentialGroup()
                             .add(398, 398, 398)
                             .add(jButton29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(18, 18, 18)
                             .add(jButton30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 33, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
                     .addContainerGap(388, Short.MAX_VALUE)))
         );
-        PanelDatosEmpresaLayout.setVerticalGroup(
-            PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelDatosEmpresaLayout.createSequentialGroup()
+        PanelEmpresaDatosLayout.setVerticalGroup(
+            PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelEmpresaDatosLayout.createSequentialGroup()
                 .addContainerGap(207, Short.MAX_VALUE)
-                .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                     .add(org.jdesktop.layout.GroupLayout.TRAILING, textField41, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                     .add(org.jdesktop.layout.GroupLayout.TRAILING, label53, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                    .add(PanelDatosEmpresaLayout.createSequentialGroup()
+                .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                    .add(PanelEmpresaDatosLayout.createSequentialGroup()
                         .add(textField39, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(textField40, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                    .add(PanelDatosEmpresaLayout.createSequentialGroup()
-                        .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                            .add(PanelDatosEmpresaLayout.createSequentialGroup()
-                                .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelEmpresaDatosLayout.createSequentialGroup()
+                        .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                            .add(PanelEmpresaDatosLayout.createSequentialGroup()
+                                .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                     .add(label62, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                     .add(textField46, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED))
-                            .add(PanelDatosEmpresaLayout.createSequentialGroup()
+                            .add(PanelEmpresaDatosLayout.createSequentialGroup()
                                 .add(label54, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(10, 10, 10)))
                         .add(label55, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
                 .add(9, 9, 9)
-                .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
-                    .add(PanelDatosEmpresaLayout.createSequentialGroup()
+                .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
+                    .add(PanelEmpresaDatosLayout.createSequentialGroup()
                         .add(textField38, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(fax, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                    .add(PanelDatosEmpresaLayout.createSequentialGroup()
+                    .add(PanelEmpresaDatosLayout.createSequentialGroup()
                         .add(label56, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(label57, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                    .add(PanelDatosEmpresaLayout.createSequentialGroup()
+                    .add(PanelEmpresaDatosLayout.createSequentialGroup()
                         .add(label63, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(label58, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                    .add(PanelDatosEmpresaLayout.createSequentialGroup()
+                    .add(PanelEmpresaDatosLayout.createSequentialGroup()
                         .add(textField47, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .add(textField42, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
                 .add(120, 120, 120))
-            .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                .add(PanelDatosEmpresaLayout.createSequentialGroup()
+            .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                .add(PanelEmpresaDatosLayout.createSequentialGroup()
                     .add(50, 50, 50)
                     .add(label48, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                     .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                    .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                    .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                         .add(label49, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(textField35, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                     .add(13, 13, 13)
-                    .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                         .add(label50, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(textField36, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                     .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                    .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                         .add(textField37, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(label51, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                     .add(13, 13, 13)
                     .add(label52, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                     .add(180, 180, 180)
-                    .add(PanelDatosEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                    .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
                         .add(jButton30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(jButton29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
                     .addContainerGap(61, Short.MAX_VALUE)))
         );
 
-        jTabbedPane4.addTab("Datos", PanelDatosEmpresa);
+        jTabbedPane4.addTab("Datos", PanelEmpresaDatos);
 
         label64.setForeground(new java.awt.Color(255, 0, 0));
         label64.setText("Colaboraciones");
@@ -4501,121 +3923,121 @@
 
         jComboBox8.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Fecha inicial" }));
 
-        org.jdesktop.layout.GroupLayout PanelColaboracionesEmpresaLayout = new org.jdesktop.layout.GroupLayout(PanelColaboracionesEmpresa);
-        PanelColaboracionesEmpresa.setLayout(PanelColaboracionesEmpresaLayout);
-        PanelColaboracionesEmpresaLayout.setHorizontalGroup(
-            PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelColaboracionesEmpresaLayout.createSequentialGroup()
+        org.jdesktop.layout.GroupLayout PanelEmpresaColaboracionesLayout = new org.jdesktop.layout.GroupLayout(PanelEmpresaColaboraciones);
+        PanelEmpresaColaboraciones.setLayout(PanelEmpresaColaboracionesLayout);
+        PanelEmpresaColaboracionesLayout.setHorizontalGroup(
+            PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(org.jdesktop.layout.GroupLayout.TRAILING, PanelEmpresaColaboracionesLayout.createSequentialGroup()
                 .addContainerGap(18, Short.MAX_VALUE)
-                .add(PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelColaboracionesEmpresaLayout.createSequentialGroup()
-                        .add(PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                .add(PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelEmpresaColaboracionesLayout.createSequentialGroup()
+                        .add(PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
                             .add(label65, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(label64, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                            .add(PanelColaboracionesEmpresaLayout.createSequentialGroup()
-                                .add(PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(PanelEmpresaColaboracionesLayout.createSequentialGroup()
+                                .add(PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                     .add(label66, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                     .add(label67, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                                 .add(29, 29, 29)
-                                .add(PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
-                                    .add(PanelColaboracionesEmpresaLayout.createSequentialGroup()
+                                .add(PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                                    .add(PanelEmpresaColaboracionesLayout.createSequentialGroup()
                                         .add(textField48, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 111, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                         .add(76, 76, 76)
                                         .add(label68, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                                         .add(textField50, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 139, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                         .add(272, 272, 272))
-                                    .add(PanelColaboracionesEmpresaLayout.createSequentialGroup()
+                                    .add(PanelEmpresaColaboracionesLayout.createSequentialGroup()
                                         .add(textField49, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                         .add(60, 60, 60)))))
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                        .add(PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                             .add(jButton32, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 32, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(jButton31, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                         .add(18, 18, 18)
                         .add(jButton33, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                    .add(PanelColaboracionesEmpresaLayout.createSequentialGroup()
+                    .add(PanelEmpresaColaboracionesLayout.createSequentialGroup()
                         .add(jScrollPane14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 672, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(29, 29, 29)
-                        .add(PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                        .add(PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                             .add(jComboBox8, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 144, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(jComboBox7, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 144, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
                 .add(58, 58, 58))
         );
-        PanelColaboracionesEmpresaLayout.setVerticalGroup(
-            PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelColaboracionesEmpresaLayout.createSequentialGroup()
+        PanelEmpresaColaboracionesLayout.setVerticalGroup(
+            PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(PanelEmpresaColaboracionesLayout.createSequentialGroup()
                 .add(40, 40, 40)
                 .add(label64, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelColaboracionesEmpresaLayout.createSequentialGroup()
+                .add(PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelEmpresaColaboracionesLayout.createSequentialGroup()
                         .add(12, 12, 12)
                         .add(jComboBox8, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(18, 18, 18)
                         .add(jComboBox7, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(28, 28, 28)
-                        .add(PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                        .add(PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                             .add(jButton32, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 33, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(jButton33, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 31, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                    .add(PanelColaboracionesEmpresaLayout.createSequentialGroup()
+                    .add(PanelEmpresaColaboracionesLayout.createSequentialGroup()
                         .add(jScrollPane14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 183, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(21, 21, 21)
-                        .add(PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                            .add(PanelColaboracionesEmpresaLayout.createSequentialGroup()
+                        .add(PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                            .add(PanelEmpresaColaboracionesLayout.createSequentialGroup()
                                 .add(label65, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                                .add(PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                                .add(PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                                     .add(label66, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                     .add(textField48, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
                             .add(label68, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                            .add(PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                 .add(jButton31, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 26, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                                 .add(textField50, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
                         .add(20, 20, 20)
-                        .add(PanelColaboracionesEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                        .add(PanelEmpresaColaboracionesLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                             .add(label67, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                             .add(textField49, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
                 .addContainerGap(102, Short.MAX_VALUE))
         );
 
-        jTabbedPane4.addTab("Colaboraciones", PanelColaboracionesEmpresa);
+        jTabbedPane4.addTab("Colaboraciones", PanelEmpresaColaboraciones);
 
-        org.jdesktop.layout.GroupLayout PanelEmpresaDatosLayout = new org.jdesktop.layout.GroupLayout(PanelEmpresaDatos);
-        PanelEmpresaDatos.setLayout(PanelEmpresaDatosLayout);
-        PanelEmpresaDatosLayout.setHorizontalGroup(
-            PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelEmpresaDatosLayout.createSequentialGroup()
+        org.jdesktop.layout.GroupLayout PanelEmpresaLayout = new org.jdesktop.layout.GroupLayout(PanelEmpresa);
+        PanelEmpresa.setLayout(PanelEmpresaLayout);
+        PanelEmpresaLayout.setHorizontalGroup(
+            PanelEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(PanelEmpresaLayout.createSequentialGroup()
                 .addContainerGap()
-                .add(navToMainFromDatosEmpresa)
+                .add(navToMainFromVoluntarios4)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(senalaVoluntario16)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 12, Short.MAX_VALUE)
-                .add(navToColaboradoresFromDatosEmpresa)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 8, Short.MAX_VALUE)
+                .add(jButton27)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(senalaVoluntario17)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(navToEmpresaFromDatosEmpresa)
+                .add(jButton28)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(senalaVoluntario18)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(labSVolunt4)
                 .add(674, 674, 674))
-            .add(PanelEmpresaDatosLayout.createSequentialGroup()
+            .add(PanelEmpresaLayout.createSequentialGroup()
                 .add(41, 41, 41)
                 .add(jTabbedPane4, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 916, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap())
         );
-        PanelEmpresaDatosLayout.setVerticalGroup(
-            PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelEmpresaDatosLayout.createSequentialGroup()
+        PanelEmpresaLayout.setVerticalGroup(
+            PanelEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(PanelEmpresaLayout.createSequentialGroup()
                 .addContainerGap()
-                .add(PanelEmpresaDatosLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(navToMainFromDatosEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .add(PanelEmpresaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(navToMainFromVoluntarios4, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                     .add(senalaVoluntario16)
                     .add(labSVolunt4)
-                    .add(navToColaboradoresFromDatosEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(navToEmpresaFromDatosEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(jButton27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(jButton28, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                     .add(senalaVoluntario17)
                     .add(senalaVoluntario18))
                 .add(18, 18, 18)
@@ -4623,33 +4045,34 @@
                 .addContainerGap(81, Short.MAX_VALUE))
         );
 
-        getContentPane().add(PanelEmpresaDatos, "card15");
+        getContentPane().add(PanelEmpresa, "card15");
 
-        navToMainFromBuscarEmpresa.setForeground(new java.awt.Color(0, 0, 255));
-        navToMainFromBuscarEmpresa.setText("DIAKETAS");
-        navToMainFromBuscarEmpresa.setActionCommand("navToMainFromVoluntarios");
-        navToMainFromBuscarEmpresa.setBorderPainted(false);
+        labSVolunt5.setText("ComprobarCuotas");
 
-        senalaVoluntario28.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario28.setText(">");
+        senalaVoluntario19.setForeground(new java.awt.Color(153, 153, 153));
+        senalaVoluntario19.setText(">");
 
-        navToEmpresaFromBuscarEmpresa.setForeground(new java.awt.Color(0, 0, 255));
-        navToEmpresaFromBuscarEmpresa.setText("Empresa");
+        navToMainFromVoluntarios5.setForeground(new java.awt.Color(0, 0, 255));
+        navToMainFromVoluntarios5.setText("DIAKETAS");
+        navToMainFromVoluntarios5.setActionCommand("navToMainFromVoluntarios");
+        navToMainFromVoluntarios5.setBorderPainted(false);
 
-        labSVolunt9.setText("Buscar");
+        jButton34.setForeground(new java.awt.Color(0, 0, 255));
+        jButton34.setText("Voluntario");
 
-        senalaVoluntario29.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario29.setText(">");
+        jButton35.setForeground(new java.awt.Color(0, 0, 255));
+        jButton35.setText("Colaboraciones");
 
-        textBuscarSocio1.setText("Buscar");
+        senalaVoluntario20.setForeground(new java.awt.Color(153, 153, 153));
+        senalaVoluntario20.setText(">");
 
-        btBuscar1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/buscar.png"))); // NOI18N
+        senalaVoluntario21.setForeground(new java.awt.Color(153, 153, 153));
+        senalaVoluntario21.setText(">");
 
-        jLabel87.setText("Buscar por:");
+        jLabel92.setForeground(new java.awt.Color(255, 0, 0));
+        jLabel92.setText("Cuotas");
 
-        cbTextSocio1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Tipo de busqueda", " " }));
-
-        tableBuscarSocio1.setModel(new javax.swing.table.DefaultTableModel(
+        jTable9.setModel(new javax.swing.table.DefaultTableModel(
             new Object [][] {
                 {null, null, null, null, null},
                 {null, null, null, null, null},
@@ -4657,107 +4080,114 @@
                 {null, null, null, null, null}
             },
             new String [] {
-                "DNI", "Nombre", "Apellidos", "Localidad", "Fecha Nacimiento"
+                "DNI", "Cantidad de cuota", "Cantidad que debe", "Intervalo de pagos", "Fecha ultimo pago"
             }
-        ) {
-            Class[] types = new Class [] {
-                java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.Object.class
-            };
+        ));
+        jScrollPane15.setViewportView(jTable9);
 
-            public Class getColumnClass(int columnIndex) {
-                return types [columnIndex];
-            }
-        });
-        jScrollPane16.setViewportView(tableBuscarSocio1);
+        jLabel82.setForeground(new java.awt.Color(255, 0, 0));
+        jLabel82.setText("AÃ±adir pago");
 
-        btConsultar1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/modificar.png"))); // NOI18N
+        jLabel83.setText("DNI del socio");
 
-        btEliminar1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/borrar.png"))); // NOI18N
+        jLabel84.setText("Cantidad");
 
-        navToColaboradoresFromBuscarEmpresa.setForeground(new java.awt.Color(0, 0, 255));
-        navToColaboradoresFromBuscarEmpresa.setText("Colaboradores");
-        navToColaboradoresFromBuscarEmpresa.setActionCommand("navToMainFromVoluntarios");
-        navToColaboradoresFromBuscarEmpresa.setBorderPainted(false);
+        jLabel85.setText("Concepto");
 
-        senalaVoluntario30.setForeground(new java.awt.Color(153, 153, 153));
-        senalaVoluntario30.setText(">");
+        jLabel86.setText("Fecha");
 
-        org.jdesktop.layout.GroupLayout PanelEmpresaBuscarLayout = new org.jdesktop.layout.GroupLayout(PanelEmpresaBuscar);
-        PanelEmpresaBuscar.setLayout(PanelEmpresaBuscarLayout);
-        PanelEmpresaBuscarLayout.setHorizontalGroup(
-            PanelEmpresaBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelEmpresaBuscarLayout.createSequentialGroup()
-                .addContainerGap()
-                .add(PanelEmpresaBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                    .add(PanelEmpresaBuscarLayout.createSequentialGroup()
-                        .add(0, 105, Short.MAX_VALUE)
-                        .add(PanelEmpresaBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(PanelEmpresaBuscarLayout.createSequentialGroup()
-                                .add(textBuscarSocio1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 214, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                                .add(btBuscar1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                            .add(PanelEmpresaBuscarLayout.createSequentialGroup()
-                                .add(jLabel87)
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                                .add(cbTextSocio1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 162, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                        .add(659, 659, 659))
-                    .add(PanelEmpresaBuscarLayout.createSequentialGroup()
-                        .add(navToMainFromBuscarEmpresa)
+        jButton36.setIcon(new javax.swing.ImageIcon(getClass().getResource("/Vista/images/guardar.png"))); // NOI18N
+
+        org.jdesktop.layout.GroupLayout PanelCuotasNoPagadasLayout = new org.jdesktop.layout.GroupLayout(PanelCuotasNoPagadas);
+        PanelCuotasNoPagadas.setLayout(PanelCuotasNoPagadasLayout);
+        PanelCuotasNoPagadasLayout.setHorizontalGroup(
+            PanelCuotasNoPagadasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(PanelCuotasNoPagadasLayout.createSequentialGroup()
+                .add(PanelCuotasNoPagadasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelCuotasNoPagadasLayout.createSequentialGroup()
+                        .addContainerGap()
+                        .add(navToMainFromVoluntarios5)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario28)
+                        .add(senalaVoluntario19)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToColaboradoresFromBuscarEmpresa)
+                        .add(jButton34)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(senalaVoluntario30)
+                        .add(senalaVoluntario20)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(navToEmpresaFromBuscarEmpresa)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                        .add(senalaVoluntario29)
+                        .add(jButton35)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(labSVolunt9)
-                        .add(0, 0, Short.MAX_VALUE))))
-            .add(PanelEmpresaBuscarLayout.createSequentialGroup()
-                .add(PanelEmpresaBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(PanelEmpresaBuscarLayout.createSequentialGroup()
-                        .add(85, 85, 85)
-                        .add(jScrollPane16, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 797, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                    .add(PanelEmpresaBuscarLayout.createSequentialGroup()
-                        .add(458, 458, 458)
-                        .add(btConsultar1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 26, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .add(18, 18, 18)
-                        .add(btEliminar1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 24, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                .addContainerGap())
+                        .add(senalaVoluntario21)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(labSVolunt5))
+                    .add(PanelCuotasNoPagadasLayout.createSequentialGroup()
+                        .add(34, 34, 34)
+                        .add(PanelCuotasNoPagadasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(jLabel92)
+                            .add(jLabel82)
+                            .add(PanelCuotasNoPagadasLayout.createSequentialGroup()
+                                .add(10, 10, 10)
+                                .add(PanelCuotasNoPagadasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                                    .add(jScrollPane15, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 872, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                    .add(PanelCuotasNoPagadasLayout.createSequentialGroup()
+                                        .add(PanelCuotasNoPagadasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                                            .add(jLabel83)
+                                            .add(jLabel84)
+                                            .add(jLabel85))
+                                        .add(18, 18, 18)
+                                        .add(PanelCuotasNoPagadasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                                            .add(jTextField16, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 611, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                            .add(jTextField14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 125, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                            .add(PanelCuotasNoPagadasLayout.createSequentialGroup()
+                                                .add(jTextField15, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 197, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                                .add(74, 74, 74)
+                                                .add(jLabel86)
+                                                .add(18, 18, 18)
+                                                .add(jTextField17, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 150, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+                                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                        .add(jButton36, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                        .add(63, 63, 63)))))))
+                .addContainerGap(111, Short.MAX_VALUE))
         );
-        PanelEmpresaBuscarLayout.setVerticalGroup(
-            PanelEmpresaBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(PanelEmpresaBuscarLayout.createSequentialGroup()
+        PanelCuotasNoPagadasLayout.setVerticalGroup(
+            PanelCuotasNoPagadasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(PanelCuotasNoPagadasLayout.createSequentialGroup()
                 .addContainerGap()
-                .add(PanelEmpresaBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(navToMainFromBuscarEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario28)
-                    .add(labSVolunt9)
-                    .add(navToEmpresaFromBuscarEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario29)
-                    .add(navToColaboradoresFromBuscarEmpresa, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(senalaVoluntario30))
-                .add(20, 20, 20)
-                .add(PanelEmpresaBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(btBuscar1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(textBuscarSocio1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .add(PanelCuotasNoPagadasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(navToMainFromVoluntarios5, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(senalaVoluntario19)
+                    .add(labSVolunt5)
+                    .add(jButton34, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(jButton35, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(senalaVoluntario20)
+                    .add(senalaVoluntario21))
+                .add(26, 26, 26)
+                .add(jLabel92)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(PanelEmpresaBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel87)
-                    .add(cbTextSocio1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .add(50, 50, 50)
-                .add(jScrollPane16, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 368, Short.MAX_VALUE)
-                .add(18, 18, 18)
-                .add(PanelEmpresaBuscarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, btConsultar1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 25, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, btEliminar1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 25, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .add(57, 57, 57))
+                .add(jScrollPane15, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 301, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .add(27, 27, 27)
+                .add(jLabel82)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                .add(PanelCuotasNoPagadasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(jLabel83)
+                    .add(jTextField14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                .add(PanelCuotasNoPagadasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(PanelCuotasNoPagadasLayout.createSequentialGroup()
+                        .add(PanelCuotasNoPagadasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(PanelCuotasNoPagadasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                                .add(jTextField15, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                .add(jLabel86)
+                                .add(jTextField17, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                            .add(jLabel84))
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(PanelCuotasNoPagadasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                            .add(jLabel85)
+                            .add(jTextField16, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+                    .add(jButton36, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 30, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(122, Short.MAX_VALUE))
         );
 
-        getContentPane().add(PanelEmpresaBuscar, "card15");
+        getContentPane().add(PanelCuotasNoPagadas, "card14");
 
         bindingGroup.bind();
 
@@ -4767,30 +4197,24 @@
         setLocation((screenSize.width-dialogSize.width)/2,(screenSize.height-dialogSize.height)/2);
     }// </editor-fold>//GEN-END:initComponents
 
-    private void btColaboradorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btColaboradorActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_btColaboradorActionPerformed
-
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JDialog DiagPassVoluntario;
+    private javax.swing.JPanel PanelAÃ±adirColaboraciones;
     private javax.swing.JPanel PanelBeneficiarioBuscar;
     private javax.swing.JPanel PanelBeneficiarioDatos;
     private javax.swing.JPanel PanelBeneficiarioInicio;
-    private javax.swing.JPanel PanelColaboracionesColaborador;
-    private javax.swing.JPanel PanelColaboracionesEmpresa;
     private javax.swing.JPanel PanelColaboracionesSocio;
-    private javax.swing.JPanel PanelColaboradorBuscar;
+    private javax.swing.JPanel PanelColaborador;
+    private javax.swing.JPanel PanelColaboradorColaboraciones;
     private javax.swing.JPanel PanelColaboradorDatos;
-    private javax.swing.JPanel PanelColaboradorInicio;
     private javax.swing.JPanel PanelColaboradores;
+    private javax.swing.JPanel PanelCuotasNoPagadas;
     private javax.swing.JPanel PanelCuotasSocio;
-    private javax.swing.JPanel PanelDatosColaborador;
-    private javax.swing.JPanel PanelDatosEmpresa;
     private javax.swing.JPanel PanelDatosGenerales;
     private javax.swing.JPanel PanelDatosSocio;
-    private javax.swing.JPanel PanelEmpresaBuscar;
+    private javax.swing.JPanel PanelEmpresa;
+    private javax.swing.JPanel PanelEmpresaColaboraciones;
     private javax.swing.JPanel PanelEmpresaDatos;
-    private javax.swing.JPanel PanelEmpresaInicio;
     private javax.swing.JPanel PanelIdentificacion;
     private javax.swing.JPanel PanelInicio;
     private javax.swing.JPanel PanelIntervenciones;
@@ -4801,61 +4225,41 @@
     private javax.swing.JPanel PanelVoluntarioAyudas;
     private javax.swing.JPanel PanelVoluntarioBuscar;
     private javax.swing.JPanel PanelVoluntarioColaboraciones;
-    private javax.swing.JPanel PanelVoluntarioColaboracionesAnadirColaboraciones;
-    private javax.swing.JPanel PanelVoluntarioColaboracionesComprobarPagos;
     private javax.swing.JPanel PanelVoluntarioContabilidad;
     private javax.swing.JPanel PanelVoluntarioDatos;
     private javax.swing.JPanel PanelVoluntarioInicio;
-    private javax.swing.JButton btAnadirColaboracion;
     private javax.swing.JButton btAyudas;
     private javax.swing.JButton btBeneficiario;
     private javax.swing.JButton btBolsaTrabajo;
     private javax.swing.JButton btBorrar;
     private javax.swing.JButton btBuscar;
-    private javax.swing.JButton btBuscar1;
-    private javax.swing.JButton btBuscar2;
     private javax.swing.JButton btBuscarBeneficiario;
+    private javax.swing.JButton btBuscarBeneficiario1;
     private javax.swing.JButton btBuscarBeneficiarioDNI;
     private javax.swing.JButton btBuscarColaboracionSocio;
-    private javax.swing.JButton btBuscarColaborador;
-    private javax.swing.JButton btBuscarEmpresa;
     private javax.swing.JButton btBuscarSocio;
     private javax.swing.JButton btBuscarVoluntario;
     private javax.swing.JButton btBuscarVoluntarioDNI;
     private javax.swing.JButton btColaboraciones;
-    private javax.swing.JButton btColaborador;
-    private javax.swing.JButton btColaboradores;
-    private javax.swing.JButton btComprobarPagos;
     private javax.swing.JButton btConectarse;
     private javax.swing.JButton btConsultar;
-    private javax.swing.JButton btConsultar1;
-    private javax.swing.JButton btConsultar2;
     private javax.swing.JButton btContabilidad;
     private javax.swing.JButton btEliminar;
-    private javax.swing.JButton btEliminar1;
-    private javax.swing.JButton btEliminar2;
     private javax.swing.JButton btEliminarBeneficiario;
     private javax.swing.JButton btEliminarColaboracionSocio;
     private javax.swing.JButton btEliminarCuotaSocio;
     private javax.swing.JButton btEliminarFamiliarBeneficiario;
     private javax.swing.JButton btEliminarIntervencionBeneficiario;
-    private javax.swing.JButton btEmpresa;
     private javax.swing.JButton btGuardar;
-    private javax.swing.JButton btGuardarAnadirColaborador;
-    private javax.swing.JButton btGuardarAnadirEmpresa;
     private javax.swing.JButton btGuardarBeneficiario;
     private javax.swing.JButton btGuardarColaboracionSocio;
     private javax.swing.JButton btGuardarCuotaSocio;
     private javax.swing.JButton btGuardarDatosSocio;
     private javax.swing.JButton btGuardarFamiliarBeneficiario;
     private javax.swing.JButton btGuardarIntervencionBeneficiario;
-    private javax.swing.JButton btGuardarPago;
-    private javax.swing.JButton btLimpiarAnadirColaborador;
-    private javax.swing.JButton btLimpiarAnadirEmpresa;
     private javax.swing.JButton btLimpiarCamposDatosSocio;
     private javax.swing.JButton btNuevoBeneficiario;
-    private javax.swing.JButton btNuevoColaborador;
-    private javax.swing.JButton btNuevoEmpresa;
+    private javax.swing.JButton btNuevoBeneficiario1;
     private javax.swing.JButton btNuevoSocio;
     private javax.swing.JButton btNuevoVoluntario;
     private javax.swing.JButton btPassVoluntario;
@@ -4874,8 +4278,6 @@
     private javax.swing.JComboBox cbNivelEstudiosBeneficiario;
     private javax.swing.JComboBox cbParentescoBeneficiario;
     private javax.swing.JComboBox cbTextSocio;
-    private javax.swing.JComboBox cbTextSocio1;
-    private javax.swing.JComboBox cbTextSocio2;
     private javax.swing.JComboBox cbTipoBusquedaBeneficiario;
     private javax.swing.JComboBox cbTipoBusquedaVoluntario;
     private javax.swing.JComboBox cbTipoColaboracionSocio;
@@ -4885,16 +4287,30 @@
     private javax.swing.JFormattedTextField fieldFechaFin;
     private javax.swing.JFormattedTextField fieldFechaInicio;
     private javax.swing.JLabel imgLogo;
+    private javax.swing.JButton jButton10;
+    private javax.swing.JButton jButton11;
+    private javax.swing.JButton jButton12;
+    private javax.swing.JButton jButton13;
+    private javax.swing.JButton jButton14;
+    private javax.swing.JButton jButton20;
+    private javax.swing.JButton jButton21;
     private javax.swing.JButton jButton22;
     private javax.swing.JButton jButton23;
     private javax.swing.JButton jButton24;
     private javax.swing.JButton jButton25;
     private javax.swing.JButton jButton26;
+    private javax.swing.JButton jButton27;
+    private javax.swing.JButton jButton28;
     private javax.swing.JButton jButton29;
     private javax.swing.JButton jButton30;
     private javax.swing.JButton jButton31;
     private javax.swing.JButton jButton32;
     private javax.swing.JButton jButton33;
+    private javax.swing.JButton jButton34;
+    private javax.swing.JButton jButton35;
+    private javax.swing.JButton jButton36;
+    private javax.swing.JButton jButton8;
+    private javax.swing.JButton jButton9;
     private javax.swing.JComboBox jComboBox5;
     private javax.swing.JComboBox jComboBox6;
     private javax.swing.JComboBox jComboBox7;
@@ -4984,8 +4400,6 @@
     private javax.swing.JLabel jLabel84;
     private javax.swing.JLabel jLabel85;
     private javax.swing.JLabel jLabel86;
-    private javax.swing.JLabel jLabel87;
-    private javax.swing.JLabel jLabel88;
     private javax.swing.JLabel jLabel9;
     private javax.swing.JLabel jLabel92;
     private javax.swing.JRadioButton jRadioButton3;
@@ -4997,8 +4411,6 @@
     private javax.swing.JScrollPane jScrollPane13;
     private javax.swing.JScrollPane jScrollPane14;
     private javax.swing.JScrollPane jScrollPane15;
-    private javax.swing.JScrollPane jScrollPane16;
-    private javax.swing.JScrollPane jScrollPane17;
     private javax.swing.JScrollPane jScrollPane2;
     private javax.swing.JScrollPane jScrollPane3;
     private javax.swing.JScrollPane jScrollPane4;
@@ -5016,20 +4428,29 @@
     private javax.swing.JTable jTable3;
     private javax.swing.JTable jTable6;
     private javax.swing.JTable jTable8;
+    private javax.swing.JTable jTable9;
     private javax.swing.JTextArea jTextArea1;
+    private javax.swing.JTextField jTextField10;
+    private javax.swing.JTextField jTextField11;
+    private javax.swing.JTextField jTextField12;
+    private javax.swing.JTextField jTextField14;
+    private javax.swing.JTextField jTextField15;
+    private javax.swing.JTextField jTextField16;
+    private javax.swing.JTextField jTextField17;
+    private javax.swing.JTextField jTextField5;
+    private javax.swing.JTextField jTextField6;
+    private javax.swing.JTextField jTextField7;
+    private javax.swing.JTextField jTextField8;
+    private javax.swing.JTextField jTextField9;
     private javax.swing.JLabel labSBenef;
     private javax.swing.JLabel labSBenef1;
     private javax.swing.JLabel labSVolunt;
     private javax.swing.JLabel labSVolunt1;
-    private javax.swing.JLabel labSVolunt10;
     private javax.swing.JLabel labSVolunt2;
     private javax.swing.JLabel labSVolunt3;
     private javax.swing.JLabel labSVolunt4;
     private javax.swing.JLabel labSVolunt5;
     private javax.swing.JLabel labSVolunt6;
-    private javax.swing.JLabel labSVolunt7;
-    private javax.swing.JLabel labSVolunt8;
-    private javax.swing.JLabel labSVolunt9;
     private java.awt.Label label1;
     private java.awt.Label label10;
     private java.awt.Label label11;
@@ -5101,47 +4522,26 @@
     private javax.swing.JTable listDatosFamiliarBeneficiario;
     private javax.swing.JButton navToBeneficiariosFromBeneficiarioDatos;
     private javax.swing.JButton navToBeneficiariosFromBuscarBeneficiario;
-    private javax.swing.JButton navToColaboracionesFromAnadirColaboraciones;
-    private javax.swing.JButton navToColaboracionesFromComprobarCuotas;
-    private javax.swing.JButton navToColaboradorFromBuscarColaborador;
-    private javax.swing.JButton navToColaboradorFromColaboradorDatos;
-    private javax.swing.JButton navToColaboradoresFromBuscarColaborador;
-    private javax.swing.JButton navToColaboradoresFromBuscarEmpresa;
-    private javax.swing.JButton navToColaboradoresFromBuscarSocio;
-    private javax.swing.JButton navToColaboradoresFromColaborador;
-    private javax.swing.JButton navToColaboradoresFromColaboradorDatos;
-    private javax.swing.JButton navToColaboradoresFromDatosEmpresa;
-    private javax.swing.JButton navToColaboradoresFromDatosSocio;
-    private javax.swing.JButton navToColaboradoresFromEmpresa;
-    private javax.swing.JButton navToColaboradoresFromSocio;
-    private javax.swing.JButton navToEmpresaFromBuscarEmpresa;
-    private javax.swing.JButton navToEmpresaFromDatosEmpresa;
-    private javax.swing.JButton navToMainFromAnadirColaboraciones;
     private javax.swing.JButton navToMainFromAyudas;
     private javax.swing.JButton navToMainFromBeneficiarioDatos;
     private javax.swing.JButton navToMainFromBeneficiarios;
     private javax.swing.JButton navToMainFromBeneficiarios1;
     private javax.swing.JButton navToMainFromBeneficiarios2;
     private javax.swing.JButton navToMainFromBuscarBeneficiario;
-    private javax.swing.JButton navToMainFromBuscarEmpresa;
     private javax.swing.JButton navToMainFromBuscarSocio;
     private javax.swing.JButton navToMainFromBuscarVoluntario;
-    private javax.swing.JButton navToMainFromColaborador;
-    private javax.swing.JButton navToMainFromColaboradorBuscar;
-    private javax.swing.JButton navToMainFromColaboradorDatos;
-    private javax.swing.JButton navToMainFromColaboradores;
-    private javax.swing.JButton navToMainFromComprobarCuotas;
     private javax.swing.JButton navToMainFromContabilidad;
-    private javax.swing.JButton navToMainFromDatosEmpresa;
     private javax.swing.JButton navToMainFromDatosSocio;
     private javax.swing.JButton navToMainFromDatosVoluntario;
-    private javax.swing.JButton navToMainFromEmpresa;
     private javax.swing.JButton navToMainFromNuevoSocio;
     private javax.swing.JButton navToMainFromSocio;
+    private javax.swing.JButton navToMainFromSocioDatos2;
     private javax.swing.JButton navToMainFromVoluntarios;
+    private javax.swing.JButton navToMainFromVoluntarios1;
+    private javax.swing.JButton navToMainFromVoluntarios3;
+    private javax.swing.JButton navToMainFromVoluntarios4;
+    private javax.swing.JButton navToMainFromVoluntarios5;
     private javax.swing.JButton navToSocioFromBuscarSocio;
-    private javax.swing.JButton navToVoluntarioFromAnadirColaboraciones;
-    private javax.swing.JButton navToVoluntarioFromComprobarCuotas;
     private javax.swing.JButton navToVoluntariosFromAyudas;
     private javax.swing.JButton navToVoluntariosFromBuscarVoluntario;
     private javax.swing.JButton navToVoluntariosFromContabilidad;
@@ -5165,7 +4565,6 @@
     private javax.swing.JLabel senalaVoluntario;
     private javax.swing.JLabel senalaVoluntario1;
     private javax.swing.JLabel senalaVoluntario10;
-    private javax.swing.JLabel senalaVoluntario11;
     private javax.swing.JLabel senalaVoluntario12;
     private javax.swing.JLabel senalaVoluntario13;
     private javax.swing.JLabel senalaVoluntario14;
@@ -5178,19 +4577,7 @@
     private javax.swing.JLabel senalaVoluntario20;
     private javax.swing.JLabel senalaVoluntario21;
     private javax.swing.JLabel senalaVoluntario22;
-    private javax.swing.JLabel senalaVoluntario23;
-    private javax.swing.JLabel senalaVoluntario24;
-    private javax.swing.JLabel senalaVoluntario25;
-    private javax.swing.JLabel senalaVoluntario26;
-    private javax.swing.JLabel senalaVoluntario27;
-    private javax.swing.JLabel senalaVoluntario28;
-    private javax.swing.JLabel senalaVoluntario29;
     private javax.swing.JLabel senalaVoluntario3;
-    private javax.swing.JLabel senalaVoluntario30;
-    private javax.swing.JLabel senalaVoluntario31;
-    private javax.swing.JLabel senalaVoluntario32;
-    private javax.swing.JLabel senalaVoluntario33;
-    private javax.swing.JLabel senalaVoluntario34;
     private javax.swing.JLabel senalaVoluntario4;
     private javax.swing.JLabel senalaVoluntario5;
     private javax.swing.JLabel senalaVoluntario6;
@@ -5207,36 +4594,17 @@
     private javax.swing.JSeparator separadorVoluntario2;
     private javax.swing.JSeparator separadorVoluntario3;
     private javax.swing.JSeparator separadorVoluntario4;
-    private javax.swing.JSeparator separadorVoluntario5;
-    private javax.swing.JSeparator separadorVoluntario6;
     private javax.swing.JTable tablaBusquedaBeneficiario;
     private javax.swing.JTable tablaBusquedaVoluntario;
     private javax.swing.JTable tableBuscarSocio;
-    private javax.swing.JTable tableBuscarSocio1;
-    private javax.swing.JTable tableBuscarSocio2;
     private javax.swing.JTable tableColaboracionesSocio;
-    private javax.swing.JTable tableComprobarPagos;
     private javax.swing.JTable tableCuotasSocio;
-    private javax.swing.JTextField textAnadirCIFEmpresa;
-    private javax.swing.JTextField textAnadirCantidadColaborador;
-    private javax.swing.JTextField textAnadirCantidadEmpresa;
-    private javax.swing.JTextField textAnadirConceptoColaborador;
-    private javax.swing.JTextField textAnadirConceptoEmpresa;
-    private javax.swing.JTextField textAnadirDNIColaborador;
-    private javax.swing.JTextField textAnadirFechaColaborador;
-    private javax.swing.JTextField textAnadirFechaEmpresa;
-    private javax.swing.JTextField textAnadirPagoCantidad;
-    private javax.swing.JTextField textAnadirPagoConcepto;
-    private javax.swing.JTextField textAnadirPagoDNISocio;
-    private javax.swing.JTextField textAnadirPagoFecha;
     private java.awt.TextField textAnoNacimientoSocio;
     private java.awt.TextField textApellidoSocio;
     private javax.swing.JTextField textApellidos;
     private javax.swing.JTextField textApellidosBeneficiario;
     private javax.swing.JTextField textBeneficiarioAyudas;
     private javax.swing.JTextField textBuscarSocio;
-    private javax.swing.JTextField textBuscarSocio1;
-    private javax.swing.JTextField textBuscarSocio2;
     private javax.swing.JTextField textBusquedaBeneficiarioDNI;
     private javax.swing.JTextField textBusquedaVoluntarioDNI;
     private javax.swing.JTextField textCP;
@@ -5343,19 +4711,11 @@
 			PanelVoluntarioAyudas.setVisible(false);
 			PanelVoluntarioContabilidad.setVisible(false);
 			PanelVoluntarioBuscar.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
                         PanelSocioInicio.setVisible(false);
                         PanelSocioDatos.setVisible(false);
                         PanelSocioBuscar.setVisible(false);
-			PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
+			
 	}
 	
 	/**
@@ -5375,19 +4735,11 @@
 			PanelVoluntarioAyudas.setVisible(false);
 			PanelVoluntarioContabilidad.setVisible(false);
 			PanelVoluntarioBuscar.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
                         PanelSocioInicio.setVisible(false);
                         PanelSocioDatos.setVisible(false);
                         PanelSocioBuscar.setVisible(false);
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
+
 	}
 	
 	/**
@@ -5408,19 +4760,10 @@
 			PanelVoluntarioContabilidad.setVisible(false);			
 			PanelVoluntarioBuscar.setVisible(false);			
 			PanelVoluntarioAyudas.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
                         PanelSocioInicio.setVisible(false);
                         PanelSocioDatos.setVisible(false);
                         PanelSocioBuscar.setVisible(false);
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
 	}
 	
 	/**
@@ -5441,19 +4784,11 @@
 			PanelVoluntarioAyudas.setVisible(false);
 			PanelVoluntarioDatos.setVisible(false);
 			PanelVoluntarioContabilidad.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
             PanelVoluntarioBuscar.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
                         PanelSocioDatos.setVisible(false);
                         PanelSocioBuscar.setVisible(false);
-			PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
+			
 	}
 	
 	/**
@@ -5474,18 +4809,10 @@
 			PanelVoluntarioDatos.setVisible(false);
 			PanelVoluntarioContabilidad.setVisible(false);        
 			PanelVoluntarioBuscar.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
                         PanelSocioDatos.setVisible(false);
                         PanelSocioBuscar.setVisible(false);
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
+
 	}
 	
 	/**
@@ -5499,8 +4826,6 @@
 			PanelVoluntarioDatos.setVisible(false);
 			PanelVoluntarioContabilidad.setVisible(false);
 			PanelVoluntarioBuscar.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
                         PanelSocioInicio.setVisible(false);
 			
@@ -5512,13 +4837,6 @@
 			PanelBeneficiarioDatos.setVisible(false);
                         PanelSocioDatos.setVisible(false);
                         PanelSocioBuscar.setVisible(false);
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
 	}
 	
 	/**
@@ -5532,12 +4850,8 @@
 			PanelVoluntarioContabilidad.setVisible(false);              
 			PanelVoluntarioBuscar.setVisible(false);
 			PanelVoluntarioAyudas.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
                         PanelSocioInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
 
 		PanelInicio.setVisible(false);
 		PanelIdentificacion.setVisible(false);
@@ -5548,13 +4862,7 @@
 			PanelBeneficiarioBuscar.setVisible(false);
                         PanelSocioDatos.setVisible(false);
                         PanelSocioBuscar.setVisible(false);
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
+		
 	}
 	
 	/**
@@ -5568,10 +4876,8 @@
 			PanelVoluntarioAyudas.setVisible(false);
 			PanelVoluntarioDatos.setVisible(false);
 			PanelVoluntarioContabilidad.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
-                        PanelSocioInicio.setVisible(false);                  
+                        PanelSocioInicio.setVisible(false);
 			
 		PanelInicio.setVisible(false);
 		PanelIdentificacion.setVisible(false);		
@@ -5581,74 +4887,8 @@
 			PanelBeneficiarioDatos.setVisible(false);
                         PanelSocioDatos.setVisible(false);
                         PanelSocioBuscar.setVisible(false);
-                        PanelColaboradores.setVisible(false);	
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
+				
 	}
-        
-        
-        public void mostrarVistaAnadirColaboracion(){
-        		PanelVoluntarioBuscar.setVisible(false);
-		//Todos los demas paneles se ponen a false
-		PanelVoluntarioInicio.setVisible(false);
-			PanelVoluntarioAyudas.setVisible(false);
-			PanelVoluntarioDatos.setVisible(false);
-			PanelVoluntarioContabilidad.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(true);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
-			DiagPassVoluntario.setVisible(false);
-                        PanelSocioInicio.setVisible(false);
-			
-		PanelInicio.setVisible(false);
-		PanelIdentificacion.setVisible(false);		
-        
-		PanelBeneficiarioInicio.setVisible(false);
-			PanelBeneficiarioBuscar.setVisible(false);
-			PanelBeneficiarioDatos.setVisible(false);
-                        PanelSocioDatos.setVisible(false);
-                        PanelSocioBuscar.setVisible(false);
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
-        }
-        
-        public void mostrarVistaComprobarPagos(){
-        		PanelVoluntarioBuscar.setVisible(false);
-		//Todos los demas paneles se ponen a false
-		PanelVoluntarioInicio.setVisible(false);
-			PanelVoluntarioAyudas.setVisible(false);
-			PanelVoluntarioDatos.setVisible(false);
-			PanelVoluntarioContabilidad.setVisible(false);
-			DiagPassVoluntario.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(true);
-                        PanelSocioInicio.setVisible(false);
-			
-		PanelInicio.setVisible(false);
-		PanelIdentificacion.setVisible(false);		
-        
-		PanelBeneficiarioInicio.setVisible(false);
-			PanelBeneficiarioBuscar.setVisible(false);
-			PanelBeneficiarioDatos.setVisible(false);
-                        PanelSocioDatos.setVisible(false);
-                        PanelSocioBuscar.setVisible(false);
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
-        }
-	
 	
 	/**
 	 * Muestra la vista de contabilidad
@@ -5661,8 +4901,6 @@
 			PanelVoluntarioBuscar.setVisible(false);
 			PanelVoluntarioDatos.setVisible(false);
 			PanelVoluntarioAyudas.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
                         PanelSocioInicio.setVisible(false);
 
@@ -5674,13 +4912,7 @@
 			PanelBeneficiarioDatos.setVisible(false);
                         PanelSocioDatos.setVisible(false);
                         PanelSocioBuscar.setVisible(false);  
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
+				
 	}
 	
 	/**
@@ -5694,8 +4926,6 @@
 			PanelVoluntarioBuscar.setVisible(false);
 			PanelVoluntarioDatos.setVisible(false);
 			PanelVoluntarioContabilidad.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
                         PanelSocioInicio.setVisible(false);
                
@@ -5707,13 +4937,7 @@
 			PanelBeneficiarioDatos.setVisible(false);
                         PanelSocioDatos.setVisible(false);
                         PanelSocioBuscar.setVisible(false);  
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
+			
 	}
         
         	
@@ -5725,8 +4949,6 @@
 			PanelVoluntarioDatos.setVisible(false);
 			PanelVoluntarioContabilidad.setVisible(false);
 			PanelVoluntarioBuscar.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
 			
 		PanelInicio.setVisible(false);
@@ -5736,15 +4958,6 @@
 			PanelBeneficiarioBuscar.setVisible(false);                
 			PanelBeneficiarioDatos.setVisible(false);
                         PanelSocioInicio.setVisible(true);
-                        PanelSocioDatos.setVisible(false);
-                        PanelSocioBuscar.setVisible(false);  
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
 	}
 	
         public void mostrarVistaSocioBuscar() {
@@ -5754,8 +4967,6 @@
 			PanelVoluntarioBuscar.setVisible(false);
 			PanelVoluntarioDatos.setVisible(false);
 			PanelVoluntarioContabilidad.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
                         PanelSocioInicio.setVisible(false);
                
@@ -5766,14 +4977,7 @@
 			PanelBeneficiarioBuscar.setVisible(false);
 			PanelBeneficiarioDatos.setVisible(false);
                         PanelSocioDatos.setVisible(false);
-                        PanelSocioBuscar.setVisible(true);   
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
+                        PanelSocioBuscar.setVisible(true);                       
         }
 
         public void mostrarVistaSocioDatos() {
@@ -5783,8 +4987,6 @@
 			PanelVoluntarioBuscar.setVisible(false);
 			PanelVoluntarioDatos.setVisible(false);
 			PanelVoluntarioContabilidad.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
                         PanelSocioInicio.setVisible(false);
                
@@ -5796,46 +4998,7 @@
 			PanelBeneficiarioDatos.setVisible(false);
                         PanelSocioDatos.setVisible(true);
                         PanelSocioBuscar.setVisible(false);
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
         }
-        
-        
-        public void  mostrarVistaColaboradores() {
-			PanelVoluntarioAyudas.setVisible(false);
-		//Todos los demas paneles se ponen a false		
-		PanelVoluntarioInicio.setVisible(false);
-			PanelVoluntarioBuscar.setVisible(false);
-			PanelVoluntarioDatos.setVisible(false);
-			PanelVoluntarioContabilidad.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
-			DiagPassVoluntario.setVisible(false);
-                        PanelSocioInicio.setVisible(false);
-               
-		PanelInicio.setVisible(false);
-		PanelIdentificacion.setVisible(false);
-		
-		PanelBeneficiarioInicio.setVisible(false);
-			PanelBeneficiarioBuscar.setVisible(false);
-			PanelBeneficiarioDatos.setVisible(false);
-                        PanelSocioDatos.setVisible(false);
-                        PanelSocioBuscar.setVisible(false);
-                        PanelColaboradores.setVisible(true);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
-        }
-        
-       
 
 	/**
 	 *  Muestra el dialogo de la contraseÃ±a de Voluntarios
@@ -5851,8 +5014,6 @@
 			PanelVoluntarioDatos.setVisible(false);
 			PanelVoluntarioContabilidad.setVisible(false);
 			PanelVoluntarioBuscar.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
 			DiagPassVoluntario.setVisible(false);
                         PanelVoluntarioColaboraciones.setVisible(true);
 			
@@ -5863,235 +5024,30 @@
 			PanelBeneficiarioBuscar.setVisible(false);                
 			PanelBeneficiarioDatos.setVisible(false);
                         PanelSocioInicio.setVisible(false);
-                        PanelSocioDatos.setVisible(false);
-                        PanelSocioBuscar.setVisible(false);  
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
 	}
-        
-        public void mostrarVistaEmpresa(){
-		
-		PanelVoluntarioInicio.setVisible(false);
-		//Todos los demas paneles se ponen a false
-			PanelVoluntarioAyudas.setVisible(false);
-			PanelVoluntarioDatos.setVisible(false);
-			PanelVoluntarioContabilidad.setVisible(false);
-			PanelVoluntarioBuscar.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
-			DiagPassVoluntario.setVisible(false);
-                        PanelVoluntarioColaboraciones.setVisible(false);
-			
-		PanelInicio.setVisible(false);
-		PanelIdentificacion.setVisible(false);
-		
-		PanelBeneficiarioInicio.setVisible(false);
-			PanelBeneficiarioBuscar.setVisible(false);                
-			PanelBeneficiarioDatos.setVisible(false);
-                        PanelSocioInicio.setVisible(false);
-                        PanelSocioDatos.setVisible(false);
-                        PanelSocioBuscar.setVisible(false);  
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(true);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
-	}
-        
-         public void mostrarVistaEmpresaBuscar(){
-		
-		PanelVoluntarioInicio.setVisible(false);
-		//Todos los demas paneles se ponen a false
-			PanelVoluntarioAyudas.setVisible(false);
-			PanelVoluntarioDatos.setVisible(false);
-			PanelVoluntarioContabilidad.setVisible(false);
-			PanelVoluntarioBuscar.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
-			DiagPassVoluntario.setVisible(false);
-                        PanelVoluntarioColaboraciones.setVisible(false);
-			
-		PanelInicio.setVisible(false);
-		PanelIdentificacion.setVisible(false);
-		
-		PanelBeneficiarioInicio.setVisible(false);
-			PanelBeneficiarioBuscar.setVisible(false);                
-			PanelBeneficiarioDatos.setVisible(false);
-                        PanelSocioInicio.setVisible(false);
-                        PanelSocioDatos.setVisible(false);
-                        PanelSocioBuscar.setVisible(false);  
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(true);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
-	}
-         
-         public void mostrarVistaEmpresaDatos(){
-		
-		PanelVoluntarioInicio.setVisible(false);
-		//Todos los demas paneles se ponen a false
-			PanelVoluntarioAyudas.setVisible(false);
-			PanelVoluntarioDatos.setVisible(false);
-			PanelVoluntarioContabilidad.setVisible(false);
-			PanelVoluntarioBuscar.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
-			DiagPassVoluntario.setVisible(false);
-                        PanelVoluntarioColaboraciones.setVisible(false);
-			
-		PanelInicio.setVisible(false);
-		PanelIdentificacion.setVisible(false);
-		
-		PanelBeneficiarioInicio.setVisible(false);
-			PanelBeneficiarioBuscar.setVisible(false);                
-			PanelBeneficiarioDatos.setVisible(false);
-                        PanelSocioInicio.setVisible(false);
-                        PanelSocioDatos.setVisible(false);
-                        PanelSocioBuscar.setVisible(false);  
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(true);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
-	}
-        
-        public void mostrarVistaColaborador(){
-		
-		PanelVoluntarioInicio.setVisible(false);
-		//Todos los demas paneles se ponen a false
-			PanelVoluntarioAyudas.setVisible(false);
-			PanelVoluntarioDatos.setVisible(false);
-			PanelVoluntarioContabilidad.setVisible(false);
-			PanelVoluntarioBuscar.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
-			DiagPassVoluntario.setVisible(false);
-                        PanelVoluntarioColaboraciones.setVisible(false);
-			
-		PanelInicio.setVisible(false);
-		PanelIdentificacion.setVisible(false);
-		
-		PanelBeneficiarioInicio.setVisible(false);
-			PanelBeneficiarioBuscar.setVisible(false);                
-			PanelBeneficiarioDatos.setVisible(false);
-                        PanelSocioInicio.setVisible(false);
-                        PanelSocioDatos.setVisible(false);
-                        PanelSocioBuscar.setVisible(false);  
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(true);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(true);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
-	}
-        
-        public void mostrarVistaColaboradorDatos(){
-		
-		PanelVoluntarioInicio.setVisible(false);
-		//Todos los demas paneles se ponen a false
-			PanelVoluntarioAyudas.setVisible(false);
-			PanelVoluntarioDatos.setVisible(false);
-			PanelVoluntarioContabilidad.setVisible(false);
-			PanelVoluntarioBuscar.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
-			DiagPassVoluntario.setVisible(false);
-                        PanelVoluntarioColaboraciones.setVisible(false);
-			
-		PanelInicio.setVisible(false);
-		PanelIdentificacion.setVisible(false);
-		
-		PanelBeneficiarioInicio.setVisible(false);
-			PanelBeneficiarioBuscar.setVisible(false);                
-			PanelBeneficiarioDatos.setVisible(false);
-                        PanelSocioInicio.setVisible(false);
-                        PanelSocioDatos.setVisible(false);
-                        PanelSocioBuscar.setVisible(false);  
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(true);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(true);
-	}
-                          
-        public void mostrarVistaColaboradorBuscar(){
-		
-		PanelVoluntarioInicio.setVisible(false);
-		//Todos los demas paneles se ponen a false
-			PanelVoluntarioAyudas.setVisible(false);
-			PanelVoluntarioDatos.setVisible(false);
-			PanelVoluntarioContabilidad.setVisible(false);
-			PanelVoluntarioBuscar.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
-			DiagPassVoluntario.setVisible(false);
-                        PanelVoluntarioColaboraciones.setVisible(false);
-			
-		PanelInicio.setVisible(false);
-		PanelIdentificacion.setVisible(false);
-		
-		PanelBeneficiarioInicio.setVisible(false);
-			PanelBeneficiarioBuscar.setVisible(false);                
-			PanelBeneficiarioDatos.setVisible(false);
-                        PanelSocioInicio.setVisible(false);
-                        PanelSocioDatos.setVisible(false);
-                        PanelSocioBuscar.setVisible(false);  
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(true);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(true);
-                        PanelColaboradorDatos.setVisible(false);
-
-	}
+                
+                
 	public void mostrarDiagPassVoluntario(String pass){
 		
-                        DiagPassVoluntario.setVisible(false);
-                        DiagPassVoluntario.toFront();
-                        textPassVoluntario.setText(pass);
-                //Todos los demas paneles se ponen a false excepto panel Voluntario Datos que se pone a no opaco
-                PanelVoluntarioInicio.setVisible(false);			
-                        PanelVoluntarioAyudas.setVisible(false);
-                        PanelVoluntarioContabilidad.setVisible(false);			
-                        PanelVoluntarioBuscar.setVisible(false);
-                        PanelVoluntarioColaboracionesAnadirColaboraciones.setVisible(false);
-                        PanelVoluntarioColaboracionesComprobarPagos.setVisible(false);
+			DiagPassVoluntario.setVisible(true);
+			DiagPassVoluntario.toFront();
+			textPassVoluntario.setText(pass);
+		//Todos los demas paneles se ponen a false excepto panel Voluntario Datos que se pone a no opaco
+		PanelVoluntarioInicio.setVisible(false);			
+			PanelVoluntarioAyudas.setVisible(false);
+			PanelVoluntarioContabilidad.setVisible(false);			
+			PanelVoluntarioBuscar.setVisible(false);
                         PanelSocioInicio.setVisible(false);
-                        PanelSocioDatos.setVisible(false);
-                        PanelSocioBuscar.setVisible(false);  
-
-                PanelInicio.setVisible(false);
-                PanelIdentificacion.setVisible(false);
-
-                PanelBeneficiarioInicio.setVisible(false);
-                        PanelBeneficiarioBuscar.setVisible(false);
-                        PanelBeneficiarioDatos.setVisible(false);
-                        PanelColaboradores.setVisible(false);
-                        PanelEmpresaInicio.setVisible(false);
-                        PanelEmpresaDatos.setVisible(false);
-                        PanelEmpresaBuscar.setVisible(false);
-                        PanelColaboradorInicio.setVisible(false);
-                        PanelColaboradorBuscar.setVisible(false);
-                        PanelColaboradorDatos.setVisible(false);
+		
+		PanelInicio.setVisible(false);
+		PanelIdentificacion.setVisible(false);
+		
+		PanelBeneficiarioInicio.setVisible(false);
+			PanelBeneficiarioBuscar.setVisible(false);
+			PanelBeneficiarioDatos.setVisible(false);
+			
 	}
 
-        
 	/**
 	 *  Muestra un mensaje de error por login incorrecto
 	 */
@@ -6147,19 +5103,13 @@
 	}
 	
 	/**
-	 * @post  Asigna a btColaborador el listener desde el controlador encargado
+	 * @post  Asigna a btSocio el listener desde el controlador encargado
 	 * @param listener 
 	 */
-	//AÃ±adir listener Panel Colaboradores
-
-        public void anadirListenerBtColaboradores(ActionListener listener){
-                btColaboradores.addActionListener(listener);
-        }
-        
-
-        public void anadirListenernavToMainFromColaboradores(ActionListener listener){
-                navToMainFromColaboradores.addActionListener(listener);
-        }
+	
+	public void anadirListenerBtSocio(ActionListener listener){
+		btSocio.addActionListener(listener);
+	}
 	
 	/**
 	 * @post  Asigna a btVoluntario el listener desde el controlador encargado
@@ -6541,18 +5491,8 @@
 	* Funciones que devuelven el contenido de los campos jTextField o jTextPassword
 	* @return El contenido del campo de texto  
 	*/
-        //AÃ±adir listener Panel socio
-        public void anadirListenernavToMainFromSocio(ActionListener listener){
-		navToMainFromSocio.addActionListener(listener);
-	}
         
-        public void anadirListenerNavToColaboradoresFromSocio(ActionListener listener){
-		navToColaboradoresFromSocio.addActionListener(listener);
-	}
-                             
-        public void anadirListenerBtSocio(ActionListener listener){
-		btSocio.addActionListener(listener);
-	}
+        //AÃ±adir listener Panel socio
         
         public void anadirListenerbtBuscarSocio(ActionListener listener){
                        btBuscarSocio.addActionListener(listener);
@@ -6560,7 +5500,6 @@
         public void anadirListenerbtNuevoSocio(ActionListener listener){
                        btNuevoSocio.addActionListener(listener);
                 } 
-        
                 //PANEL BUSCAR SOCIO
         public void anadirListenernavToMainFromBuscarSocio(ActionListener listener){
                         navToMainFromBuscarSocio.addActionListener(listener); 
@@ -6569,9 +5508,6 @@
         public void anadirListenerNavToSocioFromBuscarSocio(ActionListener listener){
                         navToSocioFromBuscarSocio.addActionListener(listener);
                 }
-        public void anadirListenerNavToColaboradoresFromBuscarSocio(ActionListener listener){
-		navToColaboradoresFromBuscarSocio.addActionListener(listener);
-	}
                 //PANEL NUEVO SOCIO
         public void anadirListenernavToMainFromNuevoSocio(ActionListener listener){
                 navToMainFromNuevoSocio.addActionListener(listener); 
@@ -6579,107 +5515,15 @@
         public void anadirListenerNavToSocioFromDatosSocio(ActionListener listener){
                 navToMainFromDatosSocio.addActionListener(listener);
         }
-        public void anadirListenerNavToColaboradoresFromDatosSocio(ActionListener listener){
-		navToColaboradoresFromDatosSocio.addActionListener(listener);
-	}
         
-        
-        //AÃ±adir listener Panel Empresa
-        
-        public void anadirListenerBtEmpresa(ActionListener listener){
-		btEmpresa.addActionListener(listener);
-	}
-         public void anadirListenerbtBuscarEmpresa(ActionListener listener){
-                       btBuscarEmpresa.addActionListener(listener);
-                }  
-        public void anadirListenerbtNuevaEmpresa(ActionListener listener){
-                       btNuevoEmpresa.addActionListener(listener);
-                } 
-        
-        public void anadirListenernavToMainFromEmpresa(ActionListener listener){
-                navToMainFromEmpresa.addActionListener(listener); 
-        }
-
-        public void anadirListenerNavToColaboradoresFromEmpresa(ActionListener listener){
-                navToColaboradoresFromEmpresa.addActionListener(listener); 
-        }
-                //PANEL BUSCAR Empresa
-        public void anadirListenernavToMainFromBuscarEmpresa(ActionListener listener){
-                        navToMainFromBuscarEmpresa.addActionListener(listener); 
-                }
-        
-        public void anadirListenerNavToEmpresaFromBuscarEmpresa(ActionListener listener){
-                        navToEmpresaFromBuscarEmpresa.addActionListener(listener);
-                }
-        
-        public void anadirListenerNavToColaboradoresFromBuscarEmpresa(ActionListener listener){
-                        navToColaboradoresFromBuscarEmpresa.addActionListener(listener); 
-                }
-                //PANEL NUEVO Empresa
-        public void anadirListenernavToMainFromNuevoEmpresa(ActionListener listener){
-                navToMainFromDatosEmpresa.addActionListener(listener); 
-        }
-        public void anadirListenerNavToEmpresaFromDatosEmpresa(ActionListener listener){
-                navToEmpresaFromDatosEmpresa.addActionListener(listener);
-        }
-        public void anadirListenerNavToColaboradoresFromDatosEmpresa(ActionListener listener){
-                navToColaboradoresFromDatosEmpresa.addActionListener(listener); 
-        }
-        
-                //AÃ±adir listener Panel Colaborador
-        
-        public void anadirListenerBtColaborador(ActionListener listener){
-		btColaborador.addActionListener(listener);
-	}
-         public void anadirListenerbtBuscarColaborador(ActionListener listener){
-                       btBuscarColaborador.addActionListener(listener);
-                }  
-        public void anadirListenerbtNuevaColaborador(ActionListener listener){
-                       btNuevoColaborador.addActionListener(listener);
-                } 
-        
-        public void anadirListenernavToMainFromColaborador(ActionListener listener){
-                    navToMainFromColaborador.addActionListener(listener);
-                }
-        public void anadirListenerNavToColaboradoresFromColaborador(ActionListener listener){
-                    navToColaboradoresFromColaborador.addActionListener(listener);
-                }
-                //PANEL BUSCAR Colaborador
-        public void anadirListenernavToMainFromBuscarColaborador(ActionListener listener){
-                        navToMainFromColaboradorBuscar.addActionListener(listener); 
-                }
-                    
-        public void anadirListenerNavToColaboradoresFromBuscarColaborador(ActionListener listener){
-                        navToColaboradoresFromBuscarColaborador.addActionListener(listener);
-                }
-        public void anadirListenerNavToColaboradorFromBuscarColaborador(ActionListener listener){
-                        navToColaboradorFromBuscarColaborador.addActionListener(listener);
-                 }
-
-                //PANEL NUEVO Colaborador
-        public void anadirListenernavToMainFromNuevoColaborador(ActionListener listener){
-                navToMainFromColaboradorDatos.addActionListener(listener); 
-        }
-        public void anadirListenerNavToColaboradoresFromDatosColaborador(ActionListener listener){
-                navToColaboradoresFromColaboradorDatos.addActionListener(listener);
-        }
-        
-        public void anadirListenerNavToColaboradorFromDatosColaborador(ActionListener listener){
-                navToColaboradorFromColaboradorDatos.addActionListener(listener);
-        }
-        
-        //AÃ±adir listener Panel Colaboracion
-        
-        public void anadirListenerBtAnadirColaboracion(ActionListener listener){
-                btAnadirColaboracion.addActionListener(listener);
-        }
-        
-        public void anadirListenerBtComprobarPagos(ActionListener listener){
-                btComprobarPagos.addActionListener(listener);
-        }
-
+	/**
+	 * @post  Asigna a navToMainFromVoluntarios el listener desde el controlador encargado
+	 * @param listener 
+	 */
 	
-
+	public void anadirListenernavToMainFromSocio(ActionListener listener){
+		navToMainFromSocio.addActionListener(listener);
+	}
 /**
 	* PANEL IDENTIFICACION
 	*/
Revert "From 33878b0808b21881a9a0a6fe409bb812f61932c4 Mon Sep 17 00:00:00 2001 From: Alberto <Alberto@Alberto-PC> Date: 10-may-2012 1:06:09"

This reverts commit bf274e06d8249921288765fcb3f0e70bb5a7e283.
Merge branch 'master' of https://github.com/psylock/Diaketas-Manage.git
otro