From e45ada81913b65c926bbc099557a1e23435550d3 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Fri, 23 Feb 2018 01:43:03 -0300
Subject: [PATCH 01/27] =?UTF-8?q?Dise=C3=B1o=20mejorado=20y=20ajustes=20a?=
 =?UTF-8?q?=20todas=20las=20ventanas=20del=20proyecto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/info/EmpleadoRepository.java   |   2 +-
 .../venta/OrganizacionRepository.java         |   2 +-
 .../repository/venta/ViajeRepository.java     |   6 +-
 src/application/view/Login.fxml               |   8 +-
 src/application/view/LoginController.java     |   3 +
 src/application/view/Principal.fxml           |   5 +-
 src/application/view/Register.fxml            |   6 +-
 .../view/calculo/CargarAcoplado.fxml          |  56 +--
 .../view/calculo/CargarCamion.fxml            |  52 +--
 src/application/view/calculo/InfoFinca.fxml   |  44 +-
 src/application/view/calculo/InfoIngenio.fxml |  61 ++-
 .../view/calculo/InfoOrigenDestino.fxml       |  73 ++-
 .../view/calculo/cruds/AcopladoEdit.fxml      |   2 +-
 .../view/calculo/cruds/CamionEdit.fxml        |   2 +-
 .../view/calculo/cruds/DistanciasEdit.fxml    |   2 +-
 .../view/calculo/cruds/FincaEdit.fxml         |   2 +-
 .../view/calculo/cruds/IngenioEdit.fxml       |   2 +-
 src/application/view/compra/Articulos.fxml    |  60 ++-
 .../view/compra/CategoriaArticulos.fxml       |  56 +--
 .../view/compra/CompraCompras.fxml            |  82 ++--
 src/application/view/compra/ControlStock.fxml |  68 ++-
 src/application/view/compra/Proveedores.fxml  |  60 ++-
 .../view/compra/cruds/ArticuloEdit.fxml       |   6 +-
 .../compra/cruds/CategoriaArticuloEdit.fxml   |   4 +-
 .../view/compra/cruds/FacturaEdit.fxml        |   8 +-
 .../view/compra/cruds/ProveedorEdit.fxml      |   2 +-
 .../view/compra/cruds/StockEdit.fxml          |   6 +-
 src/application/view/css/theme.css            | 440 ++++++++++++++++++
 .../view/info/AdministrarEmpleados.fxml       |  72 ++-
 .../view/info/AdministrarUsuarios.fxml        |  54 +--
 src/application/view/info/Desempleados.fxml   |  54 +--
 src/application/view/info/GrupoFamiliar.fxml  |   5 +-
 .../view/info/InfoCategoriaEmpleado.fxml      |  51 +-
 src/application/view/info/InfoDomicilio.fxml  |  55 +--
 .../info/cruds/CategoriaEmpleadoEdit.fxml     |   2 +-
 .../view/info/cruds/EditarEmpleadoDialog.fxml |   6 +-
 .../view/info/cruds/EditarUsuarioDialog.fxml  |   2 +-
 .../view/info/cruds/FamiliarEdit.fxml         |   2 +-
 .../view/inicio/HomeController.java           |   2 +-
 src/application/view/inicio/Organizacion.fxml |   4 +-
 .../view/inicio/OrganizacionController.java   |  10 +
 .../view/inicio/crud/OrganizacionEdit.fxml    |   2 +-
 .../view/sueldo/ConceptosSalariales.fxml      |  59 +--
 .../view/sueldo/Liquidaciones.fxml            |  81 ++--
 .../view/sueldo/cruds/ConceptoEdit.fxml       |   6 +-
 .../view/sueldo/cruds/LiquidacionSueldo.fxml  |   2 +-
 .../view/venta/AdministrarViajes.fxml         |  90 ++--
 src/application/view/venta/Facturacion.fxml   |   2 +-
 src/application/view/venta/VentaCliente.fxml  |  59 ++-
 .../view/venta/cruds/ClienteEdit.fxml         |   2 +-
 .../view/venta/cruds/EmitirFactura.fxml       |   6 +-
 .../view/venta/cruds/ViajeEdit.fxml           |   2 +-
 .../resources/ca\303\261asprincipal.jpg"      | Bin
 src/resources/volks.png                       | Bin 0 -> 171927 bytes
 54 files changed, 1032 insertions(+), 718 deletions(-)
 create mode 100644 src/application/view/css/theme.css
 rename "src/img/ca\303\261asprincipal.jpg" => "src/resources/ca\303\261asprincipal.jpg" (100%)
 create mode 100644 src/resources/volks.png

diff --git a/src/application/repository/info/EmpleadoRepository.java b/src/application/repository/info/EmpleadoRepository.java
index 9b0e3f5..b0f5adb 100644
--- a/src/application/repository/info/EmpleadoRepository.java
+++ b/src/application/repository/info/EmpleadoRepository.java
@@ -95,7 +95,7 @@ public void edit(Empleado empleado){
 		}
 	}
 	
-	public static Empleado buscarEmpleadoById(Integer id){
+	public Empleado buscarEmpleadoById(Integer id){
 		
 		Empleado empleado = new Empleado();
 		Statement statement = null;
diff --git a/src/application/repository/venta/OrganizacionRepository.java b/src/application/repository/venta/OrganizacionRepository.java
index 3b7d826..973bc6e 100644
--- a/src/application/repository/venta/OrganizacionRepository.java
+++ b/src/application/repository/venta/OrganizacionRepository.java
@@ -92,7 +92,7 @@ public ObservableList<Organizacion> view(){
                 Organizacion organizacion = new Organizacion();
                 organizacion.setIdOrganizacion(resultSet.getInt("idORGANIZACION"));
                 organizacion.setNombreOrg(resultSet.getString("Nombre"));
-                Empleado apoderado = empleadoRepository.getEmpleadoById(resultSet.getInt("APODERADO_idEmpleado"));
+                Empleado apoderado = empleadoRepository.buscarEmpleadoById(resultSet.getInt("APODERADO_idEmpleado"));
                 organizacion.setApoderadoOrg(apoderado);
                 Domicilio domicilio = domicilioRepository.getDomicilioById(resultSet.getInt("DOMICILIO_idDomicilio"));
                 organizacion.setDomicilioOrg(domicilio);
diff --git a/src/application/repository/venta/ViajeRepository.java b/src/application/repository/venta/ViajeRepository.java
index a923643..1f03ad0 100644
--- a/src/application/repository/venta/ViajeRepository.java
+++ b/src/application/repository/venta/ViajeRepository.java
@@ -245,7 +245,7 @@ public ObservableList<Viaje> getViajesSinLiquidar(){
 					Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
 					viaje.setIngenio(ingenio);
 					Camion camion = camionRepository.getCamionById(resultSet.getInt("CAMION_idCamion"));
-					Empleado conductor = empleadoRepository.getEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
+					Empleado conductor = empleadoRepository.buscarEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
 					viaje.setConductor(conductor);
 					viaje.setCamion(camion);
 					list.add(viaje);
@@ -365,7 +365,7 @@ public ObservableList<Viaje> getViajesByIdIngenio(int idIngenio){
 					Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
 					viaje.setIngenio(ingenio);
 					Camion camion = camionRepository.getCamionById(resultSet.getInt("CAMION_idCamion"));
-					Empleado conductor = empleadoRepository.getEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
+					Empleado conductor = empleadoRepository.buscarEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
 					viaje.setConductor(conductor);
 					viaje.setCamion(camion);
 					list.add(viaje);
@@ -422,7 +422,7 @@ public ObservableList<Viaje> getViajesSinLiqByIngenioId(int idIngenio){
 					Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
 					viaje.setIngenio(ingenio);
 					Camion camion = camionRepository.getCamionById(resultSet.getInt("CAMION_idCamion"));
-					Empleado conductor = empleadoRepository.getEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
+					Empleado conductor = empleadoRepository.buscarEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
 					viaje.setConductor(conductor);
 					viaje.setCamion(camion);
 					list.add(viaje);
diff --git a/src/application/view/Login.fxml b/src/application/view/Login.fxml
index 5ac3771..e2e2241 100644
--- a/src/application/view/Login.fxml
+++ b/src/application/view/Login.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
 
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.LoginController">
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" stylesheets="@css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.LoginController">
    <center>
       <AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
          <children>
@@ -36,10 +36,10 @@
                               </HBox>
                               <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="4">
                                  <children>
-                                    <VBox alignment="CENTER" prefHeight="72.0" prefWidth="259.0" spacing="30.0">
+                                    <VBox alignment="CENTER" prefHeight="72.0" prefWidth="259.0" spacing="10.0">
                                        <children>
-                                          <Label fx:id="errorLoginLabel" alignment="CENTER" prefHeight="17.0" prefWidth="257.0" text=" " textFill="#f50808" />
-                                          <Button fx:id="btnLogin" mnemonicParsing="false" onAction="#btnLogin" text="Login" />
+                                          <Label fx:id="errorLoginLabel" alignment="CENTER" prefHeight="17.0" prefWidth="257.0" text=" " textFill="RED" />
+                                          <Button fx:id="btnLogin" mnemonicParsing="false" onAction="#btnLogin" onKeyPressed="#btnLogin" text="Login" />
                                        </children>
                                     </VBox>
                                  </children>
diff --git a/src/application/view/LoginController.java b/src/application/view/LoginController.java
index a3241ed..357f5d6 100644
--- a/src/application/view/LoginController.java
+++ b/src/application/view/LoginController.java
@@ -4,6 +4,7 @@
 import application.model.compra.Proveedor;
 import application.model.info.Usuario;
 import application.repository.info.UsuarioRepository;
+import com.sun.prism.paint.Color;
 import javafx.beans.binding.BooleanBinding;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -15,6 +16,7 @@
 import javafx.scene.control.*;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.BorderPane;
+import javafx.scene.paint.Paint;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
@@ -76,6 +78,7 @@ private void btnLogin(ActionEvent event){
                 Parent parent = loader.getRoot();
                 Stage adminPanelStage = new Stage();
                 adminPanelStage.setTitle("LogiServ app - usuario: " + nombreUsuario + " conectado.");
+                adminPanelStage.setMaximized(true);
                 PrincipalController controller = loader.getController();
                 controller.setRootLayout(root);
                 controller.setHome();
diff --git a/src/application/view/Principal.fxml b/src/application/view/Principal.fxml
index 4eae6f6..979a801 100644
--- a/src/application/view/Principal.fxml
+++ b/src/application/view/Principal.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.VBox?>
 
-<BorderPane prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.PrincipalController">
+<BorderPane prefHeight="600.0" prefWidth="900.0" stylesheets="@css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.PrincipalController">
    <top>
       <MenuBar BorderPane.alignment="CENTER">
         <menus>
@@ -136,4 +136,7 @@
                </children>
             </AnchorPane>
    </left>
+   <center>
+      <Pane prefHeight="541.0" prefWidth="623.0" BorderPane.alignment="CENTER" />
+   </center>
       </BorderPane>
diff --git a/src/application/view/Register.fxml b/src/application/view/Register.fxml
index 35c0423..b7093f3 100644
--- a/src/application/view/Register.fxml
+++ b/src/application/view/Register.fxml
@@ -21,7 +21,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.RegisterController">
+<Group stylesheets="@css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.RegisterController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="591.0" prefWidth="547.0">
       <children>
@@ -82,8 +82,8 @@
                   </GridPane>
                   <HBox alignment="CENTER" prefHeight="53.0" prefWidth="547.0" spacing="20.0">
                      <children>
-                        <Button fx:id="registrarButton" mnemonicParsing="false" onAction="#handleRegistro" text="Registrar" />
-                        <Button mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
+                        <Button fx:id="registrarButton" defaultButton="true" mnemonicParsing="false" onAction="#handleRegistro" text="Registrar" />
+                        <Button cancelButton="true" mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
                      </children>
                   </HBox>
                   <Hyperlink fx:id="hlLogin" onAction="#handleLogin" prefHeight="43.0" prefWidth="165.0" text="¿Ya tienes una cuenta? Login " />
diff --git a/src/application/view/calculo/CargarAcoplado.fxml b/src/application/view/calculo/CargarAcoplado.fxml
index e6dda41..fd9f905 100644
--- a/src/application/view/calculo/CargarAcoplado.fxml
+++ b/src/application/view/calculo/CargarAcoplado.fxml
@@ -16,41 +16,33 @@
 
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.CargarAcopladoController">
    <children>
-      <Pane prefHeight="400.0" prefWidth="600.0">
+      <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="11.0" prefHeight="389.0" prefWidth="581.0" spacing="20.0">
          <children>
-            <AnchorPane prefHeight="400.0" prefWidth="600.0">
+            <Label text="Acoplados" />
+            <TableView fx:id="acopladoTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
+              <columns>
+                <TableColumn fx:id="idAcopladoTableColumn" minWidth="0.0" prefWidth="0.0" text="id" />
+                <TableColumn fx:id="marcaTableColumn" prefWidth="203.20001220703125" text="Marca" />
+                  <TableColumn fx:id="patenteTableColumn" prefWidth="192.79998779296875" text="Patente" />
+              </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+            <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
                <children>
-                  <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Acoplados" />
-                        <TableView fx:id="acopladoTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
-                          <columns>
-                            <TableColumn fx:id="idAcopladoTableColumn" minWidth="0.0" prefWidth="0.0" text="id" />
-                            <TableColumn fx:id="marcaTableColumn" prefWidth="203.20001220703125" text="Marca" />
-                              <TableColumn fx:id="patenteTableColumn" prefWidth="192.79998779296875" text="Patente" />
-                          </columns>
-                           <columnResizePolicy>
-                              <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                           </columnResizePolicy>
-                        </TableView>
-                        <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
-                           <children>
-                              <Button fx:id="btnNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNewAcoplado" text="Nuevo Acoplado" />
-                              <Button fx:id="btnEdit" alignment="CENTER" mnemonicParsing="false" onAction="#handleEditAcoplado" text="Editar Acoplado" />
-                              <Button fx:id="btnEliminar" alignment="CENTER" mnemonicParsing="false" onAction="#handleEliminarAcoplado" text="Eliminar Acoplado" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                           <padding>
-                              <Insets top="30.0" />
-                           </padding>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <Button fx:id="btnNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNewAcoplado" text="Nuevo Acoplado" />
+                  <Button fx:id="btnEdit" alignment="CENTER" mnemonicParsing="false" onAction="#handleEditAcoplado" text="Editar Acoplado" />
+                  <Button fx:id="btnEliminar" alignment="CENTER" mnemonicParsing="false" onAction="#handleEliminarAcoplado" text="Eliminar Acoplado" />
                </children>
-            </AnchorPane>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+               <padding>
+                  <Insets top="30.0" />
+               </padding>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/calculo/CargarCamion.fxml b/src/application/view/calculo/CargarCamion.fxml
index 7ca92c7..cce7f2d 100644
--- a/src/application/view/calculo/CargarCamion.fxml
+++ b/src/application/view/calculo/CargarCamion.fxml
@@ -16,39 +16,31 @@
 
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.CargarCamionController">
    <children>
-      <Pane prefHeight="400.0" prefWidth="600.0">
+      <VBox alignment="CENTER_LEFT" layoutX="17.0" layoutY="15.0" prefHeight="385.0" prefWidth="583.0" spacing="20.0">
          <children>
-            <AnchorPane prefHeight="400.0" prefWidth="600.0">
+            <Label text="Camiones" />
+            <TableView fx:id="camionTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
+              <columns>
+                <TableColumn fx:id="idCamionTableColumn" minWidth="0.0" prefWidth="0.0" text="id" />
+                <TableColumn fx:id="marcaTableColumn" prefWidth="203.20001220703125" text="Marca" />
+                  <TableColumn fx:id="modeloTableColumn" prefWidth="206.4000244140625" text="Modelo" />
+                  <TableColumn fx:id="patenteTableColumn" prefWidth="192.79998779296875" text="Patente" />
+              </columns>
+            </TableView>
+            <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
                <children>
-                  <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Camiones" />
-                        <TableView fx:id="camionTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
-                          <columns>
-                            <TableColumn fx:id="idCamionTableColumn" minWidth="0.0" prefWidth="0.0" text="id" />
-                            <TableColumn fx:id="marcaTableColumn" prefWidth="203.20001220703125" text="Marca" />
-                              <TableColumn fx:id="modeloTableColumn" prefWidth="206.4000244140625" text="Modelo" />
-                              <TableColumn fx:id="patenteTableColumn" prefWidth="192.79998779296875" text="Patente" />
-                          </columns>
-                        </TableView>
-                        <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
-                           <children>
-                              <Button fx:id="btnNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNewCamion" text="Nuevo Camion" />
-                              <Button fx:id="btnEdit" alignment="CENTER" mnemonicParsing="false" onAction="#handleEditCamion" text="Editar Camion" />
-                              <Button fx:id="btnEliminar" alignment="CENTER" mnemonicParsing="false" onAction="#handleEliminarCamion" text="Eliminar Camion" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                           <padding>
-                              <Insets top="30.0" />
-                           </padding>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <Button fx:id="btnNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNewCamion" text="Nuevo Camion" />
+                  <Button fx:id="btnEdit" alignment="CENTER" mnemonicParsing="false" onAction="#handleEditCamion" text="Editar Camion" />
+                  <Button fx:id="btnEliminar" alignment="CENTER" mnemonicParsing="false" onAction="#handleEliminarCamion" text="Eliminar Camion" />
                </children>
-            </AnchorPane>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+               <padding>
+                  <Insets top="30.0" />
+               </padding>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/calculo/InfoFinca.fxml b/src/application/view/calculo/InfoFinca.fxml
index 38333a7..e4be503 100644
--- a/src/application/view/calculo/InfoFinca.fxml
+++ b/src/application/view/calculo/InfoFinca.fxml
@@ -10,35 +10,27 @@
 
 <AnchorPane prefHeight="417.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.InfoFincaController">
    <children>
-      <Pane prefHeight="417.0" prefWidth="600.0">
+      <VBox alignment="CENTER_LEFT" layoutX="20.0" layoutY="19.0" prefHeight="488.0" prefWidth="580.0" spacing="20.0">
          <children>
-            <AnchorPane prefHeight="417.0" prefWidth="600.0">
+            <Label text="Finca" />
+            <Pane prefHeight="50.0" prefWidth="600.0" />
+            <HBox alignment="CENTER" prefHeight="311.0" prefWidth="600.0" spacing="20.0">
                <children>
-                  <VBox layoutY="5.0" prefHeight="417.0" prefWidth="600.0" AnchorPane.bottomAnchor="-5.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="5.0">
-                     <children>
-                        <Label text="Finca" />
-                        <Pane prefHeight="50.0" prefWidth="600.0" />
-                        <HBox alignment="CENTER" prefHeight="311.0" prefWidth="600.0" spacing="20.0">
-                           <children>
-                              <ListView fx:id="fincaListView" prefHeight="200.0" prefWidth="200.0" />
-                              <WebView fx:id="webView" prefHeight="284.0" prefWidth="365.0" />
-                           </children>
-                        </HBox>
-                        <HBox alignment="CENTER" prefHeight="80.0" prefWidth="600.0" spacing="20.0">
-                           <children>
-                              <Button fx:id="btnNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nueva Finca" />
-                              <Button fx:id="btnEdit" alignment="CENTER" mnemonicParsing="false" onAction="#handleEdit" text="Editar Finca" />
-                              <Button fx:id="btnDelete" alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleEliminar" text="Eliminar Finca" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <ListView fx:id="fincaListView" prefHeight="200.0" prefWidth="200.0" />
+                  <WebView fx:id="webView" prefHeight="284.0" prefWidth="365.0" />
                </children>
-            </AnchorPane>
+            </HBox>
+            <HBox alignment="CENTER" prefHeight="104.0" prefWidth="580.0" spacing="20.0">
+               <children>
+                  <Button fx:id="btnNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nueva Finca" />
+                  <Button fx:id="btnEdit" alignment="CENTER" mnemonicParsing="false" onAction="#handleEdit" text="Editar Finca" />
+                  <Button fx:id="btnDelete" alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleEliminar" text="Eliminar Finca" />
+               </children>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/calculo/InfoIngenio.fxml b/src/application/view/calculo/InfoIngenio.fxml
index 3fd5305..c81c949 100644
--- a/src/application/view/calculo/InfoIngenio.fxml
+++ b/src/application/view/calculo/InfoIngenio.fxml
@@ -10,44 +10,35 @@
 
 <AnchorPane prefHeight="417.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.InfoIngenioController">
    <children>
-      <Pane prefHeight="417.0" prefWidth="600.0">
+      <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="12.0" prefHeight="405.0" prefWidth="581.0" spacing="20.0">
          <children>
-            <AnchorPane prefHeight="417.0" prefWidth="600.0">
+            <Label text="Ingenios:" />
+            <HBox alignment="CENTER" prefHeight="311.0" prefWidth="600.0" spacing="20.0">
                <children>
-                  <VBox layoutY="5.0" prefHeight="417.0" prefWidth="600.0" AnchorPane.bottomAnchor="-5.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="5.0">
-                     <children>
-                        <Label text="Ingenio:" />
-                        <Pane prefHeight="32.0" prefWidth="600.0" />
-                        <HBox alignment="CENTER" prefHeight="311.0" prefWidth="600.0" spacing="20.0">
-                           <children>
-                              <TableView fx:id="ingenioTableView" prefHeight="303.0" prefWidth="377.0">
-                                <columns>
-                                  <TableColumn fx:id="idColumn" minWidth="0.0" prefWidth="0.0" text="Id" />
-                                    <TableColumn fx:id="latitudColumn" minWidth="0.0" prefWidth="0.0" text="Latitud" />
-                                    <TableColumn fx:id="longitudColumn" minWidth="0.0" prefWidth="0.0" text="Longitud" />
-                                  <TableColumn fx:id="nombreColumn" prefWidth="172.0" text="Nombre" />
-                                    <TableColumn fx:id="arranqueColumn" prefWidth="65.0" text="Arranque" />
-                                    <TableColumn fx:id="tarifaColumn" prefWidth="65.0" text="Tarifa" />
-                                </columns>
-                              </TableView>
-                              <WebView fx:id="webView" prefHeight="303.0" prefWidth="350.0" />
-                           </children>
-                        </HBox>
-                        <HBox alignment="CENTER" prefHeight="80.0" prefWidth="600.0" spacing="20.0">
-                           <children>
-                              <Button fx:id="btnNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nuevo Ingenio" />
-                              <Button fx:id="btnEdit" alignment="CENTER" mnemonicParsing="false" onAction="#handleEdit" text="Editar Ingenio" />
-                              <Button fx:id="btnDelete" alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleEliminar" text="Eliminar Ingenio" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <TableView fx:id="ingenioTableView" prefHeight="303.0" prefWidth="377.0">
+                    <columns>
+                      <TableColumn fx:id="idColumn" minWidth="0.0" prefWidth="0.0" text="Id" />
+                        <TableColumn fx:id="latitudColumn" minWidth="0.0" prefWidth="0.0" text="Latitud" />
+                        <TableColumn fx:id="longitudColumn" minWidth="0.0" prefWidth="0.0" text="Longitud" />
+                      <TableColumn fx:id="nombreColumn" prefWidth="172.0" text="Nombre" />
+                        <TableColumn fx:id="arranqueColumn" prefWidth="65.0" text="Arranque" />
+                        <TableColumn fx:id="tarifaColumn" prefWidth="65.0" text="Tarifa" />
+                    </columns>
+                  </TableView>
+                  <WebView fx:id="webView" prefHeight="303.0" prefWidth="350.0" />
                </children>
-            </AnchorPane>
+            </HBox>
+            <HBox alignment="CENTER" prefHeight="80.0" prefWidth="600.0" spacing="20.0">
+               <children>
+                  <Button fx:id="btnNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nuevo Ingenio" />
+                  <Button fx:id="btnEdit" alignment="CENTER" mnemonicParsing="false" onAction="#handleEdit" text="Editar Ingenio" />
+                  <Button fx:id="btnDelete" alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleEliminar" text="Eliminar Ingenio" />
+               </children>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/calculo/InfoOrigenDestino.fxml b/src/application/view/calculo/InfoOrigenDestino.fxml
index d20355c..6ef392f 100644
--- a/src/application/view/calculo/InfoOrigenDestino.fxml
+++ b/src/application/view/calculo/InfoOrigenDestino.fxml
@@ -9,46 +9,35 @@
 
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.InfoOrigenDestinoController">
     <children>
-        <Pane prefHeight="400.0" prefWidth="600.0">
-            <children>
-                <AnchorPane prefHeight="400.0" prefWidth="600.0">
-                    <children>
-                        <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                            <children>
-                                <Label text="Distancia" />
-                                <Pane prefHeight="43.0" prefWidth="600.0">
-                                    <children>
-                                        <TextField fx:id="buscarPorIngenioField" layoutX="300.0" layoutY="9.0" />
-                                        <Button fx:id="searchButton" layoutX="465.0" layoutY="9.0" mnemonicParsing="false" text="Buscar" />
-                                        <Label layoutX="191.0" layoutY="13.0" text="Buscar por Ingenio:" />
-                                    </children>
-                                </Pane>
-                                <TableView fx:id="tableView" pickOnBounds="false" prefHeight="269.0" prefWidth="600.0">
-                                    <columns>
-                                        <TableColumn fx:id="idColumn" minWidth="0.0" prefWidth="0.0" text="Id" />
-                                        <TableColumn fx:id="ingenioColumn" prefWidth="230.0" text="Ingenio" />
-                                        <TableColumn fx:id="fincaColumn" prefWidth="230.0" text="Finca" />
-                                        <TableColumn fx:id="distanciaColumn" prefWidth="139.0" text="Distancia" />
-                                    </columns>
-                                </TableView>
-                                <HBox alignment="CENTER" prefHeight="45.0" prefWidth="600.0" spacing="10.0">
-                                    <VBox.margin>
-                                        <Insets />
-                                    </VBox.margin>
-                                    <padding>
-                                        <Insets top="30.0" />
-                                    </padding>
-                                    <children>
-                                        <Button fx:id="newButton" mnemonicParsing="false" onAction="#handleNew" text="Nueva Distancia" />
-                                        <Button fx:id="editButton" mnemonicParsing="false" onAction="#handleEdit" text="Editar Distancia" />
-                                        <Button fx:id="eliminarButton" mnemonicParsing="false" onAction="#handleEliminar" text="Eliminar Distancia" />
-                                    </children>
-                                </HBox>
-                            </children>
-                        </VBox>
-                    </children>
-                </AnchorPane>
-            </children>
-        </Pane>
+            <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="15.0" prefHeight="433.0" prefWidth="581.0" spacing="20.0">
+                <children>
+                    <Label text="Tabla de Distancias" />
+            <HBox alignment="CENTER" prefHeight="51.0" prefWidth="581.0" spacing="20.0">
+               <children>
+                            <Label text="Buscar por Ingenio:" />
+                            <TextField fx:id="buscarPorIngenioField" />
+                            <Button fx:id="searchButton" mnemonicParsing="false" text="Buscar" />
+               </children>
+            </HBox>
+                    <TableView fx:id="tableView" pickOnBounds="false" prefHeight="269.0" prefWidth="600.0">
+                        <columns>
+                            <TableColumn fx:id="idColumn" minWidth="0.0" prefWidth="0.0" text="Id" />
+                            <TableColumn fx:id="ingenioColumn" prefWidth="230.0" text="Ingenio" />
+                            <TableColumn fx:id="fincaColumn" prefWidth="230.0" text="Finca" />
+                            <TableColumn fx:id="distanciaColumn" prefWidth="139.0" text="Distancia" />
+                        </columns>
+                    </TableView>
+                    <HBox alignment="CENTER" prefHeight="97.0" prefWidth="581.0" spacing="20.0">
+                        <VBox.margin>
+                            <Insets />
+                        </VBox.margin>
+                        <children>
+                            <Button fx:id="newButton" mnemonicParsing="false" onAction="#handleNew" text="Nueva Distancia" />
+                            <Button fx:id="editButton" mnemonicParsing="false" onAction="#handleEdit" text="Editar Distancia" />
+                            <Button fx:id="eliminarButton" mnemonicParsing="false" onAction="#handleEliminar" text="Eliminar Distancia" />
+                        </children>
+                    </HBox>
+                </children>
+            </VBox>
     </children>
-</AnchorPane>
\ No newline at end of file
+</AnchorPane>
diff --git a/src/application/view/calculo/cruds/AcopladoEdit.fxml b/src/application/view/calculo/cruds/AcopladoEdit.fxml
index d1fb6ac..671bb46 100644
--- a/src/application/view/calculo/cruds/AcopladoEdit.fxml
+++ b/src/application/view/calculo/cruds/AcopladoEdit.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.AcopladoEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.AcopladoEditController">
   <children>
     <AnchorPane prefHeight="246.0" prefWidth="473.0">
       <children>
diff --git a/src/application/view/calculo/cruds/CamionEdit.fxml b/src/application/view/calculo/cruds/CamionEdit.fxml
index 59c2b5d..35823fe 100644
--- a/src/application/view/calculo/cruds/CamionEdit.fxml
+++ b/src/application/view/calculo/cruds/CamionEdit.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.CamionEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.CamionEditController">
   <children>
     <AnchorPane prefHeight="246.0" prefWidth="473.0">
       <children>
diff --git a/src/application/view/calculo/cruds/DistanciasEdit.fxml b/src/application/view/calculo/cruds/DistanciasEdit.fxml
index 9493ef6..9b51834 100644
--- a/src/application/view/calculo/cruds/DistanciasEdit.fxml
+++ b/src/application/view/calculo/cruds/DistanciasEdit.fxml
@@ -16,7 +16,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.DistanciasEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.DistanciasEditController">
     <children>
         <AnchorPane prefHeight="550.0" prefWidth="528.0">
             <children>
diff --git a/src/application/view/calculo/cruds/FincaEdit.fxml b/src/application/view/calculo/cruds/FincaEdit.fxml
index 566d10b..1bb2723 100644
--- a/src/application/view/calculo/cruds/FincaEdit.fxml
+++ b/src/application/view/calculo/cruds/FincaEdit.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.FincaEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.FincaEditController">
    <children>
       <AnchorPane prefHeight="416.0" prefWidth="528.0">
          <children>
diff --git a/src/application/view/calculo/cruds/IngenioEdit.fxml b/src/application/view/calculo/cruds/IngenioEdit.fxml
index 5e01253..fbacbc1 100644
--- a/src/application/view/calculo/cruds/IngenioEdit.fxml
+++ b/src/application/view/calculo/cruds/IngenioEdit.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.IngenioEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.IngenioEditController">
    <children>
       <AnchorPane prefHeight="550.0" prefWidth="528.0">
          <children>
diff --git a/src/application/view/compra/Articulos.fxml b/src/application/view/compra/Articulos.fxml
index 4ae97f5..d328a40 100644
--- a/src/application/view/compra/Articulos.fxml
+++ b/src/application/view/compra/Articulos.fxml
@@ -7,42 +7,34 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.AnchorPane?>
 
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.ArticulosController">
+<AnchorPane prefHeight="445.0" prefWidth="627.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.ArticulosController">
   <children>
-    <Pane prefHeight="400.0" prefWidth="600.0">
+<VBox alignment="CENTER_LEFT" layoutX="20.0" prefHeight="445.0" prefWidth="643.0" spacing="10.0">
+  <children>
+    <Label text="Articulos" />
+    <TableView fx:id="articuloTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="592.0">
+      <columns>
+        <TableColumn fx:id="marcaTableColumn" prefWidth="67.0" text="Marca" />
+        <TableColumn fx:id="modeloTableColumn" prefWidth="89.0" text="Modelo" />
+        <TableColumn fx:id="descripcionTableColumn" prefWidth="283.0" text="Descripción" />
+        <TableColumn fx:id="categoriaTableColumn" prefWidth="109.0" text="Categoría" />
+        <TableColumn fx:id="stockTableColumn" prefWidth="94.0" text="Stock" />
+      </columns>
+    </TableView>
+    <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
       <children>
-        <AnchorPane prefHeight="400.0" prefWidth="600.0">
-          <children>
-            <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-              <children>
-                <Label text="Articulos" />
-                <TableView fx:id="articuloTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
-                  <columns>
-                    <TableColumn fx:id="marcaTableColumn" prefWidth="67.0" text="Marca" />
-                    <TableColumn fx:id="modeloTableColumn" prefWidth="89.0" text="Modelo" />
-                    <TableColumn fx:id="descripcionTableColumn" prefWidth="283.0" text="Descripción" />
-                    <TableColumn fx:id="categoriaTableColumn" prefWidth="109.0" text="Categoría" />
-                    <TableColumn fx:id="stockTableColumn" prefWidth="51.0" text="Stock" />
-                  </columns>
-                </TableView>
-                <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
-                  <children>
-                    <Button fx:id="buttonNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nuevo Artículo" />
-                    <Button fx:id="buttonUpdate" alignment="CENTER" mnemonicParsing="false" onAction="#handleUpdate" text="Editar Artículo" />
-                    <Button fx:id="buttonDelete" alignment="CENTER" mnemonicParsing="false" onAction="#handleDelete" text="Eliminar Artículo" />
-                  </children>
-                  <padding>
-                    <Insets top="30.0" />
-                  </padding>
-                  <VBox.margin>
-                    <Insets />
-                  </VBox.margin>
-                </HBox>
-              </children>
-            </VBox>
-          </children>
-        </AnchorPane>
+        <Button fx:id="buttonNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nuevo Artículo" />
+        <Button fx:id="buttonUpdate" alignment="CENTER" mnemonicParsing="false" onAction="#handleUpdate" text="Editar Artículo" />
+        <Button fx:id="buttonDelete" alignment="CENTER" mnemonicParsing="false" onAction="#handleDelete" text="Eliminar Artículo" />
       </children>
-    </Pane>
+      <padding>
+        <Insets top="30.0" />
+      </padding>
+      <VBox.margin>
+        <Insets />
+      </VBox.margin>
+    </HBox>
+  </children>
+</VBox>
   </children>
 </AnchorPane>
diff --git a/src/application/view/compra/CategoriaArticulos.fxml b/src/application/view/compra/CategoriaArticulos.fxml
index 0553335..5c38575 100644
--- a/src/application/view/compra/CategoriaArticulos.fxml
+++ b/src/application/view/compra/CategoriaArticulos.fxml
@@ -7,42 +7,34 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.AnchorPane?>
 
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.CategoriaArticuloController">
+<AnchorPane prefHeight="419.0" prefWidth="645.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.CategoriaArticuloController">
    <children>
-      <Pane prefHeight="400.0" prefWidth="600.0">
+      <VBox alignment="CENTER_LEFT" layoutX="15.0" layoutY="16.0" prefHeight="384.0" prefWidth="585.0" spacing="10.0">
          <children>
-            <AnchorPane prefHeight="400.0" prefWidth="600.0">
+            <Label text="Categoría Articulos" />
+            <TableView fx:id="categoriaArticuloTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
+              <columns>
+                <TableColumn fx:id="idCategoriaTableColumn" prefWidth="75.0" text="id" />
+                <TableColumn fx:id="nombreCategoriaTableColumn" prefWidth="75.0" text="Nombre Categoría" />
+              </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+            <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
                <children>
-                  <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Categoría Articulos" />
-                        <TableView fx:id="categoriaArticuloTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
-                          <columns>
-                            <TableColumn fx:id="idCategoriaTableColumn" prefWidth="75.0" text="id" />
-                            <TableColumn fx:id="nombreCategoriaTableColumn" prefWidth="75.0" text="Nombre Categoría" />
-                          </columns>
-                           <columnResizePolicy>
-                              <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                           </columnResizePolicy>
-                        </TableView>
-                        <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
-                           <children>
-                              <Button fx:id="btnNuevaCategoria" alignment="CENTER" mnemonicParsing="false" onAction="#handleNuevaCategoria" text="Nueva Categoría" />
-                              <Button fx:id="btnEditarCategoria" alignment="CENTER" mnemonicParsing="false" onAction="#handleEditCategoria" text="Editar Categoría" />
-                              <Button fx:id="btnEliminarCategoria" alignment="CENTER" mnemonicParsing="false" onAction="#handleEliminarCategoria" text="Eliminar Categoría" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                           <padding>
-                              <Insets top="30.0" />
-                           </padding>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <Button fx:id="btnNuevaCategoria" alignment="CENTER" mnemonicParsing="false" onAction="#handleNuevaCategoria" text="Nueva Categoría" />
+                  <Button fx:id="btnEditarCategoria" alignment="CENTER" mnemonicParsing="false" onAction="#handleEditCategoria" text="Editar Categoría" />
+                  <Button fx:id="btnEliminarCategoria" alignment="CENTER" mnemonicParsing="false" onAction="#handleEliminarCategoria" text="Eliminar Categoría" />
                </children>
-            </AnchorPane>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+               <padding>
+                  <Insets top="30.0" />
+               </padding>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/compra/CompraCompras.fxml b/src/application/view/compra/CompraCompras.fxml
index a4e5cb6..2f6c8f5 100644
--- a/src/application/view/compra/CompraCompras.fxml
+++ b/src/application/view/compra/CompraCompras.fxml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
@@ -10,53 +14,45 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.CompraComprasController">
+<AnchorPane prefHeight="418.0" prefWidth="637.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.CompraComprasController">
    <children>
-      <Pane prefHeight="548.0" prefWidth="600.0">
+      <VBox alignment="CENTER_LEFT" layoutX="16.0" layoutY="13.0" prefHeight="387.0" prefWidth="584.0" spacing="10.0">
          <children>
-            <AnchorPane prefHeight="548.0" prefWidth="600.0">
+            <Label text="Compras" />
+            <TableView fx:id="comprasTable" onMouseClicked="#showLinea" pickOnBounds="false" prefHeight="172.0" prefWidth="600.0">
+              <columns>
+                <TableColumn fx:id="codigoFacturaColumn" prefWidth="75.0" text="Factura" />
+                <TableColumn fx:id="fechaColumn" prefWidth="75.0" text="Fecha" />
+                  <TableColumn fx:id="montoColumn" prefWidth="90.0" text="Monto" />
+                  <TableColumn fx:id="proveedorColumn" prefWidth="75.0" text="Proveedor" />
+              </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+            <Pane prefHeight="49.0" prefWidth="600.0" />
+            <TableView fx:id="lineaCompraTableView" prefHeight="177.0" prefWidth="600.0">
+               <columns>
+                  <TableColumn fx:id="descripcionColumn" prefWidth="312.0" text="Descripción" />
+                  <TableColumn fx:id="cantidadColumn" prefWidth="105.0" text="Cantidad" />
+                  <TableColumn fx:id="precioUnitarioColumn" prefWidth="89.0" text="Precio Unitario" />
+                  <TableColumn fx:id="subTotalColumn" prefWidth="77.0" text="Subtotal" />
+               </columns>
+            </TableView>
+            <HBox alignment="CENTER" prefHeight="131.0" prefWidth="600.0" spacing="10.0">
                <children>
-                  <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Compras" />
-                        <TableView fx:id="comprasTable" onMouseClicked="#showLinea" pickOnBounds="false" prefHeight="172.0" prefWidth="600.0">
-                          <columns>
-                            <TableColumn fx:id="codigoFacturaColumn" prefWidth="75.0" text="Factura" />
-                            <TableColumn fx:id="fechaColumn" prefWidth="75.0" text="Fecha" />
-                              <TableColumn fx:id="montoColumn" prefWidth="90.0" text="Monto" />
-                              <TableColumn fx:id="proveedorColumn" prefWidth="75.0" text="Proveedor" />
-                          </columns>
-                           <columnResizePolicy>
-                              <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                           </columnResizePolicy>
-                        </TableView>
-                        <Pane prefHeight="49.0" prefWidth="600.0" />
-                        <TableView fx:id="lineaCompraTableView" prefHeight="177.0" prefWidth="600.0">
-                           <columns>
-                              <TableColumn fx:id="descripcionColumn" prefWidth="312.0" text="Descripción" />
-                              <TableColumn fx:id="cantidadColumn" prefWidth="105.0" text="Cantidad" />
-                              <TableColumn fx:id="precioUnitarioColumn" prefWidth="118.0" text="Precio Unitario" />
-                              <TableColumn fx:id="subTotalColumn" prefWidth="64.0" text="Subtotal" />
-                           </columns>
-                        </TableView>
-                        <HBox alignment="CENTER" prefHeight="131.0" prefWidth="600.0" spacing="10.0">
-                           <children>
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nueva Compra" />
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEdit" text="Editar Compra" />
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEliminar" text="Eliminar Compra" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                           <padding>
-                              <Insets top="30.0" />
-                           </padding>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nueva Compra" />
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEdit" text="Editar Compra" />
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEliminar" text="Eliminar Compra" />
                </children>
-            </AnchorPane>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+               <padding>
+                  <Insets top="30.0" />
+               </padding>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/compra/ControlStock.fxml b/src/application/view/compra/ControlStock.fxml
index 2f84ed8..9fdf769 100644
--- a/src/application/view/compra/ControlStock.fxml
+++ b/src/application/view/compra/ControlStock.fxml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>
@@ -13,43 +17,35 @@
 
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.ControlStockController">
   <children>
-    <Pane prefHeight="400.0" prefWidth="600.0">
+<VBox alignment="CENTER_LEFT" layoutX="17.0" layoutY="13.0" prefHeight="387.0" prefWidth="583.0" spacing="10.0">
+  <children>
+    <Label text="Stock de Articulos" />
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="40.0">
+               <children>
+                  <Label text="Filtrar por Categoria:" />
+                  <ComboBox fx:id="categoriasComboBox" onAction="#filtrarCategoria" prefWidth="150.0" />
+               </children>
+            </HBox>
+    <TableView fx:id="articuloTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
+      <columns>
+        <TableColumn fx:id="marcaTableColumn" prefWidth="90.0" text="Marca" />
+        <TableColumn fx:id="descripcionTableColumn" prefWidth="413.0" text="Descripción" />
+        <TableColumn fx:id="stockTableColumn" prefWidth="96.0" text="Stock" />
+      </columns>
+    </TableView>
+    <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
       <children>
-        <AnchorPane prefHeight="400.0" prefWidth="600.0">
-          <children>
-            <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-              <children>
-                <Label text="Stock de Articulos" />
-                        <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="40.0">
-                           <children>
-                              <Label text="Filtrar por Categoria:" />
-                              <ComboBox fx:id="categoriasComboBox" onAction="#filtrarCategoria" prefWidth="150.0" />
-                           </children>
-                        </HBox>
-                <TableView fx:id="articuloTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
-                  <columns>
-                    <TableColumn fx:id="marcaTableColumn" prefWidth="90.0" text="Marca" />
-                    <TableColumn fx:id="descripcionTableColumn" prefWidth="413.0" text="Descripción" />
-                    <TableColumn fx:id="stockTableColumn" prefWidth="96.0" text="Stock" />
-                  </columns>
-                </TableView>
-                <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
-                  <children>
-                    <Button fx:id="controlButton" alignment="CENTER" mnemonicParsing="false" onAction="#handleControlStock" text="Control Stock" />
-                              <Button fx:id="reportButton" mnemonicParsing="false" text="Reporte de Stock" />
-                  </children>
-                  <padding>
-                    <Insets top="30.0" />
-                  </padding>
-                  <VBox.margin>
-                    <Insets />
-                  </VBox.margin>
-                </HBox>
-              </children>
-            </VBox>
-          </children>
-        </AnchorPane>
+        <Button fx:id="controlButton" alignment="CENTER" mnemonicParsing="false" onAction="#handleControlStock" text="Control Stock" />
+                  <Button fx:id="reportButton" mnemonicParsing="false" text="Reporte de Stock" />
       </children>
-    </Pane>
+      <padding>
+        <Insets top="30.0" />
+      </padding>
+      <VBox.margin>
+        <Insets />
+      </VBox.margin>
+    </HBox>
+  </children>
+</VBox>
   </children>
 </AnchorPane>
diff --git a/src/application/view/compra/Proveedores.fxml b/src/application/view/compra/Proveedores.fxml
index 4891ef5..8b823db 100644
--- a/src/application/view/compra/Proveedores.fxml
+++ b/src/application/view/compra/Proveedores.fxml
@@ -9,41 +9,37 @@
 
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.ProveedoresController">
    <children>
-      <Pane prefHeight="400.0" prefWidth="600.0">
+      <VBox alignment="CENTER_LEFT" layoutX="14.0" layoutY="19.0" prefHeight="381.0" prefWidth="586.0" spacing="10.0">
          <children>
-            <AnchorPane prefHeight="400.0" prefWidth="600.0">
+            <Label text="Proveedores" />
+            <TableView fx:id="proveedorTableView" pickOnBounds="false" prefHeight="194.0" prefWidth="600.0">
+              <columns>
+                  <TableColumn fx:id="idColumn" minWidth="0.0" prefWidth="0.0" text="id" />
+                <TableColumn fx:id="nombreTableColumn" prefWidth="155.0" text="Nombre" />
+                <TableColumn fx:id="cuitTableColumn" prefWidth="120.0" text="CUIT" />
+                  <TableColumn prefWidth="75.0" text="Domicilio">
+                     <columns>
+                        <TableColumn fx:id="calleTableColumn" prefWidth="103.0" text="Calle" />
+                        <TableColumn fx:id="numeroTableColumn" prefWidth="58.0" text="Numero" />
+                        <TableColumn fx:id="localidadTableColumn" prefWidth="150.0" text="Localidad" />
+                     </columns>
+                  </TableColumn>
+              </columns>
+            </TableView>
+            <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
                <children>
-                  <VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Proveedores" />
-                        <TableView fx:id="proveedorTableView" pickOnBounds="false" prefHeight="194.0" prefWidth="600.0">
-                          <columns>
-                              <TableColumn fx:id="idColumn" minWidth="0.0" prefWidth="0.0" text="id" />
-                            <TableColumn fx:id="nombreTableColumn" prefWidth="155.0" text="Nombre" />
-                            <TableColumn fx:id="cuitTableColumn" prefWidth="120.0" text="CUIT" />
-                              <TableColumn fx:id="calleTableColumn" prefWidth="103.0" text="Calle" />
-                              <TableColumn fx:id="numeroTableColumn" prefWidth="58.0" text="Numero" />
-                              <TableColumn fx:id="localidadTableColumn" prefWidth="163.0" text="Localidad" />
-                          </columns>
-                        </TableView>
-                        <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
-                           <children>
-                              <Button fx:id="buttonNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nuevo Proveedor" />
-                              <Button fx:id="buttonUpdate" alignment="CENTER" mnemonicParsing="false" onAction="#handleUpdate" text="Editar Proveedor" />
-                              <Button fx:id="buttonDelete" alignment="CENTER" mnemonicParsing="false" onAction="#handleDelete" text="Eliminar Proveedor" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                           <padding>
-                              <Insets top="30.0" />
-                           </padding>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <Button fx:id="buttonNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nuevo Proveedor" />
+                  <Button fx:id="buttonUpdate" alignment="CENTER" mnemonicParsing="false" onAction="#handleUpdate" text="Editar Proveedor" />
+                  <Button fx:id="buttonDelete" alignment="CENTER" mnemonicParsing="false" onAction="#handleDelete" text="Eliminar Proveedor" />
                </children>
-            </AnchorPane>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+               <padding>
+                  <Insets top="30.0" />
+               </padding>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/compra/cruds/ArticuloEdit.fxml b/src/application/view/compra/cruds/ArticuloEdit.fxml
index e2696e7..1e213c9 100644
--- a/src/application/view/compra/cruds/ArticuloEdit.fxml
+++ b/src/application/view/compra/cruds/ArticuloEdit.fxml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>
@@ -12,7 +16,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.ArticuloEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.ArticuloEditController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="387.0" prefWidth="473.0">
       <children>
diff --git a/src/application/view/compra/cruds/CategoriaArticuloEdit.fxml b/src/application/view/compra/cruds/CategoriaArticuloEdit.fxml
index 075363f..db425a6 100644
--- a/src/application/view/compra/cruds/CategoriaArticuloEdit.fxml
+++ b/src/application/view/compra/cruds/CategoriaArticuloEdit.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.CategoriaArticuloEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.CategoriaArticuloEditController">
    <children>
       <AnchorPane prefHeight="201.0" prefWidth="436.0">
          <children>
@@ -28,7 +28,7 @@
             <HBox layoutX="210.0" layoutY="147.0" spacing="15.0">
                <children>
                   <Button fx:id="btnOk" defaultButton="true" mnemonicParsing="false" onAction="#handleOk" text="Aceptar" />
-                  <Button fx:id="btnCancel" layoutX="305.0" layoutY="273.0" mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
+                  <Button fx:id="btnCancel" cancelButton="true" layoutX="305.0" layoutY="273.0" mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
                </children>
             </HBox>
          </children></AnchorPane>
diff --git a/src/application/view/compra/cruds/FacturaEdit.fxml b/src/application/view/compra/cruds/FacturaEdit.fxml
index 4459afc..e3ee5e3 100644
--- a/src/application/view/compra/cruds/FacturaEdit.fxml
+++ b/src/application/view/compra/cruds/FacturaEdit.fxml
@@ -21,7 +21,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.FacturaEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.FacturaEditController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="523.0" prefWidth="647.0">
       <children>
@@ -62,7 +62,7 @@
                   <TextField fx:id="cantidadField" onAction="#handleNewLine" GridPane.columnIndex="3" GridPane.rowIndex="10" />
                   <Button fx:id="agregarLineaButton" mnemonicParsing="false" onAction="#handleNewLine" text="+" GridPane.columnIndex="5" GridPane.rowIndex="12" />
                   <Button fx:id="quitarLineaButton" mnemonicParsing="false" onAction="#handleQuitLine" prefHeight="25.0" prefWidth="25.0" text="-" GridPane.columnIndex="5" GridPane.rowIndex="13" />
-                  <Label fx:id="impedirUpdateLineasLabel" prefHeight="17.0" prefWidth="441.0" text="Por Razones de integridad en los datos no se permite modificar lineas de compra" textFill="RED" GridPane.columnIndex="1" GridPane.columnSpan="4" GridPane.rowIndex="9">
+                  <Label fx:id="impedirUpdateLineasLabel" prefHeight="17.0" prefWidth="441.0" text="Por Razones de integridad en los datos no se permite modificar lineas de compra" textFill="#f20000" GridPane.columnIndex="1" GridPane.columnSpan="4" GridPane.rowIndex="9">
                      <font>
                         <Font name="System Italic" size="12.0" />
                      </font>
@@ -101,8 +101,8 @@
         </GridPane>
             <HBox alignment="CENTER" layoutY="444.0" prefHeight="79.0" prefWidth="647.0" spacing="20.0">
                <children>
-                  <Button fx:id="okButton" mnemonicParsing="false" onAction="#handleOK" text="Aceptar" />
-                  <Button fx:id="closeButton" mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
+                  <Button fx:id="okButton" defaultButton="true" mnemonicParsing="false" onAction="#handleOK" text="Aceptar" />
+                  <Button fx:id="closeButton" cancelButton="true" mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
                </children>
                <opaqueInsets>
                   <Insets />
diff --git a/src/application/view/compra/cruds/ProveedorEdit.fxml b/src/application/view/compra/cruds/ProveedorEdit.fxml
index 852e59e..97b380e 100644
--- a/src/application/view/compra/cruds/ProveedorEdit.fxml
+++ b/src/application/view/compra/cruds/ProveedorEdit.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.ProveedorEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.ProveedorEditController">
    <children>
       <AnchorPane prefHeight="416.0" prefWidth="528.0">
          <children>
diff --git a/src/application/view/compra/cruds/StockEdit.fxml b/src/application/view/compra/cruds/StockEdit.fxml
index e3c3a88..94252ad 100644
--- a/src/application/view/compra/cruds/StockEdit.fxml
+++ b/src/application/view/compra/cruds/StockEdit.fxml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
@@ -10,7 +14,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.StockEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.StockEditController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="387.0" prefWidth="473.0">
       <children>
diff --git a/src/application/view/css/theme.css b/src/application/view/css/theme.css
new file mode 100644
index 0000000..3c2fe7f
--- /dev/null
+++ b/src/application/view/css/theme.css
@@ -0,0 +1,440 @@
+/*
+*		FLATBEE by KarlTheBee´
+* An javafx css style for a smooth & flat user interface
+* Website : github.com/karlthebee/flatbee
+* Mail    : karlthebee@gmail.com
+*
+*	Version 1.0.0
+*
+* The license is pretty much a CC-BY-NC 4.0 license (https://creativecommons.org/licenses/by-nc/4.0/).
+* In simple (non legal) english :
+* you can modify and distribute it, ship in in your application,
+* but not use/sell it commercially.
+* And you have to give credits,
+* like "FlatBee theme by karlthebee (https://github.com/karlthebee/flatbee)"
+*/
+
+/*
+	* These are values you can edit safely.
+	The "color" is your main color (in this case greenish)
+	*/
+* {
+	-color : #2ecc71;
+	-white : #efefef;
+	-gray : #dfdfdf;
+	-darkGray : derive(-gray,-20%);
+	-black : #444444dd;
+	-abort : #e74c3c;
+}
+
+.root{
+	-fx-background-color : -white;
+	-fx-fill-width : true;
+	-fx-color : -color;
+	-fx-fill-height : true;
+	-fx-font-family: 'Segoe UI';
+	/* remove the ugly focus shade */
+	-fx-focus-color : transparent;
+	-fx-faint-focus-color: transparent;
+}
+
+#flatbee-tiny{
+	-fx-font-size : 8.0;
+}
+
+#flatbee-small{
+	-fx-font-size : 10.0;
+}
+
+#flatbee-medium{
+	-fx-font-size : 12.0;
+}
+
+#flatbee-large{
+	-fx-font-size : 18.0;
+}
+
+#flatbee-xlarge{
+	-fx-font-size : 24.0;
+}
+
+#flatbee-xxlarge{
+	-fx-font-size : 32.0;
+	-fx-font-weight: bold;
+}
+
+#flatbee-xxxlarge{
+	-fx-font-size : 40.0;
+	-fx-font-weight: bold;
+}
+
+#flatbee-jumbo{
+	-fx-font-size : 48.0;
+	-fx-font-weight: bold;
+}
+
+#flatbee-card{
+	-fx-spacing : 12.0;
+	-fx-padding : 10;
+	-fx-hgap : 10;
+	-fx-vgap : 10;
+	-fx-background-color : -white;
+	-fx-effect : dropshadow(two-pass-box,-black,10,0,0,0);
+}
+
+#flatbee-container{
+	-fx-spacing : 12.0;
+	-fx-padding : 10;
+	-fx-hgap : 10;
+	-fx-vgap : 10;
+}
+
+#flatbee-panel{
+	-fx-padding : 10;
+}
+
+/*
+ * **********
+ * LABELS
+ * **********
+*/
+.label{
+	 -fx-text-fill : -black;
+ }
+
+/*
+ * **********
+ * BUTTONS
+ * **********
+ *
+ */
+.button {
+	-fx-background-color : -gray,-gray,-gray,-gray;
+}
+.button:default{
+	-fx-background-color : -color;
+}
+.button:cancel{
+	-fx-background-color : -abort;
+}
+
+.button:focused {
+	-fx-color : -darkGray;
+   -fx-background-color : -darkGray;
+   -fx-focus-color : -darkGray;
+}
+.button:hover {
+    -fx-color: -darkGray;
+	-fx-inner-border : -darkGray;
+	-fx-body-color : -darkGray;
+}
+
+.button:armed {
+    -fx-color: -white;
+}
+
+
+.toggle-button{
+	-fx-background-color : -gray;
+}
+
+.toggle-button:selected{
+	-fx-background-color : -darkGray;
+}
+
+.menu-button{
+	-fx-background-color : -gray;
+}
+
+.split-menu-button{
+	-fx-background-color : -gray;
+}
+
+.split-menu-button>*.label{
+	-fx-background-color : -gray;
+}
+
+.split-menu-button>*.arrow-button{
+	-fx-background-color : -gray;
+}
+
+
+/*
+ * **********
+ * PROGRESSBAR
+ * **********
+ *
+ */
+.progress-indicator {
+	-fx-indeterminate-segment-count : 12;
+	-fx-progress-color : -color;
+	-fx-spin-enabled : true;
+}
+
+.progress-bar>*.bar{
+	 -fx-background-color : -color;
+ }
+
+.progress-bar>*.track{
+	 -fx-background-color : -gray;
+ }
+
+.progress-bar:determinate>*.determinate-indicator>*.track{
+	 -fx-background-color : -gray;
+ }
+
+.progress-bar:determinate>*.determinate-indicator>*.indicator{
+	 -fx-background-color : -gray;
+ }
+
+ /*
+ * **********
+ * DATE PICKER
+ * **********
+ *
+ */
+.date-picker{
+	-fx-background-color : -white,-gray,gray;
+}
+
+.date-picker>*.arrow-button{
+	-fx-background-color : -white,-gray,-gray;
+}
+
+ .date-picker>*.arrow-button>*.arrow{
+	-fx-background-color : -darkGray, -black;
+}
+/*
+ * **********
+ * SLIDER
+ * **********
+ *
+ */
+ .slider>*.track{
+	 -fx-background-color : -gray;
+ }
+.slider>*.axis:bottom{
+	-fx-tick-label-font-family : 'Segoe UI';
+}
+
+.slider>*.thumb{
+	-fx-background-color : -color;
+}
+
+/*
+ * **********
+ * COMBOBOX
+ * **********
+ *
+ */
+.combo-box {
+	-fx-background-color : -gray;
+}
+
+.check-box>*.box{
+	-fx-background-color : -color;
+}
+
+
+/*
+ * **********
+ * TABPANE
+ * **********
+ *
+ */
+ .tab-pane>*.tab-header-area{
+	 -fx-padding : 0,0,0,0;
+ }
+.tab-pane>*.tab-header-area>*.headers-region>*.tab:selected:top{
+	-fx-padding : 6,6,6,6;
+	-fx-text-fill : -white;
+	-fx-background-color : -color;
+}
+.tab-pane>*.tab-header-area>*.headers-region>*.tab:selected>*.tab-container>*.tab-label{
+	-fx-font-size : 13.0;
+	-fx-font-weight: bold;
+}
+
+.tab-pane>*.tab-header-area>*.headers-region>*.tab:top{
+	-fx-padding : 4,4,4,4;
+	-fx-text-fill : -white;
+	-fx-background-color : -white;
+}
+
+.tab-pane>*.tab-header-area>*.control-buttons-tab>*.container>*.tab-down-button{
+	-fx-background-color : -white;
+}
+
+.tab-pane>*.tab-header-area>*.control-buttons-tab>*.container>*.tab-down-button>*.arrow{
+	-fx-background-color : -darkGray;
+}
+
+
+/*
+ * **********
+ * MENU
+ * **********
+ *
+ */
+.menu-bar{
+	-fx-background-color : -gray;
+}
+
+
+/*
+ * **********
+ * Checkbox
+ * **********
+ *
+ */
+ .check-box>*.box{
+	 -fx-background-color : -gray;
+ }
+
+ .check-box:selected>*.box>*.mark{
+	 -fx-background-color : -black;
+ }
+.check-box:indeterminate>*.box>*.mark{
+	 -fx-background-color : -black;
+ }
+
+
+ /*
+ * **********
+ * RADIO BUTTONS
+ * **********
+ *
+ */
+ .radio-button>*.radio{
+	-fx-background-color : -gray;
+ }
+
+ .radio-button:selected>*.radio>*.dot{
+	 -fx-background-color : -black;
+ }
+
+/*
+ * **********
+ * Text fields / inputs
+ * **********
+ *
+ */
+.text-field{
+	-fx-highlight-fill : -color;
+	-fx-highlight-text-fill : -white;
+}
+
+.text-area{
+	-fx-highlight-fill : -color;
+	-fx-highlight-text-fill : -white;
+}
+
+.spinner>*.increment-arrow-button{
+	-fx-background-color : -gray;
+}
+
+.spinner>*.decrement-arrow-button{
+	-fx-background-color : -gray;
+}
+/*
+ * **********
+ * Titled Pane
+ * **********
+ *
+ */
+
+.first-titled-pane:expanded>*.title{
+	-fx-background-color : -color;
+}
+
+.titled-pane:expanded>*.title{
+	-fx-background-color : -color;
+}
+
+.titled-pane:collapsed>*.title{
+	-fx-background-color : -gray;
+}
+
+.titled-pane*>*.title>*.arrow-button>*.arrow{
+	-fx-background-color : -black;
+}
+
+/*
+ * **********
+ * Table
+ * **********
+ *
+ */
+.table-view:row-selection{
+	-fx-background-color : -gray;
+}
+
+.table-view:row-selection>*.column-header-background{
+	-fx-background-color : -white;
+}
+
+.table-view>*.column-resize-line{
+	-fx-background-color : -black;
+}
+
+.table-view>*.column-header-background>*.nested-column-header>*.table-column{
+	-fx-background-color : -darkGray, -white;
+}
+
+.table-view>*.column-header-background>*.filler{
+	-fx-background-color : -darkGray, -gray;
+}
+
+.table-view>*.column-header-background>*.show-hide-columns-button{
+	-fx-background-color : -gray;
+}
+
+
+.tree-table-view:row-selection{
+	-fx-background-color : -gray;
+}
+
+.tree-table-view:row-selection>*.column-header-background{
+	-fx-background-color : -white;
+}
+
+.tree-table-view>*.column-resize-line{
+	-fx-background-color : -black;
+}
+
+.tree-table-view>*.column-header-background>*.nested-column-header>*.table-column{
+	-fx-background-color : -darkGray, -white;
+}
+
+.tree-table-view>*.column-header-background>*.filler{
+	-fx-background-color : -darkGray, -gray;
+}
+
+.tree-table-view>*.column-header-background>*.show-hide-columns-button{
+	-fx-background-color : -gray;
+}
+
+
+/*
+ * **********
+ * Color picker
+ * **********
+ *
+ */
+.color-picker{
+	-fx-background-color : -gray;
+}
+
+/*
+ * **********
+ * Scroll pane
+ * **********
+ *
+ */
+.scroll-pane>*.scroll-bar{
+	-fx-background-color : -gray;
+}
+
+.scroll-pane>*.scroll-bar>*.thumb{
+	-fx-background-color : -color;
+}
diff --git a/src/application/view/info/AdministrarEmpleados.fxml b/src/application/view/info/AdministrarEmpleados.fxml
index 32b098a..eafe448 100644
--- a/src/application/view/info/AdministrarEmpleados.fxml
+++ b/src/application/view/info/AdministrarEmpleados.fxml
@@ -9,50 +9,40 @@
 
 <AnchorPane prefHeight="400.0" prefWidth="772.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.AdministrarEmpleadosController">
    <children>
-      <Pane prefHeight="400.0" prefWidth="772.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <VBox layoutX="20.0" layoutY="14.0" prefHeight="386.0" prefWidth="735.0" spacing="20.0">
          <children>
-            <AnchorPane prefHeight="400.0" prefWidth="772.0">
+            <Label text="Empleados" />
+            <TableView fx:id="empleadoTable" pickOnBounds="false" prefHeight="283.0" prefWidth="772.0">
+              <columns>
+                <TableColumn fx:id="nombreColumn" prefWidth="75.0" text="Nombre" />
+                <TableColumn fx:id="apellidoColumn" prefWidth="75.0" text="Apellido" />
+                  <TableColumn prefWidth="75.0" text="Domicilio">
+                     <columns>
+                        <TableColumn fx:id="calleColumn" prefWidth="75.0" text="Calle" />
+                        <TableColumn fx:id="numeroColumn" prefWidth="75.0" text="Numero" />
+                        <TableColumn fx:id="localidadColumn" prefWidth="75.0" text="Localidad" />
+                        <TableColumn fx:id="provinciaColumn" prefWidth="75.0" text="Provincia" />
+                     </columns>
+                  </TableColumn>
+                  <TableColumn fx:id="nacimientoColumn" prefWidth="90.0" text="Nacimiento" />
+                  <TableColumn fx:id="cuitColumn" prefWidth="75.0" text="CUIT" />
+                  <TableColumn fx:id="categoriaColumn" prefWidth="75.0" text="Categoria" />
+              </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+            <HBox alignment="CENTER" prefHeight="96.0" prefWidth="772.0" spacing="20.0">
                <children>
-                  <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Empleados" />
-                        <TableView fx:id="empleadoTable" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
-                          <columns>
-                            <TableColumn fx:id="nombreColumn" prefWidth="75.0" text="Nombre" />
-                            <TableColumn fx:id="apellidoColumn" prefWidth="75.0" text="Apellido" />
-                              <TableColumn prefWidth="75.0" text="Domicilio">
-                                 <columns>
-                                    <TableColumn fx:id="calleColumn" prefWidth="75.0" text="Calle" />
-                                    <TableColumn fx:id="numeroColumn" prefWidth="75.0" text="Numero" />
-                                    <TableColumn fx:id="localidadColumn" prefWidth="75.0" text="Localidad" />
-                                    <TableColumn fx:id="provinciaColumn" prefWidth="75.0" text="Provincia" />
-                                 </columns></TableColumn>
-                              <TableColumn fx:id="nacimientoColumn" prefWidth="90.0" text="Nacimiento" />
-                              <TableColumn fx:id="cuitColumn" prefWidth="75.0" text="CUIT" />
-                              <TableColumn fx:id="categoriaColumn" prefWidth="75.0" text="Categoria" />
-                          </columns>
-                           <columnResizePolicy>
-                              <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                           </columnResizePolicy>
-                        </TableView>
-                        <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
-                           <children>
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nuevo Empleado" />
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEditPerson" text="Editar Empleado" />
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleDeleteEmpleado" text="Dar de Baja Empleado" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                           <padding>
-                              <Insets top="30.0" />
-                           </padding>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nuevo Empleado" />
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEditPerson" text="Editar Empleado" />
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleDeleteEmpleado" text="Dar de Baja Empleado" />
                </children>
-            </AnchorPane>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/info/AdministrarUsuarios.fxml b/src/application/view/info/AdministrarUsuarios.fxml
index df81a41..2cd2ed8 100644
--- a/src/application/view/info/AdministrarUsuarios.fxml
+++ b/src/application/view/info/AdministrarUsuarios.fxml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
@@ -12,38 +16,30 @@
 
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.AdministrarUsuariosController">
    <children>
-      <Pane prefHeight="400.0" prefWidth="600.0">
+      <VBox alignment="CENTER_LEFT" layoutX="18.0" layoutY="13.0" prefHeight="387.0" prefWidth="582.0" spacing="20.0">
          <children>
-            <AnchorPane prefHeight="400.0" prefWidth="600.0">
+            <Label text="Usuario" />
+            <TableView fx:id="usuarioTable" pickOnBounds="false" prefHeight="316.0" prefWidth="600.0">
+              <columns>
+                <TableColumn fx:id="usuarioColumn" prefWidth="75.0" text="Usuario" />
+                  <TableColumn fx:id="nombreColumn" prefWidth="75.0" text="Nombre" />
+                  <TableColumn fx:id="apellidoColumn" prefWidth="75.0" text="Apellido" />
+              </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+            <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="20.0">
                <children>
-                  <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Usuario" />
-                        <TableView fx:id="usuarioTable" pickOnBounds="false" prefHeight="316.0" prefWidth="600.0">
-                          <columns>
-                            <TableColumn fx:id="usuarioColumn" prefWidth="75.0" text="Usuario" />
-                              <TableColumn fx:id="nombreColumn" prefWidth="75.0" text="Nombre" />
-                              <TableColumn fx:id="apellidoColumn" prefWidth="75.0" text="Apellido" />
-                          </columns>
-                           <columnResizePolicy>
-                              <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                           </columnResizePolicy>
-                        </TableView>
-                        <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
-                           <children>
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleNewUsuario" text="Nuevo Usuario" />
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEditUsuario" text="Editar Usuario" />
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleDeleteUsuario" text="Eliminar Usuario" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleNewUsuario" text="Nuevo Usuario" />
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEditUsuario" text="Editar Usuario" />
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleDeleteUsuario" text="Eliminar Usuario" />
                </children>
-            </AnchorPane>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/info/Desempleados.fxml b/src/application/view/info/Desempleados.fxml
index e3841d1..424317b 100644
--- a/src/application/view/info/Desempleados.fxml
+++ b/src/application/view/info/Desempleados.fxml
@@ -7,40 +7,30 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.AnchorPane?>
 
-<AnchorPane prefHeight="400.0" prefWidth="832.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.DesempleadosController">
+<AnchorPane prefHeight="328.0" prefWidth="832.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.DesempleadosController">
    <children>
-      <Pane prefHeight="400.0" prefWidth="814.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="0.0">
+      <VBox alignment="CENTER_LEFT" layoutX="14.0" layoutY="14.0" prefHeight="281.0" prefWidth="798.0" spacing="20.0">
          <children>
-            <AnchorPane prefHeight="400.0" prefWidth="814.0">
-               <children>
-                  <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Empleados dados de baja" />
-                        <TableView fx:id="empleadoTable" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
-                          <columns>
-                            <TableColumn fx:id="nombreColumn" prefWidth="75.0" text="Nombre" />
-                            <TableColumn fx:id="apellidoColumn" prefWidth="75.0" text="Apellido" />
-                              <TableColumn prefWidth="75.0" text="Domicilio">
-                                 <columns>
-                                    <TableColumn fx:id="calleColumn" prefWidth="75.0" text="Calle" />
-                                    <TableColumn fx:id="numeroColumn" prefWidth="75.0" text="Numero" />
-                                    <TableColumn fx:id="localidadColumn" prefWidth="75.0" text="Localidad" />
-                                    <TableColumn fx:id="provinciaColumn" prefWidth="75.0" text="Provincia" />
-                                 </columns></TableColumn>
-                              <TableColumn fx:id="nacimientoColumn" prefWidth="90.0" text="Nacimiento" />
-                              <TableColumn fx:id="cuitColumn" prefWidth="75.0" text="CUIT" />
-                              <TableColumn fx:id="categoriaColumn" prefWidth="75.0" text="Categoria" />
-                              <TableColumn fx:id="fechaBajaColumn" prefWidth="75.0" text="Fecha de baja" />
-                          </columns>
-                           <columnResizePolicy>
-                              <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                           </columnResizePolicy>
-                        </TableView>
-                     </children>
-                  </VBox>
-               </children>
-            </AnchorPane>
+            <Label text="Empleados dados de baja" />
+            <TableView fx:id="empleadoTable" pickOnBounds="false" prefHeight="233.0" prefWidth="782.0">
+              <columns>
+                <TableColumn fx:id="nombreColumn" prefWidth="75.0" text="Nombre" />
+                <TableColumn fx:id="apellidoColumn" prefWidth="75.0" text="Apellido" />
+                  <TableColumn prefWidth="75.0" text="Domicilio">
+                     <columns>
+                        <TableColumn fx:id="calleColumn" prefWidth="75.0" text="Calle" />
+                        <TableColumn fx:id="numeroColumn" prefWidth="75.0" text="Numero" />
+                        <TableColumn fx:id="localidadColumn" prefWidth="75.0" text="Localidad" />
+                        <TableColumn fx:id="provinciaColumn" prefWidth="75.0" text="Provincia" />
+                     </columns>
+                  </TableColumn>
+                  <TableColumn fx:id="nacimientoColumn" prefWidth="90.0" text="Nacimiento" />
+                  <TableColumn fx:id="cuitColumn" prefWidth="75.0" text="CUIT" />
+                  <TableColumn fx:id="categoriaColumn" prefWidth="93.0" text="Categoria" />
+                  <TableColumn fx:id="fechaBajaColumn" prefWidth="89.0" text="Fecha de baja" />
+              </columns>
+            </TableView>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/info/GrupoFamiliar.fxml b/src/application/view/info/GrupoFamiliar.fxml
index 5a460f1..a045177 100644
--- a/src/application/view/info/GrupoFamiliar.fxml
+++ b/src/application/view/info/GrupoFamiliar.fxml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
@@ -11,7 +14,7 @@
 
 <AnchorPane prefHeight="406.0" prefWidth="612.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.GrupoFamiliarController">
    <children>
-      <VBox layoutX="12.0" layoutY="14.0" prefHeight="388.0" prefWidth="600.0" AnchorPane.bottomAnchor="4.0" AnchorPane.topAnchor="14.0">
+      <VBox layoutX="24.0" layoutY="14.0" prefHeight="388.0" prefWidth="588.0" AnchorPane.bottomAnchor="4.0" AnchorPane.topAnchor="14.0">
          <children>
             <Label text="Grupo Familiar" />
             <HBox alignment="CENTER" prefHeight="71.0" prefWidth="600.0" spacing="20.0">
diff --git a/src/application/view/info/InfoCategoriaEmpleado.fxml b/src/application/view/info/InfoCategoriaEmpleado.fxml
index 534f878..819919c 100644
--- a/src/application/view/info/InfoCategoriaEmpleado.fxml
+++ b/src/application/view/info/InfoCategoriaEmpleado.fxml
@@ -9,40 +9,29 @@
 
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.InfoCategoriaEmpleadoController">
    <children>
-      <Pane prefHeight="400.0" prefWidth="600.0">
+      <VBox alignment="CENTER_LEFT" layoutX="17.0" layoutY="17.0" prefHeight="383.0" prefWidth="583.0" spacing="20.0">
          <children>
-            <AnchorPane prefHeight="400.0" prefWidth="600.0">
+            <Label text="Categoría Empleado" />
+            <TableView fx:id="ceTableView" pickOnBounds="false" prefHeight="263.0" prefWidth="600.0">
+              <columns>
+                <TableColumn fx:id="idCategoriaEmpleadoTableColumn" prefWidth="75.0" text="id" />
+                <TableColumn fx:id="nombreCategoriaTableColumn" prefWidth="75.0" text="Nombre Categoría" />
+              </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+            <HBox alignment="CENTER" prefHeight="82.0" prefWidth="600.0" spacing="20.0">
                <children>
-                  <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Categoría Empleado" />
-                        <TableView fx:id="ceTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
-                          <columns>
-                            <TableColumn fx:id="idCategoriaEmpleadoTableColumn" prefWidth="75.0" text="id" />
-                            <TableColumn fx:id="nombreCategoriaTableColumn" prefWidth="75.0" text="Nombre Categoría" />
-                          </columns>
-                           <columnResizePolicy>
-                              <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                           </columnResizePolicy>
-                        </TableView>
-                        <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
-                           <children>
-                              <Button fx:id="btnNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNewCategoriaEmpleado" text="Nueva Categoría" />
-                              <Button fx:id="btnEdit" alignment="CENTER" mnemonicParsing="false" onAction="#handleEditCategoriaEmpleado" text="Editar Categoría" />
-                              <Button fx:id="btnEliminar" alignment="CENTER" mnemonicParsing="false" onAction="#handleEliminarAcoplado" text="Eliminar Categoría" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                           <padding>
-                              <Insets top="30.0" />
-                           </padding>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <Button fx:id="btnNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNewCategoriaEmpleado" text="Nueva Categoría" />
+                  <Button fx:id="btnEdit" alignment="CENTER" mnemonicParsing="false" onAction="#handleEditCategoriaEmpleado" text="Editar Categoría" />
+                  <Button fx:id="btnEliminar" alignment="CENTER" mnemonicParsing="false" onAction="#handleEliminarAcoplado" text="Eliminar Categoría" />
                </children>
-            </AnchorPane>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/info/InfoDomicilio.fxml b/src/application/view/info/InfoDomicilio.fxml
index 33061ca..8b24bb3 100644
--- a/src/application/view/info/InfoDomicilio.fxml
+++ b/src/application/view/info/InfoDomicilio.fxml
@@ -9,42 +9,31 @@
 
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <Pane prefHeight="400.0" prefWidth="600.0">
+      <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="17.0" prefHeight="383.0" prefWidth="581.0" spacing="20.0">
          <children>
-            <AnchorPane prefHeight="400.0" prefWidth="600.0">
+            <Label text="Domicilio" />
+            <TableView pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
+              <columns>
+                <TableColumn prefWidth="75.0" text="id" />
+                  <TableColumn prefWidth="75.0" text="Calle" />
+                  <TableColumn prefWidth="75.0" text="Numero" />
+                  <TableColumn prefWidth="75.0" text="Localidad" />
+              </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+            <HBox alignment="CENTER" prefHeight="83.0" prefWidth="600.0" spacing="20.0">
                <children>
-                  <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Domicilio" />
-                        <TableView pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
-                          <columns>
-                            <TableColumn prefWidth="75.0" text="id" />
-                              <TableColumn prefWidth="75.0" text="Calle" />
-                              <TableColumn prefWidth="75.0" text="Numero" />
-                              <TableColumn prefWidth="75.0" text="Localidad" />
-                          </columns>
-                           <columnResizePolicy>
-                              <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                           </columnResizePolicy>
-                        </TableView>
-                        <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
-                           <children>
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleNewEmpleado" text="Nuevo Domicilio" />
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEditPerson" text="Editar Domiclio" />
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleDeleteEmpleado" text="Eliminar Domicilio" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                           <padding>
-                              <Insets top="30.0" />
-                           </padding>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleNewEmpleado" text="Nuevo Domicilio" />
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEditPerson" text="Editar Domiclio" />
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleDeleteEmpleado" text="Eliminar Domicilio" />
                </children>
-            </AnchorPane>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/info/cruds/CategoriaEmpleadoEdit.fxml b/src/application/view/info/cruds/CategoriaEmpleadoEdit.fxml
index 3059e52..50bc762 100644
--- a/src/application/view/info/cruds/CategoriaEmpleadoEdit.fxml
+++ b/src/application/view/info/cruds/CategoriaEmpleadoEdit.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.CategoriaEmpleadoEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.CategoriaEmpleadoEditController">
   <children>
     <AnchorPane prefHeight="181.0" prefWidth="479.0">
       <children>
diff --git a/src/application/view/info/cruds/EditarEmpleadoDialog.fxml b/src/application/view/info/cruds/EditarEmpleadoDialog.fxml
index 3eea071..0bd5262 100644
--- a/src/application/view/info/cruds/EditarEmpleadoDialog.fxml
+++ b/src/application/view/info/cruds/EditarEmpleadoDialog.fxml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.DatePicker?>
@@ -13,7 +17,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane prefHeight="329.0" prefWidth="593.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.EmpleadoEditDialogController">
+<AnchorPane prefHeight="329.0" prefWidth="593.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.EmpleadoEditDialogController">
    <children>
       <VBox layoutX="13.0" layoutY="46.0">
          <children>
diff --git a/src/application/view/info/cruds/EditarUsuarioDialog.fxml b/src/application/view/info/cruds/EditarUsuarioDialog.fxml
index fbe2882..0c0533d 100644
--- a/src/application/view/info/cruds/EditarUsuarioDialog.fxml
+++ b/src/application/view/info/cruds/EditarUsuarioDialog.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.AnchorPane?>
 
-<AnchorPane prefHeight="472.0" prefWidth="617.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.UsuarioEditDialogController">
+<AnchorPane prefHeight="472.0" prefWidth="617.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.UsuarioEditDialogController">
    <children>
       <GridPane prefHeight="90.0" prefWidth="400.0" AnchorPane.leftAnchor="100.0" AnchorPane.topAnchor="100.0">
         <columnConstraints>
diff --git a/src/application/view/info/cruds/FamiliarEdit.fxml b/src/application/view/info/cruds/FamiliarEdit.fxml
index 686a63f..83c0ff8 100644
--- a/src/application/view/info/cruds/FamiliarEdit.fxml
+++ b/src/application/view/info/cruds/FamiliarEdit.fxml
@@ -16,7 +16,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.FamiliarEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.FamiliarEditController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="387.0" prefWidth="473.0">
       <children>
diff --git a/src/application/view/inicio/HomeController.java b/src/application/view/inicio/HomeController.java
index f91037a..40ec9b9 100644
--- a/src/application/view/inicio/HomeController.java
+++ b/src/application/view/inicio/HomeController.java
@@ -32,7 +32,7 @@ public void setOwner(Stage owner){
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        File file = new File("src/img/cañasprincipal.jpg");
+        File file = new File("src/resources/cañasprincipal.jpg");
         Image image = new Image(file.toURI().toString());
         imageView.setImage(image);
     }
diff --git a/src/application/view/inicio/Organizacion.fxml b/src/application/view/inicio/Organizacion.fxml
index 913c761..2bd0d3a 100644
--- a/src/application/view/inicio/Organizacion.fxml
+++ b/src/application/view/inicio/Organizacion.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.image.*?>
 <?import javafx.scene.text.*?>
 <?import java.lang.*?>
 <?import java.util.*?>
@@ -7,7 +8,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.inicio.OrganizacionController">
+<AnchorPane prefHeight="551.0" prefWidth="820.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.inicio.OrganizacionController">
    <children>
       <VBox alignment="CENTER" layoutY="40.0" prefHeight="265.0" prefWidth="600.0" AnchorPane.bottomAnchor="95.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="40.0">
          <children>
@@ -69,5 +70,6 @@
          </children>
       </VBox>
       <Label layoutX="14.0" layoutY="14.0" prefHeight="26.0" prefWidth="143.0" text="Datos de la Organización" />
+      <ImageView fx:id="imagenCamion" fitHeight="306.0" fitWidth="346.0" layoutY="245.0" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" />
    </children>
 </AnchorPane>
diff --git a/src/application/view/inicio/OrganizacionController.java b/src/application/view/inicio/OrganizacionController.java
index 565b3ba..ca29390 100644
--- a/src/application/view/inicio/OrganizacionController.java
+++ b/src/application/view/inicio/OrganizacionController.java
@@ -11,9 +11,12 @@
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
@@ -34,6 +37,9 @@ public class OrganizacionController implements Initializable{
     @FXML
     private Button actualizarDatosOrganizacionLabel;
 
+    @FXML
+    private ImageView imagenCamion;
+
     Organizacion organizacion = new Organizacion();
     OrganizacionRepository repository = new OrganizacionRepository();
     private Stage owner;
@@ -44,6 +50,9 @@ public void setOwner(Stage owner) {
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
+        File file = new File("src/resources/volks.png");
+        Image image = new Image(file.toURI().toString());
+        imagenCamion.setImage(image);
         cargarDatosOrganizacion();
     }
 
@@ -60,6 +69,7 @@ private void cargarDatosOrganizacion() {
     @FXML
     public void handleNew(){
         handleEdit(organizacion);
+        cargarDatosOrganizacion();
     }
 
     private void handleEdit(Organizacion organizacion){
diff --git a/src/application/view/inicio/crud/OrganizacionEdit.fxml b/src/application/view/inicio/crud/OrganizacionEdit.fxml
index 915eeb4..d4d1d9a 100644
--- a/src/application/view/inicio/crud/OrganizacionEdit.fxml
+++ b/src/application/view/inicio/crud/OrganizacionEdit.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.inicio.crud.OrganizacionEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.inicio.crud.OrganizacionEditController">
    <children>
       <AnchorPane prefHeight="548.0" prefWidth="528.0">
          <children>
diff --git a/src/application/view/sueldo/ConceptosSalariales.fxml b/src/application/view/sueldo/ConceptosSalariales.fxml
index e31d553..b00e494 100644
--- a/src/application/view/sueldo/ConceptosSalariales.fxml
+++ b/src/application/view/sueldo/ConceptosSalariales.fxml
@@ -14,45 +14,34 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.sueldo.ConceptosSalarialesController">
+<AnchorPane prefHeight="400.0" prefWidth="617.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.sueldo.ConceptosSalarialesController">
    <children>
-      <Pane prefHeight="400.0" prefWidth="600.0">
+      <VBox alignment="CENTER_LEFT" layoutX="20.0" layoutY="11.0" prefHeight="389.0" prefWidth="580.0" spacing="20.0">
          <children>
-            <AnchorPane prefHeight="400.0" prefWidth="600.0">
+            <Label text="Conceptos de Sueldo" />
+            <TableView fx:id="conceptoSueldoTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
+              <columns>
+                  <TableColumn fx:id="idConceptoSueldoColumn" prefWidth="90.0" text="id" />
+                <TableColumn fx:id="descripcionColumn" prefWidth="75.0" text="Descripción" />
+                <TableColumn fx:id="cantidadColumn" prefWidth="75.0" text="Cantidad" />
+                  <TableColumn fx:id="tipoConceptoColumn" prefWidth="75.0" text="Tipo Concepto" />
+                  <TableColumn fx:id="tipoCantidadColumn" prefWidth="75.0" text="Tipo Cantidad" />
+              </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+            <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
                <children>
-                  <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Conceptos de Sueldo" />
-                        <TableView fx:id="conceptoSueldoTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
-                          <columns>
-                              <TableColumn fx:id="idConceptoSueldoColumn" prefWidth="90.0" text="id" />
-                            <TableColumn fx:id="descripcionColumn" prefWidth="75.0" text="Descripción" />
-                            <TableColumn fx:id="cantidadColumn" prefWidth="75.0" text="Cantidad" />
-                              <TableColumn fx:id="tipoConceptoColumn" prefWidth="75.0" text="Tipo Concepto" />
-                              <TableColumn fx:id="tipoCantidadColumn" prefWidth="75.0" text="Tipo Cantidad" />
-                          </columns>
-                           <columnResizePolicy>
-                              <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                           </columnResizePolicy>
-                        </TableView>
-                        <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
-                           <children>
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nuevo Concepto" />
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEdit" text="Editar Concepto" />
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleDelete" text="Eliminar Concepto" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                           <padding>
-                              <Insets top="30.0" />
-                           </padding>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nuevo Concepto" />
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEdit" text="Editar Concepto" />
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleDelete" text="Eliminar Concepto" />
                </children>
-            </AnchorPane>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/sueldo/Liquidaciones.fxml b/src/application/view/sueldo/Liquidaciones.fxml
index 80800ae..e02a83b 100644
--- a/src/application/view/sueldo/Liquidaciones.fxml
+++ b/src/application/view/sueldo/Liquidaciones.fxml
@@ -18,69 +18,48 @@
 
 <AnchorPane prefHeight="450.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.sueldo.LiquidacionesController">
    <children>
-      <GridPane layoutX="14.0" layoutY="-1.0" prefHeight="450.0" prefWidth="695.0">
-         <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="327.5" minWidth="10.0" prefWidth="231.0" />
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="350.0" minWidth="10.0" prefWidth="252.5" />
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="206.5" minWidth="10.0" prefWidth="206.5" />
-         </columnConstraints>
-         <rowConstraints>
-            <RowConstraints maxHeight="47.0" minHeight="10.0" prefHeight="29.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="159.33333206176758" minHeight="10.0" prefHeight="156.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="53.0" minHeight="0.0" prefHeight="26.666656494140625" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="127.0" minHeight="10.0" prefHeight="127.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="57.0" minHeight="0.0" prefHeight="28.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="42.333343505859375" minHeight="10.0" prefHeight="41.0" vgrow="SOMETIMES" />
-         </rowConstraints>
+      <VBox alignment="CENTER_LEFT" layoutX="17.0" layoutY="14.0" prefHeight="476.0" prefWidth="683.0" spacing="10.0">
          <children>
-            <HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="3" GridPane.rowIndex="5">
+            <Label text="Liquidaciones" />
+            <TableView fx:id="liquidacionTable" onMouseClicked="#cargarEmpleadosLiquidados" pickOnBounds="false" prefHeight="157.0" prefWidth="677.0">
+               <columns>
+                  <TableColumn fx:id="idLiquidacion" prefWidth="60.5" resizable="false" text="Nro" />
+                  <TableColumn fx:id="fechaColumn" minWidth="0.0" prefWidth="138.5" text="Fecha" />
+                  <TableColumn fx:id="hrColumn" prefWidth="155.0" text="Haberes Remunerativos" />
+                  <TableColumn fx:id="hnrColumn" maxWidth="330.5" minWidth="-1.0" prefWidth="190.5" text="Haberes No Remunerativos" />
+                  <TableColumn fx:id="retencionesColumn" maxWidth="283.0" minWidth="-1.0" prefWidth="153.0" text="Retenciones" />
+               </columns>
+            </TableView>
+            <Label text="Empleados Liquidados" />
+            <TableView fx:id="empleadosTable" onMouseClicked="#cargarEmpleadosLiquidados" prefHeight="164.0" prefWidth="678.0">
+               <columns>
+                  <TableColumn fx:id="legajoColumn" prefWidth="312.0" text="Legajo" />
+                  <TableColumn fx:id="apellidoColumn" prefWidth="105.0" text="Apellido" />
+                  <TableColumn fx:id="nombreColumn" prefWidth="118.0" text="Nombre" />
+                  <TableColumn fx:id="categoriaColumn" prefWidth="64.0" text="Categoria" />
+                  <TableColumn fx:id="hrEmpleadoColumn" prefWidth="75.0" text="HR" />
+                  <TableColumn fx:id="hnrEmpleadoColumn" prefWidth="75.0" text="HNR" />
+                  <TableColumn fx:id="retencionesEmpleadoColumn" prefWidth="75.0" text="Rentenciones" />
+               </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0">
                <children>
                   <Button fx:id="nuevaLiquidacionButton" alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleNew" prefHeight="31.0" prefWidth="114.0" text="Nueva Liquidacion" textAlignment="CENTER">
                      <HBox.margin>
-                        <Insets left="150.0" top="5.0" />
+                        <Insets />
                      </HBox.margin>
                   </Button>
                   <Button fx:id="reportesButton" alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" prefHeight="31.0" prefWidth="114.0" text="Reportes" textAlignment="CENTER">
                      <HBox.margin>
-                        <Insets left="150.0" top="5.0" />
+                        <Insets />
                      </HBox.margin>
                   </Button>
                </children>
             </HBox>
-            <Label text="Empleados Liquidados" GridPane.rowIndex="2" />
-            <ScrollPane prefHeight="92.0" prefWidth="701.0" GridPane.columnSpan="3" GridPane.rowIndex="1">
-               <content>
-                  <TableView fx:id="liquidacionTable" onMouseClicked="#cargarEmpleadosLiquidados" pickOnBounds="false" prefHeight="157.0" prefWidth="677.0">
-                     <columns>
-                        <TableColumn fx:id="idLiquidacion" prefWidth="60.5" resizable="false" text="Nro" />
-                        <TableColumn fx:id="fechaColumn" minWidth="0.0" prefWidth="138.5" text="Fecha" />
-                        <TableColumn fx:id="hrColumn" prefWidth="155.0" text="Haberes Remunerativos" />
-                        <TableColumn fx:id="hnrColumn" maxWidth="330.5" minWidth="-1.0" prefWidth="190.5" text="Haberes No Remunerativos" />
-                        <TableColumn fx:id="retencionesColumn" maxWidth="283.0" minWidth="-1.0" prefWidth="132.5" text="Retenciones" />
-                     </columns>
-                  </TableView>
-               </content>
-            </ScrollPane>
-            <ScrollPane prefHeight="109.0" prefWidth="695.0" GridPane.columnSpan="3" GridPane.rowIndex="3" GridPane.rowSpan="2">
-               <content>
-                  <TableView fx:id="empleadosTable" onMouseClicked="#cargarEmpleadosLiquidados" prefHeight="164.0" prefWidth="678.0">
-                     <columns>
-                        <TableColumn fx:id="legajoColumn" prefWidth="312.0" text="Legajo" />
-                        <TableColumn fx:id="apellidoColumn" prefWidth="105.0" text="Apellido" />
-                        <TableColumn fx:id="nombreColumn" prefWidth="118.0" text="Nombre" />
-                        <TableColumn fx:id="categoriaColumn" prefWidth="64.0" text="Categoria" />
-                        <TableColumn fx:id="hrEmpleadoColumn" prefWidth="75.0" text="HR" />
-                        <TableColumn fx:id="hnrEmpleadoColumn" prefWidth="75.0" text="HNR" />
-                        <TableColumn fx:id="retencionesEmpleadoColumn" prefWidth="75.0" text="Rentenciones" />
-                     </columns>
-                     <columnResizePolicy>
-                        <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                     </columnResizePolicy>
-                  </TableView>
-               </content>
-            </ScrollPane>
-            <Label text="Liquidaciones" />
          </children>
-      </GridPane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/sueldo/cruds/ConceptoEdit.fxml b/src/application/view/sueldo/cruds/ConceptoEdit.fxml
index de7b423..59206ac 100644
--- a/src/application/view/sueldo/cruds/ConceptoEdit.fxml
+++ b/src/application/view/sueldo/cruds/ConceptoEdit.fxml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>
@@ -14,7 +18,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.sueldo.cruds.ConceptoEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.sueldo.cruds.ConceptoEditController">
   <children>
     <AnchorPane prefHeight="579.0" prefWidth="660.0">
       <children>
diff --git a/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml b/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml
index 4134479..1b9d77d 100644
--- a/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml
+++ b/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml
@@ -16,7 +16,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<AnchorPane prefHeight="615.0" prefWidth="673.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.sueldo.cruds.LiquidacionSueldoController">
+<AnchorPane prefHeight="615.0" prefWidth="673.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.sueldo.cruds.LiquidacionSueldoController">
    <children>
       <GridPane layoutX="33.0" layoutY="14.0" prefHeight="498.0" prefWidth="653.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0">
         <columnConstraints>
diff --git a/src/application/view/venta/AdministrarViajes.fxml b/src/application/view/venta/AdministrarViajes.fxml
index bccda56..dca93c6 100644
--- a/src/application/view/venta/AdministrarViajes.fxml
+++ b/src/application/view/venta/AdministrarViajes.fxml
@@ -8,58 +8,50 @@
 
 <AnchorPane prefHeight="400.0" prefWidth="726.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.AdministrarViajesController">
    <children>
-      <Pane prefHeight="400.0" prefWidth="726.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <VBox alignment="CENTER_LEFT" layoutX="16.0" layoutY="15.0" prefHeight="385.0" prefWidth="710.0" spacing="10.0">
          <children>
-            <AnchorPane prefHeight="400.0" prefWidth="726.0">
+            <Label text="Viajes" />
+            <TableView fx:id="viajeTable" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
+              <columns>
+                  <TableColumn prefWidth="75.0" text="Fecha">
+                     <columns>
+                      <TableColumn fx:id="diaColumn" prefWidth="75.0" text="Dia" />
+                      <TableColumn fx:id="horaEntradaColumn" prefWidth="75.0" text="Hora Entrada" />
+                     </columns>
+                  </TableColumn>
+                  <TableColumn prefWidth="75.0" text="Viaje">
+                     <columns>
+                        <TableColumn fx:id="brutoColumn" prefWidth="75.0" text="Peso Bruto" />
+                        <TableColumn fx:id="taraColumn" prefWidth="75.0" text="Tara" />
+                        <TableColumn fx:id="distanciaColumn" prefWidth="75.0" text="Distancia" />
+                        <TableColumn fx:id="ingenioColumn" prefWidth="75.0" text="Ingenio" />
+                     </columns>
+                  </TableColumn>
+                  <TableColumn prefWidth="75.0" text="Conductor">
+                     <columns>
+                        <TableColumn fx:id="nombreConductorColumn" prefWidth="75.0" text="Nombre" />
+                        <TableColumn fx:id="apellidoConductorColumn" prefWidth="75.0" text="Apellido" />
+                     </columns>
+                  </TableColumn>
+              </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+            <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
                <children>
-                  <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Viajes" />
-                        <TableView fx:id="viajeTable" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
-                          <columns>
-                              <TableColumn prefWidth="75.0" text="Fecha">
-                                 <columns>
-                                  <TableColumn fx:id="diaColumn" prefWidth="75.0" text="Dia" />
-                                  <TableColumn fx:id="horaEntradaColumn" prefWidth="75.0" text="Hora Entrada" />
-                                 </columns>
-                              </TableColumn>
-                              <TableColumn prefWidth="75.0" text="Viaje">
-                                 <columns>
-                                    <TableColumn fx:id="brutoColumn" prefWidth="75.0" text="Peso Bruto" />
-                                    <TableColumn fx:id="taraColumn" prefWidth="75.0" text="Tara" />
-                                    <TableColumn fx:id="distanciaColumn" prefWidth="75.0" text="Distancia" />
-                                    <TableColumn fx:id="ingenioColumn" prefWidth="75.0" text="Ingenio" />
-                                 </columns>
-                              </TableColumn>
-                              <TableColumn prefWidth="75.0" text="Conductor">
-                                 <columns>
-                                    <TableColumn fx:id="nombreConductorColumn" prefWidth="75.0" text="Nombre" />
-                                    <TableColumn fx:id="apellidoConductorColumn" prefWidth="75.0" text="Apellido" />
-                                 </columns>
-                              </TableColumn>
-                          </columns>
-                           <columnResizePolicy>
-                              <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                           </columnResizePolicy>
-                        </TableView>
-                        <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
-                           <children>
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleNewViaje" text="Nuevo Viaje" />
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEditViaje" text="Editar Viaje" />
-                              <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleDeleteViaje" text="Eliminar Viaje" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                           <padding>
-                              <Insets top="30.0" />
-                           </padding>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleNewViaje" text="Nuevo Viaje" />
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEditViaje" text="Editar Viaje" />
+                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleDeleteViaje" text="Eliminar Viaje" />
                </children>
-            </AnchorPane>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+               <padding>
+                  <Insets top="30.0" />
+               </padding>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/venta/Facturacion.fxml b/src/application/view/venta/Facturacion.fxml
index 9bee12c..f1adf10 100644
--- a/src/application/view/venta/Facturacion.fxml
+++ b/src/application/view/venta/Facturacion.fxml
@@ -8,7 +8,7 @@
 
 <AnchorPane prefHeight="450.0" prefWidth="740.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.FacturacionController">
    <children>
-      <VBox prefHeight="450.0" prefWidth="740.0">
+      <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="13.0" prefHeight="437.0" prefWidth="721.0" spacing="10.0">
          <children>
             <Label text="Histórico Facturaciones" />
             <HBox alignment="CENTER" prefHeight="174.0" prefWidth="740.0">
diff --git a/src/application/view/venta/VentaCliente.fxml b/src/application/view/venta/VentaCliente.fxml
index a5643a8..381a4c0 100644
--- a/src/application/view/venta/VentaCliente.fxml
+++ b/src/application/view/venta/VentaCliente.fxml
@@ -14,43 +14,36 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.VentaClienteController">
+<AnchorPane prefHeight="428.0" prefWidth="662.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.VentaClienteController">
    <children>
-      <Pane prefHeight="400.0" prefWidth="600.0">
+      <VBox alignment="CENTER_LEFT" layoutX="15.0" layoutY="18.0" prefHeight="410.0" prefWidth="624.0" spacing="10.0">
          <children>
-            <AnchorPane prefHeight="400.0" prefWidth="600.0">
+            <Label text="Clientes" />
+            <TableView fx:id="tableView" pickOnBounds="false" prefHeight="297.0" prefWidth="600.0">
+              <columns>
+                  <TableColumn fx:id="idColumn" minWidth="0.0" prefWidth="0.0" text="Id" />
+                <TableColumn fx:id="nombreColumn" prefWidth="194.0" text="Nombre" />
+                <TableColumn fx:id="cuitColumn" prefWidth="100.0" text="CUIT" />
+                  <TableColumn prefWidth="128.0" text="Domicilio">
+                     <columns>
+                        <TableColumn fx:id="calleColumn" prefWidth="108.0" text="Calle" />
+                        <TableColumn fx:id="numeroColumn" prefWidth="64.0" text="Numero" />
+                     </columns>
+                  </TableColumn>
+                  <TableColumn fx:id="localidadColumn" prefWidth="157.0" text="Localidad" />
+              </columns>
+            </TableView>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="600.0" spacing="20.0">
                <children>
-                  <VBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <children>
-                        <Label text="Clientes" />
-                        <TableView fx:id="tableView" pickOnBounds="false" prefHeight="297.0" prefWidth="600.0">
-                          <columns>
-                              <TableColumn fx:id="idColumn" minWidth="0.0" prefWidth="0.0" text="Id" />
-                            <TableColumn fx:id="nombreColumn" prefWidth="194.0" text="Nombre" />
-                            <TableColumn fx:id="cuitColumn" prefWidth="100.0" text="CUIT" />
-                              <TableColumn prefWidth="128.0" text="Domicilio">
-                                 <columns>
-                                    <TableColumn fx:id="calleColumn" prefWidth="108.0" text="Calle" />
-                                    <TableColumn fx:id="numeroColumn" prefWidth="64.0" text="Numero" />
-                                 </columns></TableColumn>
-                              <TableColumn fx:id="localidadColumn" prefWidth="133.0" text="Localidad" />
-                          </columns>
-                        </TableView>
-                        <HBox alignment="CENTER" prefHeight="100.0" prefWidth="600.0" spacing="20.0">
-                           <children>
-                              <Button fx:id="btnNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nuevo Cliente" />
-                              <Button fx:id="btnEdit" alignment="CENTER" mnemonicParsing="false" onAction="#handleEdit" text="Editar Cliente" />
-                              <Button fx:id="btnEliminar" alignment="CENTER" mnemonicParsing="false" onAction="#handleDelete" text="Eliminar Cliente" />
-                           </children>
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                        </HBox>
-                     </children>
-                  </VBox>
+                  <Button fx:id="btnNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nuevo Cliente" />
+                  <Button fx:id="btnEdit" alignment="CENTER" mnemonicParsing="false" onAction="#handleEdit" text="Editar Cliente" />
+                  <Button fx:id="btnEliminar" alignment="CENTER" mnemonicParsing="false" onAction="#handleDelete" text="Eliminar Cliente" />
                </children>
-            </AnchorPane>
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+            </HBox>
          </children>
-      </Pane>
+      </VBox>
    </children>
 </AnchorPane>
diff --git a/src/application/view/venta/cruds/ClienteEdit.fxml b/src/application/view/venta/cruds/ClienteEdit.fxml
index 463b12e..9329fd7 100644
--- a/src/application/view/venta/cruds/ClienteEdit.fxml
+++ b/src/application/view/venta/cruds/ClienteEdit.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
 
-<Group xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.cruds.ClienteEditController">
+<Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.cruds.ClienteEditController">
    <children>
       <AnchorPane prefHeight="416.0" prefWidth="528.0">
          <children>
diff --git a/src/application/view/venta/cruds/EmitirFactura.fxml b/src/application/view/venta/cruds/EmitirFactura.fxml
index 4f7b62f..e528e0f 100644
--- a/src/application/view/venta/cruds/EmitirFactura.fxml
+++ b/src/application/view/venta/cruds/EmitirFactura.fxml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
@@ -10,8 +13,7 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 
-
-<AnchorPane prefHeight="400.0" prefWidth="721.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.cruds.EmitirFacturaController">
+<AnchorPane prefHeight="400.0" prefWidth="721.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.cruds.EmitirFacturaController">
    <children>
       <Pane layoutX="14.0" layoutY="14.0" prefHeight="400.0" prefWidth="721.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
diff --git a/src/application/view/venta/cruds/ViajeEdit.fxml b/src/application/view/venta/cruds/ViajeEdit.fxml
index cb06f29..41fb1a2 100644
--- a/src/application/view/venta/cruds/ViajeEdit.fxml
+++ b/src/application/view/venta/cruds/ViajeEdit.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<AnchorPane prefHeight="440.0" prefWidth="674.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.cruds.ViajeEditController">
+<AnchorPane prefHeight="440.0" prefWidth="674.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.cruds.ViajeEditController">
    <children>
       <Pane prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
diff --git "a/src/img/ca\303\261asprincipal.jpg" "b/src/resources/ca\303\261asprincipal.jpg"
similarity index 100%
rename from "src/img/ca\303\261asprincipal.jpg"
rename to "src/resources/ca\303\261asprincipal.jpg"
diff --git a/src/resources/volks.png b/src/resources/volks.png
new file mode 100644
index 0000000000000000000000000000000000000000..7632cbb103db1ca71ca13b9871b671a884c62d88
GIT binary patch
literal 171927
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
OfX5ME#_#S?8UF$5Q7;t$

literal 0
HcmV?d00001


From 3e0dcbb3590a62b500079f030ef9a542544a330d Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Fri, 23 Feb 2018 11:02:15 -0300
Subject: [PATCH 02/27] Reportes con viewer de JasperReports funcional

---
 .idea/workspace.xml                           | 579 ++++++++----------
 .settings/org.eclipse.core.resources.prefs    |   3 +
 LogiservStudio.iml                            |  30 +-
 pom.xml                                       |   5 +
 .../reports/AbstractJasperReports.java        |  38 ++
 src/application/reports/ControlStock.jasper   | Bin 0 -> 28880 bytes
 src/application/reports/ControlStock.jrxml    | 180 ++++++
 .../reports/DatosOrganizacion.jasper          | Bin 0 -> 24902 bytes
 .../reports/DatosOrganizacion.jrxml           | 119 ++++
 .../venta/OrganizacionRepository.java         |   3 -
 src/application/view/compra/ControlStock.fxml |   2 +-
 .../view/compra/ControlStockController.java   |   4 +-
 12 files changed, 624 insertions(+), 339 deletions(-)
 create mode 100644 .settings/org.eclipse.core.resources.prefs
 create mode 100644 src/application/reports/AbstractJasperReports.java
 create mode 100644 src/application/reports/ControlStock.jasper
 create mode 100644 src/application/reports/ControlStock.jrxml
 create mode 100644 src/application/reports/DatosOrganizacion.jasper
 create mode 100644 src/application/reports/DatosOrganizacion.jrxml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c5777e1..de7fefe 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="ad24a087-34e9-4c0a-89a3-9d660d897332" name="Default" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/application/view/info/Desempleados.fxml" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/application/view/info/DesempleadosController.java" />
+    <list default="true" id="ad24a087-34e9-4c0a-89a3-9d660d897332" name="Default" comment="Diseño mejorado y ajustes a todas las ventanas del proyecto">
+      <change beforePath="" afterPath="$PROJECT_DIR$/.settings/org.eclipse.core.resources.prefs" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/application/reports/AbstractJasperReports.java" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/application/reports/ControlStock.jasper" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/application/reports/ControlStock.jrxml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/application/reports/DatosOrganizacion.jasper" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/application/reports/DatosOrganizacion.jrxml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/application/reports/VisorPDF.fxml" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change beforePath="$PROJECT_DIR$/src/application/model/info/Empleado.java" afterPath="$PROJECT_DIR$/src/application/model/info/Empleado.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" afterPath="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/Principal.fxml" afterPath="$PROJECT_DIR$/src/application/view/Principal.fxml" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/PrincipalController.java" afterPath="$PROJECT_DIR$/src/application/view/PrincipalController.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/info/AdministrarEmpleadosController.java" afterPath="$PROJECT_DIR$/src/application/view/info/AdministrarEmpleadosController.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/info/cruds/EmpleadoEditDialogController.java" afterPath="$PROJECT_DIR$/src/application/view/info/cruds/EmpleadoEditDialogController.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/venta/AdministrarViajesController.java" afterPath="$PROJECT_DIR$/src/application/view/venta/AdministrarViajesController.java" />
+      <change beforePath="$PROJECT_DIR$/LogiservStudio.iml" afterPath="$PROJECT_DIR$/LogiservStudio.iml" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+      <change beforePath="$PROJECT_DIR$/src/application/repository/venta/OrganizacionRepository.java" afterPath="$PROJECT_DIR$/src/application/repository/venta/OrganizacionRepository.java" />
+      <change beforePath="$PROJECT_DIR$/src/application/view/compra/ControlStock.fxml" afterPath="$PROJECT_DIR$/src/application/view/compra/ControlStock.fxml" />
+      <change beforePath="$PROJECT_DIR$/src/application/view/compra/ControlStockController.java" afterPath="$PROJECT_DIR$/src/application/view/compra/ControlStockController.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -26,87 +29,46 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="AdministrarEmpleadosController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/application/view/info/AdministrarEmpleadosController.java">
+      <file leaf-file-name="AbstractJasperReports.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/application/reports/AbstractJasperReports.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-423">
-              <caret line="89" column="43" lean-forward="true" selection-start-line="89" selection-start-column="43" selection-end-line="89" selection-end-column="43" />
-              <folding />
+            <state relative-caret-position="340">
+              <caret line="25" column="54" lean-forward="false" selection-start-line="25" selection-start-column="54" selection-end-line="25" selection-end-column="54" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="EmpleadoEditDialogController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/application/view/info/cruds/EmpleadoEditDialogController.java">
+      <file leaf-file-name="OrganizacionRepository.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/application/repository/venta/OrganizacionRepository.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="155">
-              <caret line="213" column="5" lean-forward="true" selection-start-line="209" selection-start-column="4" selection-end-line="213" selection-end-column="5" />
+            <state relative-caret-position="120">
+              <caret line="61" column="46" lean-forward="false" selection-start-line="61" selection-start-column="46" selection-end-line="61" selection-end-column="46" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="EmpleadoRepository.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java">
+      <file leaf-file-name="VisorPDF.fxml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/application/reports/VisorPDF.fxml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="577">
-              <caret line="195" column="60" lean-forward="false" selection-start-line="195" selection-start-column="60" selection-end-line="195" selection-end-column="60" />
+            <state relative-caret-position="170">
+              <caret line="10" column="55" lean-forward="false" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="55" />
               <folding />
             </state>
           </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Desempleados.fxml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/application/view/info/Desempleados.fxml">
           <provider editor-type-id="JavaFX-Scene-Builder">
             <state />
           </provider>
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DesempleadosController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/application/view/info/DesempleadosController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="291">
-              <caret line="54" column="0" lean-forward="true" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
-              <folding>
-                <element signature="e#3035#3036#0" expanded="true" />
-                <element signature="e#3060#3061#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PrincipalController.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/application/view/PrincipalController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="373">
-              <caret line="140" column="41" lean-forward="false" selection-start-line="140" selection-start-column="41" selection-end-line="140" selection-end-column="41" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CategoriaArticuloRepository.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/application/repository/compra/CategoriaArticuloRepository.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-289">
-              <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-              <folding />
-            </state>
-          </provider>
         </entry>
       </file>
-      <file leaf-file-name="FacturaEditController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/application/view/compra/cruds/FacturaEditController.java">
+      <file leaf-file-name="ControlStockController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/application/view/compra/ControlStockController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="398">
-              <caret line="152" column="44" lean-forward="false" selection-start-line="152" selection-start-column="44" selection-end-line="152" selection-end-column="44" />
+            <state relative-caret-position="1632">
+              <caret line="121" column="93" lean-forward="false" selection-start-line="121" selection-start-column="93" selection-end-line="121" selection-end-column="93" />
               <folding />
             </state>
           </provider>
@@ -120,6 +82,7 @@
         <option value="JavaFXApplication" />
         <option value="Interface" />
         <option value="Class" />
+        <option value="FxmlFile" />
       </list>
     </option>
   </component>
@@ -150,16 +113,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/application/model/info/Provincia.java" />
-        <option value="$PROJECT_DIR$/src/application/model/info/Domicilio.java" />
-        <option value="$PROJECT_DIR$/src/application/Main.java" />
-        <option value="$PROJECT_DIR$/db.properties" />
-        <option value="$PROJECT_DIR$/src/application/repository/info/DomicilioRepository.java" />
-        <option value="$PROJECT_DIR$/src/application/repository/info/ProvinciaRepository.java" />
-        <option value="$PROJECT_DIR$/src/application/model/compra/Proveedor.java" />
-        <option value="$PROJECT_DIR$/src/application/view/compra/CompraProveedoresController.java" />
-        <option value="$PROJECT_DIR$/src/application/repository/info/LocalidadRepository.java" />
-        <option value="$PROJECT_DIR$/src/application/repository/info/ProveedorRepository.java" />
         <option value="$PROJECT_DIR$/src/application/view/compra/Articulos.fxml" />
         <option value="$PROJECT_DIR$/src/application/model/compra/Articulo.java" />
         <option value="$PROJECT_DIR$/src/application/view/compra/cruds/CategoriaArticuloEditController.java" />
@@ -198,16 +151,33 @@
         <option value="$PROJECT_DIR$/src/application/model/info/Empleado.java" />
         <option value="$PROJECT_DIR$/src/application/view/info/cruds/EmpleadoEditDialogController.java" />
         <option value="$PROJECT_DIR$/src/application/view/info/AdministrarEmpleadosController.java" />
-        <option value="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" />
         <option value="$PROJECT_DIR$/src/application/view/info/DesempleadosController.java" />
         <option value="$PROJECT_DIR$/src/application/view/PrincipalController.java" />
+        <option value="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" />
+        <option value="$PROJECT_DIR$/src/application/repository/venta/ViajeRepository.java" />
+        <option value="$PROJECT_DIR$/src/application/view/inicio/HomeController.java" />
+        <option value="$PROJECT_DIR$/src/application/view/css/theme.css" />
+        <option value="$PROJECT_DIR$/src/application/view/LoginController.java" />
+        <option value="$PROJECT_DIR$/src/application/view/inicio/OrganizacionController.java" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/src/application/view/compra/ControlStockController.java" />
+        <option value="$PROJECT_DIR$/src/application/reports/AbstractJasperReports.java" />
+        <option value="$PROJECT_DIR$/src/application/repository/venta/OrganizacionRepository.java" />
+        <option value="$PROJECT_DIR$/src/application/reports/visorPDF.fxml" />
       </list>
     </option>
   </component>
+  <component name="MavenImportPreferences">
+    <option name="importingSettings">
+      <MavenImportingSettings>
+        <option name="importAutomatically" value="true" />
+      </MavenImportingSettings>
+    </option>
+  </component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-8" />
     <option name="y" value="-8" />
-    <option name="width" value="1372" />
+    <option name="width" value="1376" />
     <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager">
@@ -228,8 +198,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
-      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -253,52 +221,13 @@
               <item name="LogiservStudio" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="application" type="462c0819:PsiDirectoryNode" />
-              <item name="model" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="LogiservStudio" type="b2602c69:ProjectViewProjectNode" />
-              <item name="LogiservStudio" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="application" type="462c0819:PsiDirectoryNode" />
-              <item name="model" type="462c0819:PsiDirectoryNode" />
-              <item name="compra" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="LogiservStudio" type="b2602c69:ProjectViewProjectNode" />
-              <item name="LogiservStudio" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="application" type="462c0819:PsiDirectoryNode" />
-              <item name="info" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="LogiservStudio" type="b2602c69:ProjectViewProjectNode" />
-              <item name="LogiservStudio" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="application" type="462c0819:PsiDirectoryNode" />
-              <item name="view" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="LogiservStudio" type="b2602c69:ProjectViewProjectNode" />
-              <item name="LogiservStudio" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="application" type="462c0819:PsiDirectoryNode" />
-              <item name="view" type="462c0819:PsiDirectoryNode" />
-              <item name="compra" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="LogiservStudio" type="b2602c69:ProjectViewProjectNode" />
-              <item name="LogiservStudio" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="application" type="462c0819:PsiDirectoryNode" />
-              <item name="view" type="462c0819:PsiDirectoryNode" />
-              <item name="compra" type="462c0819:PsiDirectoryNode" />
-              <item name="cruds" type="462c0819:PsiDirectoryNode" />
+              <item name="reports" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="PackagesPane">
         <subPane>
           <expand>
@@ -311,15 +240,36 @@
               <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
               <item name="application" type="1f31426a:PackageElementNode" />
             </path>
+            <path>
+              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
+              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
+              <item name="application" type="1f31426a:PackageElementNode" />
+              <item name="reports" type="1f31426a:PackageElementNode" />
+            </path>
+            <path>
+              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
+              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
+              <item name="application" type="1f31426a:PackageElementNode" />
+              <item name="repository" type="1f31426a:PackageElementNode" />
+            </path>
+            <path>
+              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
+              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
+              <item name="application" type="1f31426a:PackageElementNode" />
+              <item name="repository" type="1f31426a:PackageElementNode" />
+              <item name="venta" type="1f31426a:PackageElementNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
-    <property name="SearchEverywhereHistoryKey" value="getloca&#9;PSI&#9;JAVA://application.model.compra.Proveedor#getLocalidad&#10;viaje&#9;PSI&#9;JAVA://application.model.info.Viaje&#10;provincia&#9;FILE&#9;file://C:/Users/Isa/Documents/GitHub/LogiservStudio/src/application/repository/info/ProvinciaRepository.java&#10;.close()&#9;null&#9;null&#10;todo&#9;ACTION&#9;ActivateTODOToolWindow&#10;plug&#9;ACTION&#9;WelcomeScreen.Plugins" />
+    <property name="SearchEverywhereHistoryKey" value="plu&#9;ACTION&#9;WelcomeScreen.Plugins&#10;getloca&#9;PSI&#9;JAVA://application.model.compra.Proveedor#getLocalidad&#10;viaje&#9;PSI&#9;JAVA://application.model.info.Viaje&#10;provincia&#9;FILE&#9;file://C:/Users/Isa/Documents/GitHub/LogiservStudio/src/application/repository/info/ProvinciaRepository.java&#10;.close()&#9;null&#9;null&#10;todo&#9;ACTION&#9;ActivateTODOToolWindow&#10;plug&#9;ACTION&#9;WelcomeScreen.Plugins" />
     <property name="full.screen.before.presentation.mode" value="true" />
     <property name="project.structure.last.edited" value="SDKs" />
     <property name="project.structure.proportion" value="0.15" />
@@ -332,22 +282,25 @@
     </force-push-targets>
   </component>
   <component name="RecentsManager">
-    <key name="CreateClassDialog.RecentsKey">
-      <recent name="application.repository.info" />
-      <recent name="application.model.info.Familiar" />
-      <recent name="application.comunes" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="application.view.info" />
-      <recent name="application.view.venta.cruds" />
-      <recent name="application.view.info.cruds" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\Isa\Documents\GitHub\LogiservStudio\src\resources" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\Isa\Documents\GitHub\LogiservStudio\src\resources" />
       <recent name="C:\Users\Isa\Documents\GitHub\LogiservStudio\src\application\view\info" />
       <recent name="C:\Users\Isa\Documents\GitHub\LogiservStudio\src\application\view\venta\cruds" />
       <recent name="C:\Users\Isa\Documents\GitHub\LogiservStudio\src\application\view\info\cruds" />
       <recent name="C:\Users\Isa\Documents\GitHub\LogiservStudio\src\application\view\compra\cruds" />
-      <recent name="C:\Users\Isa\Documents\GitHub\LogiservStudio\src\application\repository\info" />
+    </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="application.view.info" />
+      <recent name="application.view.venta.cruds" />
+      <recent name="application.view.info.cruds" />
+    </key>
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="application.repository.info" />
+      <recent name="application.model.info.Familiar" />
+      <recent name="application.comunes" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -601,7 +554,14 @@
       <option name="project" value="LOCAL" />
       <updated>1519003053166</updated>
     </task>
-    <option name="localTasksCounter" value="18" />
+    <task id="LOCAL-00018" summary="Diseño mejorado y ajustes a todas las ventanas del proyecto">
+      <created>1519360983968</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1519360983968</updated>
+    </task>
+    <option name="localTasksCounter" value="19" />
     <servers />
   </component>
   <component name="TodoView">
@@ -618,7 +578,6 @@
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -629,8 +588,7 @@
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24772036" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25531915" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -641,10 +599,15 @@
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978722" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" x="0" y="0" width="588" height="544" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
+  <component name="UnknownFeatures">
+    <option featureType="com.intellij.fileTypeFactory" implementationName="*.css" />
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -658,7 +621,8 @@
     <MESSAGE value="Arreglado Modulo Empleado (ABM), optimizada clases Repository, todo funcional excepto nuevo boton &quot;personas a Cargo&quot;" />
     <MESSAGE value="Avances en Grupo Familiar" />
     <MESSAGE value="modulo ventas - seccion clientes completada" />
-    <option name="LAST_COMMIT_MESSAGE" value="modulo ventas - seccion clientes completada" />
+    <MESSAGE value="Diseño mejorado y ajustes a todas las ventanas del proyecto" />
+    <option name="LAST_COMMIT_MESSAGE" value="Diseño mejorado y ajustes a todas las ventanas del proyecto" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -671,90 +635,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/application/view/compra/CategoriaArticuloController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="92" column="45" lean-forward="false" selection-start-line="92" selection-start-column="45" selection-end-line="92" selection-end-column="45" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/compra/cruds/ArticuloEditController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="48" column="47" lean-forward="false" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/venta/cruds/CamionEditController.java" />
-    <entry file="file://$PROJECT_DIR$/src/application/view/compra/cruds/CategoriaArticuloEditController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="124">
-          <caret line="42" column="31" lean-forward="false" selection-start-line="42" selection-start-column="31" selection-end-line="42" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/venta/CargarCamionController.java" />
-    <entry file="file://$PROJECT_DIR$/src/application/repository/info/CategoriaArticuloRepository.java" />
-    <entry file="file://$PROJECT_DIR$/src/application/repository/info/CamionRepository.java" />
-    <entry file="file://$PROJECT_DIR$/src/application/model/sueldo/HaberNoRemunerativo.java" />
-    <entry file="file://$PROJECT_DIR$/src/application/view/compra/cruds/StockEditController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="254">
-          <caret line="59" column="0" lean-forward="false" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/sueldo/Liquidaciones.fxml">
-      <provider editor-type-id="JavaFX-Scene-Builder">
-        <state />
-      </provider>
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="68" column="88" lean-forward="false" selection-start-line="68" selection-start-column="88" selection-end-line="68" selection-end-column="88" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/model/sueldo/LiquidacionEmpleado.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="935">
-          <caret line="83" column="51" lean-forward="false" selection-start-line="83" selection-start-column="45" selection-end-line="83" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="18" column="43" lean-forward="true" selection-start-line="18" selection-start-column="43" selection-end-line="18" selection-end-column="43" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/model/sueldo/Liquidaciones.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="427">
-          <caret line="89" column="0" lean-forward="false" selection-start-line="89" selection-start-column="0" selection-end-line="89" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/model/compra/Proveedor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/model/compra/Articulo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="850">
-          <caret line="82" column="42" lean-forward="false" selection-start-line="82" selection-start-column="42" selection-end-line="82" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionesRepository.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="247">
@@ -766,7 +646,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="238">
           <caret line="40" column="70" lean-forward="false" selection-start-line="40" selection-start-column="70" selection-end-line="40" selection-end-column="70" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -788,7 +667,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1078">
           <caret line="86" column="19" lean-forward="false" selection-start-line="86" selection-start-column="19" selection-end-line="86" selection-end-column="19" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -796,7 +674,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="289">
           <caret line="21" column="55" lean-forward="false" selection-start-line="21" selection-start-column="55" selection-end-line="21" selection-end-column="55" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -804,7 +681,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-18">
           <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -812,7 +688,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="186">
           <caret line="91" column="10" lean-forward="false" selection-start-line="91" selection-start-column="10" selection-end-line="91" selection-end-column="10" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -820,92 +695,42 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="192">
           <caret line="106" column="84" lean-forward="true" selection-start-line="106" selection-start-column="84" selection-end-line="106" selection-end-column="84" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/info/CompraCompras.fxml" />
     <entry file="file://$PROJECT_DIR$/src/application/view/info/GrupoFamiliar.fxml">
-      <provider editor-type-id="JavaFX-Scene-Builder">
-        <state />
-      </provider>
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
+      <provider editor-type-id="JavaFX-Scene-Builder">
+        <state />
+      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/compra/CompraComprasController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="226">
           <caret line="136" column="53" lean-forward="false" selection-start-line="136" selection-start-column="53" selection-end-line="136" selection-end-column="53" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/Principal.fxml">
-      <provider editor-type-id="JavaFX-Scene-Builder">
-        <state />
-      </provider>
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/repository/compra/CompraRepository.java" />
-    <entry file="file://$PROJECT_DIR$/src/application/repository/compra/ArticuloRepository.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="29" column="53" lean-forward="true" selection-start-line="28" selection-start-column="12" selection-end-line="29" selection-end-column="53" />
-        </state>
+      <provider editor-type-id="JavaFX-Scene-Builder">
+        <state />
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/repository/compra/CompraRepository.java" />
     <entry file="file://$PROJECT_DIR$/src/application/model/info/Familiar.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="475">
           <caret line="93" column="44" lean-forward="false" selection-start-line="93" selection-start-column="44" selection-end-line="93" selection-end-column="44" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#510#511#0" expanded="false" />
-            <element signature="e#549#550#0" expanded="false" />
-            <element signature="e#600#601#0" expanded="false" />
-            <element signature="e#633#634#0" expanded="false" />
-            <element signature="e#682#683#0" expanded="false" />
-            <element signature="e#729#730#0" expanded="false" />
-            <element signature="e#766#767#0" expanded="false" />
-            <element signature="e#805#806#0" expanded="false" />
-            <element signature="e#855#856#0" expanded="false" />
-            <element signature="e#888#889#0" expanded="false" />
-            <element signature="e#940#941#0" expanded="false" />
-            <element signature="e#987#988#0" expanded="false" />
-            <element signature="e#1020#1021#0" expanded="false" />
-            <element signature="e#1055#1056#0" expanded="false" />
-            <element signature="e#1101#1102#0" expanded="false" />
-            <element signature="e#1130#1131#0" expanded="false" />
-            <element signature="e#1174#1175#0" expanded="false" />
-            <element signature="e#1213#1214#0" expanded="false" />
-            <element signature="e#1248#1249#0" expanded="false" />
-            <element signature="e#1285#1286#0" expanded="false" />
-            <element signature="e#1333#1334#0" expanded="false" />
-            <element signature="e#1364#1365#0" expanded="false" />
-            <element signature="e#1412#1413#0" expanded="false" />
-            <element signature="e#1455#1456#0" expanded="false" />
-            <element signature="e#1497#1498#0" expanded="false" />
-            <element signature="e#1541#1542#0" expanded="false" />
-            <element signature="e#1596#1597#0" expanded="false" />
-            <element signature="e#1634#1635#0" expanded="false" />
-            <element signature="e#1696#1697#0" expanded="false" />
-            <element signature="e#1753#1754#0" expanded="false" />
-            <element signature="e#1790#1791#0" expanded="false" />
-            <element signature="e#1821#1822#0" expanded="false" />
-            <element signature="e#1871#1872#0" expanded="false" />
-            <element signature="e#1911#1912#0" expanded="false" />
-            <element signature="e#2432#2433#0" expanded="false" />
-            <element signature="e#2483#2484#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -920,7 +745,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2482">
           <caret line="153" column="26" lean-forward="false" selection-start-line="153" selection-start-column="26" selection-end-line="153" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -928,7 +752,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -936,39 +759,33 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="526">
           <caret line="82" column="36" lean-forward="false" selection-start-line="82" selection-start-column="36" selection-end-line="82" selection-end-column="36" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/info/cruds/FamiliarEdit.fxml">
-      <provider editor-type-id="JavaFX-Scene-Builder">
-        <state />
-      </provider>
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="306">
           <caret line="18" column="40" lean-forward="false" selection-start-line="18" selection-start-column="40" selection-end-line="18" selection-end-column="40" />
-          <folding />
         </state>
       </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/venta/cruds/ClienteEdit.fxml">
       <provider editor-type-id="JavaFX-Scene-Builder">
         <state />
       </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/venta/cruds/ClienteEdit.fxml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
+      <provider editor-type-id="JavaFX-Scene-Builder">
+        <state />
+      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/venta/cruds/ClienteEditController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-459">
           <caret line="35" column="9" lean-forward="false" selection-start-line="35" selection-start-column="9" selection-end-line="35" selection-end-column="9" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -976,7 +793,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
           <caret line="60" column="25" lean-forward="false" selection-start-line="60" selection-start-column="25" selection-end-line="60" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -984,7 +800,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="407">
           <caret line="81" column="74" lean-forward="false" selection-start-line="81" selection-start-column="74" selection-end-line="81" selection-end-column="74" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -992,7 +807,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="206">
           <caret line="79" column="62" lean-forward="false" selection-start-line="74" selection-start-column="21" selection-end-line="79" selection-end-column="62" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1000,20 +814,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="136">
           <caret line="25" column="16" lean-forward="false" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />
-          <folding>
-            <element signature="e#2780#2781#0" expanded="true" />
-            <element signature="e#2809#2810#0" expanded="true" />
-            <element signature="e#2855#2856#0" expanded="true" />
-            <element signature="e#2878#2879#0" expanded="true" />
-            <element signature="e#2925#2926#0" expanded="true" />
-            <element signature="e#2961#2962#0" expanded="true" />
-            <element signature="e#2994#2995#0" expanded="true" />
-            <element signature="e#3023#3024#0" expanded="true" />
-            <element signature="e#3069#3070#0" expanded="true" />
-            <element signature="e#3092#3093#0" expanded="true" />
-            <element signature="e#3139#3140#0" expanded="true" />
-            <element signature="e#3175#3176#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1021,7 +821,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="398">
           <caret line="152" column="44" lean-forward="false" selection-start-line="152" selection-start-column="44" selection-end-line="152" selection-end-column="44" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1029,7 +828,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="155">
           <caret line="213" column="5" lean-forward="true" selection-start-line="209" selection-start-column="4" selection-end-line="213" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1037,7 +835,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="177">
           <caret line="88" column="106" lean-forward="false" selection-start-line="80" selection-start-column="8" selection-end-line="88" selection-end-column="106" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1045,7 +842,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-423">
           <caret line="89" column="43" lean-forward="true" selection-start-line="89" selection-start-column="43" selection-end-line="89" selection-end-column="43" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1053,48 +849,165 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-289">
           <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/info/Desempleados.fxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
       <provider editor-type-id="JavaFX-Scene-Builder">
         <state />
       </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/info/DesempleadosController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="291">
+          <caret line="54" column="0" lean-forward="true" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/repository/venta/ViajeRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5117">
+          <caret line="324" column="58" lean-forward="true" selection-start-line="324" selection-start-column="58" selection-end-line="324" selection-end-column="58" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/css/theme.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1263">
+          <caret line="443" column="0" lean-forward="false" selection-start-line="443" selection-start-column="0" selection-end-line="443" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="577">
-          <caret line="195" column="60" lean-forward="false" selection-start-line="195" selection-start-column="60" selection-end-line="195" selection-end-column="60" />
+        <state relative-caret-position="595">
+          <caret line="97" column="10" lean-forward="false" selection-start-line="97" selection-start-column="10" selection-end-line="97" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/inicio/crud/OrganizacionEditController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1358">
+          <caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/LoginController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="137">
+          <caret line="80" column="49" lean-forward="false" selection-start-line="80" selection-start-column="49" selection-end-line="80" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/PrincipalController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-34">
+          <caret line="170" column="41" lean-forward="true" selection-start-line="170" selection-start-column="41" selection-end-line="170" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/inicio/HomeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="373">
+          <caret line="36" column="34" lean-forward="true" selection-start-line="34" selection-start-column="7" selection-end-line="36" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/inicio/OrganizacionController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="54" column="20" lean-forward="false" selection-start-line="54" selection-start-column="20" selection-end-line="54" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/calculo/cruds/AcopladoEdit.fxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+        </state>
+      </provider>
+      <provider editor-type-id="JavaFX-Scene-Builder">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="495">
+          <caret line="62" column="19" lean-forward="false" selection-start-line="62" selection-start-column="19" selection-end-line="62" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/repository/compra/ArticuloRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="10" lean-forward="false" selection-start-line="0" selection-start-column="10" selection-end-line="0" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_141/javafx-src.zip!/com/sun/javafx/tk/quantum/QuantumToolkit.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="109">
+          <caret line="1145" column="0" lean-forward="false" selection-start-line="1145" selection-start-column="0" selection-end-line="1145" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_141/javafx-src.zip!/com/sun/javafx/application/PlatformImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="101">
+          <caret line="481" column="0" lean-forward="false" selection-start-line="481" selection-start-column="0" selection-end-line="481" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_141/javafx-src.zip!/javafx/application/Platform.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="109">
+          <caret line="167" column="0" lean-forward="false" selection-start-line="167" selection-start-column="0" selection-end-line="167" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/compra/ControlStockController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1632">
+          <caret line="121" column="93" lean-forward="false" selection-start-line="121" selection-start-column="93" selection-end-line="121" selection-end-column="93" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/info/DesempleadosController.java">
+    <entry file="file://$PROJECT_DIR$/src/application/reports/AbstractJasperReports.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="291">
-          <caret line="54" column="0" lean-forward="true" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
+        <state relative-caret-position="340">
+          <caret line="25" column="54" lean-forward="false" selection-start-line="25" selection-start-column="54" selection-end-line="25" selection-end-column="54" />
           <folding>
-            <element signature="e#3035#3036#0" expanded="true" />
-            <element signature="e#3060#3061#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/PrincipalController.java">
+    <entry file="file://$PROJECT_DIR$/src/application/repository/venta/OrganizacionRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="373">
-          <caret line="140" column="41" lean-forward="false" selection-start-line="140" selection-start-column="41" selection-end-line="140" selection-end-column="41" />
+        <state relative-caret-position="120">
+          <caret line="61" column="46" lean-forward="false" selection-start-line="61" selection-start-column="46" selection-end-line="61" selection-end-column="46" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/reports/VisorPDF.fxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="10" column="55" lean-forward="false" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="55" />
+          <folding />
+        </state>
+      </provider>
+      <provider editor-type-id="JavaFX-Scene-Builder">
+        <state />
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..5c7671a
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//src/application/reports/ControlStock.jrxml=UTF-8
+encoding//src/application/reports/DatosOrganizacion.jrxml=UTF-8
diff --git a/LogiservStudio.iml b/LogiservStudio.iml
index 8e67c96..8a0e148 100644
--- a/LogiservStudio.iml
+++ b/LogiservStudio.iml
@@ -19,7 +19,6 @@
     <orderEntry type="library" name="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER" level="application" />
     <orderEntry type="library" name="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" level="application" />
     <orderEntry type="library" name="com.google.maps:google-maps-services:0.2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.13" level="project" />
     <orderEntry type="library" name="Maven: org.controlsfx:controlsfx:8.0.6_20" level="project" />
     <orderEntry type="library" name="Maven: com.google.maps:google-maps-services:0.2.5" level="project" />
@@ -31,5 +30,34 @@
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-nop:1.7.25" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.jasperreports:jasperreports:6.5.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:2.1.7.js6" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.52" level="project" />
+    <orderEntry type="library" name="Maven: org.jfree:jcommon:1.0.23" level="project" />
+    <orderEntry type="library" name="Maven: org.jfree:jfreechart:1.0.19" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jdt.core.compiler:ecj:4.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.castor:castor-xml:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.castor:castor-core:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.1.4" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.1.4" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.5.1" level="project" />
+    <orderEntry type="library" name="Maven: jakarta-regexp:jakarta-regexp:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.olap4j:olap4j:0.9.7.309-JS-3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.ibm.icu:icu4j:57.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e4c4524..c09fe95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,5 +56,10 @@
           <artifactId>commons-codec</artifactId>
           <version>1.11</version>
       </dependency>
+      <dependency>
+          <groupId>net.sf.jasperreports</groupId>
+          <artifactId>jasperreports</artifactId>
+          <version>6.5.1</version>
+      </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/src/application/reports/AbstractJasperReports.java b/src/application/reports/AbstractJasperReports.java
new file mode 100644
index 0000000..41d69e8
--- /dev/null
+++ b/src/application/reports/AbstractJasperReports.java
@@ -0,0 +1,38 @@
+package application.reports;
+
+import application.database.JDBCConnection;
+import net.sf.jasperreports.engine.*;
+import net.sf.jasperreports.engine.util.JRLoader;
+import net.sf.jasperreports.view.JasperViewer;
+
+import java.sql.Connection;
+
+public abstract class AbstractJasperReports {
+    private static JasperReport report;
+    private static JasperPrint reportFilled;
+    private static JasperViewer viewer;
+
+    public static void createReport(String path){
+        try {
+            Connection connection = JDBCConnection.getInstanceConnection();
+            report = (JasperReport) JRLoader.loadObjectFromFile(path);
+            reportFilled = JasperFillManager.fillReport(report,null, connection);
+        }catch (JRException e){
+            e.printStackTrace();
+        }
+
+    }
+    public static void showViewer(){
+        viewer = new JasperViewer(reportFilled,false);
+
+        viewer.setVisible(true);
+    }
+    public static void exportToPdf(String path){
+        try {
+            JasperExportManager.exportReportToPdfFile(reportFilled, path);
+        }catch (JRException e){
+            e.printStackTrace();
+        }
+
+    }
+}
diff --git a/src/application/reports/ControlStock.jasper b/src/application/reports/ControlStock.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..28a8d9b4756d91302f936d24b9fd7c1ca0ffc6b9
GIT binary patch
literal 28880
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

literal 0
HcmV?d00001

diff --git a/src/application/reports/ControlStock.jrxml b/src/application/reports/ControlStock.jrxml
new file mode 100644
index 0000000..185ff7c
--- /dev/null
+++ b/src/application/reports/ControlStock.jrxml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ControlStock" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="5b6cdc7a-91ef-49f0-8fae-91e6632039a3">
+	<property name="com.jaspersoft.studio.data.sql.tables">
+		<![CDATA[bW9kZWxvZmluYWwuYXJ0aWN1bG8gLDE1LDE1LDNmNmRmMzI4LWZkYjItNDJmYS1iYjExLWI3ZTkz
+OTI0M2Y0MTs=]]>
+	</property>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="logiserv"/>
+	<queryString language="SQL">
+		<![CDATA[SELECT modelofinal.articulo.`idArticulo`,
+	modelofinal.articulo.`Marca`,
+	modelofinal.articulo.`Modelo`,
+	modelofinal.articulo.`Descripcion`,
+	modelofinal.articulo.stock
+FROM modelofinal.articulo]]>
+	</queryString>
+	<field name="idArticulo" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="idArticulo"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="articulo"/>
+	</field>
+	<field name="Marca" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="Marca"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="articulo"/>
+	</field>
+	<field name="Modelo" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="Modelo"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="articulo"/>
+	</field>
+	<field name="Descripcion" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="Descripcion"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="articulo"/>
+	</field>
+	<field name="stock" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="stock"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="articulo"/>
+	</field>
+	<title>
+		<band height="149">
+			<subreport>
+				<reportElement x="0" y="0" width="555" height="140" uuid="95b5a40e-068a-475b-814e-875e8fe6c82b"/>
+				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+				<subreportExpression><![CDATA["src/application/reports/DatosOrganizacion.jasper"]]></subreportExpression>
+			</subreport>
+			<staticText>
+				<reportElement x="98" y="98" width="365" height="42" forecolor="#FFFB00" uuid="23e99129-5bcc-404e-b033-c1495b78fc91"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="25" isBold="true"/>
+				</textElement>
+				<text><![CDATA[REPORTE DE STOCK]]></text>
+			</staticText>
+		</band>
+	</title>
+	<columnHeader>
+		<band height="21">
+			<line>
+				<reportElement x="-20" y="20" width="595" height="1" forecolor="#666666" uuid="00929e7d-6370-49d1-b406-568ad5b6582c"/>
+			</line>
+			<staticText>
+				<reportElement mode="Opaque" x="0" y="0" width="80" height="20" forecolor="#006699" backcolor="#E6E6E6" uuid="edfae0a0-5907-45f2-96db-96f558196738">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="d1829412-9abb-4605-991d-cda113b7063c"/>
+				</reportElement>
+				<textElement textAlignment="Center">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Cod.]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="80" y="0" width="111" height="20" forecolor="#006699" backcolor="#E6E6E6" uuid="c98d2046-234f-48d7-a511-18a5306996cf">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="d4f7637d-f993-4722-8609-9b44437b6454"/>
+				</reportElement>
+				<textElement textAlignment="Left">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Marca]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="190" y="0" width="90" height="20" forecolor="#006699" backcolor="#E6E6E6" uuid="942e3bd6-7f97-4623-9ec9-79702c23ad99">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="aa25608f-4b30-4ca5-948e-b770afdba130"/>
+				</reportElement>
+				<textElement textAlignment="Left">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Modelo]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="500" y="0" width="55" height="20" forecolor="#006699" backcolor="#E6E6E6" uuid="2da90984-1a80-44ad-aced-5d2858a53692">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="1fc07dd2-9b8f-4446-90c9-df51c113b1da"/>
+				</reportElement>
+				<textElement textAlignment="Center">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[stock]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="280" y="0" width="220" height="20" forecolor="#006699" backcolor="#E6E6E6" uuid="d5d18336-318a-4e30-81dc-f509c17e0838">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="9d94a62e-96d5-4a11-bbc7-8e52d56accc0"/>
+				</reportElement>
+				<textElement textAlignment="Left">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Descripción]]></text>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="20">
+			<line>
+				<reportElement positionType="FixRelativeToBottom" x="0" y="19" width="555" height="1" uuid="4e41cbc6-40a3-4a21-89a4-1c2dbfb04831"/>
+			</line>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="0" y="0" width="80" height="20" uuid="b9d65c12-f906-4ec8-ab28-8d82d5ff799f">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="d1829412-9abb-4605-991d-cda113b7063c"/>
+				</reportElement>
+				<textElement textAlignment="Center">
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{idArticulo}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="80" y="0" width="110" height="20" uuid="14288586-b772-4a7e-a1c6-21d8ebcfcd9f">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="d4f7637d-f993-4722-8609-9b44437b6454"/>
+				</reportElement>
+				<textElement>
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Marca}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="190" y="0" width="90" height="20" uuid="bc316c23-6abd-4612-a12f-239f066584e9">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="aa25608f-4b30-4ca5-948e-b770afdba130"/>
+				</reportElement>
+				<textElement>
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Modelo}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="280" y="0" width="220" height="20" uuid="c9cbd1a7-6fbf-4154-90ca-2163d25c547f">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="9d94a62e-96d5-4a11-bbc7-8e52d56accc0"/>
+				</reportElement>
+				<textElement>
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Descripcion}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="500" y="0" width="55" height="20" uuid="33b0a6ba-5150-4f36-aaf4-db1baee4901a">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="1fc07dd2-9b8f-4446-90c9-df51c113b1da"/>
+				</reportElement>
+				<textElement textAlignment="Center">
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{stock}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band/>
+	</columnFooter>
+	<pageFooter>
+		<band height="17">
+			<textField>
+				<reportElement mode="Opaque" x="0" y="4" width="515" height="13" backcolor="#E6E6E6" uuid="b42c2add-613f-4ba2-800a-450e44d759d1"/>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement mode="Opaque" x="515" y="4" width="40" height="13" backcolor="#E6E6E6" uuid="ea6175ae-e770-4177-9fcb-b10c66365c1c"/>
+				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField pattern="EEEEE dd MMMMM yyyy">
+				<reportElement x="0" y="4" width="100" height="13" uuid="574881b0-d41d-4b46-ac7f-a0468159a649"/>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageFooter>
+	<summary>
+		<band/>
+	</summary>
+</jasperReport>
diff --git a/src/application/reports/DatosOrganizacion.jasper b/src/application/reports/DatosOrganizacion.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..eef5c1cffb304d233e8c20d0156f9623a6d0f1d3
GIT binary patch
literal 24902
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

literal 0
HcmV?d00001

diff --git a/src/application/reports/DatosOrganizacion.jrxml b/src/application/reports/DatosOrganizacion.jrxml
new file mode 100644
index 0000000..be0aa72
--- /dev/null
+++ b/src/application/reports/DatosOrganizacion.jrxml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="DatosOrganizacion" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="3951cce0-7cc9-48ce-935e-5dab107b81e7">
+	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="logiserv"/>
+	<queryString language="SQL">
+		<![CDATA[SELECT p.idOrganizacion, p.Nombre, p.CUIT, CONCAT(e.Apellido, ", ", e.nombre) AS nombreApoderado,
+  l.idLocalidad, l.NombreLocalidad, CONCAT(d.calle, " ", d.numero) AS direccion, c.* 
+    FROM ORGANIZACION AS p,EMPLEADO AS e, DOMICILIO AS d, LOCALIDAD AS l, PROVINCIA AS c 
+        WHERE p.DOMICILIO_idDomicilio=d.idDomicilio
+			AND e.idEmpleado = p.APODERADO_idEmpleado 
+           AND d.LOCALIDAD_idLocalidad=l.idLocalidad
+           AND l.PROVINCIA_idProvincia=c.idProvincia]]>
+	</queryString>
+	<field name="idOrganizacion" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="idOrganizacion"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="organizacion"/>
+	</field>
+	<field name="Nombre" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="Nombre"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="organizacion"/>
+	</field>
+	<field name="CUIT" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="CUIT"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="organizacion"/>
+	</field>
+	<field name="nombreApoderado" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="nombreApoderado"/>
+	</field>
+	<field name="idLocalidad" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="idLocalidad"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="localidad"/>
+	</field>
+	<field name="NombreLocalidad" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="NombreLocalidad"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="localidad"/>
+	</field>
+	<field name="direccion" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="direccion"/>
+	</field>
+	<field name="idProvincia" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="idProvincia"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="provincia"/>
+	</field>
+	<field name="NombreProvincia" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="NombreProvincia"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="provincia"/>
+	</field>
+	<background>
+		<band/>
+	</background>
+	<title>
+		<band height="121">
+			<frame>
+				<reportElement mode="Opaque" x="-20" y="-20" width="595" height="140" backcolor="#006699" uuid="2a464480-7866-4aa1-87e4-1d953cafb4a8"/>
+				<textField isStretchWithOverflow="true">
+					<reportElement x="0" y="0" width="360" height="90" forecolor="#FFFFFF" uuid="589cd6be-6cb4-4c58-b067-af24da0f1d3d">
+						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="9ef7ebef-557c-4eb9-a6f6-fd203f3d15a3"/>
+					</reportElement>
+					<textElement textAlignment="Center">
+						<font size="63"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{Nombre}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement x="431" y="9" width="150" height="21" forecolor="#FFFFFF" uuid="9755d5f7-e87c-46db-8343-e9203adca05d">
+						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="6f8b35ff-2a96-4fab-af23-7689e034e597"/>
+					</reportElement>
+					<textElement textAlignment="Center">
+						<font size="14"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{CUIT}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement x="428" y="26" width="161" height="20" forecolor="#FFFFFF" uuid="77557b0f-7e91-4d03-90b7-237331a28b22">
+						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="bdf93edd-7fd2-421a-aa9e-7b2094197432"/>
+					</reportElement>
+					<textElement textAlignment="Center">
+						<font size="13"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{nombreApoderado}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement x="442" y="43" width="130" height="22" forecolor="#FFFFFF" uuid="08257133-8d42-471a-a0b1-da9b19f17140">
+						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="dfc5f143-78c5-43d8-a2c2-8359c8b3a532"/>
+					</reportElement>
+					<textElement textAlignment="Center">
+						<font size="12"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{direccion}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement x="431" y="57" width="159" height="20" forecolor="#FFFFFF" uuid="60dddd26-5924-402b-9b4d-4f0f33510b83">
+						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="3c6ce040-c370-40bb-bc7b-9f575e076019"/>
+					</reportElement>
+					<textElement textAlignment="Center">
+						<font size="11"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{NombreLocalidad}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement x="440" y="70" width="140" height="20" forecolor="#FFFFFF" uuid="8b3f0a29-5d29-4e17-bdd9-11333b877f80">
+						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="a798d107-c3e5-44ca-9357-93a4547a34af"/>
+					</reportElement>
+					<textElement textAlignment="Center">
+						<font size="10"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{NombreProvincia}]]></textFieldExpression>
+				</textField>
+			</frame>
+		</band>
+	</title>
+	<columnFooter>
+		<band/>
+	</columnFooter>
+	<summary>
+		<band/>
+	</summary>
+</jasperReport>
diff --git a/src/application/repository/venta/OrganizacionRepository.java b/src/application/repository/venta/OrganizacionRepository.java
index 973bc6e..d8548bc 100644
--- a/src/application/repository/venta/OrganizacionRepository.java
+++ b/src/application/repository/venta/OrganizacionRepository.java
@@ -60,9 +60,6 @@ public void update(Organizacion organizacion){
 //            preparedStatement.setString(4, organizacion.getTelefono());
             preparedStatement.setInt(7, organizacion.getIdOrganizacion());
             preparedStatement.executeUpdate();
-            String headerMsj="Actualización: datos de la organizacion actualizados";
-            String cuerpoMsj = "Organizacion: " + organizacion.getNombreOrg() + " modificado correctamente.";
-            Alerta.alertaInfo("Organización", headerMsj, cuerpoMsj);
         } catch (SQLException e) {
             e.printStackTrace();
         }
diff --git a/src/application/view/compra/ControlStock.fxml b/src/application/view/compra/ControlStock.fxml
index 9fdf769..ea5c1e2 100644
--- a/src/application/view/compra/ControlStock.fxml
+++ b/src/application/view/compra/ControlStock.fxml
@@ -36,7 +36,7 @@
     <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
       <children>
         <Button fx:id="controlButton" alignment="CENTER" mnemonicParsing="false" onAction="#handleControlStock" text="Control Stock" />
-                  <Button fx:id="reportButton" mnemonicParsing="false" text="Reporte de Stock" />
+                  <Button fx:id="reportButton" mnemonicParsing="false" onAction="#generarReporteStock" text="Reporte de Stock" />
       </children>
       <padding>
         <Insets top="30.0" />
diff --git a/src/application/view/compra/ControlStockController.java b/src/application/view/compra/ControlStockController.java
index bd71a27..977786d 100644
--- a/src/application/view/compra/ControlStockController.java
+++ b/src/application/view/compra/ControlStockController.java
@@ -4,6 +4,7 @@
 import application.comunes.Alerta;
 import application.model.compra.Articulo;
 import application.model.compra.CategoriaArticulo;
+import application.reports.AbstractJasperReports;
 import application.repository.compra.ArticuloRepository;
 import application.repository.compra.CategoriaArticuloRepository;
 import application.view.compra.cruds.ArticuloEditController;
@@ -118,6 +119,7 @@ private void filtrarCategoria(){
     }
     @FXML
     private void generarReporteStock(){
-        //todo: hacer reporte de stock
+        AbstractJasperReports.createReport("src\\application\\reports\\ControlStock.jasper");
+        AbstractJasperReports.showViewer();
     }
 }

From b211a3c6146ba1e815cdfa2b3987a4c7b38a43c9 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Fri, 23 Feb 2018 12:36:43 -0300
Subject: [PATCH 03/27] mejora en el viewer para javaFX en reportes

---
 .../reports/AbstractJasperReports.java        |  20 +-
 src/application/reports/JasperFX.java         | 360 ++++++++++++++++++
 src/application/reports/Page.java             |  92 +++++
 src/application/reports/ReportExporter.java   |  54 +++
 src/application/reports/ZoomConverter.java    |  24 ++
 5 files changed, 536 insertions(+), 14 deletions(-)
 create mode 100644 src/application/reports/JasperFX.java
 create mode 100644 src/application/reports/Page.java
 create mode 100644 src/application/reports/ReportExporter.java
 create mode 100644 src/application/reports/ZoomConverter.java

diff --git a/src/application/reports/AbstractJasperReports.java b/src/application/reports/AbstractJasperReports.java
index 41d69e8..f2cfa26 100644
--- a/src/application/reports/AbstractJasperReports.java
+++ b/src/application/reports/AbstractJasperReports.java
@@ -1,17 +1,18 @@
 package application.reports;
 
 import application.database.JDBCConnection;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import net.sf.jasperreports.engine.*;
 import net.sf.jasperreports.engine.util.JRLoader;
-import net.sf.jasperreports.view.JasperViewer;
 
 import java.sql.Connection;
 
 public abstract class AbstractJasperReports {
     private static JasperReport report;
     private static JasperPrint reportFilled;
-    private static JasperViewer viewer;
-
+    private static JasperFX viewer;
     public static void createReport(String path){
         try {
             Connection connection = JDBCConnection.getInstanceConnection();
@@ -23,16 +24,7 @@ public static void createReport(String path){
 
     }
     public static void showViewer(){
-        viewer = new JasperViewer(reportFilled,false);
-
-        viewer.setVisible(true);
-    }
-    public static void exportToPdf(String path){
-        try {
-            JasperExportManager.exportReportToPdfFile(reportFilled, path);
-        }catch (JRException e){
-            e.printStackTrace();
-        }
-
+        viewer = new JasperFX(reportFilled);
+        viewer.show();
     }
 }
diff --git a/src/application/reports/JasperFX.java b/src/application/reports/JasperFX.java
new file mode 100644
index 0000000..d17b8ff
--- /dev/null
+++ b/src/application/reports/JasperFX.java
@@ -0,0 +1,360 @@
+package application.reports;
+
+import javafx.animation.AnimationTimer;
+import javafx.collections.FXCollections;
+import javafx.embed.swing.SwingFXUtils;
+import javafx.geometry.Orientation;
+import javafx.geometry.Pos;
+import javafx.geometry.VPos;
+import javafx.scene.Scene;
+import javafx.scene.canvas.Canvas;
+import javafx.scene.canvas.GraphicsContext;
+import javafx.scene.control.*;
+import javafx.scene.control.Button;
+import javafx.scene.image.WritableImage;
+import javafx.scene.layout.*;
+import javafx.scene.text.Text;
+import javafx.stage.*;
+import javafx.stage.Window;
+import net.sf.jasperreports.engine.*;
+import net.sf.jasperreports.engine.export.JRGraphics2DExporter;
+import net.sf.jasperreports.export.SimpleExporterInput;
+import net.sf.jasperreports.export.SimpleGraphics2DExporterOutput;
+import net.sf.jasperreports.export.SimpleGraphics2DReportConfiguration;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.util.Arrays;
+
+
+public class JasperFX {
+
+    private static final int WIDTH = 800;
+    private static final int HEIGHT = 600;
+
+    private final int RESOLUTION;
+    private final JasperPrint print;
+    private final Canvas canvas;
+    private final ComboBox<Integer> cbxZoom;
+    private final ScrollBar sbHorizontal;
+    private final ScrollBar sbVertical;
+    private final JasperReportsContext jasperReportsContext;
+
+    private JRGraphics2DExporter exporter;
+    private Page pages;
+    private boolean loaded;
+    private Stage stage;
+
+    private AnimationTimer timer;
+    private long lastTimerCall;
+
+    public JasperFX(JasperPrint print) {
+        this.print = print;
+        this.canvas = new Canvas();
+        this.cbxZoom = new ComboBox<>();
+        this.sbHorizontal = new ScrollBar();
+        this.sbVertical = new ScrollBar();
+        this.loaded = false;
+        this.jasperReportsContext = DefaultJasperReportsContext.getInstance();
+
+        Toolkit toolkit = Toolkit.getDefaultToolkit();
+        RESOLUTION = toolkit.getScreenResolution();
+    }
+
+    public void show() {
+        this.show(WIDTH, HEIGHT, null, Modality.NONE, StageStyle.DECORATED);
+    }
+
+    public void show(int width, int height, StageStyle style) {
+        this.show(width, height, null, Modality.NONE, style);
+    }
+
+    public void show(int width, int height, final Window owner, Modality modality, StageStyle style) {
+        pages = new Page(print.getPages().size() - 1, 0, 0);
+        Scene scene = createScene(pages, width, height);
+
+        stage = new Stage();
+        stage.setScene(scene);
+        stage.setTitle("Jasper ViewerFX");
+        stage.setOnShown(s -> showFirstPage());
+        stage.initOwner(owner);
+        stage.initModality(modality);
+        stage.initStyle(style);
+        stage.sizeToScene();
+        stage.show();
+    }
+
+    private Scene createScene(Page page, int width, int height) {
+        VBox vbxRoot = new VBox();
+
+        Region topShadow = new Region();
+        topShadow.setStyle("-fx-background-color: linear-gradient(from 100% 0% to 100% 100%, gray, transparent);");
+        topShadow.setMaxSize(Double.MAX_VALUE, 5);
+
+        cbxZoom.setMaxWidth(100);
+        cbxZoom.setEditable(true);
+        cbxZoom.setItems(FXCollections.observableArrayList(50, 75, 100, 125, 150, 175, 200, 250, 400, 800));
+        cbxZoom.getSelectionModel().select(2);
+        cbxZoom.getSelectionModel().selectedItemProperty().addListener((p, o, z) -> showPage(page.getActual()));
+        cbxZoom.setConverter(new ZoomConverter());
+        cbxZoom.getEditor().setContextMenu(new ContextMenu());
+        cbxZoom.getEditor().setOnKeyTyped(k -> {
+            if (!Character.isDigit(k.getCharacter().charAt(0))) {
+                k.consume();
+            }
+        });
+
+        sbVertical.setOrientation(Orientation.VERTICAL);
+
+        sbVertical.heightProperty().addListener((p, o, n) -> handleResize());
+        sbHorizontal.widthProperty().addListener((p, o, n) -> handleResize());
+
+        sbHorizontal.valueProperty().addListener((p, o, n) -> handleResize() /*renderPage(page.getActual())*/);
+        sbVertical.valueProperty().addListener((p, o, n) -> handleResize() /*renderPage(page.getActual())*/);
+
+        GridPane scrollPane = new GridPane();
+        scrollPane.add(sbHorizontal, 0, 1);
+        scrollPane.add(sbVertical, 1, 0);
+        scrollPane.add(canvas, 0, 0);
+        scrollPane.add(topShadow, 0, 0);
+
+        GridPane.setHgrow(sbVertical, Priority.NEVER);
+        GridPane.setVgrow(sbHorizontal, Priority.NEVER);
+
+        ColumnConstraints cc = new ColumnConstraints();
+        cc.setHgrow(Priority.ALWAYS);
+        cc.setMinWidth(0.0);
+
+        scrollPane.getColumnConstraints().add(cc);
+
+        RowConstraints rc = new RowConstraints();
+        rc.setValignment(VPos.TOP);
+        rc.setVgrow(Priority.ALWAYS);
+        rc.setMinHeight(0.0);
+
+        scrollPane.getRowConstraints().add(rc);
+
+        VBox.setVgrow(scrollPane, Priority.ALWAYS);
+
+        canvas.heightProperty().bind(sbVertical.heightProperty());
+        canvas.widthProperty().bind(sbHorizontal.widthProperty());
+
+        Button btnNext = new Button("Next");
+        Button btnPrev = new Button("Prev");
+        Button btnLast = new Button("Last");
+        Button btnFirst = new Button("First");
+        Button btnSave = new Button("Save");
+        Button btnPrint = new Button("Print");
+
+        btnPrint.setOnAction(ae -> printReport());
+        btnSave.setOnAction(ae -> saveReport());
+
+        btnNext.setOnAction((ae) -> showPage(nextPage()));
+        btnPrev.setOnAction((ae) -> showPage(prevPage()));
+        btnLast.setOnAction((ae) -> showPage(lastPage()));
+        btnFirst.setOnAction((ae) -> showPage(firstPage()));
+
+        btnFirst.getStyleClass().add("left-pill");
+        btnNext.getStyleClass().add("center-pill");
+        btnLast.getStyleClass().add("right-pill");
+        btnPrev.getStyleClass().add("center-pill");
+
+/*        btnFirst.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        btnNext.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        btnLast.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        btnPrev.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        btnSave.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        btnPrint.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);*/
+
+        btnPrint.setTooltip(new Tooltip("Imprimir"));
+        btnSave.setTooltip(new Tooltip("Guardar"));
+
+        btnFirst.disableProperty().bind(page.firstPageProperty());
+        btnPrev.disableProperty().bind(page.firstPageProperty());
+        btnLast.disableProperty().bind(page.lastPageProperty());
+        btnNext.disableProperty().bind(page.lastPageProperty());
+
+        Text pageInfo = new Text("0 / 0");
+        pageInfo.textProperty().bind(page.actualPageProperty()
+                .asString().concat(" / ").concat(page.getLast() + 1));
+
+        HBox navBar = new HBox(btnFirst, btnPrev, btnNext, btnLast);
+        navBar.setAlignment(Pos.CENTER);
+
+        ToolBar hbxToolBar = new ToolBar(btnSave, btnPrint, new Separator(),
+                navBar, new Separator(), pageInfo, new Separator(), cbxZoom);
+
+        vbxRoot.getChildren().addAll(hbxToolBar, scrollPane);
+
+        return new Scene(vbxRoot, width, height);
+    }
+
+    private void saveReport() {
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setInitialFileName("Reporte.pdf");
+        fileChooser.setTitle("Guardar Reporte");
+        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("PDF Document", Arrays.asList("*.pdf", "*.PDF")));
+        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("DOCX Document", Arrays.asList("*.docx", "*.DOCX")));
+        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("XLSX Document", Arrays.asList("*.xlsx", "*.XLSX")));
+        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("HTML Document", Arrays.asList("*.html", "*.HTML")));
+
+        File file = fileChooser.showSaveDialog(stage);
+
+        if (fileChooser.getSelectedExtensionFilter() != null && fileChooser.getSelectedExtensionFilter().getExtensions() != null) {
+            java.util.List<String> selectedExtension = fileChooser.getSelectedExtensionFilter().getExtensions();
+            try {
+                if (selectedExtension.contains("*.pdf")) {
+                    JasperExportManager.exportReportToPdfFile(print, file.getAbsolutePath());
+                } else if (selectedExtension.contains("*.html")) {
+                    JasperExportManager.exportReportToHtmlFile(print, file.getAbsolutePath());
+                } else if (selectedExtension.contains("*.docx")) {
+                    ReportExporter.docx(print, file.getAbsolutePath());
+                } else if (selectedExtension.contains("*.xlsx")) {
+                    ReportExporter.xlsx(print, file.getAbsolutePath());
+                }
+            } catch (JRException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private void printReport() {
+        try {
+            JasperPrintManager.printReport(print, true);
+        } catch (JRException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private int nextPage() {
+        return pages.moveNext().getActual();
+    }
+
+    private int prevPage() {
+        return pages.movePrev().getActual();
+    }
+
+    private int lastPage() {
+        return pages.moveLast().getActual();
+    }
+
+    private int firstPage() {
+        return pages.moveFirst().getActual();
+    }
+
+    private float getZoom() {
+        Integer zoom = cbxZoom.getSelectionModel().getSelectedItem();
+        return (zoom / 100.0f) * RESOLUTION / 72.0f;
+    }
+
+    private void showFirstPage() {
+        updateScrollSize(print, 0, getZoom());
+        renderPage(0);
+        loaded = true;
+    }
+
+    private void showPage(int page) {
+        sbVertical.setValue(0);
+        sbHorizontal.setValue(0);
+
+        updateScrollSize(print, page, getZoom());
+        renderPage(page);
+    }
+
+    private void handleResize() {
+        if (loaded) {
+            lastTimerCall = System.nanoTime();
+            if (timer == null) {
+                timer = new AnimationTimer() {
+                    @Override
+                    public void handle(long now) {
+                        if (now > lastTimerCall + 2_500_000l /*30_000_000l*/) {
+                            updateScrollSize(print, pages.getActual(), getZoom());
+                            renderPage(pages.getActual());
+                            timer.stop();
+                        }
+                    }
+                };
+            }
+            timer.start();
+        }
+    }
+
+    private void updateScrollSize(JasperPrint printer, int page, float zoom) {
+        PrintPageFormat pageFormat = printer.getPageFormat(page);
+
+        int image_width = (int) (pageFormat.getPageWidth() * zoom);
+        int image_height = (int) (pageFormat.getPageHeight() * zoom);
+
+        int canvas_height = (int) canvas.getHeight();
+        int canvas_width = (int) canvas.getWidth();
+
+        double maxv = image_height - canvas_height;
+        double visv = maxv - (maxv * (maxv / canvas_height));
+
+        sbVertical.setMax(maxv);
+        sbVertical.setVisibleAmount(visv);
+
+        double maxh = image_width - canvas_width;
+        double vish = maxh - (maxh * (maxh / canvas_width));
+
+        sbHorizontal.setMax(maxh);
+        sbHorizontal.setVisibleAmount(vish);
+    }
+
+    private void renderPage(int actual) {
+        try {
+            float zoomRatio = getZoom();
+
+            PrintPageFormat pageFormat = print.getPageFormat(actual);
+
+            int image_width = (int) (pageFormat.getPageWidth() * zoomRatio);
+            int image_height = (int) (pageFormat.getPageHeight() * zoomRatio);
+            int ch = (int) canvas.getHeight(), cw = (int) canvas.getWidth();
+            int xpos = cw > image_width ? (cw / 2) - (image_width / 2) : 0;
+            int ypos = ch > image_height ? (ch / 2) - (image_height / 2) : 0;
+
+            BufferedImage bimage = getImage(print, actual, zoomRatio);
+            WritableImage wimage = SwingFXUtils.toFXImage(bimage, null);
+
+            GraphicsContext gc = canvas.getGraphicsContext2D();
+            gc.clearRect(0, 0, cw, ch);
+            gc.drawImage(wimage, xpos, ypos);
+
+        } catch (JRException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private BufferedImage getImage(JasperPrint jasperPrint, int pageIndex, float zoom) throws JRException {
+        int canvas_width =(int) canvas.getWidth();
+        int canvas_height =(int) canvas.getHeight();
+
+        BufferedImage pageImage = new BufferedImage(canvas_width, canvas_height, BufferedImage.TYPE_INT_ARGB);
+
+        if (exporter == null) {
+            exporter = new JRGraphics2DExporter(jasperReportsContext);
+            exporter.setExporterInput(new SimpleExporterInput(jasperPrint));
+        }
+
+        int offsetx = (int) sbHorizontal.getValue();
+        int offsety = (int) sbVertical.getValue();
+
+        SimpleGraphics2DExporterOutput output = new SimpleGraphics2DExporterOutput();
+        output.setGraphics2D((Graphics2D) pageImage.getGraphics());
+        output.getGraphics2D().translate(-offsetx, -offsety);
+
+        exporter.setExporterOutput(output);
+
+        SimpleGraphics2DReportConfiguration configuration = new SimpleGraphics2DReportConfiguration();
+        configuration.setPageIndex(pageIndex);
+        configuration.setZoomRatio(zoom);
+
+        exporter.setConfiguration(configuration);
+        exporter.exportReport();
+
+        return pageImage;
+    }
+
+}
diff --git a/src/application/reports/Page.java b/src/application/reports/Page.java
new file mode 100644
index 0000000..e16eeec
--- /dev/null
+++ b/src/application/reports/Page.java
@@ -0,0 +1,92 @@
+package application.reports;
+
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.property.ReadOnlyBooleanWrapper;
+import javafx.beans.property.ReadOnlyIntegerProperty;
+import javafx.beans.property.ReadOnlyIntegerWrapper;
+
+public class Page {
+    private int last, first, actual;
+
+    private final ReadOnlyIntegerWrapper actualPage;
+    private final ReadOnlyBooleanWrapper firstPage;
+    private final ReadOnlyBooleanWrapper lastPage;
+
+    public ReadOnlyBooleanProperty lastPageProperty() {
+        return lastPage.getReadOnlyProperty();
+    }
+
+    public Page(int last, int first, int actual) {
+        this.last = last;
+        this.first = first;
+        this.actual = actual;
+        this.actualPage = new ReadOnlyIntegerWrapper();
+        this.lastPage = new ReadOnlyBooleanWrapper();
+        this.firstPage = new ReadOnlyBooleanWrapper();
+        this.updateInfoPage(actual);
+    }
+
+    private void updateInfoPage(int page){
+        actualPage.set(page + 1);
+        firstPage.set(page == first);
+        lastPage.set(page == last);
+        actual = page;
+    }
+
+    public Page moveNext() {
+        updateInfoPage(actual < last ? actual + 1 : last);
+        return this;
+    }
+
+    public Page movePrev() {
+        updateInfoPage(actual > first ? actual - 1 : first);
+        return this;
+    }
+
+    public Page moveLast(){
+        updateInfoPage(last);
+        return this;
+    }
+
+    public Page moveFirst(){
+        updateInfoPage(first);
+        return this;
+    }
+
+    public Page MoveTo(int page){
+        updateInfoPage(page < first ? first : page > last ? last : page);
+        return this;
+    }
+
+    public int getLast() {
+        return last;
+    }
+
+    public int getFirst() {
+        return first;
+    }
+
+    public int getActual() {
+        return actual;
+    }
+
+    public int getActualPage() {
+        return actualPage.get();
+    }
+
+    public ReadOnlyIntegerProperty actualPageProperty() {
+        return actualPage.getReadOnlyProperty();
+    }
+
+    public boolean getFirstPage() {
+        return firstPage.get();
+    }
+
+    public ReadOnlyBooleanProperty firstPageProperty() {
+        return firstPage.getReadOnlyProperty();
+    }
+
+    public boolean getLastPage() {
+        return lastPage.get();
+    }
+}
diff --git a/src/application/reports/ReportExporter.java b/src/application/reports/ReportExporter.java
new file mode 100644
index 0000000..3444fa8
--- /dev/null
+++ b/src/application/reports/ReportExporter.java
@@ -0,0 +1,54 @@
+package application.reports;
+
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.export.JRRtfExporter;
+import net.sf.jasperreports.engine.export.oasis.JROdtExporter;
+import net.sf.jasperreports.engine.export.ooxml.JRDocxExporter;
+import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter;
+import net.sf.jasperreports.export.SimpleExporterInput;
+import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
+import net.sf.jasperreports.export.SimpleWriterExporterOutput;
+import net.sf.jasperreports.export.SimpleXlsxReportConfiguration;
+
+public class ReportExporter {
+    public static void docx(JasperPrint print, String file) throws JRException {
+        JRDocxExporter exporter = new JRDocxExporter();
+
+        exporter.setExporterInput(new SimpleExporterInput(print));
+        exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(file));
+
+        exporter.exportReport();
+    }
+
+    public static void xlsx(JasperPrint print, String file) throws JRException {
+        JRXlsxExporter exporter = new JRXlsxExporter();
+
+        exporter.setExporterInput(new SimpleExporterInput(print));
+        exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(file));
+        SimpleXlsxReportConfiguration configuration = new SimpleXlsxReportConfiguration();
+        configuration.setOnePagePerSheet(false);
+        exporter.setConfiguration(configuration);
+
+        exporter.exportReport();
+    }
+
+    public static void rtf(JasperPrint print, String file) throws JRException{
+        JRRtfExporter exporter = new JRRtfExporter();
+
+        exporter.setExporterInput(new SimpleExporterInput(print));
+        exporter.setExporterOutput(new SimpleWriterExporterOutput(file));
+
+        exporter.exportReport();
+    }
+
+    public static void odt(JasperPrint print, String file) throws JRException {
+        JROdtExporter exporter = new JROdtExporter();
+
+        exporter.setExporterInput(new SimpleExporterInput(print));
+        exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(file));
+
+        exporter.exportReport();
+    }
+    
+}
diff --git a/src/application/reports/ZoomConverter.java b/src/application/reports/ZoomConverter.java
new file mode 100644
index 0000000..015b04d
--- /dev/null
+++ b/src/application/reports/ZoomConverter.java
@@ -0,0 +1,24 @@
+package application.reports;
+
+import javafx.util.StringConverter;
+
+public class ZoomConverter extends StringConverter<Integer> {
+    @Override
+    public String toString(Integer object) {
+        return object.toString() + " %";
+    }
+
+    @Override
+    public Integer fromString(String string) {
+        String zoom = string.split("%")[0];
+        if(zoom.isEmpty()){
+            return 100;
+        }else {
+            try {
+                return Integer.parseInt(zoom.trim());
+            }catch (NumberFormatException nfe){
+                return 100;
+            }
+        }
+    }
+}

From 95222ce2b95386037d44846787071b26686e72e3 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Sat, 24 Feb 2018 15:16:15 -0300
Subject: [PATCH 04/27] optimizacion de imports en todas las clases,
 funcionalidad de reportes para todos los reportes y reportes de stock
 funcionales

---
 src/application/Main.java                     |   5 +-
 .../model/compra/DetalleCompra.java           |   2 -
 .../model/compra/FacturaCompra.java           |   7 +-
 .../model/info/CategoriaEmpleado.java         |   5 +-
 src/application/model/info/Domicilio.java     |   1 -
 src/application/model/info/Empleado.java      |   1 -
 .../model/sueldo/LiquidacionEmpleado.java     |   1 -
 .../model/sueldo/Liquidaciones.java           |   2 -
 src/application/model/venta/Cliente.java      |   1 -
 src/application/model/venta/Viaje.java        |   2 -
 .../reports/AbstractJasperReports.java        |  22 +-
 .../reports/DatosOrganizacion.jasper          | Bin 24902 -> 24933 bytes
 .../reports/DatosOrganizacion.jrxml           |  28 +-
 src/application/reports/JasperFX.java         |   2 +-
 src/application/reports/ReciboSueldo.jasper   | Bin 0 -> 35586 bytes
 src/application/reports/ReciboSueldo.jrxml    | 249 ++++++++++++++++++
 .../repository/calculo/FincaRepository.java   |   1 -
 .../repository/compra/ArticuloRepository.java |   6 +-
 .../compra/CategoriaArticuloRepository.java   |   6 +-
 .../compra/FacturaCompraRepository.java       |   1 -
 .../info/CategoriaEmpleadoRepository.java     |  16 +-
 .../repository/info/DomicilioRepository.java  |  18 +-
 .../repository/info/EmpleadoRepository.java   |   9 +-
 .../repository/info/FamiliarRepository.java   |   1 -
 .../repository/info/LocalidadRepository.java  |  22 +-
 .../repository/info/ProvinciaRepository.java  |  17 +-
 .../repository/info/UsuarioRepository.java    |   6 +-
 .../sueldo/LiquidacionesRepository.java       |   8 +-
 .../sueldo/LiquidarSueldoRepository.java      |  10 +-
 .../sueldo/TipoLiquidacionRepository.java     |   2 -
 .../venta/FacturaVentaRepository.java         |  34 +--
 .../repository/venta/ViajeRepository.java     |  43 ++-
 src/application/view/Login.fxml               |   3 -
 src/application/view/LoginController.java     |  12 +-
 src/application/view/Principal.fxml           |  11 -
 src/application/view/PrincipalController.java |  15 +-
 src/application/view/Register.fxml            |  21 +-
 src/application/view/RegisterController.java  |  12 -
 .../view/calculo/CargarAcoplado.fxml          |  11 +-
 .../view/calculo/CargarCamion.fxml            |  11 +-
 src/application/view/calculo/InfoFinca.fxml   |   8 +-
 src/application/view/calculo/InfoIngenio.fxml |   8 +-
 .../view/calculo/InfoIngenioController.java   |   5 +-
 .../view/calculo/InfoOrigenDestino.fxml       |   6 +-
 .../view/calculo/cruds/AcopladoEdit.fxml      |   5 +-
 .../view/calculo/cruds/CamionEdit.fxml        |   5 +-
 .../view/calculo/cruds/DistanciasEdit.fxml    |  15 +-
 .../view/calculo/cruds/FincaEdit.fxml         |   7 +-
 .../calculo/cruds/FincaEditController.java    |   2 +-
 .../view/calculo/cruds/IngenioEdit.fxml       |   7 +-
 .../calculo/cruds/IngenioEditController.java  |   5 +-
 src/application/view/compra/Articulos.fxml    |   8 +-
 .../compra/CategoriaArticuloController.java   |   5 +-
 .../view/compra/CategoriaArticulos.fxml       |   8 +-
 .../view/compra/CompraCompras.fxml            |  13 +-
 src/application/view/compra/ControlStock.fxml |  14 +-
 .../view/compra/ControlStockController.java   |   7 +-
 src/application/view/compra/Proveedores.fxml  |   8 +-
 .../view/compra/cruds/ArticuloEdit.fxml       |  15 +-
 .../compra/cruds/CategoriaArticuloEdit.fxml   |   5 +-
 .../view/compra/cruds/FacturaEdit.fxml        |  22 +-
 .../compra/cruds/FacturaEditController.java   |   1 -
 .../view/compra/cruds/ProveedorEdit.fxml      |   5 +-
 .../compra/cruds/ProveedorEditController.java |   2 +-
 .../view/compra/cruds/StockEdit.fxml          |  13 +-
 .../compra/cruds/StockEditController.java     |  13 +-
 .../view/info/AdministrarEmpleados.fxml       |   8 +-
 .../info/AdministrarEmpleadosController.java  |  33 ++-
 .../view/info/AdministrarUsuarios.fxml        |  11 +-
 .../info/AdministrarUsuariosController.java   |   9 +-
 src/application/view/info/Desempleados.fxml   |   6 +-
 .../view/info/DesempleadosController.java     |  16 --
 src/application/view/info/GrupoFamiliar.fxml  |  10 -
 .../view/info/GrupoFamiliarController.java    |   1 -
 .../view/info/InfoCategoriaEmpleado.fxml      |   8 +-
 .../info/InfoCategoriaEmpleadoController.java |  11 +-
 src/application/view/info/InfoDomicilio.fxml  |   8 +-
 .../info/cruds/CategoriaEmpleadoEdit.fxml     |   7 +-
 .../CategoriaEmpleadoEditController.java      |   1 -
 .../view/info/cruds/EditarEmpleadoDialog.fxml |  14 -
 .../view/info/cruds/EditarUsuarioDialog.fxml  |   3 -
 .../cruds/EmpleadoEditDialogController.java   |  25 +-
 .../view/info/cruds/FamiliarEdit.fxml         |  15 +-
 .../info/cruds/FamiliarEditController.java    |  12 -
 .../cruds/UsuarioEditDialogController.java    |  16 +-
 src/application/view/inicio/Home.fxml         |  10 +-
 src/application/view/inicio/Organizacion.fxml |   8 +-
 .../view/inicio/crud/OrganizacionEdit.fxml    |   5 +-
 .../crud/OrganizacionEditController.java      |   8 -
 .../view/sueldo/ConceptosSalariales.fxml      |  11 +-
 .../sueldo/ConceptosSalarialesController.java |   2 +-
 .../view/sueldo/Liquidaciones.fxml            |  31 +--
 .../view/sueldo/LiquidacionesController.java  |  20 +-
 .../view/sueldo/cruds/ConceptoEdit.fxml       |  17 +-
 .../sueldo/cruds/ConceptoEditController.java  |   2 +-
 .../view/sueldo/cruds/LiquidacionSueldo.fxml  |  14 -
 .../cruds/LiquidacionSueldoController.java    |   8 +-
 .../view/venta/AdministrarViajes.fxml         |   7 +-
 .../venta/AdministrarViajesController.java    |   1 -
 src/application/view/venta/Facturacion.fxml   |   3 -
 .../view/venta/FacturacionController.java     |   2 -
 src/application/view/venta/VentaCliente.fxml  |  11 +-
 .../view/venta/cruds/ClienteEdit.fxml         |   5 +-
 .../venta/cruds/ClienteEditController.java    |   1 -
 .../view/venta/cruds/EmitirFactura.fxml       |  11 -
 .../venta/cruds/EmitirFacturaController.java  |   2 -
 .../view/venta/cruds/ViajeEdit.fxml           |   4 -
 .../view/venta/cruds/ViajeEditController.java |   4 +-
 108 files changed, 536 insertions(+), 701 deletions(-)
 create mode 100644 src/application/reports/ReciboSueldo.jasper
 create mode 100644 src/application/reports/ReciboSueldo.jrxml

diff --git a/src/application/Main.java b/src/application/Main.java
index e1446f3..6b7ffdc 100644
--- a/src/application/Main.java
+++ b/src/application/Main.java
@@ -1,14 +1,15 @@
 package application;
 
-import application.view.*;
-import java.io.IOException;
 import application.database.JDBCConnection;
+import application.view.LoginController;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
 
+import java.io.IOException;
+
 public class Main extends Application {
 	private Stage primaryStage;
     private BorderPane rootLayout;
diff --git a/src/application/model/compra/DetalleCompra.java b/src/application/model/compra/DetalleCompra.java
index 01fddf2..d1fe351 100644
--- a/src/application/model/compra/DetalleCompra.java
+++ b/src/application/model/compra/DetalleCompra.java
@@ -4,8 +4,6 @@
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleFloatProperty;
 import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
 
 public class DetalleCompra {
 
diff --git a/src/application/model/compra/FacturaCompra.java b/src/application/model/compra/FacturaCompra.java
index b6edc0b..2d11eab 100644
--- a/src/application/model/compra/FacturaCompra.java
+++ b/src/application/model/compra/FacturaCompra.java
@@ -1,11 +1,6 @@
 	package application.model.compra;
 
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+    import javafx.beans.property.*;
 
 public class FacturaCompra {
 
diff --git a/src/application/model/info/CategoriaEmpleado.java b/src/application/model/info/CategoriaEmpleado.java
index 919b252..48123f8 100644
--- a/src/application/model/info/CategoriaEmpleado.java
+++ b/src/application/model/info/CategoriaEmpleado.java
@@ -1,6 +1,9 @@
 package application.model.info;
 
-import javafx.beans.property.*;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.scene.control.CheckBox;
 
 public class CategoriaEmpleado {
diff --git a/src/application/model/info/Domicilio.java b/src/application/model/info/Domicilio.java
index 51e8403..eef2564 100644
--- a/src/application/model/info/Domicilio.java
+++ b/src/application/model/info/Domicilio.java
@@ -5,7 +5,6 @@
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import application.repository.info.LocalidadRepository;
 
 public class Domicilio {
 	
diff --git a/src/application/model/info/Empleado.java b/src/application/model/info/Empleado.java
index b905f10..79a126c 100644
--- a/src/application/model/info/Empleado.java
+++ b/src/application/model/info/Empleado.java
@@ -5,7 +5,6 @@
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import application.repository.info.DomicilioRepository;
 
 
 public class Empleado {
diff --git a/src/application/model/sueldo/LiquidacionEmpleado.java b/src/application/model/sueldo/LiquidacionEmpleado.java
index f46078c..278c393 100644
--- a/src/application/model/sueldo/LiquidacionEmpleado.java
+++ b/src/application/model/sueldo/LiquidacionEmpleado.java
@@ -2,7 +2,6 @@
 
 import application.model.info.Empleado;
 import javafx.beans.property.*;
-import javafx.collections.ObservableList;
 
 import java.util.List;
 
diff --git a/src/application/model/sueldo/Liquidaciones.java b/src/application/model/sueldo/Liquidaciones.java
index eebf045..ebaac13 100644
--- a/src/application/model/sueldo/Liquidaciones.java
+++ b/src/application/model/sueldo/Liquidaciones.java
@@ -2,8 +2,6 @@
 
 import javafx.beans.property.*;
 
-import java.util.List;
-
 public class Liquidaciones {
     private IntegerProperty id;
     private StringProperty fechaLiquidacion;
diff --git a/src/application/model/venta/Cliente.java b/src/application/model/venta/Cliente.java
index 8a06eb4..e8409c0 100644
--- a/src/application/model/venta/Cliente.java
+++ b/src/application/model/venta/Cliente.java
@@ -1,7 +1,6 @@
 package application.model.venta;
 
 import application.model.info.Domicilio;
-import application.model.info.Localidad;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/src/application/model/venta/Viaje.java b/src/application/model/venta/Viaje.java
index 733bd04..86cb6d7 100644
--- a/src/application/model/venta/Viaje.java
+++ b/src/application/model/venta/Viaje.java
@@ -7,8 +7,6 @@
 import javafx.beans.property.*;
 import javafx.scene.control.CheckBox;
 
-import java.math.BigDecimal;
-
 public class Viaje {
 
     private IntegerProperty idRemito;
diff --git a/src/application/reports/AbstractJasperReports.java b/src/application/reports/AbstractJasperReports.java
index f2cfa26..a372b2f 100644
--- a/src/application/reports/AbstractJasperReports.java
+++ b/src/application/reports/AbstractJasperReports.java
@@ -1,13 +1,16 @@
 package application.reports;
 
 import application.database.JDBCConnection;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-import javafx.stage.StageStyle;
-import net.sf.jasperreports.engine.*;
+import com.sun.javafx.collections.MappingChange;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperFillManager;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.JasperReport;
 import net.sf.jasperreports.engine.util.JRLoader;
 
 import java.sql.Connection;
+import java.util.HashMap;
+import java.util.Map;
 
 public abstract class AbstractJasperReports {
     private static JasperReport report;
@@ -21,6 +24,17 @@ public static void createReport(String path){
         }catch (JRException e){
             e.printStackTrace();
         }
+    }
+    public static void createReport(String path,String nombreParametro, int id){
+        try {
+            Connection connection = JDBCConnection.getInstanceConnection();
+            report = (JasperReport) JRLoader.loadObjectFromFile(path);
+            Map<String, Object> parameter = new HashMap<>();
+            parameter.put(nombreParametro,id);
+            reportFilled = JasperFillManager.fillReport(report, parameter, connection);
+        }catch (JRException e){
+            e.printStackTrace();
+        }
 
     }
     public static void showViewer(){
diff --git a/src/application/reports/DatosOrganizacion.jasper b/src/application/reports/DatosOrganizacion.jasper
index eef5c1cffb304d233e8c20d0156f9623a6d0f1d3..5ada3d27db82ae60524c7cc89e98a425ccf0ff3f 100644
GIT binary patch
delta 1555
zcma)*O=uHA6vt;`Y)yMmNi5hFKTr`Qkxi4Pi3XdGZj(ydlw`$AAyy)x0qdseK?-dt
z6s?BnVJa#jo_f%OwB*=>8cOjX^dLwtqNUV=^qxa6&YRhl-DD0~*tZM6`R}~n8+Nmb
z_o{exRyyU76Y{V;qGV#J<gL+6B&jIL;mVTqp~a>kgdFrnWambieC@kppDUm_oSQ~%
zBgsr!Ny$nyPHKHwJV3_$>EqUfJgBJbDo&xRWbM*rvhV-gRZ5^%bv&D$n9M=GkU&S&
zdz0{5BGteJTK@#j9xFXmRT}d^tm3^kgWJongq0amxacH%*E`+M5&C-<w)oG=Y7yRr
zU<&oHE^Y_A?1Ba4SI|k;f~Q5S@-ujdZL<jBZ*&4}FarFZJm`1f1@gB4{QP404nnHR
zCh~Y19Ze0z;<`Na^OU#s%-HWL09IBwU2dcT8y@4}rIzrq0T{_^!MEr{VaqrAz*a~;
zbOyg8PeL)<5>@*`)w-G5Cz1<;+KVu#je;5^KeE&0UlAE?z#>-G`681MryQ8ZZv?s#
z+Yf*XZ}5o8NQ=}Pt!qXLk+|J~F!h0Jg1Y^tPl>sGC;2G2y^4Zcs9CpdaARdl;Kr%I
z%?M0x09<%m;HE|D-L^Eh#eszF5jCn(qX;wFCpnp&mJCKxvqlGC#LBL~h*N=)5txhs
zxbT6%NQ=}P?dqpBn6eeA(GO~rW=4l3A7f_}1EX_I8d(tSfE8S8G}36JkqH=$7;sro
zqmdq|H>&Ap6c5h}eh^DLGzbNc2^!>7(4Y~R8Z-jq|3UY#!cLX=P$%y2N^Xzj_6GtP
epV#N<?P*0;jGSbrrMt3x^M1#PdQMJ`_x=OXcLRg~

delta 1480
zcma*mK}Zx)7zgn8MJkhrf<SVKYN-gy!O_@lwhW!!#@!+;wmk->2zng#7NsP#w3vi`
zRCJJvJtVPEF~LSch=)2@bn)QLLj=+-Jaljmz3;uJ%*?*S&f%M3{`0;0e!Q9AtMGLd
z-ru)c4-DKGyj94%g-p(0u--N|jWK?pb78q@oK3+P9<)b{dyIMB)C99}zB7)C_Su%^
zj5|<p^Z4EV3nl!LYUgz$b&}Uw>Nu4AqZgN;b(U5T<t~n&>cE{#v5q;${tSEk*vn?U
zNxIeq==5ZdXzqKH6U@R7r_bQGp7xmT0dMaSKYsZK7|$4kcid&*PI?aB;KN>%)BN7}
z^o(<da5O=Y#^RlH{Yai32dAx2AWB)L3-zhSBHLu}G}>W8MJCUq2@ljPFK8-ycNrg~
zkHI1?^<|CMTvXwrm=G;v(IL@CheS6U6|K;!qEs~^nQBDAAS9x|gcXfQwM0c#C3=<4
z9d2X5J#@@)+h=}0Cu~2llp$L+L$<y~ZR=zcWldv~sm2xzLN*FaSl8H8OVqZeY~?H0
zjhE{CO9|00EV^R1ToPH0ind53%BDsnQ;jGXghUjWu%!{HmZ)fRcencU2LChQ6W^nL
zA^L}<tk|P0iB2>ss*y;PZH-8#8c{F^i6}6krV*)@sAzk4k8;km=9k~s!WR?;Zr2Z}
y()s~IL2$rO5d7nLu%F)Kk6w+zq4P;Q(QPHVy9Se8$wbof=dV3!tGkQVP~ty;%Jx$L

diff --git a/src/application/reports/DatosOrganizacion.jrxml b/src/application/reports/DatosOrganizacion.jrxml
index be0aa72..3b800b2 100644
--- a/src/application/reports/DatosOrganizacion.jrxml
+++ b/src/application/reports/DatosOrganizacion.jrxml
@@ -52,57 +52,57 @@
 	<title>
 		<band height="121">
 			<frame>
-				<reportElement mode="Opaque" x="-20" y="-20" width="595" height="140" backcolor="#006699" uuid="2a464480-7866-4aa1-87e4-1d953cafb4a8"/>
+				<reportElement stretchType="ElementGroupBottom" mode="Opaque" x="-20" y="-20" width="595" height="140" backcolor="#006699" uuid="2a464480-7866-4aa1-87e4-1d953cafb4a8"/>
 				<textField isStretchWithOverflow="true">
-					<reportElement x="0" y="0" width="360" height="90" forecolor="#FFFFFF" uuid="589cd6be-6cb4-4c58-b067-af24da0f1d3d">
+					<reportElement x="20" y="0" width="340" height="90" forecolor="#FFFFFF" uuid="589cd6be-6cb4-4c58-b067-af24da0f1d3d">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="9ef7ebef-557c-4eb9-a6f6-fd203f3d15a3"/>
 					</reportElement>
-					<textElement textAlignment="Center">
-						<font size="63"/>
+					<textElement textAlignment="Left">
+						<font size="49"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{Nombre}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement x="431" y="9" width="150" height="21" forecolor="#FFFFFF" uuid="9755d5f7-e87c-46db-8343-e9203adca05d">
+					<reportElement x="460" y="10" width="125" height="21" forecolor="#FFFFFF" uuid="9755d5f7-e87c-46db-8343-e9203adca05d">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="6f8b35ff-2a96-4fab-af23-7689e034e597"/>
 					</reportElement>
-					<textElement textAlignment="Center">
+					<textElement textAlignment="Right">
 						<font size="14"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{CUIT}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement x="428" y="26" width="161" height="20" forecolor="#FFFFFF" uuid="77557b0f-7e91-4d03-90b7-237331a28b22">
+					<reportElement x="449" y="28" width="136" height="20" forecolor="#FFFFFF" uuid="77557b0f-7e91-4d03-90b7-237331a28b22">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="bdf93edd-7fd2-421a-aa9e-7b2094197432"/>
 					</reportElement>
-					<textElement textAlignment="Center">
+					<textElement textAlignment="Right">
 						<font size="13"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{nombreApoderado}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement x="442" y="43" width="130" height="22" forecolor="#FFFFFF" uuid="08257133-8d42-471a-a0b1-da9b19f17140">
+					<reportElement x="480" y="48" width="105" height="20" forecolor="#FFFFFF" uuid="08257133-8d42-471a-a0b1-da9b19f17140">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="dfc5f143-78c5-43d8-a2c2-8359c8b3a532"/>
 					</reportElement>
-					<textElement textAlignment="Center">
+					<textElement textAlignment="Right">
 						<font size="12"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{direccion}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement x="431" y="57" width="159" height="20" forecolor="#FFFFFF" uuid="60dddd26-5924-402b-9b4d-4f0f33510b83">
+					<reportElement x="450" y="66" width="134" height="20" forecolor="#FFFFFF" uuid="60dddd26-5924-402b-9b4d-4f0f33510b83">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="3c6ce040-c370-40bb-bc7b-9f575e076019"/>
 					</reportElement>
-					<textElement textAlignment="Center">
+					<textElement textAlignment="Right">
 						<font size="11"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{NombreLocalidad}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement x="440" y="70" width="140" height="20" forecolor="#FFFFFF" uuid="8b3f0a29-5d29-4e17-bdd9-11333b877f80">
+					<reportElement x="470" y="83" width="115" height="20" forecolor="#FFFFFF" uuid="8b3f0a29-5d29-4e17-bdd9-11333b877f80">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="a798d107-c3e5-44ca-9357-93a4547a34af"/>
 					</reportElement>
-					<textElement textAlignment="Center">
+					<textElement textAlignment="Right">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{NombreProvincia}]]></textFieldExpression>
diff --git a/src/application/reports/JasperFX.java b/src/application/reports/JasperFX.java
index d17b8ff..0a50e10 100644
--- a/src/application/reports/JasperFX.java
+++ b/src/application/reports/JasperFX.java
@@ -9,8 +9,8 @@
 import javafx.scene.Scene;
 import javafx.scene.canvas.Canvas;
 import javafx.scene.canvas.GraphicsContext;
-import javafx.scene.control.*;
 import javafx.scene.control.Button;
+import javafx.scene.control.*;
 import javafx.scene.image.WritableImage;
 import javafx.scene.layout.*;
 import javafx.scene.text.Text;
diff --git a/src/application/reports/ReciboSueldo.jasper b/src/application/reports/ReciboSueldo.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..186c870d2084579ea524397bfcf542583df04b66
GIT binary patch
literal 35586
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
S<l=2_BDZ77VnA*6=Klw*EmQOW

literal 0
HcmV?d00001

diff --git a/src/application/reports/ReciboSueldo.jrxml b/src/application/reports/ReciboSueldo.jrxml
new file mode 100644
index 0000000..ed40788
--- /dev/null
+++ b/src/application/reports/ReciboSueldo.jrxml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReciboSueldo" pageWidth="420" pageHeight="595" columnWidth="380" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="5b0bdcbb-b9c4-4981-b525-d1276281a4db">
+	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="logiserv"/>
+	<property name="com.jaspersoft.studio.unit." value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
+	<parameter name="idLiquidacion" class="java.lang.Integer">
+		<parameterDescription><![CDATA[idLiquidacion]]></parameterDescription>
+		<defaultValueExpression><![CDATA[0]]></defaultValueExpression>
+	</parameter>
+	<queryString language="SQL">
+		<![CDATA[SELECT modelofinal.liquidacion_empleado.total_bruto,
+	modelofinal.liquidacion_empleado.total_haberes_remunerativos,
+	modelofinal.liquidacion_empleado.importe_neto,
+	modelofinal.liquidacion_empleado.`idLiquidacionEmpleado`,
+	modelofinal.liquidacion_empleado.total_retenciones,
+	modelofinal.liquidacion_empleado.fin_periodo,
+	modelofinal.liquidacion_empleado.total_haberes_no_remunerativos,
+	modelofinal.liquidacion_empleado.fecha_liquidacion,
+	modelofinal.liquidacion_empleado.inicio_periodo,
+	modelofinal.detalle_liquidacion_empleado.monto, 
+	modelofinal.concepto_sueldo.descripcion,
+	modelofinal.concepto_sueldo.tipo_concepto,
+	CONCAT(modelofinal.empleado.`Apellido`, ", ",	modelofinal.empleado.`Nombre`) AS nombreCompleto,
+	modelofinal.empleado.`idEmpleado`,
+	modelofinal.categoria_empleado.`NombreCategoria` 
+FROM modelofinal.liquidacion_empleado,  modelofinal.detalle_liquidacion_empleado,  modelofinal.concepto_sueldo , modelofinal.empleado,   modelofinal.categoria_empleado 
+WHERE  modelofinal.detalle_liquidacion_empleado.`LiquidacionEmpleado_idLiquidacionEmpleado` = modelofinal.liquidacion_empleado.`idLiquidacionEmpleado` 
+AND  modelofinal.detalle_liquidacion_empleado.`CONCEPTO_SUELDO_idCodigoConcepto`=  modelofinal.concepto_sueldo.`idCodigoConcepto` 
+AND  modelofinal.liquidacion_empleado.`EMPLEADO_idEmpleado` = modelofinal.empleado.`idEmpleado` 
+AND   modelofinal.empleado.`CATEGORIA_EMPLEADO_idCategoriaEmpleado` =modelofinal.categoria_empleado.`idCategoriaEmpleado` 
+AND  modelofinal.liquidacion_empleado.`LIQUIDACION_idLIQUIDACION` =$P{idLiquidacion}]]>
+	</queryString>
+	<field name="total_bruto" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="total_bruto"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
+	<field name="total_haberes_remunerativos" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="total_haberes_remunerativos"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
+	<field name="importe_neto" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="importe_neto"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
+	<field name="idLiquidacionEmpleado" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="idLiquidacionEmpleado"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
+	<field name="total_retenciones" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="total_retenciones"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
+	<field name="fin_periodo" class="java.sql.Date">
+		<property name="com.jaspersoft.studio.field.label" value="fin_periodo"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
+	<field name="total_haberes_no_remunerativos" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="total_haberes_no_remunerativos"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
+	<field name="fecha_liquidacion" class="java.sql.Date">
+		<property name="com.jaspersoft.studio.field.label" value="fecha_liquidacion"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
+	<field name="inicio_periodo" class="java.sql.Date">
+		<property name="com.jaspersoft.studio.field.label" value="inicio_periodo"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
+	<field name="monto" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="monto"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="detalle_liquidacion_empleado"/>
+	</field>
+	<field name="descripcion" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="descripcion"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="concepto_sueldo"/>
+	</field>
+	<field name="tipo_concepto" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="tipo_concepto"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="concepto_sueldo"/>
+	</field>
+	<field name="nombreCompleto" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="nombreCompleto"/>
+	</field>
+	<field name="idEmpleado" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="idEmpleado"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
+	</field>
+	<field name="NombreCategoria" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="NombreCategoria"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="categoria_empleado"/>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="155" splitType="Stretch">
+			<subreport>
+				<reportElement x="-20" y="0" width="397" height="154" uuid="51fe9eff-e8ec-4245-95e1-db4da6f28751"/>
+				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+				<subreportExpression><![CDATA["target/classes/application/reports/DatosOrganizacion.jasper"]]></subreportExpression>
+			</subreport>
+			<staticText>
+				<reportElement x="8" y="100" width="365" height="42" forecolor="#FFFFFF" uuid="91ed0f02-eda3-48b8-a2ba-e3ecaff67e02"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="25" isBold="true"/>
+				</textElement>
+				<text><![CDATA[RECIBO SUELDO]]></text>
+			</staticText>
+		</band>
+	</title>
+	<pageHeader>
+		<band height="51" splitType="Stretch">
+			<frame>
+				<reportElement x="2" y="0" width="377" height="51" uuid="ea8faf1a-0d85-459b-9c90-a04562d91803"/>
+				<line>
+					<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToBandHeight" x="0" y="1" width="376" height="1" uuid="d025d541-f52d-4305-a0f6-ee99413c83c5"/>
+				</line>
+				<textField>
+					<reportElement x="0" y="0" width="189" height="19" uuid="0d3d5267-43c3-42b7-9a56-e71e54512780"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font size="12" isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{nombreCompleto}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="323" y="0" width="40" height="19" uuid="907ea8ae-a2a0-4a9c-8ab7-8055430d0d54"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle"/>
+					<text><![CDATA[Legajo:]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="363" y="1" width="14" height="19" uuid="975c7c71-3a41-4c5d-a79c-9687a4fdd9c5"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA[$F{idEmpleado}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="0" y="20" width="50" height="30" uuid="394b9ae6-22e0-4aa1-a869-baecc7a5b348"/>
+					<text><![CDATA[Categoria:]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="50" y="20" width="100" height="30" uuid="ac42ac49-48de-49e5-a101-4a38228bb16d"/>
+					<textFieldExpression><![CDATA[$F{NombreCategoria}]]></textFieldExpression>
+				</textField>
+				<line>
+					<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToBandHeight" x="0" y="40" width="376" height="1" uuid="3cdad003-4a3a-45f4-ac4c-7eb950c00a69"/>
+				</line>
+				<textField>
+					<reportElement x="276" y="20" width="100" height="18" uuid="9083dc96-e753-459f-9bf0-30d9cfed4a05"/>
+					<textElement textAlignment="Right"/>
+					<textFieldExpression><![CDATA[$F{fecha_liquidacion}]]></textFieldExpression>
+				</textField>
+			</frame>
+		</band>
+	</pageHeader>
+	<detail>
+		<band height="22" splitType="Stretch">
+			<frame>
+				<reportElement x="1" y="0" width="378" height="22" uuid="e857996e-0d58-4666-b2db-6c3f6276b47b"/>
+				<textField>
+					<reportElement x="30" y="2" width="143" height="18" uuid="5f95ba8d-8d93-4b0f-adc4-49a387689534"/>
+					<textFieldExpression><![CDATA[$F{descripcion}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="176" y="2" width="11" height="18" uuid="7c8deb38-81bd-41e5-9ac0-acac9eed8996"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[$]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="190" y="2" width="62" height="18" uuid="dbcda56e-fe8e-4d0c-91d7-12279223a8de"/>
+					<textFieldExpression><![CDATA[$F{monto}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="252" y="2" width="118" height="18" uuid="99e14b82-4ea2-41dd-a071-a8b2fbb8a096"/>
+					<textFieldExpression><![CDATA[$F{tipo_concepto}]]></textFieldExpression>
+				</textField>
+			</frame>
+		</band>
+	</detail>
+	<columnFooter>
+		<band height="52" splitType="Stretch">
+			<textField>
+				<reportElement x="321" y="19" width="58" height="18" uuid="a9e8d003-8631-4352-87da-4da0334c3c5d"/>
+				<textElement>
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{importe_neto}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="285" y="18" width="34" height="19" uuid="2d72aa0c-2144-435e-abd5-8a5280c28fcc"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[NETO:]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="110" y="0" width="58" height="18" uuid="834e419b-8d55-4ad0-8c33-1b2d011a4edc"/>
+				<textElement>
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{total_haberes_remunerativos}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="168" y="0" width="62" height="18" uuid="a5e6500b-a100-422a-8837-b9005cd3879a"/>
+				<textElement>
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{total_haberes_no_remunerativos}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="230" y="0" width="50" height="18" uuid="7250bbd4-cfec-4477-beaf-fe030cffe797"/>
+				<textElement>
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{total_retenciones}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="279" y="0" width="40" height="18" uuid="8c5cad28-6bec-4263-bd59-c40ddcf03f18"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[BRUTO:]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="321" y="0" width="58" height="18" uuid="c2a637d1-bdc7-4e80-8036-c29869171d91"/>
+				<textElement>
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{total_bruto}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="2" y="2" width="46" height="15" uuid="387d9967-42ce-46d2-8f59-b54d786e0ee8"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Periodo:]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="31" y="20" width="63" height="14" uuid="dc385501-29ae-4077-8c3c-b3300b7e4ca4"/>
+				<textFieldExpression><![CDATA[$F{inicio_periodo}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="30" y="34" width="64" height="15" uuid="fd9395ff-501e-45db-9593-9a7a363a3628"/>
+				<textFieldExpression><![CDATA[$F{fin_periodo}]]></textFieldExpression>
+			</textField>
+		</band>
+	</columnFooter>
+</jasperReport>
diff --git a/src/application/repository/calculo/FincaRepository.java b/src/application/repository/calculo/FincaRepository.java
index 5725bbc..52394d4 100644
--- a/src/application/repository/calculo/FincaRepository.java
+++ b/src/application/repository/calculo/FincaRepository.java
@@ -6,7 +6,6 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-import java.awt.*;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
diff --git a/src/application/repository/compra/ArticuloRepository.java b/src/application/repository/compra/ArticuloRepository.java
index 8153925..ba156fd 100644
--- a/src/application/repository/compra/ArticuloRepository.java
+++ b/src/application/repository/compra/ArticuloRepository.java
@@ -4,11 +4,13 @@
 import application.database.JDBCConnection;
 import application.model.compra.Articulo;
 import application.model.compra.CategoriaArticulo;
-import com.sun.corba.se.impl.encoding.TypeCodeInputStream;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class ArticuloRepository {
     Connection connection;
diff --git a/src/application/repository/compra/CategoriaArticuloRepository.java b/src/application/repository/compra/CategoriaArticuloRepository.java
index 6c2d048..b53565f 100644
--- a/src/application/repository/compra/CategoriaArticuloRepository.java
+++ b/src/application/repository/compra/CategoriaArticuloRepository.java
@@ -6,8 +6,10 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class CategoriaArticuloRepository {
 
diff --git a/src/application/repository/compra/FacturaCompraRepository.java b/src/application/repository/compra/FacturaCompraRepository.java
index 529606b..f2d2b5a 100644
--- a/src/application/repository/compra/FacturaCompraRepository.java
+++ b/src/application/repository/compra/FacturaCompraRepository.java
@@ -4,7 +4,6 @@
 import application.database.JDBCConnection;
 import application.model.compra.FacturaCompra;
 import application.model.compra.Proveedor;
-import com.sun.org.apache.regexp.internal.RE;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
diff --git a/src/application/repository/info/CategoriaEmpleadoRepository.java b/src/application/repository/info/CategoriaEmpleadoRepository.java
index bc37672..aeb246c 100644
--- a/src/application/repository/info/CategoriaEmpleadoRepository.java
+++ b/src/application/repository/info/CategoriaEmpleadoRepository.java
@@ -1,15 +1,15 @@
 	package application.repository.info;
 
-	import application.comunes.Alerta;
-	import application.database.JDBCConnection;
-import application.model.info.CategoriaEmpleado;
+    import application.comunes.Alerta;
+    import application.database.JDBCConnection;
+    import application.model.info.CategoriaEmpleado;
     import javafx.collections.FXCollections;
-	import javafx.collections.ObservableList;
+    import javafx.collections.ObservableList;
 
-	import java.sql.Connection;
-	import java.sql.PreparedStatement;
-	import java.sql.ResultSet;
-	import java.sql.SQLException;
+    import java.sql.Connection;
+    import java.sql.PreparedStatement;
+    import java.sql.ResultSet;
+    import java.sql.SQLException;
 
 	public class CategoriaEmpleadoRepository {
 	    Connection connection;
diff --git a/src/application/repository/info/DomicilioRepository.java b/src/application/repository/info/DomicilioRepository.java
index d0d753f..69ec7f1 100644
--- a/src/application/repository/info/DomicilioRepository.java
+++ b/src/application/repository/info/DomicilioRepository.java
@@ -1,15 +1,15 @@
 	package application.repository.info;
 
-	import application.comunes.Alerta;
-	import application.database.JDBCConnection;
-	import application.model.info.Domicilio;
-	import javafx.collections.FXCollections;
-	import javafx.collections.ObservableList;
+    import application.comunes.Alerta;
+    import application.database.JDBCConnection;
+    import application.model.info.Domicilio;
+    import javafx.collections.FXCollections;
+    import javafx.collections.ObservableList;
 
-	import java.sql.Connection;
-	import java.sql.PreparedStatement;
-	import java.sql.ResultSet;
-	import java.sql.SQLException;
+    import java.sql.Connection;
+    import java.sql.PreparedStatement;
+    import java.sql.ResultSet;
+    import java.sql.SQLException;
 
 	public class DomicilioRepository {
 	    Connection connection;
diff --git a/src/application/repository/info/EmpleadoRepository.java b/src/application/repository/info/EmpleadoRepository.java
index b0f5adb..557273f 100644
--- a/src/application/repository/info/EmpleadoRepository.java
+++ b/src/application/repository/info/EmpleadoRepository.java
@@ -1,17 +1,12 @@
 package application.repository.info;
 
 import application.comunes.Alerta;
+import application.database.JDBCConnection;
 import application.model.info.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import application.database.JDBCConnection;
+import java.sql.*;
 
 public class EmpleadoRepository {
 	Connection connection;
diff --git a/src/application/repository/info/FamiliarRepository.java b/src/application/repository/info/FamiliarRepository.java
index ac28ea5..355986b 100644
--- a/src/application/repository/info/FamiliarRepository.java
+++ b/src/application/repository/info/FamiliarRepository.java
@@ -3,7 +3,6 @@
 import application.comunes.Alerta;
 import application.database.JDBCConnection;
 import application.model.info.Familiar;
-import com.sun.org.apache.bcel.internal.generic.FADD;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
diff --git a/src/application/repository/info/LocalidadRepository.java b/src/application/repository/info/LocalidadRepository.java
index 9d7945c..a787d64 100644
--- a/src/application/repository/info/LocalidadRepository.java
+++ b/src/application/repository/info/LocalidadRepository.java
@@ -1,16 +1,16 @@
 	package application.repository.info;
 
-	import application.comunes.Alerta;
-	import application.database.JDBCConnection;
-	import application.model.info.Localidad;
-	import application.model.info.Provincia;
-	import javafx.collections.FXCollections;
-	import javafx.collections.ObservableList;
-
-	import java.sql.Connection;
-	import java.sql.PreparedStatement;
-	import java.sql.ResultSet;
-	import java.sql.SQLException;
+    import application.comunes.Alerta;
+    import application.database.JDBCConnection;
+    import application.model.info.Localidad;
+    import application.model.info.Provincia;
+    import javafx.collections.FXCollections;
+    import javafx.collections.ObservableList;
+
+    import java.sql.Connection;
+    import java.sql.PreparedStatement;
+    import java.sql.ResultSet;
+    import java.sql.SQLException;
 
 	public class LocalidadRepository {
 	    Connection connection;
diff --git a/src/application/repository/info/ProvinciaRepository.java b/src/application/repository/info/ProvinciaRepository.java
index b5265a5..1c9d622 100644
--- a/src/application/repository/info/ProvinciaRepository.java
+++ b/src/application/repository/info/ProvinciaRepository.java
@@ -1,15 +1,14 @@
 	package application.repository.info;
 
-	import application.comunes.Alerta;
-	import application.database.JDBCConnection;
-	import application.model.info.Provincia;
-	import javafx.collections.FXCollections;
-	import javafx.collections.ObservableList;
+    import application.database.JDBCConnection;
+    import application.model.info.Provincia;
+    import javafx.collections.FXCollections;
+    import javafx.collections.ObservableList;
 
-	import java.sql.Connection;
-	import java.sql.PreparedStatement;
-	import java.sql.ResultSet;
-	import java.sql.SQLException;
+    import java.sql.Connection;
+    import java.sql.PreparedStatement;
+    import java.sql.ResultSet;
+    import java.sql.SQLException;
 
 	public class ProvinciaRepository {
 	    Connection connection;
diff --git a/src/application/repository/info/UsuarioRepository.java b/src/application/repository/info/UsuarioRepository.java
index 4b08e62..63b0ce0 100644
--- a/src/application/repository/info/UsuarioRepository.java
+++ b/src/application/repository/info/UsuarioRepository.java
@@ -1,15 +1,13 @@
 package application.repository.info;
 
+import application.database.JDBCConnection;
 import application.model.info.Empleado;
-import javafx.beans.property.StringProperty;
+import application.model.info.Usuario;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
 import java.sql.*;
 
-import application.database.JDBCConnection;
-import application.model.info.Usuario;
-
 public class UsuarioRepository {
 	Connection connection;
 	PreparedStatement preparedStatement;
diff --git a/src/application/repository/sueldo/LiquidacionesRepository.java b/src/application/repository/sueldo/LiquidacionesRepository.java
index 38577ec..c93f8af 100644
--- a/src/application/repository/sueldo/LiquidacionesRepository.java
+++ b/src/application/repository/sueldo/LiquidacionesRepository.java
@@ -1,18 +1,14 @@
 package application.repository.sueldo;
 
-import java.sql.*;
-import java.text.SimpleDateFormat;
-
 import application.database.JDBCConnection;
-import application.model.info.CategoriaEmpleado;
 import application.model.info.Empleado;
-import application.model.sueldo.ConceptoSueldo;
 import application.model.sueldo.LiquidacionEmpleado;
 import application.model.sueldo.Liquidaciones;
-import application.model.venta.Viaje;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import java.sql.*;
+
 public class LiquidacionesRepository {
 
     Connection connection;
diff --git a/src/application/repository/sueldo/LiquidarSueldoRepository.java b/src/application/repository/sueldo/LiquidarSueldoRepository.java
index 7386af7..4a6fd50 100644
--- a/src/application/repository/sueldo/LiquidarSueldoRepository.java
+++ b/src/application/repository/sueldo/LiquidarSueldoRepository.java
@@ -1,15 +1,13 @@
 package application.repository.sueldo;
 
+import application.database.JDBCConnection;
+import application.model.info.Empleado;
+import application.model.venta.Viaje;
+
 import java.sql.Connection;
-import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-
-import application.database.JDBCConnection;
-import application.model.info.Empleado;
-import application.model.venta.Viaje;
 
 public class LiquidarSueldoRepository {
 
diff --git a/src/application/repository/sueldo/TipoLiquidacionRepository.java b/src/application/repository/sueldo/TipoLiquidacionRepository.java
index 414dcc1..6941d5a 100644
--- a/src/application/repository/sueldo/TipoLiquidacionRepository.java
+++ b/src/application/repository/sueldo/TipoLiquidacionRepository.java
@@ -1,8 +1,6 @@
 package application.repository.sueldo;
 
-import application.comunes.Alerta;
 import application.database.JDBCConnection;
-import application.model.calculo.Finca;
 import application.model.info.CategoriaEmpleado;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
diff --git a/src/application/repository/venta/FacturaVentaRepository.java b/src/application/repository/venta/FacturaVentaRepository.java
index 55d04a3..db83493 100644
--- a/src/application/repository/venta/FacturaVentaRepository.java
+++ b/src/application/repository/venta/FacturaVentaRepository.java
@@ -1,22 +1,22 @@
 	package application.repository.venta;
 
-	import application.comunes.Alerta;
-	import application.comunes.Calculo;
-	import application.database.JDBCConnection;
-	import application.model.venta.Cliente;
-	import application.model.venta.FacturaVenta;
-	import application.model.venta.Organizacion;
-	import application.model.venta.Viaje;
-	import javafx.collections.FXCollections;
-	import javafx.collections.ObservableList;
-
-	import java.sql.Connection;
-	import java.sql.PreparedStatement;
-	import java.sql.ResultSet;
-	import java.sql.SQLException;
-	import java.text.ParseException;
-	import java.text.SimpleDateFormat;
-	import java.util.List;
+    import application.comunes.Alerta;
+    import application.comunes.Calculo;
+    import application.database.JDBCConnection;
+    import application.model.venta.Cliente;
+    import application.model.venta.FacturaVenta;
+    import application.model.venta.Organizacion;
+    import application.model.venta.Viaje;
+    import javafx.collections.FXCollections;
+    import javafx.collections.ObservableList;
+
+    import java.sql.Connection;
+    import java.sql.PreparedStatement;
+    import java.sql.ResultSet;
+    import java.sql.SQLException;
+    import java.text.ParseException;
+    import java.text.SimpleDateFormat;
+    import java.util.List;
 
 	public class FacturaVentaRepository {
 		ClienteRepository clienteRepository = new ClienteRepository();
diff --git a/src/application/repository/venta/ViajeRepository.java b/src/application/repository/venta/ViajeRepository.java
index 1f03ad0..dd35761 100644
--- a/src/application/repository/venta/ViajeRepository.java
+++ b/src/application/repository/venta/ViajeRepository.java
@@ -1,29 +1,26 @@
 	package application.repository.venta;
 
-	import application.comunes.Alerta;
-	import application.comunes.Calculo;
-	import application.database.JDBCConnection;
-	import application.model.calculo.Camion;
-	import application.model.calculo.Finca;
-	import application.model.calculo.Ingenio;
-	import application.model.info.Empleado;
-	import application.model.venta.Viaje;
-	import application.repository.calculo.CamionRepository;
-	import application.repository.calculo.FincaRepository;
-	import application.repository.calculo.IngenioRepository;
-	import application.repository.info.EmpleadoRepository;
-	import javafx.collections.FXCollections;
-	import javafx.collections.ObservableList;
+    import application.comunes.Alerta;
+    import application.database.JDBCConnection;
+    import application.model.calculo.Camion;
+    import application.model.calculo.Finca;
+    import application.model.calculo.Ingenio;
+    import application.model.info.Empleado;
+    import application.model.venta.Viaje;
+    import application.repository.calculo.CamionRepository;
+    import application.repository.calculo.FincaRepository;
+    import application.repository.calculo.IngenioRepository;
+    import application.repository.info.EmpleadoRepository;
+    import javafx.collections.FXCollections;
+    import javafx.collections.ObservableList;
 
-	import java.math.BigDecimal;
-	import java.sql.Connection;
-	import java.sql.PreparedStatement;
-	import java.sql.ResultSet;
-	import java.sql.SQLException;
-	import java.text.DateFormat;
-	import java.text.ParseException;
-	import java.text.SimpleDateFormat;
-	import java.util.List;
+    import java.sql.Connection;
+    import java.sql.PreparedStatement;
+    import java.sql.ResultSet;
+    import java.sql.SQLException;
+    import java.text.DateFormat;
+    import java.text.ParseException;
+    import java.text.SimpleDateFormat;
 
 	public class ViajeRepository {
 	    Connection connection;
diff --git a/src/application/view/Login.fxml b/src/application/view/Login.fxml
index e2e2241..4c1f51a 100644
--- a/src/application/view/Login.fxml
+++ b/src/application/view/Login.fxml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.scene.text.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
-
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" stylesheets="@css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.LoginController">
    <center>
       <AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
diff --git a/src/application/view/LoginController.java b/src/application/view/LoginController.java
index 357f5d6..352e9d7 100644
--- a/src/application/view/LoginController.java
+++ b/src/application/view/LoginController.java
@@ -1,10 +1,8 @@
 package application.view;
 
 import application.Main;
-import application.model.compra.Proveedor;
 import application.model.info.Usuario;
 import application.repository.info.UsuarioRepository;
-import com.sun.prism.paint.Color;
 import javafx.beans.binding.BooleanBinding;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -14,12 +12,6 @@
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.paint.Paint;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-import javafx.stage.StageStyle;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
@@ -27,8 +19,6 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class LoginController implements Initializable {
     @FXML
@@ -78,7 +68,7 @@ private void btnLogin(ActionEvent event){
                 Parent parent = loader.getRoot();
                 Stage adminPanelStage = new Stage();
                 adminPanelStage.setTitle("LogiServ app - usuario: " + nombreUsuario + " conectado.");
-                adminPanelStage.setMaximized(true);
+//                adminPanelStage.setMaximized(true);
                 PrincipalController controller = loader.getController();
                 controller.setRootLayout(root);
                 controller.setHome();
diff --git a/src/application/view/Principal.fxml b/src/application/view/Principal.fxml
index 979a801..5c23068 100644
--- a/src/application/view/Principal.fxml
+++ b/src/application/view/Principal.fxml
@@ -1,18 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.control.Accordion?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.TitledPane?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.VBox?>
-
 <BorderPane prefHeight="600.0" prefWidth="900.0" stylesheets="@css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.PrincipalController">
    <top>
       <MenuBar BorderPane.alignment="CENTER">
diff --git a/src/application/view/PrincipalController.java b/src/application/view/PrincipalController.java
index 7a5ccd6..a4b3c27 100644
--- a/src/application/view/PrincipalController.java
+++ b/src/application/view/PrincipalController.java
@@ -1,24 +1,17 @@
 package application.view;
 
-import java.io.IOException;
-
-import application.model.venta.Organizacion;
-import application.view.inicio.HomeController;
-import application.view.calculo.InfoFincaController;
-import application.view.calculo.InfoIngenioController;
-import application.view.calculo.InfoOrigenDestinoController;
+import application.Main;
+import application.view.calculo.*;
 import application.view.compra.*;
 import application.view.info.*;
-import application.view.calculo.CargarCamionController;
+import application.view.inicio.HomeController;
 import application.view.inicio.OrganizacionController;
 import application.view.sueldo.ConceptosSalarialesController;
 import application.view.sueldo.LiquidacionesController;
 import application.view.venta.AdministrarViajesController;
-import application.view.calculo.CargarAcopladoController;
 import application.view.venta.FacturacionController;
 import application.view.venta.VentaClienteController;
 import javafx.fxml.FXML;
-import application.Main;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Accordion;
 import javafx.scene.control.TitledPane;
@@ -26,6 +19,8 @@
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
 
+import java.io.IOException;
+
 public class PrincipalController {
 
 	private Stage primaryStage;
diff --git a/src/application/view/Register.fxml b/src/application/view/Register.fxml
index b7093f3..919abcf 100644
--- a/src/application/view/Register.fxml
+++ b/src/application/view/Register.fxml
@@ -1,26 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.text.*?>
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.Group?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Text?>
 <Group stylesheets="@css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.RegisterController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="591.0" prefWidth="547.0">
diff --git a/src/application/view/RegisterController.java b/src/application/view/RegisterController.java
index 190eff9..4c86035 100644
--- a/src/application/view/RegisterController.java
+++ b/src/application/view/RegisterController.java
@@ -2,22 +2,10 @@
 
 import application.Main;
 import application.comunes.Alerta;
-import application.model.compra.Articulo;
-import application.model.compra.DetalleCompra;
-import application.model.compra.FacturaCompra;
-import application.model.compra.Proveedor;
 import application.model.info.*;
-import application.repository.compra.ArticuloRepository;
-import application.repository.compra.DetalleCompraRepository;
-import application.repository.compra.FacturaCompraRepository;
-import application.repository.compra.ProveedorRepository;
 import application.repository.info.*;
-import application.view.compra.ArticulosController;
-import application.view.compra.ProveedoresController;
 import application.view.info.InfoCategoriaEmpleadoController;
 import javafx.beans.binding.BooleanBinding;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
diff --git a/src/application/view/calculo/CargarAcoplado.fxml b/src/application/view/calculo/CargarAcoplado.fxml
index fd9f905..aec6f0c 100644
--- a/src/application/view/calculo/CargarAcoplado.fxml
+++ b/src/application/view/calculo/CargarAcoplado.fxml
@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
-
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.CargarAcopladoController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="11.0" prefHeight="389.0" prefWidth="581.0" spacing="20.0">
diff --git a/src/application/view/calculo/CargarCamion.fxml b/src/application/view/calculo/CargarCamion.fxml
index cce7f2d..0826fbb 100644
--- a/src/application/view/calculo/CargarCamion.fxml
+++ b/src/application/view/calculo/CargarCamion.fxml
@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
-
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.CargarCamionController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="17.0" layoutY="15.0" prefHeight="385.0" prefWidth="583.0" spacing="20.0">
diff --git a/src/application/view/calculo/InfoFinca.fxml b/src/application/view/calculo/InfoFinca.fxml
index e4be503..5ff61c8 100644
--- a/src/application/view/calculo/InfoFinca.fxml
+++ b/src/application/view/calculo/InfoFinca.fxml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.web.*?>
-<?import javafx.scene.*?>
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.layout.AnchorPane?>
-
+<?import javafx.scene.web.WebView?>
 <AnchorPane prefHeight="417.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.InfoFincaController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="20.0" layoutY="19.0" prefHeight="488.0" prefWidth="580.0" spacing="20.0">
diff --git a/src/application/view/calculo/InfoIngenio.fxml b/src/application/view/calculo/InfoIngenio.fxml
index c81c949..6ee9aa9 100644
--- a/src/application/view/calculo/InfoIngenio.fxml
+++ b/src/application/view/calculo/InfoIngenio.fxml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.web.*?>
-<?import javafx.scene.*?>
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.layout.AnchorPane?>
-
+<?import javafx.scene.web.WebView?>
 <AnchorPane prefHeight="417.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.InfoIngenioController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="12.0" prefHeight="405.0" prefWidth="581.0" spacing="20.0">
diff --git a/src/application/view/calculo/InfoIngenioController.java b/src/application/view/calculo/InfoIngenioController.java
index 155fddc..5f9bfe0 100644
--- a/src/application/view/calculo/InfoIngenioController.java
+++ b/src/application/view/calculo/InfoIngenioController.java
@@ -12,7 +12,10 @@
 import javafx.fxml.Initializable;
 import javafx.scene.Group;
 import javafx.scene.Scene;
-import javafx.scene.control.*;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.Modality;
diff --git a/src/application/view/calculo/InfoOrigenDestino.fxml b/src/application/view/calculo/InfoOrigenDestino.fxml
index 6ef392f..2279a04 100644
--- a/src/application/view/calculo/InfoOrigenDestino.fxml
+++ b/src/application/view/calculo/InfoOrigenDestino.fxml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.*?>
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.layout.AnchorPane?>
-
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.InfoOrigenDestinoController">
     <children>
             <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="15.0" prefHeight="433.0" prefWidth="581.0" spacing="20.0">
diff --git a/src/application/view/calculo/cruds/AcopladoEdit.fxml b/src/application/view/calculo/cruds/AcopladoEdit.fxml
index 671bb46..9c12d1c 100644
--- a/src/application/view/calculo/cruds/AcopladoEdit.fxml
+++ b/src/application/view/calculo/cruds/AcopladoEdit.fxml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.Group?>
 <?import javafx.scene.control.*?>
+<?import javafx.scene.Group?>
 <?import javafx.scene.layout.*?>
-
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.AcopladoEditController">
   <children>
     <AnchorPane prefHeight="246.0" prefWidth="473.0">
diff --git a/src/application/view/calculo/cruds/CamionEdit.fxml b/src/application/view/calculo/cruds/CamionEdit.fxml
index 35823fe..84b4ed4 100644
--- a/src/application/view/calculo/cruds/CamionEdit.fxml
+++ b/src/application/view/calculo/cruds/CamionEdit.fxml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.Group?>
 <?import javafx.scene.control.*?>
+<?import javafx.scene.Group?>
 <?import javafx.scene.layout.*?>
-
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.CamionEditController">
   <children>
     <AnchorPane prefHeight="246.0" prefWidth="473.0">
diff --git a/src/application/view/calculo/cruds/DistanciasEdit.fxml b/src/application/view/calculo/cruds/DistanciasEdit.fxml
index 9b51834..8edf288 100644
--- a/src/application/view/calculo/cruds/DistanciasEdit.fxml
+++ b/src/application/view/calculo/cruds/DistanciasEdit.fxml
@@ -1,21 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ListView?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-
+<?import javafx.scene.layout.*?>
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.DistanciasEditController">
     <children>
         <AnchorPane prefHeight="550.0" prefWidth="528.0">
diff --git a/src/application/view/calculo/cruds/FincaEdit.fxml b/src/application/view/calculo/cruds/FincaEdit.fxml
index 1bb2723..72c067e 100644
--- a/src/application/view/calculo/cruds/FincaEdit.fxml
+++ b/src/application/view/calculo/cruds/FincaEdit.fxml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.web.*?>
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
-
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.web.WebView?>
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.FincaEditController">
    <children>
       <AnchorPane prefHeight="416.0" prefWidth="528.0">
diff --git a/src/application/view/calculo/cruds/FincaEditController.java b/src/application/view/calculo/cruds/FincaEditController.java
index a7bd272..b819078 100644
--- a/src/application/view/calculo/cruds/FincaEditController.java
+++ b/src/application/view/calculo/cruds/FincaEditController.java
@@ -97,7 +97,7 @@ private boolean isInputValid() {
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         WebEngine engine = webView.getEngine();
-        String url = "https://www.google.com";
+        String url = "https://www.google.com.ar/maps";
         engine.load(url);
     }
 
diff --git a/src/application/view/calculo/cruds/IngenioEdit.fxml b/src/application/view/calculo/cruds/IngenioEdit.fxml
index fbacbc1..3142c2e 100644
--- a/src/application/view/calculo/cruds/IngenioEdit.fxml
+++ b/src/application/view/calculo/cruds/IngenioEdit.fxml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.web.*?>
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
-
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.web.WebView?>
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.IngenioEditController">
    <children>
       <AnchorPane prefHeight="550.0" prefWidth="528.0">
diff --git a/src/application/view/calculo/cruds/IngenioEditController.java b/src/application/view/calculo/cruds/IngenioEditController.java
index eb63ace..e2f0323 100644
--- a/src/application/view/calculo/cruds/IngenioEditController.java
+++ b/src/application/view/calculo/cruds/IngenioEditController.java
@@ -10,12 +10,11 @@
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
+import org.apache.commons.lang3.math.NumberUtils;
 
 import java.net.URL;
 import java.util.ResourceBundle;
 
-import org.apache.commons.lang3.math.NumberUtils;
-
 public class IngenioEditController implements Initializable {
     @FXML
     private TextField nombreTextField;
@@ -113,7 +112,7 @@ private boolean isInputValid() {
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         WebEngine engine = webView.getEngine();
-        String url = "https://www.google.com";
+        String url = "https://www.google.com.ar/maps";
         engine.load(url);
     }
 
diff --git a/src/application/view/compra/Articulos.fxml b/src/application/view/compra/Articulos.fxml
index d328a40..449efda 100644
--- a/src/application/view/compra/Articulos.fxml
+++ b/src/application/view/compra/Articulos.fxml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.AnchorPane?>
-
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <AnchorPane prefHeight="445.0" prefWidth="627.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.ArticulosController">
   <children>
 <VBox alignment="CENTER_LEFT" layoutX="20.0" prefHeight="445.0" prefWidth="643.0" spacing="10.0">
diff --git a/src/application/view/compra/CategoriaArticuloController.java b/src/application/view/compra/CategoriaArticuloController.java
index fd7f579..cabca9d 100644
--- a/src/application/view/compra/CategoriaArticuloController.java
+++ b/src/application/view/compra/CategoriaArticuloController.java
@@ -11,7 +11,10 @@
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Group;
 import javafx.scene.Scene;
-import javafx.scene.control.*;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
diff --git a/src/application/view/compra/CategoriaArticulos.fxml b/src/application/view/compra/CategoriaArticulos.fxml
index 5c38575..d942faf 100644
--- a/src/application/view/compra/CategoriaArticulos.fxml
+++ b/src/application/view/compra/CategoriaArticulos.fxml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.*?>
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.AnchorPane?>
-
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <AnchorPane prefHeight="419.0" prefWidth="645.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.CategoriaArticuloController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="15.0" layoutY="16.0" prefHeight="384.0" prefWidth="585.0" spacing="10.0">
diff --git a/src/application/view/compra/CompraCompras.fxml b/src/application/view/compra/CompraCompras.fxml
index 2f6c8f5..7ceed00 100644
--- a/src/application/view/compra/CompraCompras.fxml
+++ b/src/application/view/compra/CompraCompras.fxml
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.VBox?>
-
 <AnchorPane prefHeight="418.0" prefWidth="637.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.CompraComprasController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="16.0" layoutY="13.0" prefHeight="387.0" prefWidth="584.0" spacing="10.0">
diff --git a/src/application/view/compra/ControlStock.fxml b/src/application/view/compra/ControlStock.fxml
index ea5c1e2..7721ff9 100644
--- a/src/application/view/compra/ControlStock.fxml
+++ b/src/application/view/compra/ControlStock.fxml
@@ -1,20 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.VBox?>
-
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.ControlStockController">
   <children>
 <VBox alignment="CENTER_LEFT" layoutX="17.0" layoutY="13.0" prefHeight="387.0" prefWidth="583.0" spacing="10.0">
diff --git a/src/application/view/compra/ControlStockController.java b/src/application/view/compra/ControlStockController.java
index 977786d..7f9fb0f 100644
--- a/src/application/view/compra/ControlStockController.java
+++ b/src/application/view/compra/ControlStockController.java
@@ -7,7 +7,6 @@
 import application.reports.AbstractJasperReports;
 import application.repository.compra.ArticuloRepository;
 import application.repository.compra.CategoriaArticuloRepository;
-import application.view.compra.cruds.ArticuloEditController;
 import application.view.compra.cruds.StockEditController;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -16,13 +15,15 @@
 import javafx.fxml.Initializable;
 import javafx.scene.Group;
 import javafx.scene.Scene;
-import javafx.scene.control.*;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.Optional;
 import java.util.ResourceBundle;
 
 public class ControlStockController implements Initializable{
diff --git a/src/application/view/compra/Proveedores.fxml b/src/application/view/compra/Proveedores.fxml
index 8b823db..1e3625f 100644
--- a/src/application/view/compra/Proveedores.fxml
+++ b/src/application/view/compra/Proveedores.fxml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.*?>
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.AnchorPane?>
-
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.ProveedoresController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="14.0" layoutY="19.0" prefHeight="381.0" prefWidth="586.0" spacing="10.0">
diff --git a/src/application/view/compra/cruds/ArticuloEdit.fxml b/src/application/view/compra/cruds/ArticuloEdit.fxml
index 1e213c9..fe437b5 100644
--- a/src/application/view/compra/cruds/ArticuloEdit.fxml
+++ b/src/application/view/compra/cruds/ArticuloEdit.fxml
@@ -1,21 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-
+<?import javafx.scene.layout.*?>
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.ArticuloEditController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="387.0" prefWidth="473.0">
diff --git a/src/application/view/compra/cruds/CategoriaArticuloEdit.fxml b/src/application/view/compra/cruds/CategoriaArticuloEdit.fxml
index db425a6..07dc347 100644
--- a/src/application/view/compra/cruds/CategoriaArticuloEdit.fxml
+++ b/src/application/view/compra/cruds/CategoriaArticuloEdit.fxml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
-
+<?import javafx.scene.layout.*?>
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.CategoriaArticuloEditController">
    <children>
       <AnchorPane prefHeight="201.0" prefWidth="436.0">
diff --git a/src/application/view/compra/cruds/FacturaEdit.fxml b/src/application/view/compra/cruds/FacturaEdit.fxml
index e3ee5e3..0c3b9ef 100644
--- a/src/application/view/compra/cruds/FacturaEdit.fxml
+++ b/src/application/view/compra/cruds/FacturaEdit.fxml
@@ -1,26 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.text.*?>
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.Group?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Font?>
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.FacturaEditController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="523.0" prefWidth="647.0">
diff --git a/src/application/view/compra/cruds/FacturaEditController.java b/src/application/view/compra/cruds/FacturaEditController.java
index 71a6dbe..14825c0 100644
--- a/src/application/view/compra/cruds/FacturaEditController.java
+++ b/src/application/view/compra/cruds/FacturaEditController.java
@@ -22,7 +22,6 @@
 import java.net.URL;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.ConcurrentModificationException;
 import java.util.Date;
 import java.util.ResourceBundle;
 
diff --git a/src/application/view/compra/cruds/ProveedorEdit.fxml b/src/application/view/compra/cruds/ProveedorEdit.fxml
index 97b380e..b48199d 100644
--- a/src/application/view/compra/cruds/ProveedorEdit.fxml
+++ b/src/application/view/compra/cruds/ProveedorEdit.fxml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
-
+<?import javafx.scene.layout.*?>
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.ProveedorEditController">
    <children>
       <AnchorPane prefHeight="416.0" prefWidth="528.0">
diff --git a/src/application/view/compra/cruds/ProveedorEditController.java b/src/application/view/compra/cruds/ProveedorEditController.java
index b5c97e0..ba6d9e9 100644
--- a/src/application/view/compra/cruds/ProveedorEditController.java
+++ b/src/application/view/compra/cruds/ProveedorEditController.java
@@ -5,9 +5,9 @@
 import application.model.info.Domicilio;
 import application.model.info.Localidad;
 import application.model.info.Provincia;
+import application.repository.compra.ProveedorRepository;
 import application.repository.info.DomicilioRepository;
 import application.repository.info.LocalidadRepository;
-import application.repository.compra.ProveedorRepository;
 import application.repository.info.ProvinciaRepository;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
diff --git a/src/application/view/compra/cruds/StockEdit.fxml b/src/application/view/compra/cruds/StockEdit.fxml
index 94252ad..abcf0cf 100644
--- a/src/application/view/compra/cruds/StockEdit.fxml
+++ b/src/application/view/compra/cruds/StockEdit.fxml
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-
+<?import javafx.scene.layout.*?>
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.StockEditController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="387.0" prefWidth="473.0">
diff --git a/src/application/view/compra/cruds/StockEditController.java b/src/application/view/compra/cruds/StockEditController.java
index 4ff8c06..72550f3 100644
--- a/src/application/view/compra/cruds/StockEditController.java
+++ b/src/application/view/compra/cruds/StockEditController.java
@@ -1,23 +1,16 @@
 package application.view.compra.cruds;
 
-import application.Main;
 import application.comunes.Alerta;
 import application.model.compra.Articulo;
-import application.model.compra.CategoriaArticulo;
 import application.repository.compra.ArticuloRepository;
-import application.repository.compra.CategoriaArticuloRepository;
-import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.control.*;
-import javafx.stage.Modality;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
 import javafx.stage.Stage;
 import org.apache.commons.lang3.math.NumberUtils;
 
-import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
 
diff --git a/src/application/view/info/AdministrarEmpleados.fxml b/src/application/view/info/AdministrarEmpleados.fxml
index eafe448..6213b4c 100644
--- a/src/application/view/info/AdministrarEmpleados.fxml
+++ b/src/application/view/info/AdministrarEmpleados.fxml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.*?>
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.AnchorPane?>
-
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <AnchorPane prefHeight="400.0" prefWidth="772.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.AdministrarEmpleadosController">
    <children>
       <VBox layoutX="20.0" layoutY="14.0" prefHeight="386.0" prefWidth="735.0" spacing="20.0">
diff --git a/src/application/view/info/AdministrarEmpleadosController.java b/src/application/view/info/AdministrarEmpleadosController.java
index 0677b1e..716879a 100644
--- a/src/application/view/info/AdministrarEmpleadosController.java
+++ b/src/application/view/info/AdministrarEmpleadosController.java
@@ -1,32 +1,29 @@
 package application.view.info;
 
-import java.io.IOException;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.Date;
-import java.util.Optional;
-
+import application.Main;
 import application.comunes.Alerta;
-import application.model.info.CategoriaEmpleado;
-import application.view.info.cruds.CategoriaEmpleadoEditController;
+import application.model.info.Empleado;
+import application.repository.info.EmpleadoRepository;
 import application.view.info.cruds.EmpleadoEditDialogController;
-import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonType;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
 import javafx.scene.layout.AnchorPane;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
-import application.Main;
-import application.model.info.Empleado;
-import application.repository.info.EmpleadoRepository;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.Optional;
 
 public class AdministrarEmpleadosController {
 
diff --git a/src/application/view/info/AdministrarUsuarios.fxml b/src/application/view/info/AdministrarUsuarios.fxml
index 2cd2ed8..ef4f582 100644
--- a/src/application/view/info/AdministrarUsuarios.fxml
+++ b/src/application/view/info/AdministrarUsuarios.fxml
@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
-
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.AdministrarUsuariosController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="18.0" layoutY="13.0" prefHeight="387.0" prefWidth="582.0" spacing="20.0">
diff --git a/src/application/view/info/AdministrarUsuariosController.java b/src/application/view/info/AdministrarUsuariosController.java
index 6d64c2e..1e8ad31 100644
--- a/src/application/view/info/AdministrarUsuariosController.java
+++ b/src/application/view/info/AdministrarUsuariosController.java
@@ -1,5 +1,8 @@
 package application.view.info;
 
+import application.Main;
+import application.model.info.Usuario;
+import application.repository.info.UsuarioRepository;
 import application.view.info.cruds.UsuarioEditDialogController;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -7,19 +10,15 @@
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-import javafx.scene.control.Alert.AlertType;
 import javafx.scene.layout.AnchorPane;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
 import java.io.IOException;
 
-import application.Main;
-import application.model.info.Usuario;
-import application.repository.info.UsuarioRepository;
-
 public class AdministrarUsuariosController {
 	
 	@FXML
diff --git a/src/application/view/info/Desempleados.fxml b/src/application/view/info/Desempleados.fxml
index 424317b..dca2646 100644
--- a/src/application/view/info/Desempleados.fxml
+++ b/src/application/view/info/Desempleados.fxml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.*?>
-<?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.AnchorPane?>
-
+<?import javafx.scene.layout.VBox?>
 <AnchorPane prefHeight="328.0" prefWidth="832.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.DesempleadosController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="14.0" layoutY="14.0" prefHeight="281.0" prefWidth="798.0" spacing="20.0">
diff --git a/src/application/view/info/DesempleadosController.java b/src/application/view/info/DesempleadosController.java
index 68804f9..0696941 100644
--- a/src/application/view/info/DesempleadosController.java
+++ b/src/application/view/info/DesempleadosController.java
@@ -1,30 +1,14 @@
 package application.view.info;
 
-import application.Main;
-import application.comunes.Alerta;
 import application.model.info.Empleado;
 import application.repository.info.EmpleadoRepository;
-import application.view.info.cruds.EmpleadoEditDialogController;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Scene;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.ButtonType;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-import javafx.scene.layout.AnchorPane;
-import javafx.stage.Modality;
 import javafx.stage.Stage;
 
-import java.io.IOException;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.Date;
-import java.util.Optional;
-
 public class DesempleadosController {
 
 	@FXML
diff --git a/src/application/view/info/GrupoFamiliar.fxml b/src/application/view/info/GrupoFamiliar.fxml
index a045177..a5ab0e2 100644
--- a/src/application/view/info/GrupoFamiliar.fxml
+++ b/src/application/view/info/GrupoFamiliar.fxml
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-
 <AnchorPane prefHeight="406.0" prefWidth="612.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.GrupoFamiliarController">
    <children>
       <VBox layoutX="24.0" layoutY="14.0" prefHeight="388.0" prefWidth="588.0" AnchorPane.bottomAnchor="4.0" AnchorPane.topAnchor="14.0">
diff --git a/src/application/view/info/GrupoFamiliarController.java b/src/application/view/info/GrupoFamiliarController.java
index 5b3aa42..d368512 100644
--- a/src/application/view/info/GrupoFamiliarController.java
+++ b/src/application/view/info/GrupoFamiliarController.java
@@ -6,7 +6,6 @@
 import application.model.info.Familiar;
 import application.repository.info.EmpleadoRepository;
 import application.repository.info.FamiliarRepository;
-import application.view.compra.cruds.FacturaEditController;
 import application.view.info.cruds.FamiliarEditController;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
diff --git a/src/application/view/info/InfoCategoriaEmpleado.fxml b/src/application/view/info/InfoCategoriaEmpleado.fxml
index 819919c..d8e6b1a 100644
--- a/src/application/view/info/InfoCategoriaEmpleado.fxml
+++ b/src/application/view/info/InfoCategoriaEmpleado.fxml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.*?>
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.AnchorPane?>
-
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.InfoCategoriaEmpleadoController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="17.0" layoutY="17.0" prefHeight="383.0" prefWidth="583.0" spacing="20.0">
diff --git a/src/application/view/info/InfoCategoriaEmpleadoController.java b/src/application/view/info/InfoCategoriaEmpleadoController.java
index bf51172..ecc126e 100644
--- a/src/application/view/info/InfoCategoriaEmpleadoController.java
+++ b/src/application/view/info/InfoCategoriaEmpleadoController.java
@@ -1,5 +1,10 @@
 package application.view.info;
 
+import application.Main;
+import application.comunes.Alerta;
+import application.model.info.CategoriaEmpleado;
+import application.repository.info.CategoriaEmpleadoRepository;
+import application.view.info.cruds.CategoriaEmpleadoEditController;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -16,12 +21,6 @@
 import java.io.IOException;
 import java.util.Optional;
 
-import application.Main;
-import application.comunes.Alerta;
-import application.model.info.CategoriaEmpleado;
-import application.repository.info.CategoriaEmpleadoRepository;
-import application.view.info.cruds.CategoriaEmpleadoEditController;
-
 public class InfoCategoriaEmpleadoController {
 
 	@FXML
diff --git a/src/application/view/info/InfoDomicilio.fxml b/src/application/view/info/InfoDomicilio.fxml
index 8b24bb3..119af39 100644
--- a/src/application/view/info/InfoDomicilio.fxml
+++ b/src/application/view/info/InfoDomicilio.fxml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.*?>
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.AnchorPane?>
-
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="17.0" prefHeight="383.0" prefWidth="581.0" spacing="20.0">
diff --git a/src/application/view/info/cruds/CategoriaEmpleadoEdit.fxml b/src/application/view/info/cruds/CategoriaEmpleadoEdit.fxml
index 50bc762..d5d9dba 100644
--- a/src/application/view/info/cruds/CategoriaEmpleadoEdit.fxml
+++ b/src/application/view/info/cruds/CategoriaEmpleadoEdit.fxml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.scene.*?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
 <?import javafx.scene.Group?>
-<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.CategoriaEmpleadoEditController">
   <children>
     <AnchorPane prefHeight="181.0" prefWidth="479.0">
diff --git a/src/application/view/info/cruds/CategoriaEmpleadoEditController.java b/src/application/view/info/cruds/CategoriaEmpleadoEditController.java
index 94ed7dc..8d7b629 100644
--- a/src/application/view/info/cruds/CategoriaEmpleadoEditController.java
+++ b/src/application/view/info/cruds/CategoriaEmpleadoEditController.java
@@ -1,7 +1,6 @@
 package application.view.info.cruds;
 
 import application.comunes.Alerta;
-import application.model.compra.CategoriaArticulo;
 import application.model.info.CategoriaEmpleado;
 import application.repository.info.CategoriaEmpleadoRepository;
 import javafx.fxml.FXML;
diff --git a/src/application/view/info/cruds/EditarEmpleadoDialog.fxml b/src/application/view/info/cruds/EditarEmpleadoDialog.fxml
index 0bd5262..950daaa 100644
--- a/src/application/view/info/cruds/EditarEmpleadoDialog.fxml
+++ b/src/application/view/info/cruds/EditarEmpleadoDialog.fxml
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Text?>
-
 <AnchorPane prefHeight="329.0" prefWidth="593.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.EmpleadoEditDialogController">
    <children>
       <VBox layoutX="13.0" layoutY="46.0">
diff --git a/src/application/view/info/cruds/EditarUsuarioDialog.fxml b/src/application/view/info/cruds/EditarUsuarioDialog.fxml
index 0c0533d..a620dbe 100644
--- a/src/application/view/info/cruds/EditarUsuarioDialog.fxml
+++ b/src/application/view/info/cruds/EditarUsuarioDialog.fxml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.layout.AnchorPane?>
-
 <AnchorPane prefHeight="472.0" prefWidth="617.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.UsuarioEditDialogController">
    <children>
       <GridPane prefHeight="90.0" prefWidth="400.0" AnchorPane.leftAnchor="100.0" AnchorPane.topAnchor="100.0">
diff --git a/src/application/view/info/cruds/EmpleadoEditDialogController.java b/src/application/view/info/cruds/EmpleadoEditDialogController.java
index ffb6bb9..a479dee 100644
--- a/src/application/view/info/cruds/EmpleadoEditDialogController.java
+++ b/src/application/view/info/cruds/EmpleadoEditDialogController.java
@@ -1,35 +1,16 @@
 package application.view.info.cruds;
 
-import application.view.info.GrupoFamiliarController;
+import application.model.info.*;
+import application.repository.info.*;
 import application.view.info.InfoCategoriaEmpleadoController;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.Button;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.DatePicker;
 import javafx.stage.Stage;
 
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
-import java.time.format.DateTimeFormatter;
-
-import application.model.info.CategoriaEmpleado;
-import application.model.info.Domicilio;
-import application.model.info.Empleado;
-import application.model.info.Localidad;
-import application.model.info.Provincia;
-import application.repository.info.CategoriaEmpleadoRepository;
-import application.repository.info.DomicilioRepository;
-import application.repository.info.EmpleadoRepository;
-import application.repository.info.LocalidadRepository;
-import application.repository.info.ProvinciaRepository;
 
 public class EmpleadoEditDialogController {
 
diff --git a/src/application/view/info/cruds/FamiliarEdit.fxml b/src/application/view/info/cruds/FamiliarEdit.fxml
index 83c0ff8..b5d9c39 100644
--- a/src/application/view/info/cruds/FamiliarEdit.fxml
+++ b/src/application/view/info/cruds/FamiliarEdit.fxml
@@ -1,21 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-
+<?import javafx.scene.layout.*?>
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.FamiliarEditController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="387.0" prefWidth="473.0">
diff --git a/src/application/view/info/cruds/FamiliarEditController.java b/src/application/view/info/cruds/FamiliarEditController.java
index 8c4b97d..987a6f6 100644
--- a/src/application/view/info/cruds/FamiliarEditController.java
+++ b/src/application/view/info/cruds/FamiliarEditController.java
@@ -1,27 +1,15 @@
 package application.view.info.cruds;
 
-import application.Main;
 import application.comunes.Alerta;
-import application.model.compra.Articulo;
-import application.model.compra.CategoriaArticulo;
-import application.model.compra.FacturaCompra;
 import application.model.info.Familiar;
-import application.repository.compra.ArticuloRepository;
-import application.repository.compra.CategoriaArticuloRepository;
 import application.repository.info.FamiliarRepository;
-import application.view.compra.cruds.CategoriaArticuloEditController;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
-import javafx.scene.Group;
-import javafx.scene.Scene;
 import javafx.scene.control.*;
-import javafx.stage.Modality;
 import javafx.stage.Stage;
 
-import java.io.IOException;
 import java.net.URL;
 import java.time.LocalDate;
 import java.util.ResourceBundle;
diff --git a/src/application/view/info/cruds/UsuarioEditDialogController.java b/src/application/view/info/cruds/UsuarioEditDialogController.java
index 87d1f4f..704d8de 100644
--- a/src/application/view/info/cruds/UsuarioEditDialogController.java
+++ b/src/application/view/info/cruds/UsuarioEditDialogController.java
@@ -1,20 +1,14 @@
 package application.view.info.cruds;
 
-import javafx.collections.FXCollections;
+import application.model.info.Empleado;
+import application.model.info.Usuario;
+import application.repository.info.EmpleadoRepository;
+import application.repository.info.UsuarioRepository;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.Button;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
 import javafx.stage.Stage;
-import application.model.info.Usuario;
-import application.repository.info.EmpleadoRepository;
-import application.repository.info.UsuarioRepository;
-import application.model.info.Empleado;
 
 public class UsuarioEditDialogController {
 
diff --git a/src/application/view/inicio/Home.fxml b/src/application/view/inicio/Home.fxml
index 6b2c619..a9eb27a 100644
--- a/src/application/view/inicio/Home.fxml
+++ b/src/application/view/inicio/Home.fxml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.text.*?>
-<?import javafx.scene.image.*?>
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.*?>
-
+<?import javafx.scene.text.Font?>
 <AnchorPane prefHeight="522.0" prefWidth="709.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.inicio.HomeController">
    <children>
       <VBox alignment="CENTER" prefHeight="522.0" prefWidth="709.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
diff --git a/src/application/view/inicio/Organizacion.fxml b/src/application/view/inicio/Organizacion.fxml
index 2bd0d3a..5967d1c 100644
--- a/src/application/view/inicio/Organizacion.fxml
+++ b/src/application/view/inicio/Organizacion.fxml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.image.*?>
-<?import javafx.scene.text.*?>
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.*?>
-
+<?import javafx.scene.text.*?>
 <AnchorPane prefHeight="551.0" prefWidth="820.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.inicio.OrganizacionController">
    <children>
       <VBox alignment="CENTER" layoutY="40.0" prefHeight="265.0" prefWidth="600.0" AnchorPane.bottomAnchor="95.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="40.0">
diff --git a/src/application/view/inicio/crud/OrganizacionEdit.fxml b/src/application/view/inicio/crud/OrganizacionEdit.fxml
index d4d1d9a..edb9c06 100644
--- a/src/application/view/inicio/crud/OrganizacionEdit.fxml
+++ b/src/application/view/inicio/crud/OrganizacionEdit.fxml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
-
+<?import javafx.scene.layout.*?>
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.inicio.crud.OrganizacionEditController">
    <children>
       <AnchorPane prefHeight="548.0" prefWidth="528.0">
diff --git a/src/application/view/inicio/crud/OrganizacionEditController.java b/src/application/view/inicio/crud/OrganizacionEditController.java
index e728326..ebaef24 100644
--- a/src/application/view/inicio/crud/OrganizacionEditController.java
+++ b/src/application/view/inicio/crud/OrganizacionEditController.java
@@ -1,23 +1,15 @@
 package application.view.inicio.crud;
 
-import application.comunes.Alerta;
-import application.model.compra.Proveedor;
-import application.model.info.Domicilio;
 import application.model.info.Empleado;
 import application.model.info.Localidad;
-import application.model.info.Provincia;
 import application.model.venta.Organizacion;
-import application.repository.compra.ProveedorRepository;
-import application.repository.info.DomicilioRepository;
 import application.repository.info.EmpleadoRepository;
 import application.repository.info.LocalidadRepository;
-import application.repository.info.ProvinciaRepository;
 import application.repository.venta.OrganizacionRepository;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.stage.Stage;
 
diff --git a/src/application/view/sueldo/ConceptosSalariales.fxml b/src/application/view/sueldo/ConceptosSalariales.fxml
index b00e494..083c338 100644
--- a/src/application/view/sueldo/ConceptosSalariales.fxml
+++ b/src/application/view/sueldo/ConceptosSalariales.fxml
@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
-
 <AnchorPane prefHeight="400.0" prefWidth="617.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.sueldo.ConceptosSalarialesController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="20.0" layoutY="11.0" prefHeight="389.0" prefWidth="580.0" spacing="20.0">
diff --git a/src/application/view/sueldo/ConceptosSalarialesController.java b/src/application/view/sueldo/ConceptosSalarialesController.java
index f13e8a9..42ff978 100644
--- a/src/application/view/sueldo/ConceptosSalarialesController.java
+++ b/src/application/view/sueldo/ConceptosSalarialesController.java
@@ -3,8 +3,8 @@
 import application.Main;
 import application.comunes.Alerta;
 import application.model.sueldo.ConceptoSueldo;
-import application.repository.sueldo.TipoLiquidacionRepository;
 import application.repository.sueldo.ConceptoSueldoRepository;
+import application.repository.sueldo.TipoLiquidacionRepository;
 import application.view.sueldo.cruds.ConceptoEditController;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
diff --git a/src/application/view/sueldo/Liquidaciones.fxml b/src/application/view/sueldo/Liquidaciones.fxml
index e02a83b..2b7784a 100644
--- a/src/application/view/sueldo/Liquidaciones.fxml
+++ b/src/application/view/sueldo/Liquidaciones.fxml
@@ -2,23 +2,13 @@
 
 <?import java.lang.*?>
 <?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
 
 <AnchorPane prefHeight="450.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.sueldo.LiquidacionesController">
    <children>
-      <VBox alignment="CENTER_LEFT" layoutX="17.0" layoutY="14.0" prefHeight="476.0" prefWidth="683.0" spacing="10.0">
+      <VBox alignment="CENTER_LEFT" layoutX="17.0" layoutY="14.0" prefHeight="476.0" prefWidth="665.0" spacing="10.0">
          <children>
             <Label text="Liquidaciones" />
             <TableView fx:id="liquidacionTable" onMouseClicked="#cargarEmpleadosLiquidados" pickOnBounds="false" prefHeight="157.0" prefWidth="677.0">
@@ -26,10 +16,15 @@
                   <TableColumn fx:id="idLiquidacion" prefWidth="60.5" resizable="false" text="Nro" />
                   <TableColumn fx:id="fechaColumn" minWidth="0.0" prefWidth="138.5" text="Fecha" />
                   <TableColumn fx:id="hrColumn" prefWidth="155.0" text="Haberes Remunerativos" />
-                  <TableColumn fx:id="hnrColumn" maxWidth="330.5" minWidth="-1.0" prefWidth="190.5" text="Haberes No Remunerativos" />
-                  <TableColumn fx:id="retencionesColumn" maxWidth="283.0" minWidth="-1.0" prefWidth="153.0" text="Retenciones" />
+                  <TableColumn fx:id="hnrColumn" maxWidth="330.5" minWidth="-1.0" prefWidth="163.0" text="Haberes No Remunerativos" />
+                  <TableColumn fx:id="retencionesColumn" maxWidth="283.0" minWidth="-1.0" prefWidth="145.0" text="Retenciones" />
                </columns>
             </TableView>
+            <HBox alignment="CENTER_RIGHT" prefHeight="48.0" prefWidth="665.0">
+               <children>
+                  <Button fx:id="imprimirRecibos" alignment="CENTER_RIGHT" mnemonicParsing="false" onAction="#handleImprimirRecibos" text="Imprimir recibos de sueldo" />
+               </children>
+            </HBox>
             <Label text="Empleados Liquidados" />
             <TableView fx:id="empleadosTable" onMouseClicked="#cargarEmpleadosLiquidados" prefHeight="164.0" prefWidth="678.0">
                <columns>
@@ -47,16 +42,12 @@
             </TableView>
             <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0">
                <children>
-                  <Button fx:id="nuevaLiquidacionButton" alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleNew" prefHeight="31.0" prefWidth="114.0" text="Nueva Liquidacion" textAlignment="CENTER">
-                     <HBox.margin>
-                        <Insets />
-                     </HBox.margin>
-                  </Button>
-                  <Button fx:id="reportesButton" alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" prefHeight="31.0" prefWidth="114.0" text="Reportes" textAlignment="CENTER">
+                  <Button fx:id="nuevaLiquidacionButton" alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleNew" prefHeight="27.0" prefWidth="114.0" text="Nueva Liquidacion" textAlignment="CENTER">
                      <HBox.margin>
                         <Insets />
                      </HBox.margin>
                   </Button>
+                  <Button fx:id="imprimirReciboDeEmpleado" mnemonicParsing="false" text="Imprimir recibo sueldo" />
                </children>
             </HBox>
          </children>
diff --git a/src/application/view/sueldo/LiquidacionesController.java b/src/application/view/sueldo/LiquidacionesController.java
index d27c37c..00321dc 100644
--- a/src/application/view/sueldo/LiquidacionesController.java
+++ b/src/application/view/sueldo/LiquidacionesController.java
@@ -4,7 +4,9 @@
 import application.model.info.Empleado;
 import application.model.sueldo.LiquidacionEmpleado;
 import application.model.sueldo.Liquidaciones;
+import application.reports.AbstractJasperReports;
 import application.repository.sueldo.LiquidacionesRepository;
+import javafx.beans.binding.BooleanBinding;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -58,7 +60,9 @@ public class LiquidacionesController implements Initializable{
 	@FXML
 	private Button nuevaLiquidacionButton;
 	@FXML
-	private Button reportesButton;
+	private Button imprimirRecibos;
+	@FXML
+	private Button imprimirReciboDeEmpleado;
 
 
 
@@ -87,6 +91,9 @@ public void buscarLiquidaciones(){
 
 	@Override
 	public void initialize(URL location, ResourceBundle resources) {
+		BooleanBinding boolenBinding = liquidacionTable.getSelectionModel().selectedItemProperty().isNull();
+		imprimirRecibos.disableProperty().bind(boolenBinding);
+
 		buscarLiquidaciones();
 		idLiquidacion.setCellValueFactory(cellData -> cellData.getValue().idProperty().asString());
 		fechaColumn.setCellValueFactory(cellData -> cellData.getValue().fechaLiquidacionProperty());
@@ -97,7 +104,7 @@ public void initialize(URL location, ResourceBundle resources) {
 		legajoColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().idEmpleadoProperty().asString());
 		apellidoColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().apellidoProperty());
 		nombreColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().nombreProperty());
-//		categoriaColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().categoriaProperty());
+		categoriaColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().getCategoriaEmpleado().nombreProperty());
 		hrEmpleadoColumn.setCellValueFactory(cellData -> cellData.getValue().totalHaberesRemunerativosProperty().asString());
 		hnrEmpleadoColumn.setCellValueFactory(cellData -> cellData.getValue().totalHaberesNoRemunerativosProperty().asString());
 		retencionesEmpleadoColumn.setCellValueFactory(cellData -> cellData.getValue().totalRetencionesProperty().asString());
@@ -138,7 +145,14 @@ public void cargarEmpleadosLiquidados(){
 			empleadosTable.setItems(empleadosLiquidados);
 		}
 	}
-
+@FXML
+	private void handleImprimirRecibos(){
+		System.out.println("se imprimieron recibos de sueldo");
+		int idLiquidacion = liquidacionTable.getSelectionModel().getSelectedItem().getId();
+		AbstractJasperReports.createReport("src\\application\\reports\\ReciboSueldo.jasper",
+				"idLiquidacion", idLiquidacion);
+		AbstractJasperReports.showViewer();
+}
 //    @FXML
 //    private void cargarLiquidaciones(){
 //        if (liquidacionTable.getSelectionModel().getSelectedItem() != null){
diff --git a/src/application/view/sueldo/cruds/ConceptoEdit.fxml b/src/application/view/sueldo/cruds/ConceptoEdit.fxml
index 59206ac..27968af 100644
--- a/src/application/view/sueldo/cruds/ConceptoEdit.fxml
+++ b/src/application/view/sueldo/cruds/ConceptoEdit.fxml
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.RadioButton?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-
+<?import javafx.scene.layout.*?>
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.sueldo.cruds.ConceptoEditController">
   <children>
     <AnchorPane prefHeight="579.0" prefWidth="660.0">
diff --git a/src/application/view/sueldo/cruds/ConceptoEditController.java b/src/application/view/sueldo/cruds/ConceptoEditController.java
index b85c7fe..bf003b5 100644
--- a/src/application/view/sueldo/cruds/ConceptoEditController.java
+++ b/src/application/view/sueldo/cruds/ConceptoEditController.java
@@ -5,8 +5,8 @@
 import application.model.info.CategoriaEmpleado;
 import application.model.sueldo.ConceptoSueldo;
 import application.repository.info.CategoriaEmpleadoRepository;
-import application.repository.sueldo.TipoLiquidacionRepository;
 import application.repository.sueldo.ConceptoSueldoRepository;
+import application.repository.sueldo.TipoLiquidacionRepository;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
diff --git a/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml b/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml
index 1b9d77d..c64af74 100644
--- a/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml
+++ b/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-
 <AnchorPane prefHeight="615.0" prefWidth="673.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.sueldo.cruds.LiquidacionSueldoController">
    <children>
       <GridPane layoutX="33.0" layoutY="14.0" prefHeight="498.0" prefWidth="653.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0">
diff --git a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
index e7e1164..61e8a1e 100644
--- a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
+++ b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
@@ -6,8 +6,8 @@
 import application.model.sueldo.ConceptoSueldo;
 import application.model.sueldo.LiquidacionEmpleado;
 import application.repository.info.CategoriaEmpleadoRepository;
-import application.repository.sueldo.ConceptoSueldoRepository;
 import application.repository.info.EmpleadoRepository;
+import application.repository.sueldo.ConceptoSueldoRepository;
 import application.view.sueldo.EmpleadoALiquidar;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -17,12 +17,14 @@
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.stage.Stage;
 
-import javax.xml.soap.Text;
 import java.math.BigDecimal;
 import java.net.URL;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.ResourceBundle;
 
 public class LiquidacionSueldoController implements Initializable {
     @FXML
diff --git a/src/application/view/venta/AdministrarViajes.fxml b/src/application/view/venta/AdministrarViajes.fxml
index dca93c6..0f664c4 100644
--- a/src/application/view/venta/AdministrarViajes.fxml
+++ b/src/application/view/venta/AdministrarViajes.fxml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <AnchorPane prefHeight="400.0" prefWidth="726.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.AdministrarViajesController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="16.0" layoutY="15.0" prefHeight="385.0" prefWidth="710.0" spacing="10.0">
diff --git a/src/application/view/venta/AdministrarViajesController.java b/src/application/view/venta/AdministrarViajesController.java
index d96972e..e17eb17 100644
--- a/src/application/view/venta/AdministrarViajesController.java
+++ b/src/application/view/venta/AdministrarViajesController.java
@@ -10,7 +10,6 @@
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
-import javafx.scene.Group;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
diff --git a/src/application/view/venta/Facturacion.fxml b/src/application/view/venta/Facturacion.fxml
index f1adf10..106d9d1 100644
--- a/src/application/view/venta/Facturacion.fxml
+++ b/src/application/view/venta/Facturacion.fxml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-
 <AnchorPane prefHeight="450.0" prefWidth="740.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.FacturacionController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="13.0" prefHeight="437.0" prefWidth="721.0" spacing="10.0">
diff --git a/src/application/view/venta/FacturacionController.java b/src/application/view/venta/FacturacionController.java
index c2eef2c..50972a3 100644
--- a/src/application/view/venta/FacturacionController.java
+++ b/src/application/view/venta/FacturacionController.java
@@ -1,7 +1,6 @@
 package application.view.venta;
 
 import application.Main;
-import application.comunes.Alerta;
 import application.model.venta.FacturaVenta;
 import application.model.venta.Viaje;
 import application.repository.venta.FacturaVentaRepository;
@@ -11,7 +10,6 @@
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.TableColumn;
diff --git a/src/application/view/venta/VentaCliente.fxml b/src/application/view/venta/VentaCliente.fxml
index 381a4c0..89f07d4 100644
--- a/src/application/view/venta/VentaCliente.fxml
+++ b/src/application/view/venta/VentaCliente.fxml
@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
-
 <AnchorPane prefHeight="428.0" prefWidth="662.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.VentaClienteController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="15.0" layoutY="18.0" prefHeight="410.0" prefWidth="624.0" spacing="10.0">
diff --git a/src/application/view/venta/cruds/ClienteEdit.fxml b/src/application/view/venta/cruds/ClienteEdit.fxml
index 9329fd7..3499f89 100644
--- a/src/application/view/venta/cruds/ClienteEdit.fxml
+++ b/src/application/view/venta/cruds/ClienteEdit.fxml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.layout.*?>
 <?import javafx.scene.Group?>
-
+<?import javafx.scene.layout.*?>
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.cruds.ClienteEditController">
    <children>
       <AnchorPane prefHeight="416.0" prefWidth="528.0">
diff --git a/src/application/view/venta/cruds/ClienteEditController.java b/src/application/view/venta/cruds/ClienteEditController.java
index 1efdfcc..c0692f2 100644
--- a/src/application/view/venta/cruds/ClienteEditController.java
+++ b/src/application/view/venta/cruds/ClienteEditController.java
@@ -1,7 +1,6 @@
 package application.view.venta.cruds;
 
 import application.comunes.Alerta;
-import application.model.compra.Proveedor;
 import application.model.info.Domicilio;
 import application.model.info.Localidad;
 import application.model.info.Provincia;
diff --git a/src/application/view/venta/cruds/EmitirFactura.fxml b/src/application/view/venta/cruds/EmitirFactura.fxml
index e528e0f..f5528a2 100644
--- a/src/application/view/venta/cruds/EmitirFactura.fxml
+++ b/src/application/view/venta/cruds/EmitirFactura.fxml
@@ -1,18 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.VBox?>
-
 <AnchorPane prefHeight="400.0" prefWidth="721.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.cruds.EmitirFacturaController">
    <children>
       <Pane layoutX="14.0" layoutY="14.0" prefHeight="400.0" prefWidth="721.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
diff --git a/src/application/view/venta/cruds/EmitirFacturaController.java b/src/application/view/venta/cruds/EmitirFacturaController.java
index 1e4d917..e2df858 100644
--- a/src/application/view/venta/cruds/EmitirFacturaController.java
+++ b/src/application/view/venta/cruds/EmitirFacturaController.java
@@ -2,9 +2,7 @@
 
 import application.comunes.Alerta;
 import application.model.calculo.Ingenio;
-import application.model.sueldo.ConceptoSueldo;
 import application.model.venta.Cliente;
-import application.model.venta.FacturaVenta;
 import application.model.venta.Organizacion;
 import application.model.venta.Viaje;
 import application.repository.calculo.IngenioRepository;
diff --git a/src/application/view/venta/cruds/ViajeEdit.fxml b/src/application/view/venta/cruds/ViajeEdit.fxml
index 41fb1a2..4f5da28 100644
--- a/src/application/view/venta/cruds/ViajeEdit.fxml
+++ b/src/application/view/venta/cruds/ViajeEdit.fxml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-
 <AnchorPane prefHeight="440.0" prefWidth="674.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.cruds.ViajeEditController">
    <children>
       <Pane prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
diff --git a/src/application/view/venta/cruds/ViajeEditController.java b/src/application/view/venta/cruds/ViajeEditController.java
index aef8b20..581cb70 100644
--- a/src/application/view/venta/cruds/ViajeEditController.java
+++ b/src/application/view/venta/cruds/ViajeEditController.java
@@ -16,15 +16,13 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import javafx.scene.control.*;
+import javafx.stage.Stage;
 
-import javax.xml.crypto.dom.DOMCryptoContext;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
-import java.util.function.BiFunction;
 
 
 public class ViajeEditController {

From 7024f5aee173f9637202eee1fb1709c108316030 Mon Sep 17 00:00:00 2001
From: Fernando Zafe <fernandozafe@gmail.com>
Date: Sat, 24 Feb 2018 21:37:10 -0300
Subject: [PATCH 05/27] Cambios en Liquidacion y Viajes

---
 .../{Liquidaciones.java => Liquidacion.java}  |  17 +-
 src/application/model/venta/Viaje.java        |   2 +
 .../sueldo/LiquidacionEmpleadoRepository.java |   1 -
 .../sueldo/LiquidacionRepository.java         | 159 ++++++++++++++++++
 .../sueldo/LiquidacionesRepository.java       |  84 ---------
 .../repository/venta/ViajeRepository.java     |  14 +-
 .../view/sueldo/LiquidacionesController.java  |  22 +--
 .../cruds/LiquidacionSueldoController.java    |  17 ++
 .../view/venta/FacturacionController.java     |   7 +
 .../view/venta/cruds/ViajeEditController.java |   2 +-
 10 files changed, 219 insertions(+), 106 deletions(-)
 rename src/application/model/sueldo/{Liquidaciones.java => Liquidacion.java} (79%)
 create mode 100644 src/application/repository/sueldo/LiquidacionRepository.java
 delete mode 100644 src/application/repository/sueldo/LiquidacionesRepository.java

diff --git a/src/application/model/sueldo/Liquidaciones.java b/src/application/model/sueldo/Liquidacion.java
similarity index 79%
rename from src/application/model/sueldo/Liquidaciones.java
rename to src/application/model/sueldo/Liquidacion.java
index eebf045..f2b1ed6 100644
--- a/src/application/model/sueldo/Liquidaciones.java
+++ b/src/application/model/sueldo/Liquidacion.java
@@ -2,22 +2,24 @@
 
 import javafx.beans.property.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
-public class Liquidaciones {
+public class Liquidacion {
     private IntegerProperty id;
     private StringProperty fechaLiquidacion;
     private DoubleProperty totalHaberesRemunerativos;
     private DoubleProperty totalHaberesNoRemunerativos;
     private DoubleProperty totalRetenciones;
+    private List<LiquidacionEmpleado> liquidacionesEmpleados = new ArrayList<>();
 
-    public Liquidaciones() {
+    public Liquidacion() {
         this(0,null,0.0,
                 0.0,0.0);
     }
 
-    public Liquidaciones(Integer id, String fechaLiquidacion, Double totalHaberesRemunerativos, Double totalHaberesNoRemunerativos,
-                         Double totalRetenciones) {
+    public Liquidacion(Integer id, String fechaLiquidacion, Double totalHaberesRemunerativos, Double totalHaberesNoRemunerativos,
+                       Double totalRetenciones) {
         this.id = new SimpleIntegerProperty(id);
         this.fechaLiquidacion = new SimpleStringProperty(fechaLiquidacion);
 
@@ -88,4 +90,11 @@ public void setTotalRetenciones(double totalRetenciones) {
         this.totalRetenciones.set(totalRetenciones);
     }
 
+    public List<LiquidacionEmpleado> getLiquidacionesEmpleados() {
+        return liquidacionesEmpleados;
+    }
+
+    public void setLiquidacionesEmpleados(List<LiquidacionEmpleado> liquidacionesEmpleados) {
+        this.liquidacionesEmpleados = liquidacionesEmpleados;
+    }
 }
\ No newline at end of file
diff --git a/src/application/model/venta/Viaje.java b/src/application/model/venta/Viaje.java
index 733bd04..de32fcc 100644
--- a/src/application/model/venta/Viaje.java
+++ b/src/application/model/venta/Viaje.java
@@ -228,6 +228,7 @@ public Viaje(Integer idRemito, String fecha, String horaEntrada,
         this.ingenioDestino = new SimpleStringProperty(ingenioDestino);
         this.camionNombre = new SimpleStringProperty(camionNombre);
         this.facturaVenta = new SimpleStringProperty(facturaVenta);
+        this.monto = new SimpleDoubleProperty();
         this.conductor = conductor;
         this.ingenio = new Ingenio();
         this.conductor = new Empleado();
@@ -241,5 +242,6 @@ public Viaje() {
         this.setDistanciaRecorrida("0");
         this.setBruto(0);
         this.setTara(0);
+        this.setMonto(0);
     }
 }
\ No newline at end of file
diff --git a/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java b/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java
index ce45b87..1ad200e 100644
--- a/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java
+++ b/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java
@@ -47,7 +47,6 @@ public void update(LiquidacionEmpleado liquidacionEmpleado){
             preparedStatement.setString(1,liquidacionEmpleado.getFechaLiquidacion());
             preparedStatement.setDouble(2,liquidacionEmpleado.getImporteNeto());
             preparedStatement.setDouble(3,liquidacionEmpleado.getTotalHaberesRemunerativos());
-            preparedStatement.setDouble(4,liquidacionEmpleado.getTotalHaberesNoRemunerativos());
             preparedStatement.setDouble(5,liquidacionEmpleado.getTotalRetenciones());
             preparedStatement.setDouble(6,liquidacionEmpleado.getTotalBruto());
 //            preparedStatement.setInt(7,liquidacionEmpleado.setIdPeriodoLiquidacion());
diff --git a/src/application/repository/sueldo/LiquidacionRepository.java b/src/application/repository/sueldo/LiquidacionRepository.java
new file mode 100644
index 0000000..5cc1e83
--- /dev/null
+++ b/src/application/repository/sueldo/LiquidacionRepository.java
@@ -0,0 +1,159 @@
+package application.repository.sueldo;
+
+import java.math.BigDecimal;
+import java.sql.*;
+
+import application.database.JDBCConnection;
+import application.model.info.Empleado;
+import application.model.sueldo.ConceptoCalculado;
+import application.model.sueldo.DetalleLiquidacionEmpleado;
+import application.model.sueldo.LiquidacionEmpleado;
+import application.model.sueldo.Liquidacion;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+public class LiquidacionRepository {
+
+    Connection connection;
+    PreparedStatement preparedStatement;
+    ResultSet resultSet;
+
+    public static ObservableList<Liquidacion> buscarLiquidaciones(){
+
+
+        ObservableList<Liquidacion> liquidaciones = FXCollections.observableArrayList();
+        Statement statement = null;
+        ResultSet resultSet = null;
+        try {
+            statement = JDBCConnection.getInstanceConnection().createStatement();
+            resultSet = statement.executeQuery("SELECT * FROM LIQUIDACION");
+            while(resultSet.next()){
+                Liquidacion liquidacion = new Liquidacion();
+                liquidacion.setId(resultSet.getInt("idLIQUIDACION"));
+                liquidacion.setTotalHaberesRemunerativos(resultSet.getDouble("total_haberes_remunerativos"));
+                liquidacion.setTotalHaberesNoRemunerativos(resultSet.getDouble("total_haberes_no_remunerativos"));
+                liquidacion.setTotalRetenciones(resultSet.getDouble("total_retenciones"));
+                liquidacion.setFechaLiquidacion(resultSet.getString("timestamp"));
+                liquidaciones.add(liquidacion);
+            }
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+        return liquidaciones;
+
+    }
+
+    /**
+     * Crea una liquidacion
+     * @return Liquidacion creada
+     */
+    public Liquidacion newLiquidacion(Liquidacion liquidacion){
+
+        try {
+            Statement statement = JDBCConnection.getInstanceConnection().createStatement();
+            statement.executeUpdate("INSERT INTO LIQUIDACION (timestamp) VALUES (NOW());");
+            resultSet = statement.executeQuery("SELECT idLiquidacion, timestamp " +
+                    "FROM LIQUIDACION " +
+                    "WHERE idLiquidacion = LAST_INSERT_ID();");
+            if (resultSet.next()){
+                liquidacion.setId(resultSet.getInt("idLiquidacion"));
+                liquidacion.setFechaLiquidacion(resultSet.getString("timestamp"));
+            }
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+        BigDecimal totalhr;
+        BigDecimal totalhnr;
+        BigDecimal totalret;
+
+        //crear una liquidacion_empleado por cada empleado, es asociado a una liquidacion
+        for (LiquidacionEmpleado liquidacionEmpleado : liquidacion.getLiquidacionesEmpleados()){
+
+            try {
+                preparedStatement  = connection.prepareStatement("INSERT INTO LIQUIDACION_EMPLEADO " +
+                        "(importe_neto,total_haberes_remunerativos, total_haberes_no_remunerativos,total_retenciones, " +
+                        "total_bruto, EMPLEADO_idEmpleado, inicio_periodo, fin_periodo, LIQUIDACION_idLiquidacion)" +
+                        " VALUES (?,?,?,?,?,?,?,?,?);");
+                preparedStatement.setDouble(1,liquidacionEmpleado.getImporteNeto());
+                preparedStatement.setDouble(2,liquidacionEmpleado.getTotalHaberesRemunerativos());
+                preparedStatement.setDouble(3,liquidacionEmpleado.getTotalHaberesNoRemunerativos());
+                preparedStatement.setDouble(4,liquidacionEmpleado.getTotalRetenciones());
+                preparedStatement.setDouble(5,liquidacionEmpleado.getTotalBruto());
+                preparedStatement.setInt(6,liquidacionEmpleado.getEmpleado().getIdEmpleado());
+                preparedStatement.setString(7,liquidacionEmpleado.getInicioPeriodo());
+                preparedStatement.setString(8,liquidacionEmpleado.getFinPeriodo());
+                preparedStatement.setInt(9,liquidacion.getId());
+                resultSet = preparedStatement.executeQuery("SELECT LAST_INSERT_ID()");
+                if (resultSet.next()){
+                    liquidacionEmpleado.setId(resultSet.getInt(1));
+                }
+            } catch (SQLException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+
+            //grabacion de detalle_liquidacion, es decir ConceptoCalculado
+            for (ConceptoCalculado conceptoCalculado : liquidacionEmpleado.getConceptosLiquidados()){
+                try {
+                    preparedStatement  = connection.prepareStatement("INSERT INTO DETALLE_LIQUIDACION_EMPLEADO " +
+                            "(cantidad,monto,LiquidacionEmpleado_idLiquidacionEmpleado,CONCEPTO_SUELDO_idCodigoConcepto)" +
+                            " VALUES (?,?,?,?);");
+                    preparedStatement.setDouble(1,conceptoCalculado.getFactor());
+                    preparedStatement.setDouble(2,conceptoCalculado.getMontoCalculado());
+                    preparedStatement.setInt(3,liquidacionEmpleado.getId());
+                    preparedStatement.setDouble(4,conceptoCalculado.getIdConceptoSueldo());//todo funcionara???
+                    resultSet = preparedStatement.executeQuery("SELECT LAST_INSERT_ID()");
+                    if (resultSet.next()){
+                        liquidacionEmpleado.setId(resultSet.getInt(1));
+                    }
+                } catch (SQLException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+
+        }
+
+        return liquidacion;
+    }
+
+    public ObservableList<LiquidacionEmpleado> getEmpleadosLiquidadosByidLiquidacion(int idLIQUIDACION){
+        ObservableList<LiquidacionEmpleado> list = FXCollections.observableArrayList();
+        try {
+            connection = JDBCConnection.getInstanceConnection();
+            preparedStatement=connection.prepareStatement("SELECT EMPLEADO.idEmpleado, EMPLEADO.Apellido, EMPLEADO.Nombre, " +
+                    " CATEGORIA_EMPLEADO.NombreCategoria, LIQUIDACION_EMPLEADO.total_haberes_remunerativos, " +
+                    "LIQUIDACION_EMPLEADO.total_haberes_no_remunerativos, LIQUIDACION_EMPLEADO.total_retenciones " +
+                    "                    FROM LIQUIDACION_EMPLEADO" +
+                    "                    INNER JOIN" +
+                    "                    EMPLEADO ON EMPLEADO.idEmpleado = LIQUIDACION_EMPLEADO.EMPLEADO_idEmpleado" +
+                    "                    INNER JOIN" +
+                    "                            CATEGORIA_EMPLEADO ON CATEGORIA_EMPLEADO.idCategoriaEmpleado = EMPLEADO.CATEGORIA_EMPLEADO_idCategoriaEmpleado" +
+                    "                    WHERE" +
+                    "                    LIQUIDACION_EMPLEADO.idLiquidacionEmpleado like ?");
+            preparedStatement.setInt(1, idLIQUIDACION);
+            resultSet = preparedStatement.executeQuery();
+            while (resultSet.next()){
+                LiquidacionEmpleado empleadosLiquidados = new LiquidacionEmpleado();
+                Empleado empleado = new Empleado();
+                empleado.setIdEmpleado(resultSet.getInt(1));
+                empleado.setApellido(resultSet.getString(2));
+                empleado.setNombre(resultSet.getString(3));
+//                empleado.setCategoria(resultSet.getString(4));
+                empleadosLiquidados.setEmpleado(empleado);
+                empleadosLiquidados.setTotalHaberesRemunerativos(resultSet.getDouble(5));
+                empleadosLiquidados.setTotalHaberesNoRemunerativos(resultSet.getDouble(6));
+                empleadosLiquidados.setTotalRetenciones(resultSet.getDouble(7));
+                list.add(empleadosLiquidados);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+
+}
diff --git a/src/application/repository/sueldo/LiquidacionesRepository.java b/src/application/repository/sueldo/LiquidacionesRepository.java
deleted file mode 100644
index 38577ec..0000000
--- a/src/application/repository/sueldo/LiquidacionesRepository.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package application.repository.sueldo;
-
-import java.sql.*;
-import java.text.SimpleDateFormat;
-
-import application.database.JDBCConnection;
-import application.model.info.CategoriaEmpleado;
-import application.model.info.Empleado;
-import application.model.sueldo.ConceptoSueldo;
-import application.model.sueldo.LiquidacionEmpleado;
-import application.model.sueldo.Liquidaciones;
-import application.model.venta.Viaje;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-
-public class LiquidacionesRepository {
-
-    Connection connection;
-    PreparedStatement preparedStatement;
-    ResultSet resultSet;
-
-    public static ObservableList<Liquidaciones> buscarLiquidaciones(){
-
-
-        ObservableList<Liquidaciones> liquidaciones = FXCollections.observableArrayList();
-        Statement statement = null;
-        ResultSet resultSet = null;
-        try {
-            statement = JDBCConnection.getInstanceConnection().createStatement();
-            resultSet = statement.executeQuery("SELECT * FROM LIQUIDACION");
-            while(resultSet.next()){
-                Liquidaciones liquidacion = new Liquidaciones();
-                liquidacion.setId(resultSet.getInt("idLIQUIDACION"));
-                liquidacion.setTotalHaberesRemunerativos(resultSet.getDouble("total_haberes_remunerativos"));
-                liquidacion.setTotalHaberesNoRemunerativos(resultSet.getDouble("total_haberes_no_remunerativos"));
-                liquidacion.setTotalRetenciones(resultSet.getDouble("total_retenciones"));
-                liquidacion.setFechaLiquidacion(resultSet.getString("timestamp"));
-                liquidaciones.add(liquidacion);
-            }
-        } catch (SQLException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-
-        return liquidaciones;
-
-    }
-
-    public ObservableList<LiquidacionEmpleado> getEmpleadosLiquidadosByidLiquidacion(int idLIQUIDACION){
-        ObservableList<LiquidacionEmpleado> list = FXCollections.observableArrayList();
-        try {
-            connection = JDBCConnection.getInstanceConnection();
-            preparedStatement=connection.prepareStatement("SELECT EMPLEADO.idEmpleado, EMPLEADO.Apellido, EMPLEADO.Nombre, " +
-                    " CATEGORIA_EMPLEADO.NombreCategoria, LIQUIDACION_EMPLEADO.total_haberes_remunerativos, " +
-                    "LIQUIDACION_EMPLEADO.total_haberes_no_remunerativos, LIQUIDACION_EMPLEADO.total_retenciones " +
-                    "                    FROM LIQUIDACION_EMPLEADO\n" +
-                    "                    INNER JOIN\n" +
-                    "                    EMPLEADO ON EMPLEADO.idEmpleado = LIQUIDACION_EMPLEADO.EMPLEADO_idEmpleado\n" +
-                    "                    INNER JOIN\n" +
-                    "                            CATEGORIA_EMPLEADO ON CATEGORIA_EMPLEADO.idCategoriaEmpleado = EMPLEADO.CATEGORIA_EMPLEADO_idCategoriaEmpleado\n" +
-                    "                    WHERE\n" +
-                    "                    LIQUIDACION_EMPLEADO.idLiquidacionEmpleado like ?");
-            preparedStatement.setInt(1, idLIQUIDACION);
-            resultSet = preparedStatement.executeQuery();
-            while (resultSet.next()){
-                LiquidacionEmpleado empleadosLiquidados = new LiquidacionEmpleado();
-                Empleado empleado = new Empleado();
-                empleado.setIdEmpleado(resultSet.getInt(1));
-                empleado.setApellido(resultSet.getString(2));
-                empleado.setNombre(resultSet.getString(3));
-//                empleado.setCategoria(resultSet.getString(4));
-                empleadosLiquidados.setEmpleado(empleado);
-                empleadosLiquidados.setTotalHaberesRemunerativos(resultSet.getDouble(5));
-                empleadosLiquidados.setTotalHaberesNoRemunerativos(resultSet.getDouble(6));
-                empleadosLiquidados.setTotalRetenciones(resultSet.getDouble(7));
-                list.add(empleadosLiquidados);
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return list;
-    }
-
-}
diff --git a/src/application/repository/venta/ViajeRepository.java b/src/application/repository/venta/ViajeRepository.java
index c8408c4..52588b2 100644
--- a/src/application/repository/venta/ViajeRepository.java
+++ b/src/application/repository/venta/ViajeRepository.java
@@ -298,11 +298,14 @@ public ObservableList<Viaje> getViajesByIdFactura(int idFactura){
 
 			try {
 				connection= JDBCConnection.getInstanceConnection();
-				preparedStatement=connection.prepareStatement("SELECT v.idRemito, v.Fecha, v.HoraEntrada, v.Bruto," +
-						" v.Tara, v.Empleado_idEmpleado, v.CAMION_idCamion, od.DistanciaKM, od.FINCA_idFinca," +
-						" od.INGENIO_idIngenio FROM VIAJE v INNER JOIN ORIGEN_DESTINO od " +
-						"ON Origen_Destino_idOrigen_Destino= od.idOrigen_Destino " +
-						"WHERE FACTURA_VENTA_idFACTURA_VENTA=?;");//TODO cambiar esto cuando se actualice la base de datos
+				preparedStatement=connection.prepareStatement("SELECT lv.monto, lv.FACTURA_VENTA_idFACTURA_VENTA, lv.VIAJE_idRemito," +
+						" v.idRemito, v.Fecha, v.HoraEntrada, v.Bruto, v.Tara, v.Empleado_idEmpleado, v.CAMION_idCamion," +
+						" od.DistanciaKM, od.FINCA_idFinca, od.INGENIO_idIngenio" +
+						" FROM LINEA_VIAJE lv" +
+						" INNER JOIN VIAJE v ON v.idRemito = lv.VIAJE_idRemito" +
+						" INNER JOIN ORIGEN_DESTINO od ON od.idOrigen_Destino = v.Origen_Destino_idOrigen_Destino" +
+						" INNER JOIN FACTURA_VENTA fv ON fv.idFACTURA_VENTA = lv.FACTURA_VENTA_idFACTURA_VENTA" +
+						" WHERE fv.idFACTURA_VENTA = ?;");
 				preparedStatement.setInt(1 ,idFactura);
 				resultSet = preparedStatement.executeQuery();
 				while (resultSet.next()){
@@ -313,6 +316,7 @@ public ObservableList<Viaje> getViajesByIdFactura(int idFactura){
 					viaje.setBruto(resultSet.getDouble("Bruto"));
 					viaje.setTara(resultSet.getDouble("Tara"));
 					viaje.setDistanciaRecorrida(resultSet.getString("DistanciaKM"));
+					viaje.setMonto(resultSet.getDouble("monto"));
 					Finca finca = fincaRepository.getFincaById(resultSet.getInt("FINCA_idFinca"));
 					viaje.setFinca(finca);
 					Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
diff --git a/src/application/view/sueldo/LiquidacionesController.java b/src/application/view/sueldo/LiquidacionesController.java
index d27c37c..0634f32 100644
--- a/src/application/view/sueldo/LiquidacionesController.java
+++ b/src/application/view/sueldo/LiquidacionesController.java
@@ -3,8 +3,8 @@
 import application.Main;
 import application.model.info.Empleado;
 import application.model.sueldo.LiquidacionEmpleado;
-import application.model.sueldo.Liquidaciones;
-import application.repository.sueldo.LiquidacionesRepository;
+import application.model.sueldo.Liquidacion;
+import application.repository.sueldo.LiquidacionRepository;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -26,17 +26,17 @@ public class LiquidacionesController implements Initializable{
 
 	//Declaracion de la tabla y columnas de la clase Liquidaciones
 	@FXML
-	private TableView<Liquidaciones> liquidacionTable;
+	private TableView<Liquidacion> liquidacionTable;
 	@FXML
-	private TableColumn<Liquidaciones, String> idLiquidacion;
+	private TableColumn<Liquidacion, String> idLiquidacion;
 	@FXML
-	private TableColumn<Liquidaciones, String> fechaColumn;
+	private TableColumn<Liquidacion, String> fechaColumn;
 	@FXML
-	private TableColumn<Liquidaciones, String> hrColumn;
+	private TableColumn<Liquidacion, String> hrColumn;
 	@FXML
-	private  TableColumn<Liquidaciones, String> hnrColumn;
+	private  TableColumn<Liquidacion, String> hnrColumn;
 	@FXML
-	private TableColumn<Liquidaciones, String> retencionesColumn;
+	private TableColumn<Liquidacion, String> retencionesColumn;
 
 	//Declaracion de la tabla y columnas de la clase LiquidacionEmpleado
 	@FXML
@@ -70,7 +70,7 @@ public class LiquidacionesController implements Initializable{
 
 	private ObservableList<Empleado> empleados = FXCollections.observableArrayList();
 
-	private LiquidacionesRepository liquidacionesRepository = new LiquidacionesRepository();
+	private LiquidacionRepository liquidacionesRepository = new LiquidacionRepository();
 
 	private ObservableList<LiquidacionEmpleado> empleadosLiquidados = FXCollections.observableArrayList();
 
@@ -78,10 +78,10 @@ public void setOwner(Stage owner){
 		this.owner = owner;
 
 	}
-	private ObservableList<Liquidaciones> liquidaciones = FXCollections.observableArrayList();
+	private ObservableList<Liquidacion> liquidaciones = FXCollections.observableArrayList();
 
 	public void buscarLiquidaciones(){
-		this.liquidaciones = LiquidacionesRepository.buscarLiquidaciones();
+		this.liquidaciones = LiquidacionRepository.buscarLiquidaciones();
 		liquidacionTable.setItems(liquidaciones);
 	}
 
diff --git a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
index e7e1164..b9e3132 100644
--- a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
+++ b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
@@ -4,10 +4,12 @@
 import application.model.info.Empleado;
 import application.model.sueldo.ConceptoCalculado;
 import application.model.sueldo.ConceptoSueldo;
+import application.model.sueldo.Liquidacion;
 import application.model.sueldo.LiquidacionEmpleado;
 import application.repository.info.CategoriaEmpleadoRepository;
 import application.repository.sueldo.ConceptoSueldoRepository;
 import application.repository.info.EmpleadoRepository;
+import application.repository.sueldo.LiquidacionRepository;
 import application.view.sueldo.EmpleadoALiquidar;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -16,12 +18,15 @@
 import javafx.scene.control.*;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.stage.Stage;
+import org.joda.time.DateTime;
 
 import javax.xml.soap.Text;
 import java.math.BigDecimal;
 import java.net.URL;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 public class LiquidacionSueldoController implements Initializable {
@@ -82,6 +87,7 @@ public class LiquidacionSueldoController implements Initializable {
     private Stage owner;
     private CategoriaEmpleadoRepository categoriaEmpleadoRepository = new CategoriaEmpleadoRepository();
     private EmpleadoRepository empleadoRepository = new EmpleadoRepository();
+    private LiquidacionRepository liquidacionRepository = new LiquidacionRepository();
     private ConceptoSueldoRepository conceptoSueldoRepository=new ConceptoSueldoRepository();
     private ObservableList<CategoriaEmpleado> categorias = FXCollections.observableArrayList();
     private ObservableList<Empleado> empleados = FXCollections.observableArrayList();
@@ -256,6 +262,9 @@ private void removeEmpleadoALiquidarById(int idEmpleadoALiquidar){
     @FXML
     private void liquidarEmpleados(){
         separarConceptosByTipoConcepto();
+        //crea un nuevo row de Liquidacion
+        Liquidacion liquidacion = new Liquidacion();
+
         //Liquidacion de Empleados
         for (EmpleadoALiquidar empleadoALiquidar : liquidarEmpleados)
         {
@@ -337,6 +346,10 @@ private void liquidarEmpleados(){
             liquidacionEmpleado.setTotalHaberesRemunerativos(totalRemunerativos);
             liquidacionEmpleado.setTotalHaberesNoRemunerativos(totalNoRemunerativos);
             liquidacionEmpleado.setTotalRetenciones(totalRetenciones);
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-d");
+            liquidacionEmpleado.setInicioPeriodo(desdeDatePicker.getValue().format(formatter));
+            liquidacionEmpleado.setFinPeriodo(hastaDatePicker.getValue().format(formatter));
+            liquidacionEmpleado.setFechaLiquidacion(LocalDateTime.now().format(formatter));
 
             BigDecimal totalBruto = BigDecimal.valueOf(totalRemunerativos).add(BigDecimal.valueOf(totalNoRemunerativos));
 
@@ -360,8 +373,12 @@ private void liquidarEmpleados(){
                                 liquidacionEmpleado.getTotalHaberesRemunerativos(), liquidacionEmpleado.getTotalHaberesNoRemunerativos(),
                                 liquidacionEmpleado.getTotalRetenciones(), liquidacionEmpleado.getTotalBruto(), liquidacionEmpleado.getImporteNeto());
 
+            //Agregar LiquidacionEmpleado a Liquidacion
+            liquidacion.getLiquidacionesEmpleados().add(liquidacionEmpleado);
         }
 
+        //Grabar los datos en la base de datos
+        liquidacionRepository.newLiquidacion(liquidacion);
     }
 
     private void separarConceptosByTipoConcepto(){
diff --git a/src/application/view/venta/FacturacionController.java b/src/application/view/venta/FacturacionController.java
index c2eef2c..b97ee6e 100644
--- a/src/application/view/venta/FacturacionController.java
+++ b/src/application/view/venta/FacturacionController.java
@@ -83,6 +83,13 @@ public void initialize() {
 		clienteColumn.setCellValueFactory(cellData -> cellData.getValue().getCliente().nombreProperty());
 		//montoTotal.setCellValueFactory(cellData -> cellData.getValue().montoFacturaProperty().asString());//TODO: inicializar este dato
 
+		facturacionesTable.getSelectionModel().selectedItemProperty().addListener((obs, oldSelection, newSelection) -> {
+			if (newSelection != null) {
+				cargarViajes();
+			}
+		});
+
+
 		fincaColumn.setCellValueFactory(cellData -> cellData.getValue().getFinca().nombreProperty());
 		ingenioColumn.setCellValueFactory(cellData -> cellData.getValue().getIngenio().nombreProperty());
 		fechaViajeColumn.setCellValueFactory(cellData -> cellData.getValue().fechaProperty());
diff --git a/src/application/view/venta/cruds/ViajeEditController.java b/src/application/view/venta/cruds/ViajeEditController.java
index aef8b20..2cf1f9c 100644
--- a/src/application/view/venta/cruds/ViajeEditController.java
+++ b/src/application/view/venta/cruds/ViajeEditController.java
@@ -143,7 +143,7 @@ public void setIngenioTabla(){
 
     public void setConductorComboBox(){
         ObservableList<String> conList = FXCollections.observableArrayList();
-        conductorData = conductorRepository.getEmpleadosByCategoriaEmpleado(2);
+        conductorData = conductorRepository.getEmpleadosByCategoriaEmpleado(2);//TODO no hardcodear esto
         for (Empleado conductor : conductoresList) conList.add(conductor.getNombre() + " " + conductor.getApellido());
         conductorCombo.setItems(conList);
     }

From fa9a811a47cd93bc9bd4bac3145c4e918995cdf1 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Sun, 25 Feb 2018 12:26:26 -0300
Subject: [PATCH 06/27] Cambios en Liquidacion

---
 .idea/workspace.xml                           |  65 ++++++-----
 .../compra/FacturaCompraRepository.java       |   1 -
 .../repository/info/EmpleadoRepository.java   |   3 +-
 .../sueldo/LiquidacionRepository.java         | 104 +++++++++++-------
 src/application/view/Register.fxml            |   6 +-
 src/application/view/RegisterController.java  |   2 +
 .../view/compra/cruds/ArticuloEdit.fxml       |  16 ++-
 .../view/compra/cruds/StockEdit.fxml          |  24 ++--
 .../view/sueldo/LiquidacionesController.java  |  20 +++-
 .../cruds/LiquidacionSueldoController.java    |  49 ++++-----
 10 files changed, 172 insertions(+), 118 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f534210..afae104 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,23 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ad24a087-34e9-4c0a-89a3-9d660d897332" name="Default" comment="Diseño mejorado y ajustes a todas las ventanas del proyecto">
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionRepository.java" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change beforePath="$PROJECT_DIR$/src/application/model/sueldo/Liquidaciones.java" afterPath="$PROJECT_DIR$/src/application/model/sueldo/Liquidacion.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/model/venta/Viaje.java" afterPath="$PROJECT_DIR$/src/application/model/venta/Viaje.java" />
       <change beforePath="$PROJECT_DIR$/src/application/repository/compra/FacturaCompraRepository.java" afterPath="$PROJECT_DIR$/src/application/repository/compra/FacturaCompraRepository.java" />
       <change beforePath="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" afterPath="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java" afterPath="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionesRepository.java" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/src/application/repository/venta/ViajeRepository.java" afterPath="$PROJECT_DIR$/src/application/repository/venta/ViajeRepository.java" />
+      <change beforePath="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionRepository.java" afterPath="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionRepository.java" />
       <change beforePath="$PROJECT_DIR$/src/application/view/Register.fxml" afterPath="$PROJECT_DIR$/src/application/view/Register.fxml" />
       <change beforePath="$PROJECT_DIR$/src/application/view/RegisterController.java" afterPath="$PROJECT_DIR$/src/application/view/RegisterController.java" />
       <change beforePath="$PROJECT_DIR$/src/application/view/compra/cruds/ArticuloEdit.fxml" afterPath="$PROJECT_DIR$/src/application/view/compra/cruds/ArticuloEdit.fxml" />
       <change beforePath="$PROJECT_DIR$/src/application/view/compra/cruds/StockEdit.fxml" afterPath="$PROJECT_DIR$/src/application/view/compra/cruds/StockEdit.fxml" />
       <change beforePath="$PROJECT_DIR$/src/application/view/sueldo/LiquidacionesController.java" afterPath="$PROJECT_DIR$/src/application/view/sueldo/LiquidacionesController.java" />
       <change beforePath="$PROJECT_DIR$/src/application/view/sueldo/cruds/LiquidacionSueldoController.java" afterPath="$PROJECT_DIR$/src/application/view/sueldo/cruds/LiquidacionSueldoController.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/venta/FacturacionController.java" afterPath="$PROJECT_DIR$/src/application/view/venta/FacturacionController.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/venta/cruds/ViajeEditController.java" afterPath="$PROJECT_DIR$/src/application/view/venta/cruds/ViajeEditController.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -32,12 +25,12 @@
     <favorites_list name="LogiservStudio" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="LiquidacionSueldoController.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/application/view/sueldo/cruds/LiquidacionSueldoController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="80">
-              <caret line="252" column="0" lean-forward="false" selection-start-line="252" selection-start-column="0" selection-end-line="252" selection-end-column="0" />
+            <state relative-caret-position="17">
+              <caret line="262" column="37" lean-forward="false" selection-start-line="262" selection-start-column="37" selection-end-line="263" selection-end-column="41" />
               <folding />
             </state>
           </provider>
@@ -46,7 +39,7 @@
       <file leaf-file-name="LiquidacionRepository.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionRepository.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="101">
+            <state relative-caret-position="1360">
               <caret line="91" column="0" lean-forward="false" selection-start-line="91" selection-start-column="0" selection-end-line="91" selection-end-column="0" />
               <folding />
             </state>
@@ -56,7 +49,7 @@
       <file leaf-file-name="FacturaCompraRepository.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/application/repository/compra/FacturaCompraRepository.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="337">
+            <state relative-caret-position="1530">
               <caret line="100" column="0" lean-forward="false" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
               <folding />
             </state>
@@ -192,8 +185,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="Scratches" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -223,7 +215,7 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
+      <pane id="Scope" />
       <pane id="PackagesPane">
         <subPane>
           <expand>
@@ -236,6 +228,12 @@
               <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
               <item name="application" type="1f31426a:PackageElementNode" />
             </path>
+            <path>
+              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
+              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
+              <item name="application" type="1f31426a:PackageElementNode" />
+              <item name="reports" type="1f31426a:PackageElementNode" />
+            </path>
             <path>
               <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
               <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
@@ -274,6 +272,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -591,7 +590,14 @@
       <option name="project" value="LOCAL" />
       <updated>1519496176174</updated>
     </task>
-    <option name="localTasksCounter" value="22" />
+    <task id="LOCAL-00022" summary="avances en liquidacion">
+      <created>1519572233342</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1519572233342</updated>
+    </task>
+    <option name="localTasksCounter" value="23" />
     <servers />
   </component>
   <component name="TodoView">
@@ -608,7 +614,6 @@
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -619,7 +624,7 @@
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27887538" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28343466" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -630,6 +635,7 @@
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978722" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" x="0" y="0" width="588" height="544" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -684,7 +690,8 @@
     <MESSAGE value="Reportes con viewer de JasperReports funcional" />
     <MESSAGE value="mejora en el viewer para javaFX en reportes" />
     <MESSAGE value="optimizacion de imports en todas las clases, funcionalidad de reportes para todos los reportes y reportes de stock funcionales" />
-    <option name="LAST_COMMIT_MESSAGE" value="optimizacion de imports en todas las clases, funcionalidad de reportes para todos los reportes y reportes de stock funcionales" />
+    <MESSAGE value="avances en liquidacion" />
+    <option name="LAST_COMMIT_MESSAGE" value="avances en liquidacion" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -991,7 +998,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="296">
           <caret line="132" column="53" lean-forward="true" selection-start-line="132" selection-start-column="53" selection-end-line="132" selection-end-column="53" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1009,14 +1015,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionesRepository.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionesRepository.java" />
     <entry file="file://$PROJECT_DIR$/src/application/view/sueldo/Liquidaciones.fxml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-765">
@@ -1056,7 +1055,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/repository/compra/FacturaCompraRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="337">
+        <state relative-caret-position="1530">
           <caret line="100" column="0" lean-forward="false" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
           <folding />
         </state>
@@ -1064,7 +1063,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="101">
+        <state relative-caret-position="1360">
           <caret line="91" column="0" lean-forward="false" selection-start-line="91" selection-start-column="0" selection-end-line="91" selection-end-column="0" />
           <folding />
         </state>
@@ -1072,8 +1071,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/sueldo/cruds/LiquidacionSueldoController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="252" column="0" lean-forward="false" selection-start-line="252" selection-start-column="0" selection-end-line="252" selection-end-column="0" />
+        <state relative-caret-position="17">
+          <caret line="262" column="37" lean-forward="false" selection-start-line="262" selection-start-column="37" selection-end-line="263" selection-end-column="41" />
           <folding />
         </state>
       </provider>
diff --git a/src/application/repository/compra/FacturaCompraRepository.java b/src/application/repository/compra/FacturaCompraRepository.java
index f2d2b5a..bd56bdb 100644
--- a/src/application/repository/compra/FacturaCompraRepository.java
+++ b/src/application/repository/compra/FacturaCompraRepository.java
@@ -98,6 +98,5 @@ public int getLastID() {
         }
         return lastIdFactura;
     }
-//TODO: hacer un metodo para obtener facturas en un rango de fechas? o bien ¿utilizar un procedimiento?
 }
 
diff --git a/src/application/repository/info/EmpleadoRepository.java b/src/application/repository/info/EmpleadoRepository.java
index 557273f..5c40a0c 100644
--- a/src/application/repository/info/EmpleadoRepository.java
+++ b/src/application/repository/info/EmpleadoRepository.java
@@ -120,7 +120,8 @@ public ObservableList<Empleado> getEmpleadosByCategoriaEmpleado(int idCategoria)
 			ObservableList<Empleado> list = FXCollections.observableArrayList();
 			try {
 				Connection connection= JDBCConnection.getInstanceConnection();
-				PreparedStatement preparedStatement=connection.prepareStatement("select idEmpleado, " +
+				PreparedStatement preparedStatement=connection.prepareStatement("" +
+						"select idEmpleado, " +
 						"Apellido, Nombre " +
 						"from Empleado " +
 						"where CATEGORIA_EMPLEADO_idCategoriaEmpleado = ?" +
diff --git a/src/application/repository/sueldo/LiquidacionRepository.java b/src/application/repository/sueldo/LiquidacionRepository.java
index 5cc1e83..b0c3295 100644
--- a/src/application/repository/sueldo/LiquidacionRepository.java
+++ b/src/application/repository/sueldo/LiquidacionRepository.java
@@ -4,6 +4,7 @@
 import java.sql.*;
 
 import application.database.JDBCConnection;
+import application.model.info.CategoriaEmpleado;
 import application.model.info.Empleado;
 import application.model.sueldo.ConceptoCalculado;
 import application.model.sueldo.DetalleLiquidacionEmpleado;
@@ -17,6 +18,7 @@ public class LiquidacionRepository {
     Connection connection;
     PreparedStatement preparedStatement;
     ResultSet resultSet;
+    private int lastIdLiquidacionEmpleado;
 
     public static ObservableList<Liquidacion> buscarLiquidaciones(){
 
@@ -47,9 +49,10 @@ public static ObservableList<Liquidacion> buscarLiquidaciones(){
 
     /**
      * Crea una liquidacion
+     *
      * @return Liquidacion creada
      */
-    public Liquidacion newLiquidacion(Liquidacion liquidacion){
+    public Liquidacion newLiquidacion(Liquidacion liquidacion) {
 
         try {
             Statement statement = JDBCConnection.getInstanceConnection().createStatement();
@@ -57,7 +60,7 @@ public Liquidacion newLiquidacion(Liquidacion liquidacion){
             resultSet = statement.executeQuery("SELECT idLiquidacion, timestamp " +
                     "FROM LIQUIDACION " +
                     "WHERE idLiquidacion = LAST_INSERT_ID();");
-            if (resultSet.next()){
+            if (resultSet.next()) {
                 liquidacion.setId(resultSet.getInt("idLiquidacion"));
                 liquidacion.setFechaLiquidacion(resultSet.getString("timestamp"));
             }
@@ -70,54 +73,50 @@ public Liquidacion newLiquidacion(Liquidacion liquidacion){
         BigDecimal totalhnr;
         BigDecimal totalret;
 
+
+        //set ID liquidacion
+        liquidacion.setId(getLastID());
         //crear una liquidacion_empleado por cada empleado, es asociado a una liquidacion
-        for (LiquidacionEmpleado liquidacionEmpleado : liquidacion.getLiquidacionesEmpleados()){
+        for (LiquidacionEmpleado liquidacionEmpleado : liquidacion.getLiquidacionesEmpleados()) {
 
             try {
-                preparedStatement  = connection.prepareStatement("INSERT INTO LIQUIDACION_EMPLEADO " +
-                        "(importe_neto,total_haberes_remunerativos, total_haberes_no_remunerativos,total_retenciones, " +
-                        "total_bruto, EMPLEADO_idEmpleado, inicio_periodo, fin_periodo, LIQUIDACION_idLiquidacion)" +
-                        " VALUES (?,?,?,?,?,?,?,?,?);");
-                preparedStatement.setDouble(1,liquidacionEmpleado.getImporteNeto());
-                preparedStatement.setDouble(2,liquidacionEmpleado.getTotalHaberesRemunerativos());
-                preparedStatement.setDouble(3,liquidacionEmpleado.getTotalHaberesNoRemunerativos());
-                preparedStatement.setDouble(4,liquidacionEmpleado.getTotalRetenciones());
-                preparedStatement.setDouble(5,liquidacionEmpleado.getTotalBruto());
-                preparedStatement.setInt(6,liquidacionEmpleado.getEmpleado().getIdEmpleado());
-                preparedStatement.setString(7,liquidacionEmpleado.getInicioPeriodo());
-                preparedStatement.setString(8,liquidacionEmpleado.getFinPeriodo());
-                preparedStatement.setInt(9,liquidacion.getId());
-                resultSet = preparedStatement.executeQuery("SELECT LAST_INSERT_ID()");
-                if (resultSet.next()){
-                    liquidacionEmpleado.setId(resultSet.getInt(1));
-                }
+                preparedStatement = connection.prepareStatement("INSERT INTO LIQUIDACION_EMPLEADO " +
+                        " VALUES (?,?,?,?,?,?,?,?,?,?,?);");
+                preparedStatement.setString(1, null);
+                preparedStatement.setString(2, liquidacionEmpleado.getFechaLiquidacion());
+                preparedStatement.setDouble(3, liquidacionEmpleado.getImporteNeto());
+                preparedStatement.setDouble(4, liquidacionEmpleado.getTotalHaberesRemunerativos());
+                preparedStatement.setDouble(5, liquidacionEmpleado.getTotalHaberesNoRemunerativos());
+                preparedStatement.setDouble(6, liquidacionEmpleado.getTotalRetenciones());
+                preparedStatement.setDouble(7, liquidacionEmpleado.getTotalBruto());
+                preparedStatement.setInt(8, liquidacionEmpleado.getEmpleado().getIdEmpleado());
+                preparedStatement.setString(9, liquidacionEmpleado.getInicioPeriodo());
+                preparedStatement.setString(10, liquidacionEmpleado.getFinPeriodo());
+                preparedStatement.setInt(11, liquidacion.getId());
+                preparedStatement.executeUpdate();
             } catch (SQLException e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
             }
 
+            liquidacionEmpleado.setId(getLastIdLiquidacionEmpleado());
             //grabacion de detalle_liquidacion, es decir ConceptoCalculado
-            for (ConceptoCalculado conceptoCalculado : liquidacionEmpleado.getConceptosLiquidados()){
+            for (ConceptoCalculado conceptoCalculado : liquidacionEmpleado.getConceptosLiquidados()) {
                 try {
-                    preparedStatement  = connection.prepareStatement("INSERT INTO DETALLE_LIQUIDACION_EMPLEADO " +
-                            "(cantidad,monto,LiquidacionEmpleado_idLiquidacionEmpleado,CONCEPTO_SUELDO_idCodigoConcepto)" +
-                            " VALUES (?,?,?,?);");
-                    preparedStatement.setDouble(1,conceptoCalculado.getFactor());
-                    preparedStatement.setDouble(2,conceptoCalculado.getMontoCalculado());
-                    preparedStatement.setInt(3,liquidacionEmpleado.getId());
-                    preparedStatement.setDouble(4,conceptoCalculado.getIdConceptoSueldo());//todo funcionara???
-                    resultSet = preparedStatement.executeQuery("SELECT LAST_INSERT_ID()");
-                    if (resultSet.next()){
-                        liquidacionEmpleado.setId(resultSet.getInt(1));
-                    }
+                    preparedStatement = connection.prepareStatement("INSERT INTO DETALLE_LIQUIDACION_EMPLEADO " +
+                            " VALUES (?,?,?,?,?)");
+                    preparedStatement.setString(1, null);
+                    preparedStatement.setDouble(2, conceptoCalculado.getFactor());
+                    preparedStatement.setInt(3, liquidacionEmpleado.getId());
+                    preparedStatement.setDouble(4, conceptoCalculado.getMontoCalculado());
+                    preparedStatement.setInt(5, conceptoCalculado.getIdConceptoSueldo());
+                    preparedStatement.executeUpdate();
                 } catch (SQLException e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
                 }
             }
-
         }
-
         return liquidacion;
     }
 
@@ -126,7 +125,7 @@ public ObservableList<LiquidacionEmpleado> getEmpleadosLiquidadosByidLiquidacion
         try {
             connection = JDBCConnection.getInstanceConnection();
             preparedStatement=connection.prepareStatement("SELECT EMPLEADO.idEmpleado, EMPLEADO.Apellido, EMPLEADO.Nombre, " +
-                    " CATEGORIA_EMPLEADO.NombreCategoria, LIQUIDACION_EMPLEADO.total_haberes_remunerativos, " +
+                    "CATEGORIA_EMPLEADO.idCategoriaEmpleado, CATEGORIA_EMPLEADO.NombreCategoria, LIQUIDACION_EMPLEADO.total_haberes_remunerativos, " +
                     "LIQUIDACION_EMPLEADO.total_haberes_no_remunerativos, LIQUIDACION_EMPLEADO.total_retenciones " +
                     "                    FROM LIQUIDACION_EMPLEADO" +
                     "                    INNER JOIN" +
@@ -143,11 +142,11 @@ public ObservableList<LiquidacionEmpleado> getEmpleadosLiquidadosByidLiquidacion
                 empleado.setIdEmpleado(resultSet.getInt(1));
                 empleado.setApellido(resultSet.getString(2));
                 empleado.setNombre(resultSet.getString(3));
-//                empleado.setCategoria(resultSet.getString(4));
+                empleado.setCategoriaEmpleado(new CategoriaEmpleado(resultSet.getInt(4),resultSet.getString(5)));
                 empleadosLiquidados.setEmpleado(empleado);
-                empleadosLiquidados.setTotalHaberesRemunerativos(resultSet.getDouble(5));
-                empleadosLiquidados.setTotalHaberesNoRemunerativos(resultSet.getDouble(6));
-                empleadosLiquidados.setTotalRetenciones(resultSet.getDouble(7));
+                empleadosLiquidados.setTotalHaberesRemunerativos(resultSet.getDouble(6));
+                empleadosLiquidados.setTotalHaberesNoRemunerativos(resultSet.getDouble(7));
+                empleadosLiquidados.setTotalRetenciones(resultSet.getDouble(8));
                 list.add(empleadosLiquidados);
             }
         } catch (SQLException e) {
@@ -156,4 +155,31 @@ public ObservableList<LiquidacionEmpleado> getEmpleadosLiquidadosByidLiquidacion
         return list;
     }
 
+    public int getLastID() {
+        int lastId=0;
+        try {
+            connection = JDBCConnection.getInstanceConnection();
+            preparedStatement=connection.prepareStatement("SELECT MAX(idLIQUIDACION) FROM liquidacion");
+            resultSet = preparedStatement.executeQuery();
+            if (resultSet.next())
+                lastId= resultSet.getInt(1);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return lastId;
+    }
+
+    public int getLastIdLiquidacionEmpleado() {
+        int lastId=0;
+        try {
+            connection = JDBCConnection.getInstanceConnection();
+            preparedStatement=connection.prepareStatement("SELECT MAX(idLiquidacionEmpleado) FROM Liquidacion_Empleado");
+            resultSet = preparedStatement.executeQuery();
+            if (resultSet.next())
+                lastId= resultSet.getInt(1);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return lastId;
+    }
 }
diff --git a/src/application/view/Register.fxml b/src/application/view/Register.fxml
index 919abcf..f661b6b 100644
--- a/src/application/view/Register.fxml
+++ b/src/application/view/Register.fxml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.Group?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Text?>
+
 <Group stylesheets="@css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.RegisterController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="591.0" prefWidth="547.0">
@@ -33,7 +37,7 @@
                         <TextField fx:id="numeroField" prefHeight="25.0" prefWidth="64.0" GridPane.columnIndex="4" GridPane.rowIndex="6" />
                         <Label alignment="CENTER_RIGHT" prefHeight="17.0" prefWidth="117.0" text="Localidad:" GridPane.columnIndex="1" GridPane.rowIndex="7" />
                         <ComboBox fx:id="localidadComboBox" prefHeight="25.0" prefWidth="168.0" GridPane.columnIndex="2" GridPane.rowIndex="7" />
-                        <DatePicker fx:id="fechaNacimiento" editable="false" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+                        <DatePicker fx:id="fechaNacimiento" promptText="dd/mm/aaaa" GridPane.columnIndex="2" GridPane.rowIndex="4" />
                         <TextField fx:id="cuitField" GridPane.columnIndex="4" GridPane.rowIndex="4" />
                         <Label alignment="CENTER_RIGHT" prefHeight="17.0" prefWidth="49.0" text="CUIT:" GridPane.columnIndex="3" GridPane.rowIndex="4" />
                         <Label text="Datos de Usuario:" GridPane.columnIndex="1" GridPane.rowIndex="8" />
diff --git a/src/application/view/RegisterController.java b/src/application/view/RegisterController.java
index 4c86035..408dddd 100644
--- a/src/application/view/RegisterController.java
+++ b/src/application/view/RegisterController.java
@@ -19,6 +19,7 @@
 import java.net.URL;
 import java.time.LocalDate;
 import java.time.ZoneId;
+import java.time.chrono.HijrahChronology;
 import java.util.Date;
 import java.util.ResourceBundle;
 
@@ -111,6 +112,7 @@ public void initialize(URL location, ResourceBundle resources) {
         registrarButton.disableProperty().bind(boolenBinding);
         cargarCategorias();
         cargarLocalidades();
+
     }
     public void setOwner(Stage owner){
         this.owner = owner;
diff --git a/src/application/view/compra/cruds/ArticuloEdit.fxml b/src/application/view/compra/cruds/ArticuloEdit.fxml
index fe437b5..f27924f 100644
--- a/src/application/view/compra/cruds/ArticuloEdit.fxml
+++ b/src/application/view/compra/cruds/ArticuloEdit.fxml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.Group?>
 <?import javafx.scene.layout.*?>
+
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.ArticuloEditController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="387.0" prefWidth="473.0">
@@ -15,16 +18,19 @@
             <TextField fx:id="marcaTextField" GridPane.columnSpan="2" GridPane.rowIndex="1" />
             <TextField fx:id="modeloTextField" GridPane.columnSpan="2" GridPane.rowIndex="3" />
             <TextArea fx:id="descripcionTextArea" prefHeight="90.0" prefWidth="395.0" GridPane.columnSpan="2" GridPane.rowIndex="5" GridPane.rowSpan="3" />
-            <Label text="Categoria" GridPane.rowIndex="8" />
-            <ComboBox fx:id="categoriaComboBox" prefHeight="25.0" prefWidth="440.0" GridPane.columnSpan="2" GridPane.rowIndex="9" />
-            <Button mnemonicParsing="false" onAction="#handleNuevaCategoria" prefHeight="25.0" prefWidth="67.0" text="+" GridPane.columnIndex="2" GridPane.rowIndex="9" />
+            <Label text="Categoria:" GridPane.rowIndex="8" />
             <Label text="Stock:" GridPane.columnIndex="0" GridPane.rowIndex="10" />
             <TextField fx:id="stockTextField" disable="true" prefWidth="200.0" GridPane.columnIndex="0" GridPane.rowIndex="11" />
+                  <HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="9">
+                     <children>
+                  <ComboBox fx:id="categoriaComboBox" prefHeight="25.0" prefWidth="307.0" />
+                  <Button mnemonicParsing="false" onAction="#handleNuevaCategoria" prefHeight="25.0" prefWidth="30.0" text="+" />
+                     </children>
+                  </HBox>
           </children>
           <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" maxWidth="226.0" minWidth="10.0" prefWidth="205.0" />
             <ColumnConstraints hgrow="SOMETIMES" maxWidth="242.0" minWidth="10.0" prefWidth="186.0" />
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="155.0" minWidth="10.0" prefWidth="46.0" />
           </columnConstraints>
           <rowConstraints>
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -36,7 +42,7 @@
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
           </rowConstraints>
diff --git a/src/application/view/compra/cruds/StockEdit.fxml b/src/application/view/compra/cruds/StockEdit.fxml
index abcf0cf..222a8d9 100644
--- a/src/application/view/compra/cruds/StockEdit.fxml
+++ b/src/application/view/compra/cruds/StockEdit.fxml
@@ -1,22 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.Group?>
 <?import javafx.scene.layout.*?>
+
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.StockEditController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="387.0" prefWidth="473.0">
       <children>
-        <GridPane layoutY="14.0" prefHeight="300.0" prefWidth="442.0" AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="16.0">
+        <GridPane layoutY="14.0" prefHeight="300.0" prefWidth="362.0" AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="96.0">
           <children>
             <Label text="Marca:" />
             <Label text="Modelo:" GridPane.rowIndex="2" />
             <Label text="Descripcion:" GridPane.rowIndex="4" />
-            <Label text="Stock:" GridPane.rowIndex="8" />
-            <TextField fx:id="stockTextField" prefWidth="200.0" GridPane.rowIndex="9" />
-                  <Label fx:id="marcaLabel" prefHeight="17.0" prefWidth="474.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="1" />
-                  <Label fx:id="modeloLabel" prefHeight="17.0" prefWidth="656.0" text=" " GridPane.columnSpan="2147483647" GridPane.rowIndex="3" />
-                  <Label fx:id="descripcionLabel" alignment="TOP_LEFT" prefHeight="87.0" prefWidth="442.0" text=" " GridPane.columnSpan="2147483647" GridPane.rowIndex="5" GridPane.rowSpan="3" />
+            <Label text="Stock:" GridPane.rowIndex="7" />
+            <TextField fx:id="stockTextField" prefWidth="200.0" GridPane.rowIndex="8" />
+                  <Label fx:id="descripcionLabel" alignment="TOP_LEFT" prefHeight="87.0" prefWidth="442.0" text=" " GridPane.columnSpan="2147483647" GridPane.rowIndex="5" GridPane.rowSpan="2" />
+                  <HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="1">
+                     <children>
+                        <Label fx:id="marcaLabel" prefHeight="17.0" prefWidth="330.0" />
+                     </children>
+                  </HBox>
+                  <HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="3">
+                     <children>
+                        <Label fx:id="modeloLabel" prefHeight="17.0" prefWidth="326.0" text=" " />
+                     </children>
+                  </HBox>
           </children>
           <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" maxWidth="226.0" minWidth="10.0" prefWidth="205.0" />
@@ -32,7 +43,6 @@
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
           </rowConstraints>
         </GridPane>
         <HBox alignment="CENTER" layoutX="-1.0" layoutY="325.0" prefHeight="62.0" prefWidth="473.0" spacing="15.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="1.0">
diff --git a/src/application/view/sueldo/LiquidacionesController.java b/src/application/view/sueldo/LiquidacionesController.java
index 0634f32..ba28c00 100644
--- a/src/application/view/sueldo/LiquidacionesController.java
+++ b/src/application/view/sueldo/LiquidacionesController.java
@@ -4,7 +4,9 @@
 import application.model.info.Empleado;
 import application.model.sueldo.LiquidacionEmpleado;
 import application.model.sueldo.Liquidacion;
+import application.reports.AbstractJasperReports;
 import application.repository.sueldo.LiquidacionRepository;
+import javafx.beans.binding.BooleanBinding;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -58,7 +60,9 @@ public class LiquidacionesController implements Initializable{
 	@FXML
 	private Button nuevaLiquidacionButton;
 	@FXML
-	private Button reportesButton;
+	private Button imprimirRecibos;
+	@FXML
+	private Button imprimirReciboDeEmpleado;
 
 
 
@@ -87,6 +91,9 @@ public void buscarLiquidaciones(){
 
 	@Override
 	public void initialize(URL location, ResourceBundle resources) {
+		BooleanBinding boolenBinding = liquidacionTable.getSelectionModel().selectedItemProperty().isNull();
+		imprimirRecibos.disableProperty().bind(boolenBinding);
+
 		buscarLiquidaciones();
 		idLiquidacion.setCellValueFactory(cellData -> cellData.getValue().idProperty().asString());
 		fechaColumn.setCellValueFactory(cellData -> cellData.getValue().fechaLiquidacionProperty());
@@ -97,7 +104,7 @@ public void initialize(URL location, ResourceBundle resources) {
 		legajoColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().idEmpleadoProperty().asString());
 		apellidoColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().apellidoProperty());
 		nombreColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().nombreProperty());
-//		categoriaColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().categoriaProperty());
+		categoriaColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().getCategoriaEmpleado().nombreProperty());
 		hrEmpleadoColumn.setCellValueFactory(cellData -> cellData.getValue().totalHaberesRemunerativosProperty().asString());
 		hnrEmpleadoColumn.setCellValueFactory(cellData -> cellData.getValue().totalHaberesNoRemunerativosProperty().asString());
 		retencionesEmpleadoColumn.setCellValueFactory(cellData -> cellData.getValue().totalRetencionesProperty().asString());
@@ -138,7 +145,14 @@ public void cargarEmpleadosLiquidados(){
 			empleadosTable.setItems(empleadosLiquidados);
 		}
 	}
-
+	@FXML
+	private void handleImprimirRecibos(){
+		System.out.println("se imprimieron recibos de sueldo");
+		int idLiquidacion = liquidacionTable.getSelectionModel().getSelectedItem().getId();
+		AbstractJasperReports.createReport("src\\application\\reports\\ReciboSueldo.jasper",
+				"idLiquidacion", idLiquidacion);
+		AbstractJasperReports.showViewer();
+	}
 //    @FXML
 //    private void cargarLiquidaciones(){
 //        if (liquidacionTable.getSelectionModel().getSelectedItem() != null){
diff --git a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
index b9e3132..44c3be3 100644
--- a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
+++ b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
@@ -273,7 +273,7 @@ private void liquidarEmpleados(){
             List<ConceptoCalculado> retCalculados = new ArrayList<>();
 
             //Muestra lista de conceptos a liquidar
-            System.out.println("%nCONCEPTOS A LIQUIDAR%n%n");
+            /*System.out.println("%nCONCEPTOS A LIQUIDAR%n%n");
             for (ConceptoSueldo conceptoSueldo : empleadoALiquidar.getRemunerativos())
                 System.out.printf("CONCEPTO REMUNERATIVO: %s%n" +
                                   "              CANTIDAD: %f%n" +
@@ -289,7 +289,7 @@ private void liquidarEmpleados(){
                                 "              CANTIDAD: %f%n" +
                                 "              FACTOR  : %f%n",  conceptoSueldo.getDescripcion(),conceptoSueldo.getCantidad(),
                         conceptoSueldo.getFactor());
-
+*/
 
             //Liquidacion de Haberes Remunerativos
             for (ConceptoSueldo conceptoSueldo : empleadoALiquidar.getRemunerativos())
@@ -300,7 +300,7 @@ private void liquidarEmpleados(){
                 noRemCalculados.add(new ConceptoCalculado(conceptoSueldo));
 
             //Muestra lista de conceptos liquidados [REMUNERATIVOS Y NO REMUNERATIVOS]
-            System.out.printf("%n%nCONCEPTOS LIQUIDADOS%n%n");
+            /*System.out.printf("%n%nCONCEPTOS LIQUIDADOS%n%n");
             for (ConceptoCalculado conceptoCalculado : remCalculados)
                 System.out.printf("CALCULADO REMUNERATIVO: %s%n" +
                                 "              CANTIDAD: %f%n" +
@@ -313,7 +313,7 @@ private void liquidarEmpleados(){
                                 "              FACTOR  : %f%n" +
                                 "      MONTO CALCULADO : %f%n",  conceptoCalculado.getDescripcion(),conceptoCalculado.getCantidad(),
                         conceptoCalculado.getFactor(), conceptoCalculado.getMontoCalculado());
-
+*/
 
 
             //Calcular suma de Haberes Remunerativos
@@ -360,18 +360,18 @@ private void liquidarEmpleados(){
 
             liquidacionEmpleado.setImporteNeto(importeNeto.doubleValue());
 
-            System.out.printf("%n%n------- Liquidación Empleado :%s %s ------- %n ", empleadoALiquidar.getEmpleado().getNombre(),
-                    empleadoALiquidar.getEmpleado().getApellido());
-            System.out.println("TOTAL HABERES REMUNERATIVOS: " + liquidacionEmpleado.getTotalHaberesRemunerativos());
-            System.out.printf("Total haberes remunerativos   : $ %f%n" +
-                              "Total haberes no remunerativos: $ %f%n" +
-                              "Total retenciones             : $ %f%n" +
-                              "------------------------------------%n" +
-                              "Total Bruto                   : $ %f%n" +
-                              "Importe Neto                  : $ %f%n" +
-                              "------------------------------------%n",
-                                liquidacionEmpleado.getTotalHaberesRemunerativos(), liquidacionEmpleado.getTotalHaberesNoRemunerativos(),
-                                liquidacionEmpleado.getTotalRetenciones(), liquidacionEmpleado.getTotalBruto(), liquidacionEmpleado.getImporteNeto());
+//            System.out.printf("%n%n------- Liquidación Empleado :%s %s ------- %n ", empleadoALiquidar.getEmpleado().getNombre(),
+//                    empleadoALiquidar.getEmpleado().getApellido());
+//            System.out.println("TOTAL HABERES REMUNERATIVOS: " + liquidacionEmpleado.getTotalHaberesRemunerativos());
+//            System.out.printf("Total haberes remunerativos   : $ %f%n" +
+//                              "Total haberes no remunerativos: $ %f%n" +
+//                              "Total retenciones             : $ %f%n" +
+//                              "------------------------------------%n" +
+//                              "Total Bruto                   : $ %f%n" +
+//                              "Importe Neto                  : $ %f%n" +
+//                              "------------------------------------%n",
+//                                liquidacionEmpleado.getTotalHaberesRemunerativos(), liquidacionEmpleado.getTotalHaberesNoRemunerativos(),
+//                                liquidacionEmpleado.getTotalRetenciones(), liquidacionEmpleado.getTotalBruto(), liquidacionEmpleado.getImporteNeto());
 
             //Agregar LiquidacionEmpleado a Liquidacion
             liquidacion.getLiquidacionesEmpleados().add(liquidacionEmpleado);
@@ -382,21 +382,15 @@ private void liquidarEmpleados(){
     }
 
     private void separarConceptosByTipoConcepto(){
-        System.out.println("------- separaConceptosByid -------");
+//        System.out.println("------- separaConceptosByid -------");
         if (!liquidarEmpleados.isEmpty()){
-
             for (EmpleadoALiquidar empleadoALiquidar : liquidarEmpleados){
-
-                System.out.printf("Empleado a Liquidar: %s %s %n", empleadoALiquidar.getEmpleado().getNombre(),
-                        empleadoALiquidar.getEmpleado().getApellido());
-
+//                System.out.printf("Empleado a Liquidar: %s %s %n", empleadoALiquidar.getEmpleado().getNombre(),
+//                        empleadoALiquidar.getEmpleado().getApellido());
                 for(ConceptoSueldo conceptoSueldo : empleadoALiquidar.getConceptos()) {
-
-                    System.out.printf("Concepto a Liquidar: %s %n Seleccionado: %s %n Tipo Concepto: %s %n ", conceptoSueldo.getDescripcion(),
-                            conceptoSueldo.getSelect().isSelected(), conceptoSueldo.getTipoConcepto());
-
+//                    System.out.printf("Concepto a Liquidar: %s %n Seleccionado: %s %n Tipo Concepto: %s %n ", conceptoSueldo.getDescripcion(),
+//                            conceptoSueldo.getSelect().isSelected(), conceptoSueldo.getTipoConcepto());
                     if (conceptoSueldo.getSelect().isSelected()) {
-
                         switch (conceptoSueldo.getTipoConcepto()) {
                             case "REMUNERATIVO":
                                 empleadoALiquidar.getRemunerativos().add(conceptoSueldo);
@@ -412,7 +406,6 @@ private void separarConceptosByTipoConcepto(){
                 }
             }
         }
-
     }
 
 

From 3a0f980759a1be0a9a00f842c65d66373f25247b Mon Sep 17 00:00:00 2001
From: Fernando Zafe <fernandozafe@gmail.com>
Date: Mon, 26 Feb 2018 15:42:55 -0300
Subject: [PATCH 07/27] Liquidacion escribe en la base de datos

---
 .../repository/info/LocalidadRepository.java  |  2 --
 .../DetalleLiquidacionEmpleadoRepository.java |  3 --
 .../sueldo/LiquidacionEmpleadoRepository.java |  4 ---
 .../sueldo/LiquidacionRepository.java         | 34 ++++++++++++-------
 .../sueldo/ReciboSueldoRepository.java        |  5 ---
 .../repository/venta/ViajeRepository.java     |  2 --
 .../view/sueldo/cruds/LiquidacionSueldo.fxml  |  2 +-
 .../cruds/LiquidacionSueldoController.java    | 29 +++++++++++++++-
 8 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/src/application/repository/info/LocalidadRepository.java b/src/application/repository/info/LocalidadRepository.java
index 9d7945c..7e2ae77 100644
--- a/src/application/repository/info/LocalidadRepository.java
+++ b/src/application/repository/info/LocalidadRepository.java
@@ -43,7 +43,6 @@ public void update(Localidad localidad, int idProvincia){
 	            preparedStatement.setInt(2,idProvincia);
 	            preparedStatement.setInt(3,localidad.getIdLocalidad());
 	            preparedStatement.close();
-	            connection.close();
 	            String headerMsj="Actualización: localidad actualizada";
 	            String cuerpoMsj = "Localidad: " + localidad.getNombre() + " modificado correctamente.";
 	            Alerta.alertaInfo("Localidad", headerMsj, cuerpoMsj);
@@ -59,7 +58,6 @@ public void delete(Localidad localidad){
 	            preparedStatement.setInt(1, localidad.getIdLocalidad());
 	            preparedStatement.executeUpdate();
 	            preparedStatement.close();
-	            connection.close();
 	        } catch (SQLException e) {
 	            e.printStackTrace();
 	        }
diff --git a/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java b/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java
index c9feec9..2e74636 100644
--- a/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java
+++ b/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java
@@ -27,7 +27,6 @@ public void save(DetalleLiquidacionEmpleado detalleLiquidacionEmpleado){
             preparedStatement.setDouble(5, detalleLiquidacionEmpleado.getMonto());
             preparedStatement.executeUpdate();
             preparedStatement.close();
-            connection.close();
 
         } catch (SQLException e) {
             e.printStackTrace();
@@ -50,7 +49,6 @@ public void update(DetalleLiquidacionEmpleado detalleLiquidacionEmpleado){
             preparedStatement.setInt(5, detalleLiquidacionEmpleado.getIdDetalleLiquidacionEmpleado());
             preparedStatement.executeUpdate();
             preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -85,7 +83,6 @@ public ObservableList<DetalleLiquidacionEmpleado> view(){
             }
             preparedStatement.close();
             resultSet.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
diff --git a/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java b/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java
index 1ad200e..33a484c 100644
--- a/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java
+++ b/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java
@@ -30,7 +30,6 @@ public void save(LiquidacionEmpleado liquidacionEmpleado){
 //            preparedStatement.setInt(9,liquidacionEmpleado.getIdEmpleado());
             preparedStatement.executeUpdate();
             preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -54,7 +53,6 @@ public void update(LiquidacionEmpleado liquidacionEmpleado){
             preparedStatement.setInt(9,liquidacionEmpleado.getId());
             preparedStatement.executeUpdate();
             preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -66,7 +64,6 @@ public void delete(LiquidacionEmpleado liquidacionEmpleado){
             preparedStatement.setInt(1,liquidacionEmpleado.getId());
             preparedStatement.executeUpdate();
             preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -92,7 +89,6 @@ public ObservableList<LiquidacionEmpleado> view(){
             }
             preparedStatement.executeUpdate();
             preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
diff --git a/src/application/repository/sueldo/LiquidacionRepository.java b/src/application/repository/sueldo/LiquidacionRepository.java
index 5cc1e83..138cb1f 100644
--- a/src/application/repository/sueldo/LiquidacionRepository.java
+++ b/src/application/repository/sueldo/LiquidacionRepository.java
@@ -52,9 +52,15 @@ public static ObservableList<Liquidacion> buscarLiquidaciones(){
     public Liquidacion newLiquidacion(Liquidacion liquidacion){
 
         try {
-            Statement statement = JDBCConnection.getInstanceConnection().createStatement();
-            statement.executeUpdate("INSERT INTO LIQUIDACION (timestamp) VALUES (NOW());");
-            resultSet = statement.executeQuery("SELECT idLiquidacion, timestamp " +
+            Connection connection = JDBCConnection.getInstanceConnection();
+            PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO LIQUIDACION (timestamp, total_haberes_remunerativos, " +
+                    "total_haberes_no_remunerativos, total_retenciones ) VALUES (NOW(), ? , ?, ?);");
+            preparedStatement.setDouble(1,liquidacion.getTotalHaberesRemunerativos());
+            preparedStatement.setDouble(2,liquidacion.getTotalHaberesNoRemunerativos());
+            preparedStatement.setDouble(3,liquidacion.getTotalRetenciones());
+            preparedStatement.executeUpdate();
+            System.out.println("SQL LIQUIDACION INSERT: " + preparedStatement);
+            resultSet = preparedStatement.executeQuery("SELECT idLiquidacion, timestamp " +
                     "FROM LIQUIDACION " +
                     "WHERE idLiquidacion = LAST_INSERT_ID();");
             if (resultSet.next()){
@@ -66,15 +72,12 @@ public Liquidacion newLiquidacion(Liquidacion liquidacion){
             e.printStackTrace();
         }
 
-        BigDecimal totalhr;
-        BigDecimal totalhnr;
-        BigDecimal totalret;
-
         //crear una liquidacion_empleado por cada empleado, es asociado a una liquidacion
         for (LiquidacionEmpleado liquidacionEmpleado : liquidacion.getLiquidacionesEmpleados()){
 
             try {
-                preparedStatement  = connection.prepareStatement("INSERT INTO LIQUIDACION_EMPLEADO " +
+                Connection connection = JDBCConnection.getInstanceConnection();
+                PreparedStatement preparedStatement  = connection.prepareStatement("INSERT INTO LIQUIDACION_EMPLEADO " +
                         "(importe_neto,total_haberes_remunerativos, total_haberes_no_remunerativos,total_retenciones, " +
                         "total_bruto, EMPLEADO_idEmpleado, inicio_periodo, fin_periodo, LIQUIDACION_idLiquidacion)" +
                         " VALUES (?,?,?,?,?,?,?,?,?);");
@@ -87,6 +90,7 @@ public Liquidacion newLiquidacion(Liquidacion liquidacion){
                 preparedStatement.setString(7,liquidacionEmpleado.getInicioPeriodo());
                 preparedStatement.setString(8,liquidacionEmpleado.getFinPeriodo());
                 preparedStatement.setInt(9,liquidacion.getId());
+                preparedStatement.executeUpdate();
                 resultSet = preparedStatement.executeQuery("SELECT LAST_INSERT_ID()");
                 if (resultSet.next()){
                     liquidacionEmpleado.setId(resultSet.getInt(1));
@@ -99,17 +103,21 @@ public Liquidacion newLiquidacion(Liquidacion liquidacion){
             //grabacion de detalle_liquidacion, es decir ConceptoCalculado
             for (ConceptoCalculado conceptoCalculado : liquidacionEmpleado.getConceptosLiquidados()){
                 try {
+                    Connection connection = JDBCConnection.getInstanceConnection();
                     preparedStatement  = connection.prepareStatement("INSERT INTO DETALLE_LIQUIDACION_EMPLEADO " +
                             "(cantidad,monto,LiquidacionEmpleado_idLiquidacionEmpleado,CONCEPTO_SUELDO_idCodigoConcepto)" +
                             " VALUES (?,?,?,?);");
                     preparedStatement.setDouble(1,conceptoCalculado.getFactor());
                     preparedStatement.setDouble(2,conceptoCalculado.getMontoCalculado());
                     preparedStatement.setInt(3,liquidacionEmpleado.getId());
-                    preparedStatement.setDouble(4,conceptoCalculado.getIdConceptoSueldo());//todo funcionara???
-                    resultSet = preparedStatement.executeQuery("SELECT LAST_INSERT_ID()");
-                    if (resultSet.next()){
-                        liquidacionEmpleado.setId(resultSet.getInt(1));
-                    }
+                    preparedStatement.setInt(4,conceptoCalculado.getIdConceptoSueldo());//todo funcionara???
+                    System.out.println("SQL CONCEPTO CALCULADO: " + preparedStatement);
+                    preparedStatement.executeUpdate();
+                   // resultSet = preparedStatement.executeQuery("SELECT LAST_INSERT_ID()");
+                    //if (resultSet.next()){
+                    //    conceptoCalculado.setId(resultSet.getInt(1));
+                     //   conceptoCalculado.setIdConceptoSueldo();
+                    // }
                 } catch (SQLException e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
diff --git a/src/application/repository/sueldo/ReciboSueldoRepository.java b/src/application/repository/sueldo/ReciboSueldoRepository.java
index 71fe032..043d93b 100644
--- a/src/application/repository/sueldo/ReciboSueldoRepository.java
+++ b/src/application/repository/sueldo/ReciboSueldoRepository.java
@@ -24,7 +24,6 @@ public void save(ReciboSueldo reciboSueldo){
 //            preparedStatement.setInt(4,reciboSueldo.getIdLiquidacionEmpleado());
             preparedStatement.executeUpdate();
             preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -42,7 +41,6 @@ public void update(ReciboSueldo reciboSueldo){
             preparedStatement.setInt(4, reciboSueldo.getIdRecibo());
             preparedStatement.executeUpdate();
             preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -54,7 +52,6 @@ public void delete(ReciboSueldo reciboSueldo){
             preparedStatement.setInt(1,reciboSueldo.getIdRecibo());
             preparedStatement.executeUpdate();
             preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -75,7 +72,6 @@ public ObservableList<ReciboSueldo> view(){
             }
             preparedStatement.executeUpdate();
             preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -88,7 +84,6 @@ public void search(ReciboSueldo reciboSueldo){
             preparedStatement.setInt(1,reciboSueldo.getIdRecibo());
             preparedStatement.executeUpdate();
             preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
diff --git a/src/application/repository/venta/ViajeRepository.java b/src/application/repository/venta/ViajeRepository.java
index 52588b2..4b9a2bd 100644
--- a/src/application/repository/venta/ViajeRepository.java
+++ b/src/application/repository/venta/ViajeRepository.java
@@ -65,7 +65,6 @@ public void save(Viaje viaje, int idOrigenDestino,  int idEmpleado, int idCamion
 	            preparedStatement.setInt(8, idFacturaVenta);
 	            preparedStatement.executeUpdate();
 	            preparedStatement.close();
-	            connection.close();
 	            String cuerpoMsj = "Provincia " + viaje.getIdRemito()+ " agregado correctamente.\n";
 	            Alerta.alertaInfo("Viajes",cuerpoMsj);
 	        } catch (SQLException e) {
@@ -155,7 +154,6 @@ public void update(Viaje viaje, int idOrigenDestino,  int idEmpleado, int idCami
 	            preparedStatement.setInt(8, idFacturaVenta);
 	            preparedStatement.setInt(9, viaje.getIdRemito());
 	            preparedStatement.close();
-	            connection.close();
 	            String headerMsj="Actualización: Provincia actualizado";
 	            String cuerpoMsj = "Provincia: " + viaje.getIdRemito() + " modificado correctamente.";
 	            Alerta.alertaInfo("Provincia", headerMsj, cuerpoMsj);
diff --git a/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml b/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml
index 4134479..4b696a1 100644
--- a/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml
+++ b/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml
@@ -100,7 +100,7 @@
       </GridPane>
       <HBox alignment="CENTER" layoutX="5.0" layoutY="508.0" prefHeight="100.0" prefWidth="310.0" spacing="20.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0">
          <children>
-            <Button fx:id="liquidarButton" defaultButton="true" mnemonicParsing="false" onAction="#liquidarEmpleados" text="Liquidar" />
+            <Button fx:id="liquidarButton" defaultButton="true" mnemonicParsing="false" onAction="#handleOk" text="Liquidar" />
             <Button fx:id="cancelButton" cancelButton="true" mnemonicParsing="false" text="Cancelar" />
          </children>
       </HBox>
diff --git a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
index b9e3132..fd20417 100644
--- a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
+++ b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
@@ -85,6 +85,7 @@ public class LiquidacionSueldoController implements Initializable {
     private Button cancelButton;
 
     private Stage owner;
+    private boolean isNew;
     private CategoriaEmpleadoRepository categoriaEmpleadoRepository = new CategoriaEmpleadoRepository();
     private EmpleadoRepository empleadoRepository = new EmpleadoRepository();
     private LiquidacionRepository liquidacionRepository = new LiquidacionRepository();
@@ -98,7 +99,6 @@ public void setOwner(Stage owner){
         this.owner = owner;
     }
 
-
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         novedadesTableView.setPlaceholder(new Label("No hay novedades para mostrar"));
@@ -346,6 +346,7 @@ private void liquidarEmpleados(){
             liquidacionEmpleado.setTotalHaberesRemunerativos(totalRemunerativos);
             liquidacionEmpleado.setTotalHaberesNoRemunerativos(totalNoRemunerativos);
             liquidacionEmpleado.setTotalRetenciones(totalRetenciones);
+            liquidacionEmpleado.setEmpleado(empleadoALiquidar.getEmpleado());
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-d");
             liquidacionEmpleado.setInicioPeriodo(desdeDatePicker.getValue().format(formatter));
             liquidacionEmpleado.setFinPeriodo(hastaDatePicker.getValue().format(formatter));
@@ -360,6 +361,10 @@ private void liquidarEmpleados(){
 
             liquidacionEmpleado.setImporteNeto(importeNeto.doubleValue());
 
+           liquidacionEmpleado.setConceptosLiquidados(remCalculados);
+           liquidacionEmpleado.getConceptosLiquidados().addAll(noRemCalculados);
+           liquidacionEmpleado.getConceptosLiquidados().addAll(retCalculados);
+
             System.out.printf("%n%n------- Liquidación Empleado :%s %s ------- %n ", empleadoALiquidar.getEmpleado().getNombre(),
                     empleadoALiquidar.getEmpleado().getApellido());
             System.out.println("TOTAL HABERES REMUNERATIVOS: " + liquidacionEmpleado.getTotalHaberesRemunerativos());
@@ -377,6 +382,20 @@ private void liquidarEmpleados(){
             liquidacion.getLiquidacionesEmpleados().add(liquidacionEmpleado);
         }
 
+        //calcular total de liquidacion empleado
+        Double totalHaberesRemunerativos = 0.0;
+        Double totalHaberesNoRemunerativos = 0.0;
+        Double totalRetenciones = 0.0;
+
+        for (LiquidacionEmpleado liquidacionEmpleado : liquidacion.getLiquidacionesEmpleados()) {
+            totalHaberesRemunerativos += liquidacionEmpleado.getTotalHaberesRemunerativos();
+            totalHaberesNoRemunerativos += liquidacionEmpleado.getTotalHaberesNoRemunerativos();
+            totalRetenciones += liquidacionEmpleado.getTotalRetenciones();
+        }
+        liquidacion.setTotalHaberesRemunerativos(totalHaberesRemunerativos.doubleValue());
+        liquidacion.setTotalHaberesNoRemunerativos(totalHaberesNoRemunerativos.doubleValue());
+        liquidacion.setTotalRetenciones(totalRetenciones.doubleValue());
+
         //Grabar los datos en la base de datos
         liquidacionRepository.newLiquidacion(liquidacion);
     }
@@ -415,5 +434,13 @@ private void separarConceptosByTipoConcepto(){
 
     }
 
+    @FXML
+    public void handleOk(){
+            liquidarEmpleados();
+//            this.owner.close();
+        }
+
+
+
 
 }

From aaf96a07e808e9a4cd8d5a9061ffd7a569d34799 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Mon, 26 Feb 2018 17:54:05 -0300
Subject: [PATCH 08/27] Cambios en Liquidacion

---
 .../model/sueldo/ConceptoCalculado.java       |  7 +++++++
 .../model/sueldo/ConceptoSueldo.java          | 12 ++++++++++++
 .../sueldo/LiquidacionRepository.java         | 19 ++++++++-----------
 .../cruds/LiquidacionSueldoController.java    | 17 +----------------
 4 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/application/model/sueldo/ConceptoCalculado.java b/src/application/model/sueldo/ConceptoCalculado.java
index 6b2e636..3411647 100644
--- a/src/application/model/sueldo/ConceptoCalculado.java
+++ b/src/application/model/sueldo/ConceptoCalculado.java
@@ -46,4 +46,11 @@ private void calcularMontoCalculado(){
                 break;
         }
     }
+
+    @Override
+    public String toString() {
+        return "ConceptoCalculado{" +
+                "montoCalculado=" + montoCalculado + "\n"+ super.toString()+
+                '}';
+    }
 }
diff --git a/src/application/model/sueldo/ConceptoSueldo.java b/src/application/model/sueldo/ConceptoSueldo.java
index 7f5957b..618b480 100644
--- a/src/application/model/sueldo/ConceptoSueldo.java
+++ b/src/application/model/sueldo/ConceptoSueldo.java
@@ -107,4 +107,16 @@ public ConceptoSueldo(){
     	this(0, null, 0f, null, null, 1.0);
     }
 
+    @Override
+    public String toString() {
+        return "ConceptoSueldo{" +
+                "idConceptoSueldo=" + idConceptoSueldo +
+                ", descripcion=" + descripcion +
+                ", cantidad=" + cantidad +
+                ", tipoConcepto=" + tipoConcepto +
+                ", tipoCantidad=" + tipoCantidad +
+                ", select=" + select +
+                ", factor=" + factor +
+                '}';
+    }
 }
diff --git a/src/application/repository/sueldo/LiquidacionRepository.java b/src/application/repository/sueldo/LiquidacionRepository.java
index b0c3295..ed65232 100644
--- a/src/application/repository/sueldo/LiquidacionRepository.java
+++ b/src/application/repository/sueldo/LiquidacionRepository.java
@@ -68,14 +68,9 @@ public Liquidacion newLiquidacion(Liquidacion liquidacion) {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
-
-        BigDecimal totalhr;
-        BigDecimal totalhnr;
-        BigDecimal totalret;
-
-
         //set ID liquidacion
         liquidacion.setId(getLastID());
+
         //crear una liquidacion_empleado por cada empleado, es asociado a una liquidacion
         for (LiquidacionEmpleado liquidacionEmpleado : liquidacion.getLiquidacionesEmpleados()) {
 
@@ -95,16 +90,18 @@ public Liquidacion newLiquidacion(Liquidacion liquidacion) {
                 preparedStatement.setInt(11, liquidacion.getId());
                 preparedStatement.executeUpdate();
             } catch (SQLException e) {
-                // TODO Auto-generated catch block
                 e.printStackTrace();
             }
 
             liquidacionEmpleado.setId(getLastIdLiquidacionEmpleado());
+            System.out.println("Empleado a liquidar: " + liquidacionEmpleado.getId());
+
             //grabacion de detalle_liquidacion, es decir ConceptoCalculado
             for (ConceptoCalculado conceptoCalculado : liquidacionEmpleado.getConceptosLiquidados()) {
                 try {
+                    System.out.println(conceptoCalculado);
                     preparedStatement = connection.prepareStatement("INSERT INTO DETALLE_LIQUIDACION_EMPLEADO " +
-                            " VALUES (?,?,?,?,?)");
+                            " VALUES (?,?,?,?,?);");
                     preparedStatement.setString(1, null);
                     preparedStatement.setDouble(2, conceptoCalculado.getFactor());
                     preparedStatement.setInt(3, liquidacionEmpleado.getId());
@@ -159,7 +156,7 @@ public int getLastID() {
         int lastId=0;
         try {
             connection = JDBCConnection.getInstanceConnection();
-            preparedStatement=connection.prepareStatement("SELECT MAX(idLIQUIDACION) FROM liquidacion");
+            preparedStatement=connection.prepareStatement("SELECT MAX(idLIQUIDACION) FROM liquidacion;");
             resultSet = preparedStatement.executeQuery();
             if (resultSet.next())
                 lastId= resultSet.getInt(1);
@@ -169,11 +166,11 @@ public int getLastID() {
         return lastId;
     }
 
-    public int getLastIdLiquidacionEmpleado() {
+    private int getLastIdLiquidacionEmpleado() {
         int lastId=0;
         try {
             connection = JDBCConnection.getInstanceConnection();
-            preparedStatement=connection.prepareStatement("SELECT MAX(idLiquidacionEmpleado) FROM Liquidacion_Empleado");
+            preparedStatement=connection.prepareStatement("SELECT MAX(idLiquidacionEmpleado) FROM Liquidacion_Empleado;");
             resultSet = preparedStatement.executeQuery();
             if (resultSet.next())
                 lastId= resultSet.getInt(1);
diff --git a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
index 44c3be3..ef3cdcc 100644
--- a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
+++ b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
@@ -159,21 +159,15 @@ private void validarListaEmpleados() {
 
     @FXML
     private void agregarEmpleadoALiquidar(){
-
         if(totalEmpleadoTableView.getSelectionModel().getSelectedItem() != null) {
             liquidarEmpleadoTableView.getItems().add(totalEmpleadoTableView.getSelectionModel().getSelectedItem());
             liquidarEmpleados.add(new EmpleadoALiquidar(totalEmpleadoTableView.getSelectionModel().getSelectedItem()));
         }
         cargarTablaEmpleados();
-        System.out.println("Lista Empleados a Liquidar: [agregarEmpleadoALiquidar] ");
-        for (EmpleadoALiquidar empleadoALiquidar : liquidarEmpleados )
-            System.out.printf("Empleado a Liquidar : %s %s%n", empleadoALiquidar.getEmpleado().getNombre(),
-                    empleadoALiquidar.getEmpleado().getApellido() );
     }
 
     @FXML
     private void agregarTodos(){
-
         if(!totalEmpleadoTableView.getItems().isEmpty())
         for(Empleado empleado : totalEmpleadoTableView.getItems()) {
             liquidarEmpleadoTableView.getItems().add(empleado);
@@ -186,28 +180,21 @@ private void agregarTodos(){
     private void quitarEmpleadoALiquidar(){
 
         if(liquidarEmpleadoTableView.getSelectionModel().getSelectedItem() != null) {
-            System.out.println("ID EMPLEADO A LIQUIDAR: " + liquidarEmpleadoTableView.getSelectionModel().getSelectedItem().getIdEmpleado());
             removeEmpleadoALiquidarById(liquidarEmpleadoTableView.getSelectionModel().getSelectedItem().getIdEmpleado());
            liquidarEmpleadoTableView.getItems().remove(liquidarEmpleadoTableView.getSelectionModel().getSelectedItem());
         }
         cargarTablaEmpleados();
         novedadesTableView.getItems().clear();
-        System.out.println("Lista Empleados a Liquidar: [quitarEmpleadoALiquidar] ");
-        for (EmpleadoALiquidar empleadoALiquidar : liquidarEmpleados )
-            System.out.printf("Empleado a Liquidar : %s %s%n", empleadoALiquidar.getEmpleado().getNombre(),
-                    empleadoALiquidar.getEmpleado().getApellido() );
     }
 
     @FXML
     private void quitarTodos(){
-
         if(!liquidarEmpleadoTableView.getItems().isEmpty()) {
             liquidarEmpleadoTableView.getItems().removeAll(liquidarEmpleadoTableView.getItems());
             liquidarEmpleados.removeAll(liquidarEmpleados);
         }
         novedadesTableView.getItems().clear();
         cargarTablaEmpleados();
-
     }
 
 
@@ -216,7 +203,6 @@ private void cargarNovedades(){
       if (liquidarEmpleadoTableView.getSelectionModel().getSelectedItem() != null)
             novedadesTableView.setItems(liquidarEmpleados.get(getEmpleadoALiquidarById(
                     liquidarEmpleadoTableView.getSelectionModel().getSelectedItem().getIdEmpleado())).getConceptos());
-
     }
 
     @FXML
@@ -228,9 +214,7 @@ private void cargarFactor(){
                     getSelectedItem().getIdEmpleado())).getConceptos().get(novedadesTableView.getItems().indexOf(
                             novedadesTableView.getSelectionModel().getSelectedItem())).setSelect(novedadesTableView.
                     getSelectionModel().getSelectedItem().getSelect().isSelected());
-
         }
-
     }
 
     @FXML
@@ -346,6 +330,7 @@ private void liquidarEmpleados(){
             liquidacionEmpleado.setTotalHaberesRemunerativos(totalRemunerativos);
             liquidacionEmpleado.setTotalHaberesNoRemunerativos(totalNoRemunerativos);
             liquidacionEmpleado.setTotalRetenciones(totalRetenciones);
+            liquidacionEmpleado.setEmpleado(empleadoALiquidar.getEmpleado());
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-d");
             liquidacionEmpleado.setInicioPeriodo(desdeDatePicker.getValue().format(formatter));
             liquidacionEmpleado.setFinPeriodo(hastaDatePicker.getValue().format(formatter));

From 03bc4be166a9725b8af20c65b48d71238d715e0e Mon Sep 17 00:00:00 2001
From: Fernando Zafe <fernandozafe@gmail.com>
Date: Mon, 26 Feb 2018 18:54:16 -0300
Subject: [PATCH 09/27] Liquidacion funcionando correctamente... quizas

---
 .../calculo/AcopladoRepository.java           |  6 ---
 .../info/CategoriaEmpleadoRepository.java     |  4 +-
 .../repository/info/EmpleadoRepository.java   |  6 ++-
 .../DetalleLiquidacionEmpleadoRepository.java |  5 --
 .../sueldo/LiquidacionEmpleadoRepository.java | 51 +++++++++++++++++--
 .../sueldo/LiquidacionRepository.java         |  5 +-
 .../sueldo/ReciboSueldoRepository.java        |  5 --
 .../venta/FacturaVentaRepository.java         |  2 -
 .../repository/venta/ViajeRepository.java     |  8 ---
 .../view/sueldo/Liquidaciones.fxml            |  4 +-
 .../view/sueldo/LiquidacionesController.java  | 29 ++++++++---
 .../cruds/LiquidacionSueldoController.java    |  2 +-
 12 files changed, 82 insertions(+), 45 deletions(-)

diff --git a/src/application/repository/calculo/AcopladoRepository.java b/src/application/repository/calculo/AcopladoRepository.java
index 7eb963a..311aee3 100644
--- a/src/application/repository/calculo/AcopladoRepository.java
+++ b/src/application/repository/calculo/AcopladoRepository.java
@@ -23,7 +23,6 @@ public void save(Acoplado acoplado){
             preparedStatement.setString(2, acoplado.getMarca());
             preparedStatement.setString(3, acoplado.getPatente());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
             String cuerpoMsj = "Acoplado \n Marca: " + acoplado.getMarca() + "\nPatente: "+acoplado.getPatente() +"\nagregado correctamente.\n";
             Alerta.alertaInfo("Acoplados",cuerpoMsj);
         } catch (SQLException e) {
@@ -42,7 +41,6 @@ public void update(Acoplado acoplado){
             preparedStatement.setString(2, acoplado.getPatente());
             preparedStatement.setInt(3, acoplado.getId());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
             String headerMsj="Actualización: Acoplado actualizado";
             String cuerpoMsj = "Acoplado: \n\tMarca: " + acoplado.getMarca() + "\n\tPatente: " +
                    acoplado.getPatente()+  "modificado correctamente.";
@@ -59,7 +57,6 @@ public void delete(Acoplado acoplado){
                     "DELETE FROM ACOPLADO WHERE idAcoplado=?");
             preparedStatement.setInt(1, acoplado.getId());
             preparedStatement.execute();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -78,8 +75,6 @@ public ObservableList<Acoplado> view(){
                 acoplado.setPatente(resultSet.getString(3));
                 list.add(acoplado);
             }
-            preparedStatement.close();
-            resultSet.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -92,7 +87,6 @@ public void search(Acoplado acoplado){
             preparedStatement=connection.prepareStatement("SELECT * FROM ACOPLADO where idAcoplado=?");
             preparedStatement.setInt(1,acoplado.getId());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
diff --git a/src/application/repository/info/CategoriaEmpleadoRepository.java b/src/application/repository/info/CategoriaEmpleadoRepository.java
index bc37672..d1881d2 100644
--- a/src/application/repository/info/CategoriaEmpleadoRepository.java
+++ b/src/application/repository/info/CategoriaEmpleadoRepository.java
@@ -22,7 +22,6 @@ public void save(CategoriaEmpleado categoriaEmpleado){
 	            preparedStatement = connection.prepareStatement("INSERT INTO CATEGORIA_EMPLEADO (NombreCategoria) values(?)");
 	            preparedStatement.setString(1, categoriaEmpleado.getNombre());
 	            preparedStatement.executeUpdate();
-	            preparedStatement.close();
 	            String cuerpoMsj = "Categoria Empleado " + categoriaEmpleado.getNombre()+ " agregada correctamente.\n";
 	            Alerta.alertaInfo("Categoria Empleado",cuerpoMsj);
 	        } catch (SQLException e) {
@@ -90,12 +89,11 @@ public CategoriaEmpleado search(int idCategoriaEmpleado){
 	        	connection= JDBCConnection.getInstanceConnection();
 	            preparedStatement=connection.prepareStatement("SELECT * FROM CATEGORIA_EMPLEADO where idCategoriaEmpleado=?");
 	            preparedStatement.setInt(1, idCategoriaEmpleado);
+	            resultSet = preparedStatement.executeQuery();
 	            if(resultSet.next()){
 		            categoriaEmpleado.setIdCategoriaEmpleado(idCategoriaEmpleado);
 		            categoriaEmpleado.setNombre(resultSet.getString("NombreCategoria"));
 	            }
-	            preparedStatement.executeUpdate();
-	            preparedStatement.close();
 	        } catch (SQLException e) {
 	            e.printStackTrace();
 	        }
diff --git a/src/application/repository/info/EmpleadoRepository.java b/src/application/repository/info/EmpleadoRepository.java
index 14ce2d9..4cb5e38 100644
--- a/src/application/repository/info/EmpleadoRepository.java
+++ b/src/application/repository/info/EmpleadoRepository.java
@@ -203,10 +203,11 @@ public ObservableList<Empleado> buscarEmpleadosDadosDeBaja(){
 	}
 		public Empleado getEmpleadoById(int idEmpleado){
 			Empleado empleado = new Empleado();
+			CategoriaEmpleadoRepository categoriaEmpleadoRepository = new CategoriaEmpleadoRepository();
 			try {
 				Connection connection= JDBCConnection.getInstanceConnection();
 				PreparedStatement preparedStatement =connection.prepareStatement("SELECT idEmpleado, CUIT, Nombre," +
-						" Apellido, FechaNacimiento FROM EMPLEADO WHERE idEmpleado=?;");
+						" Apellido, FechaNacimiento, CATEGORIA_EMPLEADO_idCategoriaEmpleado FROM EMPLEADO WHERE idEmpleado=?;");
 				preparedStatement.setInt(1,idEmpleado);
 				ResultSet resultSet = preparedStatement.executeQuery();
 				while (resultSet.next()){
@@ -215,6 +216,9 @@ public Empleado getEmpleadoById(int idEmpleado){
 					empleado.setNombre(resultSet.getString(3));
 					empleado.setApellido(resultSet.getString(4));
 					empleado.setNacimiento(resultSet.getString(5));
+					CategoriaEmpleado categoriaEmpleado = new CategoriaEmpleado();
+					categoriaEmpleado = categoriaEmpleadoRepository.search(resultSet.getInt(6));
+					empleado.setCategoriaEmpleado(categoriaEmpleado);
 				}
 			} catch (SQLException e) {
 				e.printStackTrace();
diff --git a/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java b/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java
index 2e74636..7c41fb7 100644
--- a/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java
+++ b/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java
@@ -26,7 +26,6 @@ public void save(DetalleLiquidacionEmpleado detalleLiquidacionEmpleado){
 //            preparedStatement.setInt(4, detalleLiquidacionEmpleado.getIdCodigoConcepto());
             preparedStatement.setDouble(5, detalleLiquidacionEmpleado.getMonto());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
 
         } catch (SQLException e) {
             e.printStackTrace();
@@ -48,7 +47,6 @@ public void update(DetalleLiquidacionEmpleado detalleLiquidacionEmpleado){
             preparedStatement.setDouble(4,detalleLiquidacionEmpleado.getMonto());
             preparedStatement.setInt(5, detalleLiquidacionEmpleado.getIdDetalleLiquidacionEmpleado());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -60,7 +58,6 @@ public void delete(DetalleLiquidacionEmpleado detalleLiquidacionEmpleado){
             preparedStatement= connection.prepareStatement("DELETE FROM detalle_liquidacion_empleado WHERE idDetalleLiquidacionEmpleado=?");
             preparedStatement.setInt(1,detalleLiquidacionEmpleado.getIdDetalleLiquidacionEmpleado());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -81,8 +78,6 @@ public ObservableList<DetalleLiquidacionEmpleado> view(){
                 detalleLiquidacionEmpleado.setMonto(resultSet.getDouble(5));
                 list.add(detalleLiquidacionEmpleado);
             }
-            preparedStatement.close();
-            resultSet.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
diff --git a/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java b/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java
index 33a484c..a7215fb 100644
--- a/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java
+++ b/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java
@@ -1,7 +1,10 @@
 package application.repository.sueldo;
 
 import application.database.JDBCConnection;
+import application.model.info.Empleado;
 import application.model.sueldo.LiquidacionEmpleado;
+import application.repository.info.EmpleadoRepository;
+import application.view.venta.cruds.EmitirFacturaController;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
@@ -9,6 +12,8 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 
 public class LiquidacionEmpleadoRepository {
     Connection connection;
@@ -29,7 +34,6 @@ public void save(LiquidacionEmpleado liquidacionEmpleado){
 //            preparedStatement.setInt(8, liquidacionEmpleado.getIdPeriodoLiquidacion());
 //            preparedStatement.setInt(9,liquidacionEmpleado.getIdEmpleado());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -52,7 +56,6 @@ public void update(LiquidacionEmpleado liquidacionEmpleado){
 //            preparedStatement.setInt(8,liquidacionEmpleado.setIdEmpleado());
             preparedStatement.setInt(9,liquidacionEmpleado.getId());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -63,7 +66,6 @@ public void delete(LiquidacionEmpleado liquidacionEmpleado){
             preparedStatement=connection.prepareStatement("DELETE FROM LIQUIDACION_EMPLEADO WHERE  idLiquidacionEmpleado=?");
             preparedStatement.setInt(1,liquidacionEmpleado.getId());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -88,11 +90,52 @@ public ObservableList<LiquidacionEmpleado> view(){
                 list.add(liquidacionEmpleado);
             }
             preparedStatement.executeUpdate();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
         return list;
     }
 
+    /**
+     * Busca LiquidacionEmpleado a partir de un idLiquidacion
+     *
+     * @param idLiquidacion
+     * @return ObservableList<LiquidacionEmpleado>
+     */
+    public ObservableList<LiquidacionEmpleado> getLiqEmpleadoByIdLiq(int idLiquidacion){
+        ObservableList<LiquidacionEmpleado> list = FXCollections.observableArrayList();
+        EmpleadoRepository empleadoRepository = new EmpleadoRepository();
+
+        try {
+            connection= JDBCConnection.getInstanceConnection();
+            preparedStatement = connection.prepareStatement("SELECT idLiquidacionEmpleado, fecha_liquidacion," +
+                    " importe_neto, total_haberes_remunerativos, total_haberes_no_remunerativos, total_retenciones," +
+                    " total_bruto, EMPLEADO_idEmpleado, inicio_periodo, fin_periodo, " +
+                    "LIQUIDACION_idLIQUIDACION FROM LIQUIDACION_EMPLEADO WHERE LIQUIDACION_idLIQUIDACION = ?;");
+            preparedStatement.setInt(1, idLiquidacion);
+            resultSet = preparedStatement.executeQuery();
+            while (resultSet.next()){
+                LiquidacionEmpleado liquidacionEmpleado = new LiquidacionEmpleado();
+                liquidacionEmpleado.setId(resultSet.getInt("idLiquidacionEmpleado"));
+                liquidacionEmpleado.setFechaLiquidacion(resultSet.getString("fecha_liquidacion"));
+                liquidacionEmpleado.setImporteNeto(resultSet.getDouble("importe_neto"));
+                liquidacionEmpleado.setTotalHaberesRemunerativos(resultSet.getDouble("total_haberes_remunerativos"));
+                liquidacionEmpleado.setTotalHaberesNoRemunerativos(resultSet.getDouble("total_haberes_no_remunerativos"));
+                liquidacionEmpleado.setTotalRetenciones(resultSet.getDouble("total_retenciones"));
+                liquidacionEmpleado.setTotalBruto(resultSet.getDouble("total_bruto"));
+
+                Empleado empleado = new Empleado();
+                empleado = empleadoRepository.getEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
+                liquidacionEmpleado.setEmpleado(empleado);
+                liquidacionEmpleado.setInicioPeriodo(resultSet.getString("inicio_periodo"));
+                liquidacionEmpleado.setFinPeriodo(resultSet.getString("fin_periodo"));
+                list.add(liquidacionEmpleado);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return list;
+    }
+
 }
diff --git a/src/application/repository/sueldo/LiquidacionRepository.java b/src/application/repository/sueldo/LiquidacionRepository.java
index 138cb1f..e3417f9 100644
--- a/src/application/repository/sueldo/LiquidacionRepository.java
+++ b/src/application/repository/sueldo/LiquidacionRepository.java
@@ -79,8 +79,9 @@ public Liquidacion newLiquidacion(Liquidacion liquidacion){
                 Connection connection = JDBCConnection.getInstanceConnection();
                 PreparedStatement preparedStatement  = connection.prepareStatement("INSERT INTO LIQUIDACION_EMPLEADO " +
                         "(importe_neto,total_haberes_remunerativos, total_haberes_no_remunerativos,total_retenciones, " +
-                        "total_bruto, EMPLEADO_idEmpleado, inicio_periodo, fin_periodo, LIQUIDACION_idLiquidacion)" +
-                        " VALUES (?,?,?,?,?,?,?,?,?);");
+                        "total_bruto, EMPLEADO_idEmpleado, inicio_periodo, fin_periodo, LIQUIDACION_idLiquidacion, " +
+                        "fecha_liquidacion)" +
+                        " VALUES (?,?,?,?,?,?,?,?,?,NOW());");
                 preparedStatement.setDouble(1,liquidacionEmpleado.getImporteNeto());
                 preparedStatement.setDouble(2,liquidacionEmpleado.getTotalHaberesRemunerativos());
                 preparedStatement.setDouble(3,liquidacionEmpleado.getTotalHaberesNoRemunerativos());
diff --git a/src/application/repository/sueldo/ReciboSueldoRepository.java b/src/application/repository/sueldo/ReciboSueldoRepository.java
index 043d93b..068845d 100644
--- a/src/application/repository/sueldo/ReciboSueldoRepository.java
+++ b/src/application/repository/sueldo/ReciboSueldoRepository.java
@@ -23,7 +23,6 @@ public void save(ReciboSueldo reciboSueldo){
             preparedStatement.setDouble(3,reciboSueldo.getTotalNeto());
 //            preparedStatement.setInt(4,reciboSueldo.getIdLiquidacionEmpleado());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -40,7 +39,6 @@ public void update(ReciboSueldo reciboSueldo){
 //            preparedStatement.setInt(3,reciboSueldo.getIdLiquidacionEmpleado());
             preparedStatement.setInt(4, reciboSueldo.getIdRecibo());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -51,7 +49,6 @@ public void delete(ReciboSueldo reciboSueldo){
             preparedStatement=connection.prepareStatement("DELETE FROM RECIBO_SUELDO WHERE idRECIBO_SUELDO=?");
             preparedStatement.setInt(1,reciboSueldo.getIdRecibo());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -71,7 +68,6 @@ public ObservableList<ReciboSueldo> view(){
                 list.add(reciboSueldo);
             }
             preparedStatement.executeUpdate();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -83,7 +79,6 @@ public void search(ReciboSueldo reciboSueldo){
             preparedStatement=connection.prepareStatement("SELECT * FROM RECIBO_SUELDO WHERE idRECIBO_SUELDO=?");
             preparedStatement.setInt(1,reciboSueldo.getIdRecibo());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
diff --git a/src/application/repository/venta/FacturaVentaRepository.java b/src/application/repository/venta/FacturaVentaRepository.java
index 55d04a3..a3e95fa 100644
--- a/src/application/repository/venta/FacturaVentaRepository.java
+++ b/src/application/repository/venta/FacturaVentaRepository.java
@@ -106,8 +106,6 @@ public ObservableList<FacturaVenta> view(){
 					facturaVenta.setOrganizacion(organizacion);
 	                list.add(facturaVenta);
 	            }
-	            preparedStatement.close();
-	            resultSet.close();
 	        } catch (SQLException e) {
 	            e.printStackTrace();
 	        }
diff --git a/src/application/repository/venta/ViajeRepository.java b/src/application/repository/venta/ViajeRepository.java
index 4b9a2bd..8f28a1e 100644
--- a/src/application/repository/venta/ViajeRepository.java
+++ b/src/application/repository/venta/ViajeRepository.java
@@ -210,8 +210,6 @@ public ObservableList<Viaje> view(){
 							viaje.getBruto(),
 							viaje.getTara());
 	            }
-	            preparedStatement.close();
-	            resultSet.close();
 	        } catch (SQLException e) {
 	            e.printStackTrace();
 	        }
@@ -334,8 +332,6 @@ public ObservableList<Viaje> getViajesByIdFactura(int idFactura){
 							viaje.getBruto(),
 							viaje.getTara());
 				}
-				preparedStatement.close();
-				resultSet.close();
 			} catch (SQLException e) {
 				e.printStackTrace();
 			}
@@ -381,8 +377,6 @@ public ObservableList<Viaje> getViajesByIdIngenio(int idIngenio){
 							viaje.getBruto(),
 							viaje.getTara());
 				}
-				preparedStatement.close();
-				resultSet.close();
 			} catch (SQLException e) {
 				e.printStackTrace();
 			}
@@ -438,8 +432,6 @@ public ObservableList<Viaje> getViajesSinLiqByIngenioId(int idIngenio){
 							viaje.getBruto(),
 							viaje.getTara());
 				}
-				preparedStatement.close();
-				resultSet.close();
 			} catch (SQLException e) {
 				e.printStackTrace();
 			}
diff --git a/src/application/view/sueldo/Liquidaciones.fxml b/src/application/view/sueldo/Liquidaciones.fxml
index 80800ae..74a2945 100644
--- a/src/application/view/sueldo/Liquidaciones.fxml
+++ b/src/application/view/sueldo/Liquidaciones.fxml
@@ -50,7 +50,7 @@
             <Label text="Empleados Liquidados" GridPane.rowIndex="2" />
             <ScrollPane prefHeight="92.0" prefWidth="701.0" GridPane.columnSpan="3" GridPane.rowIndex="1">
                <content>
-                  <TableView fx:id="liquidacionTable" onMouseClicked="#cargarEmpleadosLiquidados" pickOnBounds="false" prefHeight="157.0" prefWidth="677.0">
+                  <TableView fx:id="liquidacionTable" pickOnBounds="false" prefHeight="157.0" prefWidth="677.0">
                      <columns>
                         <TableColumn fx:id="idLiquidacion" prefWidth="60.5" resizable="false" text="Nro" />
                         <TableColumn fx:id="fechaColumn" minWidth="0.0" prefWidth="138.5" text="Fecha" />
@@ -63,7 +63,7 @@
             </ScrollPane>
             <ScrollPane prefHeight="109.0" prefWidth="695.0" GridPane.columnSpan="3" GridPane.rowIndex="3" GridPane.rowSpan="2">
                <content>
-                  <TableView fx:id="empleadosTable" onMouseClicked="#cargarEmpleadosLiquidados" prefHeight="164.0" prefWidth="678.0">
+                  <TableView fx:id="liqEmpleadosTable" prefHeight="164.0" prefWidth="678.0">
                      <columns>
                         <TableColumn fx:id="legajoColumn" prefWidth="312.0" text="Legajo" />
                         <TableColumn fx:id="apellidoColumn" prefWidth="105.0" text="Apellido" />
diff --git a/src/application/view/sueldo/LiquidacionesController.java b/src/application/view/sueldo/LiquidacionesController.java
index 0634f32..0c72c34 100644
--- a/src/application/view/sueldo/LiquidacionesController.java
+++ b/src/application/view/sueldo/LiquidacionesController.java
@@ -4,7 +4,9 @@
 import application.model.info.Empleado;
 import application.model.sueldo.LiquidacionEmpleado;
 import application.model.sueldo.Liquidacion;
+import application.repository.sueldo.LiquidacionEmpleadoRepository;
 import application.repository.sueldo.LiquidacionRepository;
+import application.view.sueldo.cruds.LiquidacionSueldoController;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -40,7 +42,7 @@ public class LiquidacionesController implements Initializable{
 
 	//Declaracion de la tabla y columnas de la clase LiquidacionEmpleado
 	@FXML
-	private  TableView<LiquidacionEmpleado> empleadosTable;
+	private  TableView<LiquidacionEmpleado> liqEmpleadosTable;
 	@FXML
 	private TableColumn<LiquidacionEmpleado, String> legajoColumn;
 	@FXML
@@ -66,12 +68,14 @@ public class LiquidacionesController implements Initializable{
 
 	private Stage owner;
 
-	private ObservableList<LiquidacionEmpleado> liquidacion = FXCollections.observableArrayList();
+	private ObservableList<LiquidacionEmpleado> liquidacionesEmpleado = FXCollections.observableArrayList();
 
 	private ObservableList<Empleado> empleados = FXCollections.observableArrayList();
 
 	private LiquidacionRepository liquidacionesRepository = new LiquidacionRepository();
 
+	private LiquidacionEmpleadoRepository liquidacionEmpleadoRepository = new LiquidacionEmpleadoRepository();
+
 	private ObservableList<LiquidacionEmpleado> empleadosLiquidados = FXCollections.observableArrayList();
 
 	public void setOwner(Stage owner){
@@ -85,6 +89,11 @@ public void buscarLiquidaciones(){
 		liquidacionTable.setItems(liquidaciones);
 	}
 
+	private void buscarLiquidacionesEmpleado(int idLiquidacion){
+		this.liquidacionesEmpleado = liquidacionEmpleadoRepository.getLiqEmpleadoByIdLiq(idLiquidacion);
+		liqEmpleadosTable.setItems(liquidacionesEmpleado);
+	}
+
 	@Override
 	public void initialize(URL location, ResourceBundle resources) {
 		buscarLiquidaciones();
@@ -94,10 +103,16 @@ public void initialize(URL location, ResourceBundle resources) {
 		hnrColumn.setCellValueFactory(cellData -> cellData.getValue().totalHaberesNoRemunerativosProperty().asString());
 		retencionesColumn.setCellValueFactory(cellData -> cellData.getValue().totalRetencionesProperty().asString());
 
+		liquidacionTable.getSelectionModel().selectedItemProperty().addListener((obs, oldSelection, newSelection) -> {
+			if (newSelection != null) {
+				buscarLiquidacionesEmpleado(liquidacionTable.getSelectionModel().getSelectedItem().getId());
+			}
+		});
+
 		legajoColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().idEmpleadoProperty().asString());
 		apellidoColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().apellidoProperty());
 		nombreColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().nombreProperty());
-//		categoriaColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().categoriaProperty());
+		categoriaColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().getCategoriaEmpleado().nombreProperty());
 		hrEmpleadoColumn.setCellValueFactory(cellData -> cellData.getValue().totalHaberesRemunerativosProperty().asString());
 		hnrEmpleadoColumn.setCellValueFactory(cellData -> cellData.getValue().totalHaberesNoRemunerativosProperty().asString());
 		retencionesEmpleadoColumn.setCellValueFactory(cellData -> cellData.getValue().totalRetencionesProperty().asString());
@@ -121,7 +136,8 @@ private void handleNew(){
 			Scene scene = new Scene(page);
 			dialogStage.setScene(scene);
 
-
+			LiquidacionSueldoController controller = loader.getController();
+			controller.setOwner(dialogStage);
 
 			// Show the dialog and wait until the user closes it
 			dialogStage.showAndWait();
@@ -131,14 +147,15 @@ private void handleNew(){
 		}
 	}
 
+	/*
 	@FXML
 	public void cargarEmpleadosLiquidados(){
 		if (liquidacionTable.getSelectionModel().getSelectedItem() != null){
 			empleadosLiquidados = liquidacionesRepository.getEmpleadosLiquidadosByidLiquidacion(liquidacionTable.getSelectionModel().getSelectedItem().getId());
-			empleadosTable.setItems(empleadosLiquidados);
+			liqEmpleadosTable.setItems(empleadosLiquidados);
 		}
 	}
-
+*/
 //    @FXML
 //    private void cargarLiquidaciones(){
 //        if (liquidacionTable.getSelectionModel().getSelectedItem() != null){
diff --git a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
index fd20417..519c00f 100644
--- a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
+++ b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
@@ -437,7 +437,7 @@ private void separarConceptosByTipoConcepto(){
     @FXML
     public void handleOk(){
             liquidarEmpleados();
-//            this.owner.close();
+            owner.close();
         }
 
 

From 01cc5b6aa932c4901b3ab1b28f43933a8cb79195 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Tue, 27 Feb 2018 02:32:01 -0300
Subject: [PATCH 10/27] Liquidacion actualizada

---
 .../info/CategoriaEmpleadoRepository.java     |  37 ++--
 .../repository/info/EmpleadoRepository.java   | 159 ++++++++++--------
 .../DetalleLiquidacionEmpleadoRepository.java |  10 +-
 .../sueldo/LiquidacionEmpleadoRepository.java |  75 ++++++++-
 .../sueldo/LiquidacionRepository.java         | 125 ++++++--------
 .../view/sueldo/Liquidaciones.fxml            |   4 +-
 .../view/sueldo/LiquidacionesController.java  |  51 +++---
 .../cruds/LiquidacionSueldoController.java    | 113 +++++++++----
 8 files changed, 335 insertions(+), 239 deletions(-)

diff --git a/src/application/repository/info/CategoriaEmpleadoRepository.java b/src/application/repository/info/CategoriaEmpleadoRepository.java
index aeb246c..f0553bd 100644
--- a/src/application/repository/info/CategoriaEmpleadoRepository.java
+++ b/src/application/repository/info/CategoriaEmpleadoRepository.java
@@ -82,25 +82,24 @@ public ObservableList<CategoriaEmpleado> view(){
 
 	        return list;
 	    }
-	    
-	    public CategoriaEmpleado search(int idCategoriaEmpleado){
-        	CategoriaEmpleado categoriaEmpleado = new CategoriaEmpleado();
 
-	    	try {
-	        	connection= JDBCConnection.getInstanceConnection();
-	            preparedStatement=connection.prepareStatement("SELECT * FROM CATEGORIA_EMPLEADO where idCategoriaEmpleado=?");
-	            preparedStatement.setInt(1, idCategoriaEmpleado);
-	            if(resultSet.next()){
-		            categoriaEmpleado.setIdCategoriaEmpleado(idCategoriaEmpleado);
-		            categoriaEmpleado.setNombre(resultSet.getString("NombreCategoria"));
-	            }
-	            preparedStatement.executeUpdate();
-	            preparedStatement.close();
-	        } catch (SQLException e) {
-	            e.printStackTrace();
-	        }
+		public CategoriaEmpleado search(int idCategoriaEmpleado){
+			CategoriaEmpleado categoriaEmpleado = new CategoriaEmpleado();
 
-	        
-	        return categoriaEmpleado;
-	    }
+			try {
+				connection= JDBCConnection.getInstanceConnection();
+				preparedStatement=connection.prepareStatement("SELECT * FROM CATEGORIA_EMPLEADO where idCategoriaEmpleado=?");
+				preparedStatement.setInt(1, idCategoriaEmpleado);
+				resultSet = preparedStatement.executeQuery();
+				if(resultSet.next()){
+					categoriaEmpleado.setIdCategoriaEmpleado(idCategoriaEmpleado);
+					categoriaEmpleado.setNombre(resultSet.getString("NombreCategoria"));
+				}
+			} catch (SQLException e) {
+				e.printStackTrace();
+			}
+
+
+			return categoriaEmpleado;
+		}
 	}
\ No newline at end of file
diff --git a/src/application/repository/info/EmpleadoRepository.java b/src/application/repository/info/EmpleadoRepository.java
index 5c40a0c..0bd0f15 100644
--- a/src/application/repository/info/EmpleadoRepository.java
+++ b/src/application/repository/info/EmpleadoRepository.java
@@ -3,6 +3,7 @@
 import application.comunes.Alerta;
 import application.database.JDBCConnection;
 import application.model.info.*;
+import com.ibm.icu.impl.duration.impl.DataRecord;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
@@ -12,9 +13,8 @@ public class EmpleadoRepository {
 	Connection connection;
 	PreparedStatement preparedStatement;
 	ResultSet resultSet;
-    private int lastID;
 
-    public ObservableList<Empleado> buscarEmpleados(){
+	public ObservableList<Empleado> buscarEmpleados(){
 		ObservableList<Empleado> empleados = FXCollections.observableArrayList();
 		try {
 			connection = JDBCConnection.getInstanceConnection();
@@ -28,7 +28,7 @@ public ObservableList<Empleado> buscarEmpleados(){
 					" AND e.FechaBaja IS null " +  //aqui traemos a los empleados cuya fecha de baja no fue ingresada
 					"            AND l.PROVINCIA_idProvincia=p.idProvincia");
 			resultSet = preparedStatement.executeQuery();
-			
+
 			while(resultSet.next()){
 				Empleado empleado = new Empleado();
 				empleado.setIdEmpleado(resultSet.getInt(1));
@@ -43,7 +43,7 @@ public ObservableList<Empleado> buscarEmpleados(){
 						resultSet.getString(9), resultSet.getString(10)));
 				empleados.add(empleado);
 			}
-			} catch (SQLException e) {
+		} catch (SQLException e) {
 			e.printStackTrace();
 		}
 		return empleados;
@@ -55,17 +55,17 @@ public ObservableList<Empleado> buscarEmpleados(){
 	 */
 	public void logicDelete(Empleado empleado){
 		try {
-            Connection connection = JDBCConnection.getInstanceConnection();
-            PreparedStatement preparedStatement = connection.prepareStatement(
-                    "UPDATE EMPLEADO SET FechaBaja=? where idEmpleado=?");
+			Connection connection = JDBCConnection.getInstanceConnection();
+			PreparedStatement preparedStatement = connection.prepareStatement(
+					"UPDATE EMPLEADO SET FechaBaja=? where idEmpleado=?");
 			preparedStatement.setString(1, empleado.getFechaBaja());
 			preparedStatement.setInt(2, empleado.getIdEmpleado());
-            preparedStatement.executeUpdate();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
+			preparedStatement.executeUpdate();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
 	}
-	
+
 	public void edit(Empleado empleado){
 		try {
 			connection = JDBCConnection.getInstanceConnection();
@@ -89,80 +89,79 @@ public void edit(Empleado empleado){
 			e.printStackTrace();
 		}
 	}
-	
-	public Empleado buscarEmpleadoById(Integer id){
-		
+
+	public static Empleado buscarEmpleadoById(Integer id){
+
 		Empleado empleado = new Empleado();
 		Statement statement = null;
 		ResultSet resultSet = null;
-		
+
 		try {
 			statement = JDBCConnection.getInstanceConnection().createStatement();
 			resultSet = statement.executeQuery("SELECT * FROM EMPLEADO e, CATEGORIA_EMPLEADO c, DOMICILIO d "
 					+ "WHERE e.CATEGORIA_EMPLEADO_idCategoriaEmpleado = c.idCategoriaEmpleado "
 					+ "AND e.DOMICILIO_idDomicilio = d.idDomicilio "
-					+ "AND e.idEmpleado="+id);			
+					+ "AND e.idEmpleado="+id);
 			if(resultSet.next())
 			{
-			empleado.setNombre(resultSet.getString("Nombre"));
-			empleado.setApellido(resultSet.getString("Apellido"));
+				empleado.setNombre(resultSet.getString("Nombre"));
+				empleado.setApellido(resultSet.getString("Apellido"));
 			}
-			
-	}catch (SQLException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-	
-		return empleado;
+
+		}catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
 		}
 
-		public ObservableList<Empleado> getEmpleadosByCategoriaEmpleado(int idCategoria){
-			ObservableList<Empleado> list = FXCollections.observableArrayList();
-			try {
-				Connection connection= JDBCConnection.getInstanceConnection();
-				PreparedStatement preparedStatement=connection.prepareStatement("" +
-						"select idEmpleado, " +
-						"Apellido, Nombre " +
-						"from Empleado " +
-						"where CATEGORIA_EMPLEADO_idCategoriaEmpleado = ?" +
-						" AND FechaBaja IS null");
-				preparedStatement.setInt(1,idCategoria);
-				ResultSet resultSet = preparedStatement.executeQuery();
-				while (resultSet.next()){
-					Empleado empleado = new Empleado();
-					empleado.setIdEmpleado(resultSet.getInt(1));
-					empleado.setApellido(resultSet.getString(2));
-					empleado.setNombre(resultSet.getString(3));
-					list.add(empleado);
-				}
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}
+		return empleado;
+	}
 
-			return list;
+	public ObservableList<Empleado> getEmpleadosByCategoriaEmpleado(int idCategoria){
+		ObservableList<Empleado> list = FXCollections.observableArrayList();
+		try {
+			Connection connection= JDBCConnection.getInstanceConnection();
+			PreparedStatement preparedStatement=connection.prepareStatement("select idEmpleado, " +
+					"Apellido, Nombre " +
+					"from Empleado " +
+					"where CATEGORIA_EMPLEADO_idCategoriaEmpleado = ?" +
+					" AND FechaBaja IS null");
+			preparedStatement.setInt(1,idCategoria);
+			ResultSet resultSet = preparedStatement.executeQuery();
+			while (resultSet.next()){
+				Empleado empleado = new Empleado();
+				empleado.setIdEmpleado(resultSet.getInt(1));
+				empleado.setApellido(resultSet.getString(2));
+				empleado.setNombre(resultSet.getString(3));
+				list.add(empleado);
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
 		}
+
+		return list;
+	}
 	/**
 	 * @Isa: El empleado siempre se guarda con una fecha de baja null
 	 */
-		public void save(Empleado empleado){
-				try {
-					connection = JDBCConnection.getInstanceConnection();
-					preparedStatement= connection.prepareStatement("INSERT INTO EMPLEADO VALUES(?,?,?,?,?,?,LAST_INSERT_ID(),?,?)");
-					preparedStatement.setString(1,null);
-					preparedStatement.setString(2, empleado.getCuit());
-					preparedStatement.setInt(3, empleado.getCategoriaEmpleado().getIdCategoriaEmpleado());
-					preparedStatement.setString(4, empleado.getNombre());
-					preparedStatement.setString(5, empleado.getApellido());
-					preparedStatement.setString(6, empleado.getNacimiento());
-					preparedStatement.setString(7, empleado.getFechaAlta());
-					preparedStatement.setString(8, null); //fecha de baja
-					preparedStatement.executeUpdate();
-					String cuerpoMsj = "Empleado  " + empleado.getNombre() + " agregado correctamente.\n";
-					Alerta.alertaInfo("Empleados",cuerpoMsj);
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
+	public void save(Empleado empleado){
+		try {
+			connection = JDBCConnection.getInstanceConnection();
+			preparedStatement= connection.prepareStatement("INSERT INTO EMPLEADO VALUES(?,?,?,?,?,?,LAST_INSERT_ID(),?,?)");
+			preparedStatement.setString(1,null);
+			preparedStatement.setString(2, empleado.getCuit());
+			preparedStatement.setInt(3, empleado.getCategoriaEmpleado().getIdCategoriaEmpleado());
+			preparedStatement.setString(4, empleado.getNombre());
+			preparedStatement.setString(5, empleado.getApellido());
+			preparedStatement.setString(6, empleado.getNacimiento());
+			preparedStatement.setString(7, empleado.getFechaAlta());
+			preparedStatement.setString(8, null); //fecha de baja
+			preparedStatement.executeUpdate();
+			String cuerpoMsj = "Empleado  " + empleado.getNombre() + " agregado correctamente.\n";
+			Alerta.alertaInfo("Empleados",cuerpoMsj);
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+	}
 	public ObservableList<Empleado> buscarEmpleadosDadosDeBaja(){
 		ObservableList<Empleado> empleados = FXCollections.observableArrayList();
 		try {
@@ -198,6 +197,30 @@ public ObservableList<Empleado> buscarEmpleadosDadosDeBaja(){
 		}
 		return empleados;
 	}
+	public Empleado getEmpleadoById(int idEmpleado){
+		Empleado empleado = new Empleado();
+		try {
+			Connection connection= JDBCConnection.getInstanceConnection();
+			PreparedStatement preparedStatement =connection.prepareStatement("\tSELECT idEmpleado, CUIT, Nombre, Apellido, FechaNacimiento,\n" +
+					"\t\tCATEGORIA_EMPLEADO_idCategoriaEmpleado, NombreCategoria\n" +
+					"\t\t\t\t\t FROM EMPLEADO, CATEGORIA_EMPLEADO \n" +
+					"\t\t\t\t\t WHERE idEmpleado=? \n" +
+					"\t\t\t\t\t AND CATEGORIA_EMPLEADO_idCategoriaEmpleado = idCategoriaEmpleado");
+			preparedStatement.setInt(1,idEmpleado);
+			ResultSet resultSet = preparedStatement.executeQuery();
+			if (resultSet.next()){
+				empleado.setIdEmpleado(resultSet.getInt(1));
+				empleado.setCuit(resultSet.getString(2));
+				empleado.setNombre(resultSet.getString(3));
+				empleado.setApellido(resultSet.getString(4));
+				empleado.setNacimiento(resultSet.getString(5));
+				empleado.setCategoriaEmpleado(new CategoriaEmpleado(resultSet.getInt(6), resultSet.getString(7)));
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+		return empleado;
+	}
 
     public int getLastID() {
 		int lastId=0;
diff --git a/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java b/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java
index c9feec9..f391e1a 100644
--- a/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java
+++ b/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java
@@ -26,8 +26,6 @@ public void save(DetalleLiquidacionEmpleado detalleLiquidacionEmpleado){
 //            preparedStatement.setInt(4, detalleLiquidacionEmpleado.getIdCodigoConcepto());
             preparedStatement.setDouble(5, detalleLiquidacionEmpleado.getMonto());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
-            connection.close();
 
         } catch (SQLException e) {
             e.printStackTrace();
@@ -49,8 +47,6 @@ public void update(DetalleLiquidacionEmpleado detalleLiquidacionEmpleado){
             preparedStatement.setDouble(4,detalleLiquidacionEmpleado.getMonto());
             preparedStatement.setInt(5, detalleLiquidacionEmpleado.getIdDetalleLiquidacionEmpleado());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -62,7 +58,6 @@ public void delete(DetalleLiquidacionEmpleado detalleLiquidacionEmpleado){
             preparedStatement= connection.prepareStatement("DELETE FROM detalle_liquidacion_empleado WHERE idDetalleLiquidacionEmpleado=?");
             preparedStatement.setInt(1,detalleLiquidacionEmpleado.getIdDetalleLiquidacionEmpleado());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -83,12 +78,9 @@ public ObservableList<DetalleLiquidacionEmpleado> view(){
                 detalleLiquidacionEmpleado.setMonto(resultSet.getDouble(5));
                 list.add(detalleLiquidacionEmpleado);
             }
-            preparedStatement.close();
-            resultSet.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
         return list;
     }
-}
+}
\ No newline at end of file
diff --git a/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java b/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java
index 1ad200e..140e886 100644
--- a/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java
+++ b/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java
@@ -1,7 +1,11 @@
 package application.repository.sueldo;
 
 import application.database.JDBCConnection;
+import application.model.info.CategoriaEmpleado;
+import application.model.info.Empleado;
 import application.model.sueldo.LiquidacionEmpleado;
+import application.repository.info.EmpleadoRepository;
+import application.view.venta.cruds.EmitirFacturaController;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
@@ -9,6 +13,8 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 
 public class LiquidacionEmpleadoRepository {
     Connection connection;
@@ -29,8 +35,6 @@ public void save(LiquidacionEmpleado liquidacionEmpleado){
 //            preparedStatement.setInt(8, liquidacionEmpleado.getIdPeriodoLiquidacion());
 //            preparedStatement.setInt(9,liquidacionEmpleado.getIdEmpleado());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -53,8 +57,6 @@ public void update(LiquidacionEmpleado liquidacionEmpleado){
 //            preparedStatement.setInt(8,liquidacionEmpleado.setIdEmpleado());
             preparedStatement.setInt(9,liquidacionEmpleado.getId());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -65,8 +67,6 @@ public void delete(LiquidacionEmpleado liquidacionEmpleado){
             preparedStatement=connection.prepareStatement("DELETE FROM LIQUIDACION_EMPLEADO WHERE  idLiquidacionEmpleado=?");
             preparedStatement.setInt(1,liquidacionEmpleado.getId());
             preparedStatement.executeUpdate();
-            preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -91,12 +91,69 @@ public ObservableList<LiquidacionEmpleado> view(){
                 list.add(liquidacionEmpleado);
             }
             preparedStatement.executeUpdate();
-            preparedStatement.close();
-            connection.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
         return list;
     }
 
-}
+    /**
+     * Busca LiquidacionEmpleado a partir de un idLiquidacion
+     *
+     * @param idLiquidacion
+     * @return ObservableList<LiquidacionEmpleado>
+     */
+    public ObservableList<LiquidacionEmpleado> getLiqEmpleadoByIdLiq(int idLiquidacion){
+        ObservableList<LiquidacionEmpleado> list = FXCollections.observableArrayList();
+        try {
+            connection= JDBCConnection.getInstanceConnection();
+            preparedStatement = connection.prepareStatement("SELECT idLiquidacionEmpleado, fecha_liquidacion, importe_neto, total_haberes_remunerativos, \n" +
+                    "\ttotal_haberes_no_remunerativos, total_retenciones, total_bruto, EMPLEADO_idEmpleado, CUIT,\n" +
+                    "\tCATEGORIA_EMPLEADO_idCategoriaEmpleado, NombreCategoria, Nombre, Apellido, FechaNacimiento, inicio_periodo, fin_periodo \n" +
+                    "\t\t\t\t\tFROM LIQUIDACION_EMPLEADO INNER JOIN EMPLEADO INNER JOIN CATEGORIA_EMPLEADO\n" +
+                    "\t\t\t\t\tON CATEGORIA_EMPLEADO_idCategoriaEmpleado = idCategoriaEmpleado AND \n" +
+                    "\t\t\t\t\tEMPLEADO_idEmpleado = idEmpleado \n" +
+                    "\t\t\t\t\tWHERE LIQUIDACION_idLIQUIDACION = ?");
+            preparedStatement.setInt(1, idLiquidacion);
+            resultSet = preparedStatement.executeQuery();
+            while (resultSet.next()){
+                LiquidacionEmpleado liquidacionEmpleado = new LiquidacionEmpleado();
+                liquidacionEmpleado.setId(resultSet.getInt("idLiquidacionEmpleado"));
+                liquidacionEmpleado.setFechaLiquidacion(resultSet.getString("fecha_liquidacion"));
+                liquidacionEmpleado.setImporteNeto(resultSet.getDouble("importe_neto"));
+                liquidacionEmpleado.setTotalHaberesRemunerativos(resultSet.getDouble("total_haberes_remunerativos"));
+                liquidacionEmpleado.setTotalHaberesNoRemunerativos(resultSet.getDouble("total_haberes_no_remunerativos"));
+                liquidacionEmpleado.setTotalRetenciones(resultSet.getDouble("total_retenciones"));
+                liquidacionEmpleado.setTotalBruto(resultSet.getDouble("total_bruto"));
+                liquidacionEmpleado.setEmpleado(new Empleado(
+                        resultSet.getInt("EMPLEADO_idEmpleado"),
+                        resultSet.getString("Nombre"),
+                        resultSet.getString("Apellido"),
+                        resultSet.getString("CUIT"),
+                        resultSet.getString("FechaNacimiento"),
+                        null,
+                        new CategoriaEmpleado(resultSet.getInt("CATEGORIA_EMPLEADO_idCategoriaEmpleado"),
+                                resultSet.getString("NombreCategoria")),
+                        null,
+                        null
+                ));
+                liquidacionEmpleado.setInicioPeriodo(resultSet.getString("inicio_periodo"));
+                liquidacionEmpleado.setFinPeriodo(resultSet.getString("fin_periodo"));
+                list.add(liquidacionEmpleado);
+               /* System.out.println("-----------------------------------------------------------\n" +
+                        "id: " + liquidacionEmpleado.getId() + "\n neto: " + liquidacionEmpleado.getImporteNeto()
+                        + "\n fecha: " +liquidacionEmpleado.getFechaLiquidacion() + "\n THR: " + liquidacionEmpleado.getTotalHaberesRemunerativos()
+                        + "\n THNR: " +liquidacionEmpleado.getTotalHaberesNoRemunerativos() + "\n TR: " + liquidacionEmpleado.getTotalRetenciones()
+                        + "\n bruto: " + liquidacionEmpleado.getTotalBruto()
+                        + "\nEmpleado: " + liquidacionEmpleado.getEmpleado()
+                        + "\n\t categoria: " + liquidacionEmpleado.getEmpleado().getCategoriaEmpleado().getNombre()
+                        + "\n inicio: " + liquidacionEmpleado.getInicioPeriodo() + " - fin: " + liquidacionEmpleado.getFinPeriodo()
+                );*/
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+
+}
\ No newline at end of file
diff --git a/src/application/repository/sueldo/LiquidacionRepository.java b/src/application/repository/sueldo/LiquidacionRepository.java
index ed65232..0cb0cb1 100644
--- a/src/application/repository/sueldo/LiquidacionRepository.java
+++ b/src/application/repository/sueldo/LiquidacionRepository.java
@@ -4,7 +4,6 @@
 import java.sql.*;
 
 import application.database.JDBCConnection;
-import application.model.info.CategoriaEmpleado;
 import application.model.info.Empleado;
 import application.model.sueldo.ConceptoCalculado;
 import application.model.sueldo.DetalleLiquidacionEmpleado;
@@ -18,7 +17,6 @@ public class LiquidacionRepository {
     Connection connection;
     PreparedStatement preparedStatement;
     ResultSet resultSet;
-    private int lastIdLiquidacionEmpleado;
 
     public static ObservableList<Liquidacion> buscarLiquidaciones(){
 
@@ -39,7 +37,6 @@ public static ObservableList<Liquidacion> buscarLiquidaciones(){
                 liquidaciones.add(liquidacion);
             }
         } catch (SQLException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
 
@@ -49,18 +46,23 @@ public static ObservableList<Liquidacion> buscarLiquidaciones(){
 
     /**
      * Crea una liquidacion
-     *
      * @return Liquidacion creada
      */
-    public Liquidacion newLiquidacion(Liquidacion liquidacion) {
+    public Liquidacion newLiquidacion(Liquidacion liquidacion){
 
         try {
-            Statement statement = JDBCConnection.getInstanceConnection().createStatement();
-            statement.executeUpdate("INSERT INTO LIQUIDACION (timestamp) VALUES (NOW());");
-            resultSet = statement.executeQuery("SELECT idLiquidacion, timestamp " +
+            Connection connection = JDBCConnection.getInstanceConnection();
+            PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO LIQUIDACION (timestamp, total_haberes_remunerativos, " +
+                    "total_haberes_no_remunerativos, total_retenciones ) VALUES (NOW(), ? , ?, ?);");
+            preparedStatement.setDouble(1,liquidacion.getTotalHaberesRemunerativos());
+            preparedStatement.setDouble(2,liquidacion.getTotalHaberesNoRemunerativos());
+            preparedStatement.setDouble(3,liquidacion.getTotalRetenciones());
+            preparedStatement.executeUpdate();
+            System.out.println("SQL LIQUIDACION INSERT: " + preparedStatement);
+            resultSet = preparedStatement.executeQuery("SELECT idLiquidacion, timestamp " +
                     "FROM LIQUIDACION " +
                     "WHERE idLiquidacion = LAST_INSERT_ID();");
-            if (resultSet.next()) {
+            if (resultSet.next()){
                 liquidacion.setId(resultSet.getInt("idLiquidacion"));
                 liquidacion.setFechaLiquidacion(resultSet.getString("timestamp"));
             }
@@ -68,52 +70,62 @@ public Liquidacion newLiquidacion(Liquidacion liquidacion) {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
-        //set ID liquidacion
-        liquidacion.setId(getLastID());
 
         //crear una liquidacion_empleado por cada empleado, es asociado a una liquidacion
-        for (LiquidacionEmpleado liquidacionEmpleado : liquidacion.getLiquidacionesEmpleados()) {
+        for (LiquidacionEmpleado liquidacionEmpleado : liquidacion.getLiquidacionesEmpleados()){
 
             try {
-                preparedStatement = connection.prepareStatement("INSERT INTO LIQUIDACION_EMPLEADO " +
-                        " VALUES (?,?,?,?,?,?,?,?,?,?,?);");
-                preparedStatement.setString(1, null);
-                preparedStatement.setString(2, liquidacionEmpleado.getFechaLiquidacion());
-                preparedStatement.setDouble(3, liquidacionEmpleado.getImporteNeto());
-                preparedStatement.setDouble(4, liquidacionEmpleado.getTotalHaberesRemunerativos());
-                preparedStatement.setDouble(5, liquidacionEmpleado.getTotalHaberesNoRemunerativos());
-                preparedStatement.setDouble(6, liquidacionEmpleado.getTotalRetenciones());
-                preparedStatement.setDouble(7, liquidacionEmpleado.getTotalBruto());
-                preparedStatement.setInt(8, liquidacionEmpleado.getEmpleado().getIdEmpleado());
-                preparedStatement.setString(9, liquidacionEmpleado.getInicioPeriodo());
-                preparedStatement.setString(10, liquidacionEmpleado.getFinPeriodo());
-                preparedStatement.setInt(11, liquidacion.getId());
+                Connection connection = JDBCConnection.getInstanceConnection();
+                PreparedStatement preparedStatement  = connection.prepareStatement("INSERT INTO LIQUIDACION_EMPLEADO " +
+                        "(importe_neto,total_haberes_remunerativos, total_haberes_no_remunerativos,total_retenciones, " +
+                        "total_bruto, EMPLEADO_idEmpleado, inicio_periodo, fin_periodo, LIQUIDACION_idLiquidacion, " +
+                        "fecha_liquidacion)" +
+                        " VALUES (?,?,?,?,?,?,?,?,?,NOW());");
+                preparedStatement.setDouble(1,liquidacionEmpleado.getImporteNeto());
+                preparedStatement.setDouble(2,liquidacionEmpleado.getTotalHaberesRemunerativos());
+                preparedStatement.setDouble(3,liquidacionEmpleado.getTotalHaberesNoRemunerativos());
+                preparedStatement.setDouble(4,liquidacionEmpleado.getTotalRetenciones());
+                preparedStatement.setDouble(5,liquidacionEmpleado.getTotalBruto());
+                preparedStatement.setInt(6,liquidacionEmpleado.getEmpleado().getIdEmpleado());
+                preparedStatement.setString(7,liquidacionEmpleado.getInicioPeriodo());
+                preparedStatement.setString(8,liquidacionEmpleado.getFinPeriodo());
+                preparedStatement.setInt(9,liquidacion.getId());
                 preparedStatement.executeUpdate();
+                resultSet = preparedStatement.executeQuery("SELECT LAST_INSERT_ID()");
+                if (resultSet.next()){
+                    liquidacionEmpleado.setId(resultSet.getInt(1));
+                }
             } catch (SQLException e) {
+                // TODO Auto-generated catch block
                 e.printStackTrace();
             }
 
-            liquidacionEmpleado.setId(getLastIdLiquidacionEmpleado());
-            System.out.println("Empleado a liquidar: " + liquidacionEmpleado.getId());
-
             //grabacion de detalle_liquidacion, es decir ConceptoCalculado
-            for (ConceptoCalculado conceptoCalculado : liquidacionEmpleado.getConceptosLiquidados()) {
+            for (ConceptoCalculado conceptoCalculado : liquidacionEmpleado.getConceptosLiquidados()){
                 try {
-                    System.out.println(conceptoCalculado);
-                    preparedStatement = connection.prepareStatement("INSERT INTO DETALLE_LIQUIDACION_EMPLEADO " +
-                            " VALUES (?,?,?,?,?);");
-                    preparedStatement.setString(1, null);
-                    preparedStatement.setDouble(2, conceptoCalculado.getFactor());
-                    preparedStatement.setInt(3, liquidacionEmpleado.getId());
-                    preparedStatement.setDouble(4, conceptoCalculado.getMontoCalculado());
-                    preparedStatement.setInt(5, conceptoCalculado.getIdConceptoSueldo());
+                    Connection connection = JDBCConnection.getInstanceConnection();
+                    preparedStatement  = connection.prepareStatement("INSERT INTO DETALLE_LIQUIDACION_EMPLEADO " +
+                            "(cantidad,monto,LiquidacionEmpleado_idLiquidacionEmpleado,CONCEPTO_SUELDO_idCodigoConcepto)" +
+                            " VALUES (?,?,?,?);");
+                    preparedStatement.setDouble(1,conceptoCalculado.getFactor());
+                    preparedStatement.setDouble(2,conceptoCalculado.getMontoCalculado());
+                    preparedStatement.setInt(3,liquidacionEmpleado.getId());
+                    preparedStatement.setInt(4,conceptoCalculado.getIdConceptoSueldo());//todo funcionara???
+                    System.out.println("SQL CONCEPTO CALCULADO: " + preparedStatement);
                     preparedStatement.executeUpdate();
+                    // resultSet = preparedStatement.executeQuery("SELECT LAST_INSERT_ID()");
+                    //if (resultSet.next()){
+                    //    conceptoCalculado.setId(resultSet.getInt(1));
+                    //   conceptoCalculado.setIdConceptoSueldo();
+                    // }
                 } catch (SQLException e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
                 }
             }
+
         }
+
         return liquidacion;
     }
 
@@ -122,7 +134,7 @@ public ObservableList<LiquidacionEmpleado> getEmpleadosLiquidadosByidLiquidacion
         try {
             connection = JDBCConnection.getInstanceConnection();
             preparedStatement=connection.prepareStatement("SELECT EMPLEADO.idEmpleado, EMPLEADO.Apellido, EMPLEADO.Nombre, " +
-                    "CATEGORIA_EMPLEADO.idCategoriaEmpleado, CATEGORIA_EMPLEADO.NombreCategoria, LIQUIDACION_EMPLEADO.total_haberes_remunerativos, " +
+                    " CATEGORIA_EMPLEADO.NombreCategoria, LIQUIDACION_EMPLEADO.total_haberes_remunerativos, " +
                     "LIQUIDACION_EMPLEADO.total_haberes_no_remunerativos, LIQUIDACION_EMPLEADO.total_retenciones " +
                     "                    FROM LIQUIDACION_EMPLEADO" +
                     "                    INNER JOIN" +
@@ -139,11 +151,11 @@ public ObservableList<LiquidacionEmpleado> getEmpleadosLiquidadosByidLiquidacion
                 empleado.setIdEmpleado(resultSet.getInt(1));
                 empleado.setApellido(resultSet.getString(2));
                 empleado.setNombre(resultSet.getString(3));
-                empleado.setCategoriaEmpleado(new CategoriaEmpleado(resultSet.getInt(4),resultSet.getString(5)));
+//                empleado.setCategoria(resultSet.getString(4));
                 empleadosLiquidados.setEmpleado(empleado);
-                empleadosLiquidados.setTotalHaberesRemunerativos(resultSet.getDouble(6));
-                empleadosLiquidados.setTotalHaberesNoRemunerativos(resultSet.getDouble(7));
-                empleadosLiquidados.setTotalRetenciones(resultSet.getDouble(8));
+                empleadosLiquidados.setTotalHaberesRemunerativos(resultSet.getDouble(5));
+                empleadosLiquidados.setTotalHaberesNoRemunerativos(resultSet.getDouble(6));
+                empleadosLiquidados.setTotalRetenciones(resultSet.getDouble(7));
                 list.add(empleadosLiquidados);
             }
         } catch (SQLException e) {
@@ -152,31 +164,4 @@ public ObservableList<LiquidacionEmpleado> getEmpleadosLiquidadosByidLiquidacion
         return list;
     }
 
-    public int getLastID() {
-        int lastId=0;
-        try {
-            connection = JDBCConnection.getInstanceConnection();
-            preparedStatement=connection.prepareStatement("SELECT MAX(idLIQUIDACION) FROM liquidacion;");
-            resultSet = preparedStatement.executeQuery();
-            if (resultSet.next())
-                lastId= resultSet.getInt(1);
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return lastId;
-    }
-
-    private int getLastIdLiquidacionEmpleado() {
-        int lastId=0;
-        try {
-            connection = JDBCConnection.getInstanceConnection();
-            preparedStatement=connection.prepareStatement("SELECT MAX(idLiquidacionEmpleado) FROM Liquidacion_Empleado;");
-            resultSet = preparedStatement.executeQuery();
-            if (resultSet.next())
-                lastId= resultSet.getInt(1);
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return lastId;
-    }
-}
+}
\ No newline at end of file
diff --git a/src/application/view/sueldo/Liquidaciones.fxml b/src/application/view/sueldo/Liquidaciones.fxml
index 2b7784a..1e00dc5 100644
--- a/src/application/view/sueldo/Liquidaciones.fxml
+++ b/src/application/view/sueldo/Liquidaciones.fxml
@@ -11,7 +11,7 @@
       <VBox alignment="CENTER_LEFT" layoutX="17.0" layoutY="14.0" prefHeight="476.0" prefWidth="665.0" spacing="10.0">
          <children>
             <Label text="Liquidaciones" />
-            <TableView fx:id="liquidacionTable" onMouseClicked="#cargarEmpleadosLiquidados" pickOnBounds="false" prefHeight="157.0" prefWidth="677.0">
+            <TableView fx:id="liquidacionTable" pickOnBounds="false" prefHeight="157.0" prefWidth="677.0">
                <columns>
                   <TableColumn fx:id="idLiquidacion" prefWidth="60.5" resizable="false" text="Nro" />
                   <TableColumn fx:id="fechaColumn" minWidth="0.0" prefWidth="138.5" text="Fecha" />
@@ -26,7 +26,7 @@
                </children>
             </HBox>
             <Label text="Empleados Liquidados" />
-            <TableView fx:id="empleadosTable" onMouseClicked="#cargarEmpleadosLiquidados" prefHeight="164.0" prefWidth="678.0">
+            <TableView fx:id="liqEmpleadosTable" prefHeight="164.0" prefWidth="678.0">
                <columns>
                   <TableColumn fx:id="legajoColumn" prefWidth="312.0" text="Legajo" />
                   <TableColumn fx:id="apellidoColumn" prefWidth="105.0" text="Apellido" />
diff --git a/src/application/view/sueldo/LiquidacionesController.java b/src/application/view/sueldo/LiquidacionesController.java
index ba28c00..721201e 100644
--- a/src/application/view/sueldo/LiquidacionesController.java
+++ b/src/application/view/sueldo/LiquidacionesController.java
@@ -5,7 +5,9 @@
 import application.model.sueldo.LiquidacionEmpleado;
 import application.model.sueldo.Liquidacion;
 import application.reports.AbstractJasperReports;
+import application.repository.sueldo.LiquidacionEmpleadoRepository;
 import application.repository.sueldo.LiquidacionRepository;
+import application.view.sueldo.cruds.LiquidacionSueldoController;
 import javafx.beans.binding.BooleanBinding;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -26,6 +28,8 @@
 
 public class LiquidacionesController implements Initializable{
 
+
+
 	//Declaracion de la tabla y columnas de la clase Liquidaciones
 	@FXML
 	private TableView<Liquidacion> liquidacionTable;
@@ -42,7 +46,7 @@ public class LiquidacionesController implements Initializable{
 
 	//Declaracion de la tabla y columnas de la clase LiquidacionEmpleado
 	@FXML
-	private  TableView<LiquidacionEmpleado> empleadosTable;
+	private  TableView<LiquidacionEmpleado> liqEmpleadosTable;
 	@FXML
 	private TableColumn<LiquidacionEmpleado, String> legajoColumn;
 	@FXML
@@ -64,19 +68,9 @@ public class LiquidacionesController implements Initializable{
 	@FXML
 	private Button imprimirReciboDeEmpleado;
 
-
-
-
-
 	private Stage owner;
-
-	private ObservableList<LiquidacionEmpleado> liquidacion = FXCollections.observableArrayList();
-
-	private ObservableList<Empleado> empleados = FXCollections.observableArrayList();
-
-	private LiquidacionRepository liquidacionesRepository = new LiquidacionRepository();
-
-	private ObservableList<LiquidacionEmpleado> empleadosLiquidados = FXCollections.observableArrayList();
+	private ObservableList<LiquidacionEmpleado> liquidacionesEmpleado = FXCollections.observableArrayList();
+	private LiquidacionEmpleadoRepository liquidacionEmpleadoRepository = new LiquidacionEmpleadoRepository();
 
 	public void setOwner(Stage owner){
 		this.owner = owner;
@@ -89,11 +83,14 @@ public void buscarLiquidaciones(){
 		liquidacionTable.setItems(liquidaciones);
 	}
 
+	private void buscarLiquidacionesEmpleado(int idLiquidacion){
+		this.liquidacionesEmpleado = liquidacionEmpleadoRepository.getLiqEmpleadoByIdLiq(idLiquidacion);
+		if (!liquidacionesEmpleado.isEmpty())
+		liqEmpleadosTable.setItems(liquidacionesEmpleado);
+	}
+
 	@Override
 	public void initialize(URL location, ResourceBundle resources) {
-		BooleanBinding boolenBinding = liquidacionTable.getSelectionModel().selectedItemProperty().isNull();
-		imprimirRecibos.disableProperty().bind(boolenBinding);
-
 		buscarLiquidaciones();
 		idLiquidacion.setCellValueFactory(cellData -> cellData.getValue().idProperty().asString());
 		fechaColumn.setCellValueFactory(cellData -> cellData.getValue().fechaLiquidacionProperty());
@@ -101,6 +98,12 @@ public void initialize(URL location, ResourceBundle resources) {
 		hnrColumn.setCellValueFactory(cellData -> cellData.getValue().totalHaberesNoRemunerativosProperty().asString());
 		retencionesColumn.setCellValueFactory(cellData -> cellData.getValue().totalRetencionesProperty().asString());
 
+		liquidacionTable.getSelectionModel().selectedItemProperty().addListener((obs, oldSelection, newSelection) -> {
+			if (newSelection != null) {
+				buscarLiquidacionesEmpleado(liquidacionTable.getSelectionModel().getSelectedItem().getId());
+			}
+		});
+
 		legajoColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().idEmpleadoProperty().asString());
 		apellidoColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().apellidoProperty());
 		nombreColumn.setCellValueFactory(cellData -> cellData.getValue().getEmpleado().nombreProperty());
@@ -128,7 +131,8 @@ private void handleNew(){
 			Scene scene = new Scene(page);
 			dialogStage.setScene(scene);
 
-
+			LiquidacionSueldoController controller = loader.getController();
+			controller.setOwner(dialogStage);
 
 			// Show the dialog and wait until the user closes it
 			dialogStage.showAndWait();
@@ -138,13 +142,6 @@ private void handleNew(){
 		}
 	}
 
-	@FXML
-	public void cargarEmpleadosLiquidados(){
-		if (liquidacionTable.getSelectionModel().getSelectedItem() != null){
-			empleadosLiquidados = liquidacionesRepository.getEmpleadosLiquidadosByidLiquidacion(liquidacionTable.getSelectionModel().getSelectedItem().getId());
-			empleadosTable.setItems(empleadosLiquidados);
-		}
-	}
 	@FXML
 	private void handleImprimirRecibos(){
 		System.out.println("se imprimieron recibos de sueldo");
@@ -153,10 +150,4 @@ private void handleImprimirRecibos(){
 				"idLiquidacion", idLiquidacion);
 		AbstractJasperReports.showViewer();
 	}
-//    @FXML
-//    private void cargarLiquidaciones(){
-//        if (liquidacionTable.getSelectionModel().getSelectedItem() != null){
-//
-//        }
-//    }
 }
\ No newline at end of file
diff --git a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
index ef3cdcc..01f0d0f 100644
--- a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
+++ b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
@@ -85,6 +85,7 @@ public class LiquidacionSueldoController implements Initializable {
     private Button cancelButton;
 
     private Stage owner;
+    private boolean isNew;
     private CategoriaEmpleadoRepository categoriaEmpleadoRepository = new CategoriaEmpleadoRepository();
     private EmpleadoRepository empleadoRepository = new EmpleadoRepository();
     private LiquidacionRepository liquidacionRepository = new LiquidacionRepository();
@@ -98,7 +99,6 @@ public void setOwner(Stage owner){
         this.owner = owner;
     }
 
-
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         novedadesTableView.setPlaceholder(new Label("No hay novedades para mostrar"));
@@ -159,20 +159,26 @@ private void validarListaEmpleados() {
 
     @FXML
     private void agregarEmpleadoALiquidar(){
+
         if(totalEmpleadoTableView.getSelectionModel().getSelectedItem() != null) {
             liquidarEmpleadoTableView.getItems().add(totalEmpleadoTableView.getSelectionModel().getSelectedItem());
             liquidarEmpleados.add(new EmpleadoALiquidar(totalEmpleadoTableView.getSelectionModel().getSelectedItem()));
         }
         cargarTablaEmpleados();
+        System.out.println("Lista Empleados a Liquidar: [agregarEmpleadoALiquidar] ");
+        for (EmpleadoALiquidar empleadoALiquidar : liquidarEmpleados )
+            System.out.printf("Empleado a Liquidar : %s %s%n", empleadoALiquidar.getEmpleado().getNombre(),
+                    empleadoALiquidar.getEmpleado().getApellido() );
     }
 
     @FXML
     private void agregarTodos(){
+
         if(!totalEmpleadoTableView.getItems().isEmpty())
-        for(Empleado empleado : totalEmpleadoTableView.getItems()) {
-            liquidarEmpleadoTableView.getItems().add(empleado);
-            liquidarEmpleados.add(new EmpleadoALiquidar(empleado));
-        }
+            for(Empleado empleado : totalEmpleadoTableView.getItems()) {
+                liquidarEmpleadoTableView.getItems().add(empleado);
+                liquidarEmpleados.add(new EmpleadoALiquidar(empleado));
+            }
         cargarTablaEmpleados();
     }
 
@@ -180,29 +186,37 @@ private void agregarTodos(){
     private void quitarEmpleadoALiquidar(){
 
         if(liquidarEmpleadoTableView.getSelectionModel().getSelectedItem() != null) {
+            System.out.println("ID EMPLEADO A LIQUIDAR: " + liquidarEmpleadoTableView.getSelectionModel().getSelectedItem().getIdEmpleado());
             removeEmpleadoALiquidarById(liquidarEmpleadoTableView.getSelectionModel().getSelectedItem().getIdEmpleado());
-           liquidarEmpleadoTableView.getItems().remove(liquidarEmpleadoTableView.getSelectionModel().getSelectedItem());
+            liquidarEmpleadoTableView.getItems().remove(liquidarEmpleadoTableView.getSelectionModel().getSelectedItem());
         }
         cargarTablaEmpleados();
         novedadesTableView.getItems().clear();
+        System.out.println("Lista Empleados a Liquidar: [quitarEmpleadoALiquidar] ");
+        for (EmpleadoALiquidar empleadoALiquidar : liquidarEmpleados )
+            System.out.printf("Empleado a Liquidar : %s %s%n", empleadoALiquidar.getEmpleado().getNombre(),
+                    empleadoALiquidar.getEmpleado().getApellido() );
     }
 
     @FXML
     private void quitarTodos(){
+
         if(!liquidarEmpleadoTableView.getItems().isEmpty()) {
             liquidarEmpleadoTableView.getItems().removeAll(liquidarEmpleadoTableView.getItems());
             liquidarEmpleados.removeAll(liquidarEmpleados);
         }
         novedadesTableView.getItems().clear();
         cargarTablaEmpleados();
+
     }
 
 
     @FXML
     private void cargarNovedades(){
-      if (liquidarEmpleadoTableView.getSelectionModel().getSelectedItem() != null)
+        if (liquidarEmpleadoTableView.getSelectionModel().getSelectedItem() != null)
             novedadesTableView.setItems(liquidarEmpleados.get(getEmpleadoALiquidarById(
                     liquidarEmpleadoTableView.getSelectionModel().getSelectedItem().getIdEmpleado())).getConceptos());
+
     }
 
     @FXML
@@ -212,9 +226,11 @@ private void cargarFactor(){
                     .getFactor()));
             liquidarEmpleados.get(getEmpleadoALiquidarById(liquidarEmpleadoTableView.getSelectionModel().
                     getSelectedItem().getIdEmpleado())).getConceptos().get(novedadesTableView.getItems().indexOf(
-                            novedadesTableView.getSelectionModel().getSelectedItem())).setSelect(novedadesTableView.
+                    novedadesTableView.getSelectionModel().getSelectedItem())).setSelect(novedadesTableView.
                     getSelectionModel().getSelectedItem().getSelect().isSelected());
+
         }
+
     }
 
     @FXML
@@ -257,11 +273,11 @@ private void liquidarEmpleados(){
             List<ConceptoCalculado> retCalculados = new ArrayList<>();
 
             //Muestra lista de conceptos a liquidar
-            /*System.out.println("%nCONCEPTOS A LIQUIDAR%n%n");
+            System.out.println("%nCONCEPTOS A LIQUIDAR%n%n");
             for (ConceptoSueldo conceptoSueldo : empleadoALiquidar.getRemunerativos())
                 System.out.printf("CONCEPTO REMUNERATIVO: %s%n" +
-                                  "              CANTIDAD: %f%n" +
-                                  "              FACTOR  : %f%n",  conceptoSueldo.getDescripcion(),conceptoSueldo.getCantidad(),
+                                "              CANTIDAD: %f%n" +
+                                "              FACTOR  : %f%n",  conceptoSueldo.getDescripcion(),conceptoSueldo.getCantidad(),
                         conceptoSueldo.getFactor());
             for (ConceptoSueldo conceptoSueldo : empleadoALiquidar.getNoRemunerativos())
                 System.out.printf("CONCEPTO NO REMUNERATIVO: %s%n" +
@@ -273,7 +289,7 @@ private void liquidarEmpleados(){
                                 "              CANTIDAD: %f%n" +
                                 "              FACTOR  : %f%n",  conceptoSueldo.getDescripcion(),conceptoSueldo.getCantidad(),
                         conceptoSueldo.getFactor());
-*/
+
 
             //Liquidacion de Haberes Remunerativos
             for (ConceptoSueldo conceptoSueldo : empleadoALiquidar.getRemunerativos())
@@ -284,7 +300,7 @@ private void liquidarEmpleados(){
                 noRemCalculados.add(new ConceptoCalculado(conceptoSueldo));
 
             //Muestra lista de conceptos liquidados [REMUNERATIVOS Y NO REMUNERATIVOS]
-            /*System.out.printf("%n%nCONCEPTOS LIQUIDADOS%n%n");
+            System.out.printf("%n%nCONCEPTOS LIQUIDADOS%n%n");
             for (ConceptoCalculado conceptoCalculado : remCalculados)
                 System.out.printf("CALCULADO REMUNERATIVO: %s%n" +
                                 "              CANTIDAD: %f%n" +
@@ -297,7 +313,7 @@ private void liquidarEmpleados(){
                                 "              FACTOR  : %f%n" +
                                 "      MONTO CALCULADO : %f%n",  conceptoCalculado.getDescripcion(),conceptoCalculado.getCantidad(),
                         conceptoCalculado.getFactor(), conceptoCalculado.getMontoCalculado());
-*/
+
 
 
             //Calcular suma de Haberes Remunerativos
@@ -345,37 +361,61 @@ private void liquidarEmpleados(){
 
             liquidacionEmpleado.setImporteNeto(importeNeto.doubleValue());
 
-//            System.out.printf("%n%n------- Liquidación Empleado :%s %s ------- %n ", empleadoALiquidar.getEmpleado().getNombre(),
-//                    empleadoALiquidar.getEmpleado().getApellido());
-//            System.out.println("TOTAL HABERES REMUNERATIVOS: " + liquidacionEmpleado.getTotalHaberesRemunerativos());
-//            System.out.printf("Total haberes remunerativos   : $ %f%n" +
-//                              "Total haberes no remunerativos: $ %f%n" +
-//                              "Total retenciones             : $ %f%n" +
-//                              "------------------------------------%n" +
-//                              "Total Bruto                   : $ %f%n" +
-//                              "Importe Neto                  : $ %f%n" +
-//                              "------------------------------------%n",
-//                                liquidacionEmpleado.getTotalHaberesRemunerativos(), liquidacionEmpleado.getTotalHaberesNoRemunerativos(),
-//                                liquidacionEmpleado.getTotalRetenciones(), liquidacionEmpleado.getTotalBruto(), liquidacionEmpleado.getImporteNeto());
+            liquidacionEmpleado.setConceptosLiquidados(remCalculados);
+            liquidacionEmpleado.getConceptosLiquidados().addAll(noRemCalculados);
+            liquidacionEmpleado.getConceptosLiquidados().addAll(retCalculados);
+
+            System.out.printf("%n%n------- Liquidación Empleado :%s %s ------- %n ", empleadoALiquidar.getEmpleado().getNombre(),
+                    empleadoALiquidar.getEmpleado().getApellido());
+            System.out.println("TOTAL HABERES REMUNERATIVOS: " + liquidacionEmpleado.getTotalHaberesRemunerativos());
+            System.out.printf("Total haberes remunerativos   : $ %f%n" +
+                            "Total haberes no remunerativos: $ %f%n" +
+                            "Total retenciones             : $ %f%n" +
+                            "------------------------------------%n" +
+                            "Total Bruto                   : $ %f%n" +
+                            "Importe Neto                  : $ %f%n" +
+                            "------------------------------------%n",
+                    liquidacionEmpleado.getTotalHaberesRemunerativos(), liquidacionEmpleado.getTotalHaberesNoRemunerativos(),
+                    liquidacionEmpleado.getTotalRetenciones(), liquidacionEmpleado.getTotalBruto(), liquidacionEmpleado.getImporteNeto());
 
             //Agregar LiquidacionEmpleado a Liquidacion
             liquidacion.getLiquidacionesEmpleados().add(liquidacionEmpleado);
         }
 
+        //calcular total de liquidacion empleado
+        Double totalHaberesRemunerativos = 0.0;
+        Double totalHaberesNoRemunerativos = 0.0;
+        Double totalRetenciones = 0.0;
+
+        for (LiquidacionEmpleado liquidacionEmpleado : liquidacion.getLiquidacionesEmpleados()) {
+            totalHaberesRemunerativos += liquidacionEmpleado.getTotalHaberesRemunerativos();
+            totalHaberesNoRemunerativos += liquidacionEmpleado.getTotalHaberesNoRemunerativos();
+            totalRetenciones += liquidacionEmpleado.getTotalRetenciones();
+        }
+        liquidacion.setTotalHaberesRemunerativos(totalHaberesRemunerativos.doubleValue());
+        liquidacion.setTotalHaberesNoRemunerativos(totalHaberesNoRemunerativos.doubleValue());
+        liquidacion.setTotalRetenciones(totalRetenciones.doubleValue());
+
         //Grabar los datos en la base de datos
         liquidacionRepository.newLiquidacion(liquidacion);
     }
 
     private void separarConceptosByTipoConcepto(){
-//        System.out.println("------- separaConceptosByid -------");
+        System.out.println("------- separaConceptosByid -------");
         if (!liquidarEmpleados.isEmpty()){
+
             for (EmpleadoALiquidar empleadoALiquidar : liquidarEmpleados){
-//                System.out.printf("Empleado a Liquidar: %s %s %n", empleadoALiquidar.getEmpleado().getNombre(),
-//                        empleadoALiquidar.getEmpleado().getApellido());
+
+                System.out.printf("Empleado a Liquidar: %s %s %n", empleadoALiquidar.getEmpleado().getNombre(),
+                        empleadoALiquidar.getEmpleado().getApellido());
+
                 for(ConceptoSueldo conceptoSueldo : empleadoALiquidar.getConceptos()) {
-//                    System.out.printf("Concepto a Liquidar: %s %n Seleccionado: %s %n Tipo Concepto: %s %n ", conceptoSueldo.getDescripcion(),
-//                            conceptoSueldo.getSelect().isSelected(), conceptoSueldo.getTipoConcepto());
+
+                    System.out.printf("Concepto a Liquidar: %s %n Seleccionado: %s %n Tipo Concepto: %s %n ", conceptoSueldo.getDescripcion(),
+                            conceptoSueldo.getSelect().isSelected(), conceptoSueldo.getTipoConcepto());
+
                     if (conceptoSueldo.getSelect().isSelected()) {
+
                         switch (conceptoSueldo.getTipoConcepto()) {
                             case "REMUNERATIVO":
                                 empleadoALiquidar.getRemunerativos().add(conceptoSueldo);
@@ -391,7 +431,16 @@ private void separarConceptosByTipoConcepto(){
                 }
             }
         }
+
     }
 
+    @FXML
+    public void handleOk(){
+        liquidarEmpleados();
+        owner.close();
+    }
+
+
+
 
-}
+}
\ No newline at end of file

From a5325a350c71930a9192ad22ca38efdab26336fc Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Tue, 27 Feb 2018 02:45:12 -0300
Subject: [PATCH 11/27] Icono del sistema agregado a ventanas de login y
 principal, resto de ventanas mas adelante

---
 src/application/Main.java                     |   4 ++++
 src/application/view/LoginController.java     |   1 +
 src/application/view/PrincipalController.java |   6 +++++-
 src/resources/logiserv-icon.png               | Bin 0 -> 64268 bytes
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 src/resources/logiserv-icon.png

diff --git a/src/application/Main.java b/src/application/Main.java
index 6b7ffdc..383b6ab 100644
--- a/src/application/Main.java
+++ b/src/application/Main.java
@@ -5,6 +5,7 @@
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
 
@@ -18,6 +19,9 @@ public class Main extends Application {
     public void start(Stage primaryStage) {
         this.primaryStage = primaryStage;
         this.primaryStage.setTitle("Logiserv Studio");
+        // Set the application icon.
+        this.primaryStage.getIcons().add(new Image("resources/logiserv-icon.png"));
+
         JDBCConnection.getInstanceConnection();
         initRootLayout();
     }
diff --git a/src/application/view/LoginController.java b/src/application/view/LoginController.java
index 352e9d7..0c053c3 100644
--- a/src/application/view/LoginController.java
+++ b/src/application/view/LoginController.java
@@ -70,6 +70,7 @@ private void btnLogin(ActionEvent event){
                 adminPanelStage.setTitle("LogiServ app - usuario: " + nombreUsuario + " conectado.");
 //                adminPanelStage.setMaximized(true);
                 PrincipalController controller = loader.getController();
+                controller.setPrimaryStage(adminPanelStage);
                 controller.setRootLayout(root);
                 controller.setHome();
                 // Show the scene containing the root layout.
diff --git a/src/application/view/PrincipalController.java b/src/application/view/PrincipalController.java
index a4b3c27..8857f5f 100644
--- a/src/application/view/PrincipalController.java
+++ b/src/application/view/PrincipalController.java
@@ -15,6 +15,7 @@
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Accordion;
 import javafx.scene.control.TitledPane;
+import javafx.scene.image.Image;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
@@ -31,11 +32,14 @@ public class PrincipalController {
     private TitledPane inicioTitledPane;
 	public void setRootLayout(BorderPane root){
 		this.rootLayout = root;
+
 	}
 
 	public void setPrimaryStage(Stage primary){
 		this.primaryStage = primary;
-	}
+        this.primaryStage.getIcons().add(new Image("resources/logiserv-icon.png"));
+
+    }
 
     //---------------MODULO VENTAS------------------------//
 
diff --git a/src/resources/logiserv-icon.png b/src/resources/logiserv-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a79cd99819e411dd4e5226666ff5c8f4b6ebbd0
GIT binary patch
literal 64268
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

literal 0
HcmV?d00001


From 32c3ebee57be33fdd51bab116e427cb979de6bfa Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Tue, 27 Feb 2018 02:54:35 -0300
Subject: [PATCH 12/27] ventana de liquidaciones arreglada por nanogesima
 octava vez

---
 .idea/workspace.xml                           | 426 +++++++++---------
 .../repository/info/EmpleadoRepository.java   |  26 +-
 .../view/sueldo/Liquidaciones.fxml            |  33 --
 3 files changed, 218 insertions(+), 267 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index afae104..a6857dd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="ad24a087-34e9-4c0a-89a3-9d660d897332" name="Default" comment="Diseño mejorado y ajustes a todas las ventanas del proyecto">
+    <list default="true" id="ad24a087-34e9-4c0a-89a3-9d660d897332" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change beforePath="$PROJECT_DIR$/src/application/repository/compra/FacturaCompraRepository.java" afterPath="$PROJECT_DIR$/src/application/repository/compra/FacturaCompraRepository.java" />
       <change beforePath="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" afterPath="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionRepository.java" afterPath="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionRepository.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/Register.fxml" afterPath="$PROJECT_DIR$/src/application/view/Register.fxml" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/RegisterController.java" afterPath="$PROJECT_DIR$/src/application/view/RegisterController.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/compra/cruds/ArticuloEdit.fxml" afterPath="$PROJECT_DIR$/src/application/view/compra/cruds/ArticuloEdit.fxml" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/compra/cruds/StockEdit.fxml" afterPath="$PROJECT_DIR$/src/application/view/compra/cruds/StockEdit.fxml" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/sueldo/LiquidacionesController.java" afterPath="$PROJECT_DIR$/src/application/view/sueldo/LiquidacionesController.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/sueldo/cruds/LiquidacionSueldoController.java" afterPath="$PROJECT_DIR$/src/application/view/sueldo/cruds/LiquidacionSueldoController.java" />
+      <change beforePath="$PROJECT_DIR$/src/application/view/sueldo/Liquidaciones.fxml" afterPath="$PROJECT_DIR$/src/application/view/sueldo/Liquidaciones.fxml" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -26,31 +19,41 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="LiquidacionSueldoController.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/application/view/sueldo/cruds/LiquidacionSueldoController.java">
+      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/application/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="17">
-              <caret line="262" column="37" lean-forward="false" selection-start-line="262" selection-start-column="37" selection-end-line="263" selection-end-column="41" />
+            <state relative-caret-position="-16">
+              <caret line="38" column="30" lean-forward="false" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="30" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="LiquidacionRepository.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionRepository.java">
+      <file leaf-file-name="PrincipalController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/application/view/PrincipalController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1360">
-              <caret line="91" column="0" lean-forward="false" selection-start-line="91" selection-start-column="0" selection-end-line="91" selection-end-column="0" />
+            <state relative-caret-position="171">
+              <caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FacturaCompraRepository.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/application/repository/compra/FacturaCompraRepository.java">
+      <file leaf-file-name="LoginController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/application/view/LoginController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1530">
-              <caret line="100" column="0" lean-forward="false" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
+            <state relative-caret-position="398">
+              <caret line="77" column="25" lean-forward="false" selection-start-line="77" selection-start-column="25" selection-end-line="77" selection-end-column="25" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="EmpleadoRepository.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="361">
+              <caret line="238" column="0" lean-forward="false" selection-start-line="238" selection-start-column="0" selection-end-line="238" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -100,13 +103,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/application/view/venta/CargarCamionController.java" />
-        <option value="$PROJECT_DIR$/src/application/repository/info/CamionRepository.java" />
-        <option value="$PROJECT_DIR$/src/application/view/compra/cruds/StockEditController.java" />
-        <option value="$PROJECT_DIR$/src/application/view/sueldo/SueldoLiquidarSueldo.fxml" />
-        <option value="$PROJECT_DIR$/src/application/view/sueldo/SueldoLiquidarSueldoController.java" />
-        <option value="$PROJECT_DIR$/src/application/model/sueldo/Liquidaciones.java" />
-        <option value="$PROJECT_DIR$/src/application/model/sueldo/LiquidacionEmpleado.java" />
         <option value="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionesRepository.java" />
         <option value="$PROJECT_DIR$/src/application/view/info/cruds/UsuarioEditDialogController.java" />
         <option value="$PROJECT_DIR$/src/application/comunes/Alerta.java" />
@@ -126,7 +122,6 @@
         <option value="$PROJECT_DIR$/src/application/view/info/cruds/EmpleadoEditDialogController.java" />
         <option value="$PROJECT_DIR$/src/application/view/info/AdministrarEmpleadosController.java" />
         <option value="$PROJECT_DIR$/src/application/view/info/DesempleadosController.java" />
-        <option value="$PROJECT_DIR$/src/application/view/PrincipalController.java" />
         <option value="$PROJECT_DIR$/src/application/repository/venta/ViajeRepository.java" />
         <option value="$PROJECT_DIR$/src/application/view/inicio/HomeController.java" />
         <option value="$PROJECT_DIR$/src/application/view/css/theme.css" />
@@ -142,15 +137,23 @@
         <option value="$PROJECT_DIR$/src/application/reports/JasperFX.java" />
         <option value="$PROJECT_DIR$/src/application/view/calculo/cruds/IngenioEditController.java" />
         <option value="$PROJECT_DIR$/src/application/view/calculo/cruds/FincaEditController.java" />
-        <option value="$PROJECT_DIR$/src/application/view/LoginController.java" />
         <option value="$PROJECT_DIR$/src/application/reports/AbstractJasperReports.java" />
-        <option value="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" />
         <option value="$PROJECT_DIR$/src/application/view/venta/cruds/ViajeEditController.java" />
         <option value="$PROJECT_DIR$/src/application/view/RegisterController.java" />
-        <option value="$PROJECT_DIR$/src/application/view/sueldo/LiquidacionesController.java" />
         <option value="$PROJECT_DIR$/src/application/repository/compra/FacturaCompraRepository.java" />
-        <option value="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionRepository.java" />
+        <option value="$PROJECT_DIR$/src/application/model/sueldo/ConceptoSueldo.java" />
+        <option value="$PROJECT_DIR$/src/application/model/sueldo/ConceptoCalculado.java" />
         <option value="$PROJECT_DIR$/src/application/view/sueldo/cruds/LiquidacionSueldoController.java" />
+        <option value="$PROJECT_DIR$/src/application/repository/info/CategoriaEmpleadoRepository.java" />
+        <option value="$PROJECT_DIR$/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java" />
+        <option value="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionRepository.java" />
+        <option value="$PROJECT_DIR$/src/application/view/sueldo/LiquidacionesController.java" />
+        <option value="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java" />
+        <option value="$PROJECT_DIR$/src/application/Main.java" />
+        <option value="$PROJECT_DIR$/src/application/view/PrincipalController.java" />
+        <option value="$PROJECT_DIR$/src/application/view/LoginController.java" />
+        <option value="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" />
+        <option value="$PROJECT_DIR$/src/application/view/sueldo/Liquidaciones.fxml" />
       </list>
     </option>
   </component>
@@ -185,7 +188,28 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView" />
+      <pane id="PackagesPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
+              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
+            </path>
+            <path>
+              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
+              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
+              <item name="application" type="1f31426a:PackageElementNode" />
+            </path>
+            <path>
+              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
+              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
+              <item name="resources" type="1f31426a:PackageElementNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -215,64 +239,8 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
-              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
-            </path>
-            <path>
-              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
-              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
-              <item name="application" type="1f31426a:PackageElementNode" />
-            </path>
-            <path>
-              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
-              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
-              <item name="application" type="1f31426a:PackageElementNode" />
-              <item name="reports" type="1f31426a:PackageElementNode" />
-            </path>
-            <path>
-              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
-              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
-              <item name="application" type="1f31426a:PackageElementNode" />
-              <item name="repository" type="1f31426a:PackageElementNode" />
-            </path>
-            <path>
-              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
-              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
-              <item name="application" type="1f31426a:PackageElementNode" />
-              <item name="repository" type="1f31426a:PackageElementNode" />
-              <item name="compra" type="1f31426a:PackageElementNode" />
-            </path>
-            <path>
-              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
-              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
-              <item name="application" type="1f31426a:PackageElementNode" />
-              <item name="view" type="1f31426a:PackageElementNode" />
-            </path>
-            <path>
-              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
-              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
-              <item name="application" type="1f31426a:PackageElementNode" />
-              <item name="view" type="1f31426a:PackageElementNode" />
-              <item name="sueldo" type="1f31426a:PackageElementNode" />
-            </path>
-            <path>
-              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
-              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
-              <item name="application" type="1f31426a:PackageElementNode" />
-              <item name="view" type="1f31426a:PackageElementNode" />
-              <item name="sueldo" type="1f31426a:PackageElementNode" />
-              <item name="cruds" type="1f31426a:PackageElementNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
       <pane id="Scratches" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -290,8 +258,10 @@
     </force-push-targets>
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="C:\Users\Isa\Documents\GitHub\LogiservStudio\src\resources" />
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="application.repository.info" />
+      <recent name="application.model.info.Familiar" />
+      <recent name="application.comunes" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\Isa\Documents\GitHub\LogiservStudio\src\resources" />
@@ -305,10 +275,8 @@
       <recent name="application.view.venta.cruds" />
       <recent name="application.view.info.cruds" />
     </key>
-    <key name="CreateClassDialog.RecentsKey">
-      <recent name="application.repository.info" />
-      <recent name="application.model.info.Familiar" />
-      <recent name="application.comunes" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\Isa\Documents\GitHub\LogiservStudio\src\resources" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -597,7 +565,35 @@
       <option name="project" value="LOCAL" />
       <updated>1519572233342</updated>
     </task>
-    <option name="localTasksCounter" value="23" />
+    <task id="LOCAL-00023" summary="Cambios en Liquidacion">
+      <created>1519572386910</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1519572386910</updated>
+    </task>
+    <task id="LOCAL-00024" summary="Cambios en Liquidacion">
+      <created>1519678445707</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1519678445707</updated>
+    </task>
+    <task id="LOCAL-00025" summary="Liquidacion actualizada">
+      <created>1519709522010</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1519709522010</updated>
+    </task>
+    <task id="LOCAL-00026" summary="Icono del sistema agregado a ventanas de login y principal, resto de ventanas mas adelante">
+      <created>1519710312225</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1519710312225</updated>
+    </task>
+    <option name="localTasksCounter" value="27" />
     <servers />
   </component>
   <component name="TodoView">
@@ -614,17 +610,18 @@
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4194079" sideWeight="0.50303954" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41935483" sideWeight="0.4969605" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4161184" sideWeight="0.4969605" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.4969605" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28343466" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19756839" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -635,7 +632,6 @@
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978722" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" x="0" y="0" width="588" height="544" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -691,7 +687,10 @@
     <MESSAGE value="mejora en el viewer para javaFX en reportes" />
     <MESSAGE value="optimizacion de imports en todas las clases, funcionalidad de reportes para todos los reportes y reportes de stock funcionales" />
     <MESSAGE value="avances en liquidacion" />
-    <option name="LAST_COMMIT_MESSAGE" value="avances en liquidacion" />
+    <MESSAGE value="Cambios en Liquidacion" />
+    <MESSAGE value="Liquidacion actualizada" />
+    <MESSAGE value="Icono del sistema agregado a ventanas de login y principal, resto de ventanas mas adelante" />
+    <option name="LAST_COMMIT_MESSAGE" value="Icono del sistema agregado a ventanas de login y principal, resto de ventanas mas adelante" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -704,58 +703,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/application/view/venta/cruds/ClienteEdit.fxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-      <provider editor-type-id="JavaFX-Scene-Builder">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/venta/cruds/ClienteEditController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-459">
-          <caret line="35" column="9" lean-forward="false" selection-start-line="35" selection-start-column="9" selection-end-line="35" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/venta/VentaClienteController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="60" column="25" lean-forward="false" selection-start-line="60" selection-start-column="25" selection-end-line="60" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/repository/venta/ClienteRepository.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="407">
-          <caret line="81" column="74" lean-forward="false" selection-start-line="81" selection-start-column="74" selection-end-line="81" selection-end-column="74" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/repository/compra/ProveedorRepository.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="206">
-          <caret line="79" column="62" lean-forward="false" selection-start-line="74" selection-start-column="21" selection-end-line="79" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/model/info/Empleado.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="25" column="16" lean-forward="false" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/compra/cruds/FacturaEditController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="398">
-          <caret line="152" column="44" lean-forward="false" selection-start-line="152" selection-start-column="44" selection-end-line="152" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/info/cruds/EmpleadoEditDialogController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="155">
@@ -785,14 +732,14 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/info/Desempleados.fxml">
+      <provider editor-type-id="JavaFX-Scene-Builder">
+        <state />
+      </provider>
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
-      <provider editor-type-id="JavaFX-Scene-Builder">
-        <state />
-      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/info/DesempleadosController.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -815,13 +762,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/PrincipalController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-34">
-          <caret line="170" column="41" lean-forward="true" selection-start-line="170" selection-start-column="41" selection-end-line="170" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/inicio/HomeController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="373">
@@ -837,14 +777,14 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/calculo/cruds/AcopladoEdit.fxml">
+      <provider editor-type-id="JavaFX-Scene-Builder">
+        <state />
+      </provider>
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
           <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
         </state>
       </provider>
-      <provider editor-type-id="JavaFX-Scene-Builder">
-        <state />
-      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
@@ -918,24 +858,24 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/calculo/InfoIngenio.fxml">
+      <provider editor-type-id="JavaFX-Scene-Builder">
+        <state />
+      </provider>
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/Register.fxml">
       <provider editor-type-id="JavaFX-Scene-Builder">
         <state />
       </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/Register.fxml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
-      <provider editor-type-id="JavaFX-Scene-Builder">
-        <state />
-      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/css/theme.css">
       <provider selected="true" editor-type-id="text-editor">
@@ -965,14 +905,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/LoginController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="71" column="42" lean-forward="false" selection-start-line="71" selection-start-column="42" selection-end-line="71" selection-end-column="42" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/application/reports/JasperFX.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1071">
@@ -994,13 +926,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="132" column="53" lean-forward="true" selection-start-line="132" selection-start-column="53" selection-end-line="132" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/venta/cruds/ViajeEditController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="305">
@@ -1016,17 +941,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionesRepository.java" />
-    <entry file="file://$PROJECT_DIR$/src/application/view/sueldo/Liquidaciones.fxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-765">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-      <provider editor-type-id="JavaFX-Scene-Builder">
-        <state />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/RegisterController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="408">
@@ -1039,40 +953,134 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
           <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/repository/compra/FacturaCompraRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1530">
+          <caret line="100" column="0" lean-forward="false" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/sueldo/LiquidacionesController.java">
+    <entry file="file://$PROJECT_DIR$/src/application/model/sueldo/ConceptoCalculado.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1">
-          <caret line="133" column="0" lean-forward="false" selection-start-line="133" selection-start-column="0" selection-end-line="133" selection-end-column="0" />
+        <state relative-caret-position="458">
+          <caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/model/sueldo/ConceptoSueldo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="113" column="39" lean-forward="false" selection-start-line="113" selection-start-column="38" selection-end-line="113" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="358">
+          <caret line="69" column="76" lean-forward="false" selection-start-line="69" selection-start-column="76" selection-end-line="69" selection-end-column="76" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/model/sueldo/LiquidacionEmpleado.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="561">
+          <caret line="46" column="16" lean-forward="false" selection-start-line="46" selection-start-column="16" selection-end-line="46" selection-end-column="16" />
           <folding>
-            <element signature="imports" expanded="false" />
+            <element signature="e#1251#1252#0" expanded="false" />
+            <element signature="e#1282#1283#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/repository/compra/FacturaCompraRepository.java">
+    <entry file="file://$PROJECT_DIR$/src/application/repository/info/CategoriaEmpleadoRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1530">
-          <caret line="100" column="0" lean-forward="false" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
+        <state relative-caret-position="390">
+          <caret line="100" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="104" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="146" column="44" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="158" selection-end-column="1" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1360">
-          <caret line="91" column="0" lean-forward="false" selection-start-line="91" selection-start-column="0" selection-end-line="91" selection-end-column="0" />
+        <state relative-caret-position="119">
+          <caret line="33" column="47" lean-forward="true" selection-start-line="33" selection-start-column="47" selection-end-line="33" selection-end-column="47" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/sueldo/LiquidacionesController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="48" column="36" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="152" selection-end-column="1" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/sueldo/cruds/LiquidacionSueldoController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="262" column="37" lean-forward="false" selection-start-line="262" selection-start-column="37" selection-end-line="263" selection-end-column="41" />
+        <state relative-caret-position="135">
+          <caret line="426" column="24" lean-forward="true" selection-start-line="426" selection-start-column="24" selection-end-line="426" selection-end-column="24" />
+          <folding>
+            <element signature="e#3674#3675#0" expanded="false" />
+            <element signature="e#3708#3709#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-16">
+          <caret line="38" column="30" lean-forward="false" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="30" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/PrincipalController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/LoginController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="398">
+          <caret line="77" column="25" lean-forward="false" selection-start-line="77" selection-start-column="25" selection-end-line="77" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/sueldo/Liquidaciones.fxml">
+      <provider editor-type-id="JavaFX-Scene-Builder">
+        <state />
+      </provider>
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="261">
+          <caret line="53" column="13" lean-forward="false" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="361">
+          <caret line="238" column="0" lean-forward="false" selection-start-line="238" selection-start-column="0" selection-end-line="238" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/application/repository/info/EmpleadoRepository.java b/src/application/repository/info/EmpleadoRepository.java
index ebfbeba..43ce8ec 100644
--- a/src/application/repository/info/EmpleadoRepository.java
+++ b/src/application/repository/info/EmpleadoRepository.java
@@ -236,29 +236,5 @@ public int getLastID() {
         }
         return lastId;
     }
-  
-		public Empleado getEmpleadoById(int idEmpleado){
-			Empleado empleado = new Empleado();
-			CategoriaEmpleadoRepository categoriaEmpleadoRepository = new CategoriaEmpleadoRepository();
-			try {
-				Connection connection= JDBCConnection.getInstanceConnection();
-				PreparedStatement preparedStatement =connection.prepareStatement("SELECT idEmpleado, CUIT, Nombre," +
-						" Apellido, FechaNacimiento, CATEGORIA_EMPLEADO_idCategoriaEmpleado FROM EMPLEADO WHERE idEmpleado=?;");
-				preparedStatement.setInt(1,idEmpleado);
-				ResultSet resultSet = preparedStatement.executeQuery();
-				while (resultSet.next()){
-					empleado.setIdEmpleado(resultSet.getInt(1));
-					empleado.setCuit(resultSet.getString(2));
-					empleado.setNombre(resultSet.getString(3));
-					empleado.setApellido(resultSet.getString(4));
-					empleado.setNacimiento(resultSet.getString(5));
-					CategoriaEmpleado categoriaEmpleado = new CategoriaEmpleado();
-					categoriaEmpleado = categoriaEmpleadoRepository.search(resultSet.getInt(6));
-					empleado.setCategoriaEmpleado(categoriaEmpleado);
-				}
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}
-			return empleado;
-		}
+
 }
diff --git a/src/application/view/sueldo/Liquidaciones.fxml b/src/application/view/sueldo/Liquidaciones.fxml
index 1fff09a..1e00dc5 100644
--- a/src/application/view/sueldo/Liquidaciones.fxml
+++ b/src/application/view/sueldo/Liquidaciones.fxml
@@ -50,39 +50,6 @@
                   <Button fx:id="imprimirReciboDeEmpleado" mnemonicParsing="false" text="Imprimir recibo sueldo" />
                </children>
             </HBox>
-            <Label text="Empleados Liquidados" GridPane.rowIndex="2" />
-            <ScrollPane prefHeight="92.0" prefWidth="701.0" GridPane.columnSpan="3" GridPane.rowIndex="1">
-               <content>
-                  <TableView fx:id="liquidacionTable" pickOnBounds="false" prefHeight="157.0" prefWidth="677.0">
-                     <columns>
-                        <TableColumn fx:id="idLiquidacion" prefWidth="60.5" resizable="false" text="Nro" />
-                        <TableColumn fx:id="fechaColumn" minWidth="0.0" prefWidth="138.5" text="Fecha" />
-                        <TableColumn fx:id="hrColumn" prefWidth="155.0" text="Haberes Remunerativos" />
-                        <TableColumn fx:id="hnrColumn" maxWidth="330.5" minWidth="-1.0" prefWidth="190.5" text="Haberes No Remunerativos" />
-                        <TableColumn fx:id="retencionesColumn" maxWidth="283.0" minWidth="-1.0" prefWidth="132.5" text="Retenciones" />
-                     </columns>
-                  </TableView>
-               </content>
-            </ScrollPane>
-            <ScrollPane prefHeight="109.0" prefWidth="695.0" GridPane.columnSpan="3" GridPane.rowIndex="3" GridPane.rowSpan="2">
-               <content>
-                  <TableView fx:id="liqEmpleadosTable" prefHeight="164.0" prefWidth="678.0">
-                     <columns>
-                        <TableColumn fx:id="legajoColumn" prefWidth="312.0" text="Legajo" />
-                        <TableColumn fx:id="apellidoColumn" prefWidth="105.0" text="Apellido" />
-                        <TableColumn fx:id="nombreColumn" prefWidth="118.0" text="Nombre" />
-                        <TableColumn fx:id="categoriaColumn" prefWidth="64.0" text="Categoria" />
-                        <TableColumn fx:id="hrEmpleadoColumn" prefWidth="75.0" text="HR" />
-                        <TableColumn fx:id="hnrEmpleadoColumn" prefWidth="75.0" text="HNR" />
-                        <TableColumn fx:id="retencionesEmpleadoColumn" prefWidth="75.0" text="Rentenciones" />
-                     </columns>
-                     <columnResizePolicy>
-                        <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                     </columnResizePolicy>
-                  </TableView>
-               </content>
-            </ScrollPane>
-            <Label text="Liquidaciones" />
          </children>
       </VBox>
    </children>

From c85561474749d7b6278cd170c3d7adeb5eb960f3 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Tue, 27 Feb 2018 20:24:27 -0300
Subject: [PATCH 13/27] viajes sin hardcode y funcional

---
 src/application/reports/ReciboSueldo.jasper   | Bin 35586 -> 0 bytes
 src/application/reports/ReciboSueldo.jrxml    | 103 ++-
 .../calculo/AcopladoRepository.java           |   7 +-
 .../repository/info/EmpleadoRepository.java   |  24 +
 .../venta/FacturaVentaRepository.java         | 342 ++++----
 .../repository/venta/ViajeRepository.java     | 819 +++++++++---------
 .../view/venta/cruds/ViajeEdit.fxml           |  38 +-
 .../view/venta/cruds/ViajeEditController.java |  10 +-
 8 files changed, 684 insertions(+), 659 deletions(-)
 delete mode 100644 src/application/reports/ReciboSueldo.jasper

diff --git a/src/application/reports/ReciboSueldo.jasper b/src/application/reports/ReciboSueldo.jasper
deleted file mode 100644
index 186c870d2084579ea524397bfcf542583df04b66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 35586
zcmeHw33wdEm4DSpw#L#(w&fFyiE%<OwvlWM#x~}V<dH2gIv9-%*nm8eTGHUr%y_0{
z%MNik!m$JgNP-gs;WPoV4p|a{0|^O75|)rG$1d3f2qD=VB!Ps5Y&LrU`+HT@-PJv<
zo^k%)|MUO*e``>6SHC*md-dwotEyKu2i|0p3VF6DW0(zvp@xf+g`APk8@X)WEHoII
z;Z(+GXcr&j;v*CPj{9+lRm51$Kz1~jN*n8vX3}J{V;3d2CmU1Q#vUV|N~Tl0lKpAp
z)EJwtl659Wjh?Zgq13p^>Sf||GBe!RW9CztVI-_o3G*%KWTCK)?Pj6zJUbx>xBg@S
z2*#W7@FKXRjUCb56YX8s)z=e^w>8E3Hb&z;ZC#yxy>08-SfoE|n%U8gWFADe5iRMl
z(M(HrEMvA2CKT(*B?o|-4Lv6{XpU@R(^A8kY~JWjB4^S}Wiy-Dj8vgDolTl8B42AZ
zYZ`e<Sm+rW9ZlwUb{ad7+}Okx*q_cxnIrUVgOMCG@=cjRD_32rkVu(nL*;2>)oEkM
zl!!L7nruF0WWaFL3s6p!kQyEV)>9}VaBKzuOf|dmC>rSJDS<`m6f>K%N~_y3Vq`kA
z)PjkfIU~lZ`;!A(hx1^=pvgWI1MeFPLya!EXq0l%NNmpxqTQxSZmmn@jR8W-WGezQ
zny9HUK9;dFL^ETfC?_Jzk$j-$ue85OCW&vGS$GiW77VjsvPGK%Yif@ZWk^b;4;n+s
zv9#G^?o1mdJGMkdkqp@;4;p4Nl~(A~%2<y@=y9b=kqJ>w{ZKYPnlxLJ17<eA(~)qn
zJT)r%TaRIyY^v-SV`eIienfbOsgsPMWkrXGu{v}PlLW`br<&1ZDx-)sSt+y}u2g2w
zD^<ypGeQs)snaw;+n7v`foCTMQY)IZ%aKmiszO9vxGJF~u~&6Xb);2QwY+py-L{0Q
znraG?+a$?lA*-5^(u*QCv&jXL4hYtVO9_@GA5{g}!v!Uq*%Z?l&83qjmC;zL45_jb
zDhJwnl1Uw3F=d9kZz{%|T$(ZGxcao9Y&^%<@A{#<XX1}bEzU2NPx&#_1HgXzLP=&a
zj0#K2)V!nyWKlFQgoE|&<Pn3E(Iy5p*ON=9%%*fYyTcfau^B=L2>IxEE^ibHLX|8I
zq_;ipqy_(KbNMU=Ff(NoI+8h)olqikx1JpNBYDFd%Vz|u(SXym&KOG-s5ee25YAG<
z6j%&m%{xsR>*{Q<YOZC07>F(-xM0g5M!Xee@;#b1MllquhqgxZ(m&#V2r6S>B$Xb_
z8yS+MSs=^MQkraOAWmSZmipB393)`|4ebr2lp31y`Q%Pw#`vW#%-{D^^79ppx3S7X
zYL`Jm#@LQZ3T=U7Jcoa~^Q<9=Dq=)~ixE@^{i{b=c~&P7AWk=sJWG%SqM56D67guF
zWdmwiUa}VNz@wK%{5sl%ZIg%#`=efj^N^%kkW~#{EDNeZvquufxY?RA(puM;72Gvy
z`?J}tuokw)jO|9cnbjHFp?AedpGb`w&1~uj*pyGFGFuZcTMV<A)jD4Q+Qep|Q<)Ir
zfe|t<y0#nnA@r^oo0-fEjAZj<f;k<AsGWh~+o?u~Qt7c#B!jfiaB>oY<!h*@i!i0W
zt06$D+bhhDu&HYj=og_r$4)>4q6fU0&CtMkkPf2^y?R9{wY<UNa(7bY0<A~cWyOsl
z1AS}2TVISFX{SkKvuQJx^I#NX4#I9dXEjBt&<r8pDm3_5I&GqTgjFqd3<@=p86Z>b
z$N=S}E-$_SaTTx1B~6ekGyuTURn&tJde(`DAkIoL$R0zw=7=DH22w*X21({DBq`nl
zP2r}iEn^zPMjmvD45Ug-HeDlJnARk35aHA=l#xs~rD24V_M@U_$JksSkdnuhf$C1E
z;0^9_l|X9MQD+uanrzLX6ldpCMNUQoXVZg(^kR^kDzt%?)PRcDrV8DIL($QGV{p*0
z5=|9dI<?hEj6l&3kEpZ}`V3oTkg8DMYEp&X46G{1f?zqSsG|4gET&wgY{HmK2sYPH
z9yRx&lEL0-+9$=<GK@hgQk7%TPwH(fN2Nk4F=5Fkhx5tYh{=u*WNUkz`l3im2<E`0
z%s_S!lQUHmeQNbcTRtnNNs5MAE3OD=46ISeMO>Aju%8ZnYNiH?rEhi-K-F<l={h#*
zWqK>J<;P^J$}h^!C5l5Q4;*{7F{`M9&kO3{ZOk_2=0I}E9B<3Crl4cb8G)uEvrvpk
z0s>ptfLS~!7*p89j#N2F)vXg#ENip^5W`s97|m`sNP;MZ(2C70lFJrSG{q!y33K6s
z9P237#wP8c>3JLD<M`VN>7uDDrj%IAuq?Uc4zm$c^epL`nfiPXhT!%TdXCA0TMQFQ
zZ5C<eLTN4&iv;cnAb=^KArPPsr^HyrR%54<*UHiCpy;FMTvO;>3Cxnxt=xgsN=|Cf
zfuIA0BA|k+pa`{3q<ZbqN>w~vXQ8UJjOlu}#&}h^pS@0%z@(UEoASa`Xc>XwW(ZsA
zIIodTIc8$0R+jrtXM`$es8$BNmJ4k$O%n@6VHwIw*-a!%ionXTF-VjpJ7P-Si?t(|
z#A-5CZ%w7x8cd#=FfPszs%<(E^&zr*h2>k?CiQaH$0nW8+IDVVJQ{0Cv~7&`CA#o`
zw<<r-A|*Z6;GxZ@`07q9lSwNYHm)?cg}qM{e{)~OzkhD@ibhN>+F1lPNCBhxaC6Em
zw6mJgtQ{NAUG-AO?JHtyFSzgZ=PIsT-V!H9<!A;m)iL13X#UchPv80S+PB^aG2Y51
zZKw4G=&5N=s?ISCgZV2D+&I7HGp~IjL^Fz}GZ_QPC~dlvu2~vIKU|Q%<i%V5^A9L*
zlT}_$Og$)lx%!XP4F*feA2M)iAg*$uusb<u4L3_kw}{olZgf5t++|6-(o$J=9EnL$
z^k>Ig$b>;vP&cLKV#sHwM(!F~3Us4VB|gcyUIzyJoD0#4oDGSHRX}&<u>5AHsm9u%
zJH=%BqTu6#`Q=VefqJvWC5NLln=5xoS2E4X%N=`$de|})wYW_46(l(2Ob!~=(70sm
zh+%?if!-D$Y$XegT}LUz2c=)inC6pgi7ZOHh(g6`E!A=YBm+%lw{>aB07Z6crIJV=
zP+?tma5_nUp#ITDf3Q17;-#~SjZ;}?%YLkvo)hZa7f}AB0yV~IHK^Pw%b$It<b)7h
zr`0DWMTm8v7S*_98=_9h)tE#Nk=;XW+y)C=PD`LC#L~U%i`Tebj=Vye<X!{Kj+8vq
zV<eX*uieh2Ry8#<+0H{+L-cYN8j*smuW1OgM5++T)~avK1{p5uW5i7M_do~Ol8S_3
z^-YMtENBHKcc+Ut6{s;%a7he<fqFv>Q^m^ylE-qPhY+I0na-|r4ne3Ld%|h2No_2Y
z8pLYvz{pr;E9{JArIrMoQd%ercv?vqo2-oGSSPP$ThxgmPizBd6Xbg5YuretZHQP|
zs~>~-3q&X0s?(N3C8DF}J^O0vth;)}016Ipux@3UI@3X1l;!X*)GWy-E~wdOXgpV8
zvWVQuF#1qKRu=}*!^+h|Jv40_ph=8VB~-sw7m30WC15jbBWxkan~yB@MMfB<Ka=pG
zmlh$m(Z7B1n)oG8T=#<$@?VS`v##YrOT}4ei&QbG=DIB)<<Hu|sDy4ThWcnnnN0%D
zn<&R-9{_kqHC|xhKWbr!CssTITT^r^Yli8X7E0E-de-EQwsq@bQIk#Tj3&C)h+02P
z2oX<hF2mGiVk|9-%h#@$cLG1M^Oegxn{M9I+y0!SPZYgg*>gnPS%RhsS^iN<BZ6H%
zESFFpmg@i)%XNT@<qF_s`7Vv+mhmqbC?zT>5Ffyo8DoU$Fy6TMmO`hPXJQp0-8Yhi
zJ!=&D^2X>GOh1VD_H02fS5;cf@zYV<y;NOU9KZUMhuQi6c-2jJ|GK;84%WQ*ujBY9
zhz=24?Za^i_2IY<aB*A*xHzr=UXEX_b4JM^u>cbQ!p!0LOdpOP?dEtU`&TgiMAY?b
zQ6bf*&*&)bRVLs1@_QAL_kZ)*eD^p0>Df2d?fC1MzK@C)!CoJxOQ;Xib%2ZMI>5zr
z1@JO`Z@EmL<-_#plIhrdz}h&LXbeB$POGML)X5@rl{sbe`O)*fQ~SzWXUx6!{4Xuq
z`bIOl9L+EB4~lSA(6A;Hp|i|eQWdsDI}_2k<i~_+={{;N5$yMAFA4Q&FCE}&FCE}&
zF9q<n*M5ng2nm%PCY#(G?+w)5Vws{mO>)V~Cq9>&GyjGszHrL(k3Q9T$zLbb4-#e~
zc)*8A66(Vw9pGY;4sbC^0lZ9lKx0y%?w;)<)HPD5`}1Q(_6(6_iStx@bZmeq!`5P<
zvUK%z=Y6eXJX81js*mm)ZvKbX7i@7>I8P{fk5la;__hyICDezhI>5zL9pGZB0(hDF
zZH=i)^1|J4`^pYx-F8Er&6zX6l@H)=W?7uMcI{V})$ES#e`QrKKmPtRl|prDoscun
z5IQ1w+J`d|>cbfw;Npx9aB)TfyqtO3!7&#oZgYIZtuB>GL3j3HmzP+n7p3a4tOG~l
z&IC`7#^1uS_<G}~Z`!qT&B{gZe)`7uyN`~(T(-phnD{D!ANlZALVftE16+L70WQ8O
zfS0d7(wRY6gJki~YY@!!;cLxMD&x;odoA}Qu~<k%et>E^ghfN;MI^Bi9vGY1q<(CE
zU}AY}sfnd<p+kDi^~s;DWO}SVm{{$>R8S@jm<o!bZ~W=*H?IBu6(>U{iAkh1OC7%k
zF8ms3R=6~1_|(=vT4_(*Ar^k1Q~R^zXK1@`lv<^rvAD6>od+{&uh)vTbxCcqY@EWC
zs@-Q>N`>zNBEp@?5&qvwL80_sEA1;Ur_bo${@_PmKWAU2_T1JXDX;TTMx|gwrO+x?
z7jtZs>yU!Fn5NX<oVb=ReW&fNt43}-sqe-|_U!reSyRjIVs8`9B6!QEi%F<Y7t;Z*
zE~W!qT}%PIUF<DMlMI8p*i^qRHfR(E@~Iq|etJ2o5^JP%m|6pd{$1Hjz3H(72X1}y
zZ}wii=l82FeYELUHdA*K)4qT?YrJj!hJ>tnqQQZ4Bo+aCx0u5UTFhY=K<BUvpmW#)
zcscy8&KZ;O4^1F&G~@eL*}S>opX-nN)Ccc<_2nPloq6w*9TA&1s<sK)QA6wy!4w~M
zNT?4xbbyN;I>5ya1@N$gPtn;CByiJw1a8tOc2R<cNJrGRgO&eXHal<McJEjI>+84g
z-S_jeF6+Fr>8EA0b1tz{1hakEDWN{>)B!Gb>Hrrz6~N2R+2yixx(_>R;jWbJ8_2@1
zDd%PD_=FPlK_Zy~_NEWX66!;;4semI16(9afIV8zc8%61tE3IVLm9M{2Q-8N|7g&z
z584yj#NfEofi1gcHfIOi5#mN6JC+|XI#Tdb%?#7JE>@F=$lDKtcuC)3;TDJyZ`x2Q
zjpcV|os}3l10@ZUOJ_MHS)O=~8~0{96W}<zEiPq%z@U(xalpszK1;|<xHG>hxLn0v
z-|hKH+s2Ii&eC3nXHzm@RfknG!R=-oN|4^s@ExiXqYb>JO~;oWwA)|7y^^%|(11ln
zoJu+2Cn6fAtejS2;3wP!h*_t>{d;>7XJ2sc1%(_R%%b-AMwJ$295sPdsqMwnOM8Wo
zmyC~Cip@sZZ8(F~C}lIiYLv1WTKlu7Iv2m4v&_b+hhiYQon9wn|4G>f<hetPLi0HS
zdkA7jc}XCgT@rhT1P3gfub#aVcnItBc#sn4*^W&#-7VZv5ioTt$q*JD1869h6*!xd
zKQw)XueG}mxes)}CmpuC)Q9s>Zb(?2A(I`0lTYgKRUtcsqgdwHU@F@n6iP!H3&-#T
zJvJx}{Gf~m_;`+tgF5LQA-p#>Bnu;`byC$!k3Ttk%kvd1)QUaHY;sVZL&2FLa|GQB
z?plN6xiiibv{vj0<4IoJA<)FnFxkv>Y8zZ(a2P6^>7&yMII=|B8T@oNXUD;5&4puK
zb__j1kjqa2C}<&^Mi{>4|1xW+jx+tKY!9HaEg1C@RJ-=X4mX*J05W?#`*$Vinw1)i
zIbso2QgOHmyfA>k3rsi``XNn}YA!{}AK4My;-&4wO(q;>C+w8NAf{+7zC>f{3nYh|
zHh4u%NZU3j9BnO!sHzpdV1;ez1{fWhwkfd*bhxR!IDpEJm~eD(Z5n#Fuu3%N^dVzl
zB-y8_?ZZv(l>y{l0f8+-IH+ko%cO^!w(A3EyUxTxH`k(W5Mgpod${Sj$z(^-IoEXB
z&_&2K^6$fni<p3ykVMP$Bh%q<)3qPgm^H!eD~w^XCXAT7pi{KPD-S_%oy82#84KL=
z<ikzU{r)6<32M<bpD#gFT_!u)pNG#QjpAn3OO;wAF2_z4O9ehgmRNZ^h|b`ysRUlt
zsloqO42#E17S>JQZ<{!{ZDU7t1X&PMJ0*iLLJi}rk#Ju)oaXNLaRtMGg^a6XKMjfU
zAnV^qIglKQ8w08SY>((mm|e;lcfjn@S#4OzB6}7;x#bvZhB*rpmqT&E6sP&bd_^qZ
zREq<}t=T;0ZlgI9U3L?rlT$kjIFOAq8*t3T5#!nF%!im(dzM{%r>UMJm?kS@CT`PM
z?9NE51sUf&TpgSwa3qG7kF<%bdj^R)3!8c9b6!phWaw`3Xm?jU(bv)icZPElQjM(<
zpyPw~d*sP<@*#y6p3L=vDsq-8vb!nX)DeY~L{DEwQ@38Sw8+H#6LU{@?%C~4J>Ahb
zPBIW)J${G<N`ZbENx>JtT2~D^US;2M;zoJ8!^6&KO9D5D=!MFo(PVxCn~c1Gz@2}Z
z%HPp+F39cebhW}nO2guIy~@0<Dbdu|)72YqiR!fnlO%4x=n-pY{wVdd#M`<Pv8W5B
z#vs9Hk2m$>cnxl`uoutVMb|2XV_hvxF&D0KWk85UEQ>>Q%2u~1ovkv)qms<N=H5<t
zBkI)76{fx@!CLB)Yl3bREQTlAI--4>x;kBD)H`L+ndMDzRC4FG<h!*i-qDokYi(*t
zbj8op(Fi<EBCvxVa_;(Y7e7Oh*%E8&>FJAgHLZi2ks5HR$IcS?iIeVPVKaus8YAy6
z<49FTZ#>qwp^3N@_rr66D2iGW3F!z>a&!Z>rPD@U-9q9nb*3t{wJjD!|Lp0C;ldmp
zwZLN=l5X4vL@krXc}RERcAG>yx^adn+M^dd(`geNyGZ+WqM9C3W36q`*g98M?W7Vd
z!nrG*3{uF8OJi@K)>Et2tzuQ)U6j=iH@3wSy-l&UO@~k{R(ex;bBwM;^0H-STTfrx
z`p&L+w6D8qeOo6^ce&MzrXSQvCkrn|R55ZoW!~)^j;+OILdn;<);l0xo(~#lw3=KC
zAljl_jaaX&nQ$#~5SQ&VkSfIa0I>vqg8!PONT-HkdQT4GvJN^8HP1i&SSDpQOjxUc
zI`<&q+M<9`>?@LjlVJx;UXg@z(*dRFcSr@}=Um~0{h@#o#YqjT>Y#);SBe{|#HkEi
zgA`DrOsI}wyUp{6Sm~Vx38D?!(8-w7<x=AYU3L^&sYjN<_)TYrQw1Zxoq&z-%%|r`
zdZH8c$Z9>ZT#uZhM^@;ORaQjYIa01air6M{48f3gtYb;39T<_<I?>_2Xi50k$N~cF
zS*?IGZ)117{>VxDErT`$gSOlg4^A--A(cLdEMNzk*{w#V$DlnvTqK3@Lc1pc=WJ<Y
z##IVnf=GyMs2Q8J6mm9;O$csIp4t<Q!Jb(_r;pQFSjfqAgSKL1&k7neAIPQE;;?cV
z$$j13%gL@EAt@*Q7MF^%ri)w3$y&5ZT23Zy`LUej!RvVClu)!ZR!%1Onv*9-(Be*m
zSk+m&z}?WEWs?SNy~I<tH>GPC0%<W5X=zF<(uK~NRyS;E${Fc&YB0NH>4Jsyzf0Jh
zWO9DG<@g0nJqz6H2_9seEY4KjD;dSp;D#-p3GkK$)vfWaj*>lP=>k`hAU1oFdbqY=
zsjDE13}kYBFGhVq^*I}&@u)jl5FQO%d^U0V{JYeG(_FRt>WT?^<AQ3KsfU6UiAl5@
z$J~2*Ve)kWqZVBEF`UIDOE{=(In7;~hk*^i!;`@W1%C?2LX9?wI-_b=Ym0|;t3jw5
zCyk`h#Um#ngg&~y3-?g=Y2~+AOE69$r|CVTxPb*>#kq>v>rY#(?QERqZ)%}yFww|P
z3>3<ldgv_dM|-S9*o_rEXUAYs3geSSzjo~N$Ms*j|K-g!uYBX-@3dWtr61|-5HM8Q
z-VXi0zWn0PEj_r-8YrtUPzKI9HRn^S5NDX29^|)!D?%{Q92moed{}?Rby=y*0M1|G
zd@ilI6t569vnkjOHv|;!Ia*%jh*8Ep5-m=J>ZEt^#a7r7P<RLj9+*<No`==jUkN)^
zWAJ?>CK5KbS%pzHRp&grEPJ-+J#6}c36i+HC$MIQp~S>}uKsIg`f^sa;GIqpx$a1A
zDr(9&Cy)7~%%UhcRBsR5K=%i73dV_`z?CFoU4y5wq*%ERMfRN6lZbYR6Gnk|Wr^~N
zn!=~V%1&C6kUfc}Z`^14HaBDJkkfau5}+nzi<TcRW_2}~D@OY|dpnvj3k98l3lah^
z7gK$3nk?u35JdiafmsNLS|uOJ&Ocu`*@yZ>?K3)>z>#=gOK&`mQ&Kc>jgtFyi0)!4
zoxNUVPjn@4Cog60DL1!0;|(1$%W7M?V!a)mHq!{-A@~ha{eEbZTXASJCM06T&aSxP
z5Gxjxfo*mHmE{+(Og47JS}+nzhlJLIeBN$XGpYP)giICTIl24-6rR;WDCGhtVM)07
zN`r%CRr!_pV;L^L0E?SS4kVtUl_3U`<yVO@I@H>rB~a0!0^IF<x>sdqZ!AWoKTF-U
zv|94qqU%#)n3m7uO>J`JmK7i9KyB>z%BOmTeO_WGio&?79VHHZo`!XKh{k(f;+E@g
zkM{p$ZpH7e`|^>sS43}?VoaWEVX+bv#>gG$N~ew7bTtN5EWK?jf=BHsgVtTrnDN^0
z<&TI|nfrEWTorS2P@`&?uBQv>QUgVIp;ZRqjEx;Q^NMSt=|(SlSLg;`4@AP$hy};A
z8tufP7hH#8vJVFOe8Nc)*9nbND_f^xxZTR?0wY|#N^m;69J)=mvN$aPkG|R7+oYPi
z5{WL1av0|*PqWG9=$B13!+h`C5Tzp)LdQgJ|MMUAHLbn;yU!i_V$;8!&@zce3#I1N
zrB8CmxJQT}gue9HS=4A!TwJ4Z7`I;at?N3cQ($48)N!tWc+|>ML^)CAmG7H2{^sb!
z*~eW{ds=+B<;muQ($ilQtu7}J%)sfA%2>2DK}7^#R1kWIcr5~-!>$S{dy#%~jtijs
z!@B^wKfDD{EVu542<eAi30-k+(&mX^igR?n#;ZMXS%GJNUP_G>3eH$3c^szG5$+bM
zq%5XibMTVhmfG6H^}FxA|IXXnZ;?z#6@>5mvMN!L&)plLCyBozcwDj(W{NxkZUdh5
z;jhdl0WSXP02hB1z{}sqEmkOeapJlvW(+4U@*I10m{SMlYz1$M`y$cnmB@Q;*?ZOg
zcYpHT&z^trwlz($3oPo&V$KhV2O@aJhdC1J!yFypVvY`QF-HNs%z4Jk9KwDg;fweP
zpXN}Z6@^!q;2mx0IYxIh&_Cx$v8CtyczbW^kvE>Y`>PvPpLNr(7rxehhs|46*Mvg%
z67f|8Klb6Pg!=GR2e|mE16+Jn054yEtTO{{C-$m=`>3_U7rJtqcvBu<?%?gK7JlM^
z(F4r~+BUq}<{Ygn#g|_aUqtW=AHGPa4_|bEi!VCB#TNze^5qvgUxH+<)<@R7PA+;`
zvZBzPs?6enb&;Q@3*Ad)5Kq1+L@9b8w)^4k$Es6nUwW>heNFUF6OEC76!lQXFN=)U
zu;v_KLxXa0Ex%vAMM~u6x0e0n**DuKU4Qv2dw<gtz0DSMR8dmH{)zAq!P`EKDxp4&
zssmh&ssmh&ssP?beOqscphm6pY1CpjQoXcXZo-3Xq4$Yw5!~iOwuJhStpi+S>i`$o
z5?~)>Tj3mJgOL=t3?}9s;x1kBvo2&XlJcW}^*G&4jf?Bi!q~J=w88hHtcix_7cgXL
zuJS6$^aB@#WIEFfb#&zroVI$#;9*EVbRsLEGj~&P3ojOKmDfy>Kh{jz8<y@XMX=&E
zHC%|@ONa4Vk^>{+hz@SQj^GMmaRYt=W;TA1BhaK4rnq$pF=e1rVYJUy_QmlwiM9(E
z9KPl_MZg=%L&#?DPfna%YRl5DBkufE1!}3uk7W{BdEX{U!eZCd;3jLx<a^$K|NS?p
z1#C@HQ6u{Z<?@;%H~#$PjxW4@)!ApickBDFztJ2OLO^R)Q@ouIi^e{FQkL9MmTGSn
zcqyE=&=fyp&^SQ9_+%6s;Vy>j(8X$Pqm-6H<2r0~7P|7o$qar{iu{PxNvVZ)-xg?D
zcIjf9R_Y#flxa|-6#^?=MsO80JhpHZG{1Y!<<qWPF&1KzT5*Omna+(QahddXx{@}=
zLIc=BohNrt>Go*srf2i=4r$s_CmESClppRF$xRm8+)4*QMGOqBI9gn~z`%56+4@hk
z?|kH6-uUvLcZY6xb86_#yEc4XYHUH)`li3PF1@;knkaYzQn8R~6~Vk>J*J?=ddvmT
z^_UBw>oE)9QQsBw>_(B4!a#;cSW8=T*8;hdV{5*f9nD7vcLT4n!*(OC`^OJ`S$>K3
z?~b8)@sE@VPUp=S$Y%=$IG?mQKTHOGaP*IQ(j{0}E{4q3emThv#ZBUZRkk}bv;8HQ
z+mS*CU@s)Jx%t35bN(_poOn%ba?C&L`|mwMC;A)sQB^F&*)h83Y~S*em#;qQ<W;Af
zxO~Ma%lnp}xN^m^RaLB#i%U5s`~fanWWd$J%FPs#%#OBoO`o4*5ijuzPO3m!j&L*>
zXY-s=?X}2G<qFB!GzTi(t+=N0`drSKE{G~h`U!G&q*IK7*zSA2K+BKJ4`_Q@`T=d9
zN6r>Fb-M7h-BMi$yEa8#yjBRi9OpRhk+H@O<?Y(%b}95r;dZKZVW=wcxJPn!R8cjW
zuP7Jy!OIcM!b151b2h&yr|y)<af7*+03U}#KLj)<IgY#F?NT%!K8_<lDV)IQ)0|5<
zYX}^mHSv_El!2mNh~;wPJuGF{rFku&W%aDut#!ayLOf0Y=(Bnbt1{Phj-1VuY25A?
z_Gh=V0;jWV!~@}S!PyK|zJ3t{`j;xv-e^XLv_ARl-E;iXoG4WHqp_(i@+Gl(qq(&J
zUF#UT*q>3GCY%NTD4W(i);8^_kPf>jpKT+M;stBlLY&REp|0&4G?5KZ-9oJAgN62Y
zXE#Dmt*`!bHhC@WZJy3q#iHXka#jhC0i&8#uu~#z1v_a942jhdHi=E9w^JjmO1_;I
zfmI>Coe^PE<XcmORm-=Q2&<8A(FlvkxAhTLE8p58tWLh26=7558!l{_Cf~XuY`T0q
zI|7?t)X@`RGvr%ugw2$1=S0{n`F37}&6aPQBW#X*yCA~m%D27<J3_uCBkV}|HV|R+
z*il505n=P?+i(Qe8;NhJ2<~VTZ(Ad5fqWZ{uw&#~Ho_Llw`~#jLHSmQun)<%u?Ra>
zzU_#x56icm5q6w>`$&W>l5Zc4u;b<1$0BU8e7iJ)`+S!YR+mTE3G(fV2y2jUS4CK(
zeEXXSTPEK=5n;>a+nxv(JC<_%bRt&$<<ABr$p4hHx`D9*e&Z8vw}WkHXwH@`l9n7f
zD>u?<{NU*E8>@lQry}gr>@yt4eNaX>DYF7PnYSdFc5j4z)=t|>{jfkq?2E9Q=yRBg
z*qF>0!t56GGQTmphTY0;uVS}xd9bz7LN&tfV0S`N@v~o?eOT2leio{${~~xypL)FJ
z=BGYYvHhSK+a9G%2-k=oW?z6-u=|xY(udi-=rMAL53?@<Ki8NUW(V*|<&uMXnB5Qc
zr9RoCd6@m3_SG83!|W^0S9|;pvj?58_P`xx4?#7!YPU!1F#9^tNa?4%!|W08TA|?@
zqr>c*P!1Nv<?kP6-*Q0iQ8~;WL-i_`XE+YCCm<UNrj5g4_8o|$`mP4xF#8@9mi0|L
z4iIL455q+Pe1_aG`@U0&Hr9sO4=|)?gKU`n13qXYY!!R1Je!gPLWpmey#P}u*oiUB
z{t4A+gKL=m2ofYSX(MZx{TRK}GpvT$OBe;*6}ZOKFna~8L&w3?&$`1e%wEMe_h=es
zuW@xIHOzhiA#iyfhS@Kv2it>anEe{<>yi`82P@28=kA-#!|Zo7PI}K&huIrq2)C~m
z46{GrgBW?Fb4C?=i;G2_aylUNg19;+%-)7v_>7ie_9wJ^vHL`r{TbxCM#wPx3uv%p
zi#!Ly>_5Q(XH*Qc|3(V;co;Tl;tKCFux3%4k3vBS(Q)#>qtm=qoC8lfy3r`~5dA*c
z4pO{TyaMcU0Lpu%nuqu#jI4YzhFTO4<$4znNB9(84b2F>wvndX=&Fl+YOdlDt1=ug
zzy#b{H45`O49@=t%Lvu%Sst$9)1hb_l%=0^6`ujdimy~D79v2~ELTE##|c{9VqI5y
zkV>2z;YSc%HJ}Th6lv3~RMCQ&!U-W`5FC{&T<CEI##v~1%o3MilOA>l-a=$`h$n0g
z@r1=8p0GE>6V`@!!qyN^SQ_F9J3~BSWr!zi4Dp18A)c@=#1qzqc*3?2PgoY>3A;i(
zVO5AHYzpy&MIoNBC&Uxhgm}W15KmYV;t4xKJYhwMCu|7ugasj<uph(|)`NJ$b`Vck
z4&n*BK|EnKh$n0Y@r1=7p0F3h6V`%w!d4JZSPJ3^J3%~QC5R_%1U$pwFl;-7Cu2>0
zKln@6N4~Q7AX~YZe~qo8U=0OpDL9>iGbw1MU>yam6l|cNoq`wzofLFa5T_tP!A1(s
zrC<{U=TmSY1zRZSr(lqRAqqw)xQK!@1sMu*6yzx|DcDZII0d^XxR`?76kI~VWfXjz
zf-5Pwnu2R6xb^|i$Jr+lJ_O5()^;ml6;6RYSO-gR2DmvFcHn$ifD2*!9S5s#DdccD
zVk=?eoeJyjOxSf%Saj`xcEO5Ez<xUqmfMAp(*dL&LAj%_)v$hz4d-R-V&uLQHrbWn
z^e4dU>%r?AQQA%H6m}b1#rCt+>^}Tt*8M2`t86X%Iy;R$%1&oburt_GsO<-=i9OGn
z*^gKYdl~q0b{)zPEr!xU;%cI4i<cZ^H!NOyklncWgoEsJ4wXb71D=yuH*E5=VP(gW
z2Ns+xf!~WBhE*B9cJY$>n;&MM53$GCUDWbR>hE@<YY@H1iBjVGoapI@{;d-|6VWd@
z(Pl)y>_pcg`hXK{Mf9sqbOWMabE55t9(1BHL?3pdorr$JiFPCUs1uDN`fVqgK=g4Z
zx)ISQo#?rUe%Fa^Li8yodOo60JJAafea4Ayak#w+^AE=0Ny|1vg3gB|T!0q6ke$W)
z@O2AIu_PO3{p>18%3e0e?q&vikPWdX@goT@KyrSL6mPMM*!yfNuVZQae#a<Z$};>^
zmPISUmR7B{QnniV1u*%c!sJ=%Moa3SccO!c{-YBeLi9x^I)dmwJJE{}{fQGzBl@xv
z%^><yCz?a_XHGPa=+B*~iRiyL(d~%-%88C6`Wq*@3(?;?(TfrNy%XK-@U|KALhKoW
zx8vaLPVjaYc>59X_G0k%qu|_bKt2ZEUIN};3f^7@-d+ygejL2L0=&HvJjBF9^_^Q4
z4~g(MRgHfn{jsF}U!CY>h`!@QKaS|XIngT-{dXsNHKPCFM6W^gznrM1dlrh7_)mhC
z>p;u(pydY8@+r{rY0&Z+&~hWNe3!ikjNb><l?=uO>FChsfi=cN{xI*D_eDG(1eE^G
z#ospk?Z)3V_}h!WJMniv{vN^K_we@u{$9o38~A$%c~K<CeZ2H5F&w`i!&l>PJ^p&}
zhdl~hQo;Dg@V5tlH{<WVif{1HroMx`vg01U8t>;-%J&nr_hYp8S@d2Z(@b%`vv-~E
z>|eF-ztX<{WbuP+%|pEEF<#Sg4|`??uf^j#_?UZ$PkoF}L+l~Mwu@K@v3n7_$cEj7
z*u^4N57@Pc4cV~Wh~-6WCSW<lOdHmZ*e)BEKrC&?S`izxW2+Dwv15x7>$hV^A(jy_
zs=W@e-72<}F8P%M&<jxCjC~$Wd>b>_U1+-f5ZimveD|?E>`Q3E``JGB6*S{lA<PF6
z`#O7oeG|?3DE@mKP5K0T8sQ5VCSGLEplN>qA%70d`#k$2zPy7W<Ik8+aP~5<WIsbw
zzsBof_|Ip*;tSYs(d5754Y1Kyvp@2+>>V`ypLjbg<zDt5{9N`fMBqI>1S@qL3|Ny_
z@sIH^zYK=w9$w3@hlO}EujjY&+5A2}hacec_(A?b$kgor6<U9xo#PT(#5AE*FeS8z
zX+o=DN@x+&gjT_n&?=Y`S`|}5t71xMRZI!3iYcK*OcPoW^9n7-q!2{M<R@Y~X$8BK
zpTe%;tJofh(O!NU+lOD(xRW=tyYXX|_d~26;AdgcA;uo%-I(N`&7Ovcy}&oJ7xCki
zuky|8=e!Sd$1M=UL5QJ&`CAH;sf&0e&+w@{3o$G3`4GVce4H=gJ9z{DC|}KY^R*Di
z_55<)&adLV{AzwKzm^X`JcsxV5ZX^6$6g5SXOZe=e7yxidpq9lfY9Czq5T4c_KOhO
zuRv&z{9mE<7ux@iG%f!Ig!WMg?c)&ICm^)ngU~(&p?wBI`vVB=a}e6+A+#?-XnzEu
zeF;MQGKBVL5Zc!uw7-PV{t80-TL|s%Ahdsg(EbrZ`woQmPY~L_KxqF1Li;X+_B~!7
z3i0`&3cesz#g~M_ydf0ft3$PXZD=}QAFAi=q1n7QG>4xXn#Tu1NAaQ10=_MD3^zl^
z@{ff+%r6Tq=6ga*`1PSiesgFUzcq9czb|w$KM-2Y4~Ci`wDT}};5TS-=-GG26u&zV
S<l=2_BDZ77VnA*6=Klw*EmQOW

diff --git a/src/application/reports/ReciboSueldo.jrxml b/src/application/reports/ReciboSueldo.jrxml
index ed40788..98447ef 100644
--- a/src/application/reports/ReciboSueldo.jrxml
+++ b/src/application/reports/ReciboSueldo.jrxml
@@ -17,87 +17,82 @@
 		<defaultValueExpression><![CDATA[0]]></defaultValueExpression>
 	</parameter>
 	<queryString language="SQL">
-		<![CDATA[SELECT modelofinal.liquidacion_empleado.total_bruto,
-	modelofinal.liquidacion_empleado.total_haberes_remunerativos,
-	modelofinal.liquidacion_empleado.importe_neto,
-	modelofinal.liquidacion_empleado.`idLiquidacionEmpleado`,
-	modelofinal.liquidacion_empleado.total_retenciones,
-	modelofinal.liquidacion_empleado.fin_periodo,
-	modelofinal.liquidacion_empleado.total_haberes_no_remunerativos,
-	modelofinal.liquidacion_empleado.fecha_liquidacion,
-	modelofinal.liquidacion_empleado.inicio_periodo,
-	modelofinal.detalle_liquidacion_empleado.monto, 
-	modelofinal.concepto_sueldo.descripcion,
-	modelofinal.concepto_sueldo.tipo_concepto,
-	CONCAT(modelofinal.empleado.`Apellido`, ", ",	modelofinal.empleado.`Nombre`) AS nombreCompleto,
-	modelofinal.empleado.`idEmpleado`,
-	modelofinal.categoria_empleado.`NombreCategoria` 
-FROM modelofinal.liquidacion_empleado,  modelofinal.detalle_liquidacion_empleado,  modelofinal.concepto_sueldo , modelofinal.empleado,   modelofinal.categoria_empleado 
-WHERE  modelofinal.detalle_liquidacion_empleado.`LiquidacionEmpleado_idLiquidacionEmpleado` = modelofinal.liquidacion_empleado.`idLiquidacionEmpleado` 
-AND  modelofinal.detalle_liquidacion_empleado.`CONCEPTO_SUELDO_idCodigoConcepto`=  modelofinal.concepto_sueldo.`idCodigoConcepto` 
-AND  modelofinal.liquidacion_empleado.`EMPLEADO_idEmpleado` = modelofinal.empleado.`idEmpleado` 
-AND   modelofinal.empleado.`CATEGORIA_EMPLEADO_idCategoriaEmpleado` =modelofinal.categoria_empleado.`idCategoriaEmpleado` 
-AND  modelofinal.liquidacion_empleado.`LIQUIDACION_idLIQUIDACION` =$P{idLiquidacion}]]>
+		<![CDATA[SELECT idLiquidacionEmpleado, fecha_liquidacion, importe_neto, total_haberes_remunerativos, 
+	total_haberes_no_remunerativos, total_retenciones, total_bruto, EMPLEADO_idEmpleado, CUIT,
+	CATEGORIA_EMPLEADO_idCategoriaEmpleado, NombreCategoria,
+	 CONCAT(Apellido, ", ", Nombre) AS nombreCompleto, 
+	FechaNacimiento, inicio_periodo, fin_periodo 
+					FROM LIQUIDACION_EMPLEADO 
+					INNER JOIN EMPLEADO
+						ON EMPLEADO_idEmpleado = idEmpleado
+					INNER JOIN CATEGORIA_EMPLEADO
+						ON CATEGORIA_EMPLEADO_idCategoriaEmpleado = idCategoriaEmpleado			 
+					WHERE LIQUIDACION_idLIQUIDACION =$P{idLiquidacion}]]>
 	</queryString>
-	<field name="total_bruto" class="java.lang.Double">
-		<property name="com.jaspersoft.studio.field.label" value="total_bruto"/>
+	<field name="idLiquidacionEmpleado" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="idLiquidacionEmpleado"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
-	<field name="total_haberes_remunerativos" class="java.lang.Double">
-		<property name="com.jaspersoft.studio.field.label" value="total_haberes_remunerativos"/>
+	<field name="fecha_liquidacion" class="java.sql.Date">
+		<property name="com.jaspersoft.studio.field.label" value="fecha_liquidacion"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
 	<field name="importe_neto" class="java.lang.Double">
 		<property name="com.jaspersoft.studio.field.label" value="importe_neto"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
-	<field name="idLiquidacionEmpleado" class="java.lang.Integer">
-		<property name="com.jaspersoft.studio.field.label" value="idLiquidacionEmpleado"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
-	</field>
-	<field name="total_retenciones" class="java.lang.Double">
-		<property name="com.jaspersoft.studio.field.label" value="total_retenciones"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
-	</field>
-	<field name="fin_periodo" class="java.sql.Date">
-		<property name="com.jaspersoft.studio.field.label" value="fin_periodo"/>
+	<field name="total_haberes_remunerativos" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="total_haberes_remunerativos"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
 	<field name="total_haberes_no_remunerativos" class="java.lang.Double">
 		<property name="com.jaspersoft.studio.field.label" value="total_haberes_no_remunerativos"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
-	<field name="fecha_liquidacion" class="java.sql.Date">
-		<property name="com.jaspersoft.studio.field.label" value="fecha_liquidacion"/>
+	<field name="total_retenciones" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="total_retenciones"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
-	<field name="inicio_periodo" class="java.sql.Date">
-		<property name="com.jaspersoft.studio.field.label" value="inicio_periodo"/>
+	<field name="total_bruto" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="total_bruto"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
-	<field name="monto" class="java.lang.Double">
-		<property name="com.jaspersoft.studio.field.label" value="monto"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="detalle_liquidacion_empleado"/>
-	</field>
-	<field name="descripcion" class="java.lang.String">
-		<property name="com.jaspersoft.studio.field.label" value="descripcion"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="concepto_sueldo"/>
-	</field>
-	<field name="tipo_concepto" class="java.lang.String">
-		<property name="com.jaspersoft.studio.field.label" value="tipo_concepto"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="concepto_sueldo"/>
+	<field name="EMPLEADO_idEmpleado" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="EMPLEADO_idEmpleado"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
-	<field name="nombreCompleto" class="java.lang.String">
-		<property name="com.jaspersoft.studio.field.label" value="nombreCompleto"/>
+	<field name="CUIT" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="CUIT"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
 	</field>
-	<field name="idEmpleado" class="java.lang.Integer">
-		<property name="com.jaspersoft.studio.field.label" value="idEmpleado"/>
+	<field name="CATEGORIA_EMPLEADO_idCategoriaEmpleado" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="CATEGORIA_EMPLEADO_idCategoriaEmpleado"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
 	</field>
 	<field name="NombreCategoria" class="java.lang.String">
 		<property name="com.jaspersoft.studio.field.label" value="NombreCategoria"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="categoria_empleado"/>
 	</field>
+	<field name="Nombre" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="Nombre"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
+	</field>
+	<field name="Apellido" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="Apellido"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
+	</field>
+	<field name="FechaNacimiento" class="java.sql.Date">
+		<property name="com.jaspersoft.studio.field.label" value="FechaNacimiento"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
+	</field>
+	<field name="inicio_periodo" class="java.sql.Date">
+		<property name="com.jaspersoft.studio.field.label" value="inicio_periodo"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
+	<field name="fin_periodo" class="java.sql.Date">
+		<property name="com.jaspersoft.studio.field.label" value="fin_periodo"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
diff --git a/src/application/repository/calculo/AcopladoRepository.java b/src/application/repository/calculo/AcopladoRepository.java
index f23832e..9422416 100644
--- a/src/application/repository/calculo/AcopladoRepository.java
+++ b/src/application/repository/calculo/AcopladoRepository.java
@@ -18,11 +18,10 @@ public class AcopladoRepository {
     public void save(Acoplado acoplado){
         try {
             connection= JDBCConnection.getInstanceConnection();
-            preparedStatement = connection.prepareStatement("INSERT INTO ACOPLADO values(?,?,?,?)");
+            preparedStatement = connection.prepareStatement("INSERT INTO ACOPLADO values(?,?,?)");
             preparedStatement.setString(1,null);
             preparedStatement.setString(2, acoplado.getMarca());
             preparedStatement.setString(3, acoplado.getPatente());
-            preparedStatement.setString(4, null);
             preparedStatement.executeUpdate();
             String cuerpoMsj = "Acoplado \n Marca: " + acoplado.getMarca() + "\nPatente: "+acoplado.getPatente() +"\nagregado correctamente.\n";
             Alerta.alertaInfo("Acoplados",cuerpoMsj);
@@ -44,7 +43,7 @@ public void update(Acoplado acoplado){
             preparedStatement.executeUpdate();
             String headerMsj="Actualización: Acoplado actualizado";
             String cuerpoMsj = "Acoplado: \n\tMarca: " + acoplado.getMarca() + "\n\tPatente: " +
-                   acoplado.getPatente()+  "modificado correctamente.";
+                    acoplado.getPatente()+  "modificado correctamente.";
             Alerta.alertaInfo("Acoplados", headerMsj, cuerpoMsj);
         } catch (SQLException e) {
             e.printStackTrace();
@@ -115,4 +114,4 @@ public Acoplado getAcopladoById(int idAcoplado){
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/application/repository/info/EmpleadoRepository.java b/src/application/repository/info/EmpleadoRepository.java
index 43ce8ec..f1e9623 100644
--- a/src/application/repository/info/EmpleadoRepository.java
+++ b/src/application/repository/info/EmpleadoRepository.java
@@ -236,5 +236,29 @@ public int getLastID() {
         }
         return lastId;
     }
+	public ObservableList<Empleado> getConductores(){
+		ObservableList<Empleado> list = FXCollections.observableArrayList();
+		try {
+			Connection connection= JDBCConnection.getInstanceConnection();
+			PreparedStatement preparedStatement=connection.prepareStatement("SELECT idEmpleado, Apellido, Nombre \n" +
+					"\t\tFROM Empleado INNER JOIN categoria_empleado \n" +
+					"\t\t\tON CATEGORIA_EMPLEADO_idCategoriaEmpleado = idCategoriaEmpleado\n" +
+					"\t\tWHERE nombreCategoria like 'conductor'\n" +
+					"\t\t\tAND FechaBaja is null;");
+
+			ResultSet resultSet = preparedStatement.executeQuery();
+			while (resultSet.next()){
+				Empleado empleado = new Empleado();
+				empleado.setIdEmpleado(resultSet.getInt(1));
+				empleado.setApellido(resultSet.getString(2));
+				empleado.setNombre(resultSet.getString(3));
+				list.add(empleado);
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+		return list;
+	}
 
 }
diff --git a/src/application/repository/venta/FacturaVentaRepository.java b/src/application/repository/venta/FacturaVentaRepository.java
index f1e7477..2fcc2e5 100644
--- a/src/application/repository/venta/FacturaVentaRepository.java
+++ b/src/application/repository/venta/FacturaVentaRepository.java
@@ -1,186 +1,186 @@
-	package application.repository.venta;
-
-    import application.comunes.Alerta;
-    import application.comunes.Calculo;
-    import application.database.JDBCConnection;
-    import application.model.venta.Cliente;
-    import application.model.venta.FacturaVenta;
-    import application.model.venta.Organizacion;
-    import application.model.venta.Viaje;
-    import javafx.collections.FXCollections;
-    import javafx.collections.ObservableList;
-
-    import java.sql.Connection;
-    import java.sql.PreparedStatement;
-    import java.sql.ResultSet;
-    import java.sql.SQLException;
-    import java.text.ParseException;
-    import java.text.SimpleDateFormat;
-    import java.util.List;
-
-	public class FacturaVentaRepository {
-		ClienteRepository clienteRepository = new ClienteRepository();
-		OrganizacionRepository organizacionRepository = new OrganizacionRepository();
-	    Connection connection;
-	    PreparedStatement preparedStatement;
-	    ResultSet resultSet;
-	    
-	    public void save(FacturaVenta facturaVenta, int idCliente){
-	        try {
-	            connection= JDBCConnection.getInstanceConnection();
-	            preparedStatement = connection.prepareStatement("INSERT INTO FACTURA_VENTA (NombreEmpre, CUIT, FechaEmision, CLIENTE_idCliente ) "
-	            		+ "values(?,?,?,?)");
-	            preparedStatement.setString(1,facturaVenta.getNombreEmpresa());
-	            preparedStatement.setString(2, facturaVenta.getCuit());
-	            SimpleDateFormat dateFormat  = new SimpleDateFormat("dd/MM/yyyy");
-	            try {
-					preparedStatement.setDate(3, (java.sql.Date) dateFormat.parse(facturaVenta.getFechaEmision()));
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-	            preparedStatement.setInt(4, idCliente);
-	            preparedStatement.executeUpdate();
-	            preparedStatement.close();
-	            String cuerpoMsj = "Factura Venta " + facturaVenta.getIdFacturaVenta()+ " agregada correctamente.\n";
-	            Alerta.alertaInfo("Facturas de Venta",cuerpoMsj);
-	        } catch (SQLException e) {
-	            e.printStackTrace();
-	        }
-
-
-	    }
-	    public void update(FacturaVenta facturaVenta, int idCliente){
-	        try {
-	            connection = JDBCConnection.getInstanceConnection();
-	            preparedStatement= connection.prepareStatement("" +
-	                    "UPDATE CLIENTE " +
-	                    "SET NombreEmpresa=?, CUIT=?, FechaEmision=?, CLIENTE_idCliente=? " + 
-	                    "WHERE idFACTURA_VENTA=?");
-	            preparedStatement.setString(1,facturaVenta.getNombreEmpresa());
-	            preparedStatement.setString(2,facturaVenta.getCuit());
-	            SimpleDateFormat dateFormat  = new SimpleDateFormat("dd/MM/yyyy");
-	            try {
-					preparedStatement.setDate(3, (java.sql.Date) dateFormat.parse(facturaVenta.getFechaEmision()));
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-	            preparedStatement.setInt(4, idCliente);
-	            preparedStatement.setInt(5, facturaVenta.getIdFacturaVenta());
-	            preparedStatement.close();
-	            String headerMsj="Actualización: Factura venta actualizada";
-	            String cuerpoMsj = "Factura Venta: " + facturaVenta.getIdFacturaVenta() + " modificada correctamente.";
-	            Alerta.alertaInfo("Factura Venta", headerMsj, cuerpoMsj);
-	        } catch (SQLException e) {
-	            e.printStackTrace();
-	        }
-	    }
-	    public void delete(FacturaVenta facturaVenta){
-	        try {
-	            connection= JDBCConnection.getInstanceConnection();
-	            preparedStatement = connection.prepareStatement(
-	                    "DELETE FROM FACTURA_VENTA WHERE idFACTURA_VENTA=?");
-	            preparedStatement.setInt(1, facturaVenta.getIdFacturaVenta());
-	            preparedStatement.executeUpdate();
-	            preparedStatement.close();
-	        } catch (SQLException e) {
-	            e.printStackTrace();
-	        }
-	    }
-	    public ObservableList<FacturaVenta> view(){
-
-	        ObservableList<FacturaVenta> list = FXCollections.observableArrayList();
-	        try {
-	            connection= JDBCConnection.getInstanceConnection();
-	            preparedStatement=connection.prepareStatement("SELECT * FROM FACTURA_VENTA INNER JOIN CLIENTE "
-	            		+ "WHERE idCliente = CLIENTE_idCliente");
-	            resultSet = preparedStatement.executeQuery();
-	            while (resultSet.next()){
-	                FacturaVenta facturaVenta = new FacturaVenta();
-	                facturaVenta.setIdFacturaVenta(resultSet.getInt("idFACTURA_VENTA"));
-	                facturaVenta.setFechaEmision(resultSet.getString("FechaEmision"));
-					Cliente cliente = clienteRepository.getClienteById(resultSet.getInt("CLIENTE_idCLIENTE"));
-					facturaVenta.setCliente(cliente);
- 					Organizacion organizacion = organizacionRepository.getOrganizacionById(resultSet.getInt("ORGANIZACION_idORGANIZACION"));
-					facturaVenta.setOrganizacion(organizacion);
-	                list.add(facturaVenta);
-	            }
-	        } catch (SQLException e) {
-	            e.printStackTrace();
-	        }
-
-	        return list;
-	    }
-	    public void search(FacturaVenta facturaVenta){
-	        try {
-	            connection= JDBCConnection.getInstanceConnection();
-	            preparedStatement=connection.prepareStatement("SELECT * FROM FACTURA_VENTA where idFACTURA_VENTA=?");
-	            preparedStatement.setInt(1,facturaVenta.getIdFacturaVenta());
-	            preparedStatement.executeUpdate();
-	            preparedStatement.close();
-	        } catch (SQLException e) {
-	            e.printStackTrace();
-	        }
-
-	    }
-
-		public void emitirFactura(List<Viaje> viajesALiquidar, int idCliente, int idOrg) {//TODO: Escribir este metodo en la clase que corresponda
-			//primero ingresar la factura
-
+package application.repository.venta;
+
+import application.comunes.Alerta;
+import application.comunes.Calculo;
+import application.database.JDBCConnection;
+import application.model.venta.Cliente;
+import application.model.venta.FacturaVenta;
+import application.model.venta.Organizacion;
+import application.model.venta.Viaje;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+public class FacturaVentaRepository {
+	ClienteRepository clienteRepository = new ClienteRepository();
+	OrganizacionRepository organizacionRepository = new OrganizacionRepository();
+	Connection connection;
+	PreparedStatement preparedStatement;
+	ResultSet resultSet;
+
+	public void save(FacturaVenta facturaVenta, int idCliente){
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement = connection.prepareStatement("INSERT INTO FACTURA_VENTA (NombreEmpre, CUIT, FechaEmision, CLIENTE_idCliente ) "
+					+ "values(?,?,?,?)");
+			preparedStatement.setString(1,facturaVenta.getNombreEmpresa());
+			preparedStatement.setString(2, facturaVenta.getCuit());
+			SimpleDateFormat dateFormat  = new SimpleDateFormat("dd/MM/yyyy");
 			try {
-				connection = JDBCConnection.getInstanceConnection();
-				preparedStatement = connection.prepareStatement("INSERT INTO FACTURA_VENTA" +
-						" (FechaEmision,CLIENTE_idCLIENTE,ORGANIZACION_idORGANIZACION) " +
-						"VALUES (curdate(), ?, ?);");
-				preparedStatement.setInt(1, idCliente);
-				preparedStatement.setInt(2, idOrg);
-				preparedStatement.executeUpdate();
-				preparedStatement.close();
-			} catch (SQLException e) {
+				preparedStatement.setDate(3, (java.sql.Date) dateFormat.parse(facturaVenta.getFechaEmision()));
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-
-			//luego obtener el idFactura recientemente ingresado
-			int idFactura = 0;
-
+			preparedStatement.setInt(4, idCliente);
+			preparedStatement.executeUpdate();
+			preparedStatement.close();
+			String cuerpoMsj = "Factura Venta " + facturaVenta.getIdFacturaVenta()+ " agregada correctamente.\n";
+			Alerta.alertaInfo("Facturas de Venta",cuerpoMsj);
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+
+	}
+	public void update(FacturaVenta facturaVenta, int idCliente){
+		try {
+			connection = JDBCConnection.getInstanceConnection();
+			preparedStatement= connection.prepareStatement("" +
+					"UPDATE CLIENTE " +
+					"SET NombreEmpresa=?, CUIT=?, FechaEmision=?, CLIENTE_idCliente=? " +
+					"WHERE idFACTURA_VENTA=?");
+			preparedStatement.setString(1,facturaVenta.getNombreEmpresa());
+			preparedStatement.setString(2,facturaVenta.getCuit());
+			SimpleDateFormat dateFormat  = new SimpleDateFormat("dd/MM/yyyy");
+			try {
+				preparedStatement.setDate(3, (java.sql.Date) dateFormat.parse(facturaVenta.getFechaEmision()));
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			preparedStatement.setInt(4, idCliente);
+			preparedStatement.setInt(5, facturaVenta.getIdFacturaVenta());
+			preparedStatement.close();
+			String headerMsj="Actualización: Factura venta actualizada";
+			String cuerpoMsj = "Factura Venta: " + facturaVenta.getIdFacturaVenta() + " modificada correctamente.";
+			Alerta.alertaInfo("Factura Venta", headerMsj, cuerpoMsj);
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+	}
+	public void delete(FacturaVenta facturaVenta){
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement = connection.prepareStatement(
+					"DELETE FROM FACTURA_VENTA WHERE idFACTURA_VENTA=?");
+			preparedStatement.setInt(1, facturaVenta.getIdFacturaVenta());
+			preparedStatement.executeUpdate();
+			preparedStatement.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+	}
+	public ObservableList<FacturaVenta> view(){
+
+		ObservableList<FacturaVenta> list = FXCollections.observableArrayList();
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement=connection.prepareStatement("SELECT * FROM FACTURA_VENTA INNER JOIN CLIENTE "
+					+ "WHERE idCliente = CLIENTE_idCliente");
+			resultSet = preparedStatement.executeQuery();
+			while (resultSet.next()){
+				FacturaVenta facturaVenta = new FacturaVenta();
+				facturaVenta.setIdFacturaVenta(resultSet.getInt("idFACTURA_VENTA"));
+				facturaVenta.setFechaEmision(resultSet.getString("FechaEmision"));
+				Cliente cliente = clienteRepository.getClienteById(resultSet.getInt("CLIENTE_idCLIENTE"));
+				facturaVenta.setCliente(cliente);
+				Organizacion organizacion = organizacionRepository.getOrganizacionById(resultSet.getInt("ORGANIZACION_idORGANIZACION"));
+				facturaVenta.setOrganizacion(organizacion);
+				list.add(facturaVenta);
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+		return list;
+	}
+	public void search(FacturaVenta facturaVenta){
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement=connection.prepareStatement("SELECT * FROM FACTURA_VENTA where idFACTURA_VENTA=?");
+			preparedStatement.setInt(1,facturaVenta.getIdFacturaVenta());
+			preparedStatement.executeUpdate();
+			preparedStatement.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+	}
+
+	public void emitirFactura(List<Viaje> viajesALiquidar, int idCliente, int idOrg) {//TODO: Escribir este metodo en la clase que corresponda
+		//primero ingresar la factura
+
+		try {
+			connection = JDBCConnection.getInstanceConnection();
+			preparedStatement = connection.prepareStatement("INSERT INTO FACTURA_VENTA" +
+					" (FechaEmision,CLIENTE_idCLIENTE,ORGANIZACION_idORGANIZACION) " +
+					"VALUES (curdate(), ?, ?);");
+			preparedStatement.setInt(1, idCliente);
+			preparedStatement.setInt(2, idOrg);
+			preparedStatement.executeUpdate();
+			preparedStatement.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+		//luego obtener el idFactura recientemente ingresado
+		int idFactura = 0;
+
+		try {
+			connection = JDBCConnection.getInstanceConnection();
+			preparedStatement = connection.prepareStatement("select last_insert_id();");
+			resultSet = preparedStatement.executeQuery();
+			if (resultSet.next()) idFactura = resultSet.getInt(1);
+			preparedStatement.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+		//Ahora a crear por una Linea de Viaje por cada Viaje de la colección
+
+		for (Viaje viajeaLiquidar : viajesALiquidar) {
+			Calculo calculo  = new Calculo();
+			double pesoNeto = calculo.calcularPesoNeto(viajeaLiquidar.getBruto(), viajeaLiquidar.getTara());
+
+			double monto = calculo.calcularMonto(Double.parseDouble(viajeaLiquidar.getDistanciaRecorrida()),pesoNeto,
+					viajeaLiquidar.getIngenio().getTarifa(), viajeaLiquidar.getIngenio().getArranque());
 			try {
 				connection = JDBCConnection.getInstanceConnection();
-				preparedStatement = connection.prepareStatement("select last_insert_id();");
-				resultSet = preparedStatement.executeQuery();
-				if (resultSet.next()) idFactura = resultSet.getInt(1);
+				preparedStatement = connection.prepareStatement("INSERT INTO LINEA_VIAJE (monto," +
+						" FACTURA_VENTA_idFACTURA_VENTA, VIAJE_idRemito) VALUES (?,?,?);");
+				preparedStatement.setDouble(1, monto);
+				preparedStatement.setInt(2, idFactura);
+				preparedStatement.setInt(3, viajeaLiquidar.getIdRemito() );
+				preparedStatement.executeUpdate();
+				//if (resultSet.next()) idFactura = resultSet.getInt(1);
 				preparedStatement.close();
 			} catch (SQLException e) {
 				e.printStackTrace();
 			}
-
-			//Ahora a crear por una Linea de Viaje por cada Viaje de la colección
-
-			for (Viaje viajeaLiquidar : viajesALiquidar) {
-				Calculo calculo  = new Calculo();
-				double pesoNeto = calculo.calcularPesoNeto(viajeaLiquidar.getBruto(), viajeaLiquidar.getTara());
-
-				double monto = calculo.calcularMonto(Double.parseDouble(viajeaLiquidar.getDistanciaRecorrida()),pesoNeto,
-						viajeaLiquidar.getIngenio().getTarifa(), viajeaLiquidar.getIngenio().getArranque());
-				try {
-					connection = JDBCConnection.getInstanceConnection();
-					preparedStatement = connection.prepareStatement("INSERT INTO LINEA_VIAJE (monto," +
-							" FACTURA_VENTA_idFACTURA_VENTA, VIAJE_idRemito) VALUES (?,?,?);");
-					preparedStatement.setDouble(1, monto);
-					preparedStatement.setInt(2, idFactura);
-					preparedStatement.setInt(3, viajeaLiquidar.getIdRemito() );
-					preparedStatement.executeUpdate();
-					//if (resultSet.next()) idFactura = resultSet.getInt(1);
-					preparedStatement.close();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
+		}
 
 
 
-	    }
+	}
 
 
 
-	}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/application/repository/venta/ViajeRepository.java b/src/application/repository/venta/ViajeRepository.java
index 005f107..8b43b5e 100644
--- a/src/application/repository/venta/ViajeRepository.java
+++ b/src/application/repository/venta/ViajeRepository.java
@@ -1,439 +1,442 @@
-	package application.repository.venta;
-
-    import application.comunes.Alerta;
-    import application.database.JDBCConnection;
-    import application.model.calculo.Camion;
-    import application.model.calculo.Finca;
-    import application.model.calculo.Ingenio;
-    import application.model.info.Empleado;
-    import application.model.venta.Viaje;
-    import application.repository.calculo.CamionRepository;
-    import application.repository.calculo.FincaRepository;
-    import application.repository.calculo.IngenioRepository;
-    import application.repository.info.EmpleadoRepository;
-    import javafx.collections.FXCollections;
-    import javafx.collections.ObservableList;
-
-    import java.sql.Connection;
-    import java.sql.PreparedStatement;
-    import java.sql.ResultSet;
-    import java.sql.SQLException;
-    import java.text.DateFormat;
-    import java.text.ParseException;
-    import java.text.SimpleDateFormat;
-
-	public class ViajeRepository {
-	    Connection connection;
-	    PreparedStatement preparedStatement;
-	    ResultSet resultSet;
-	    FincaRepository fincaRepository = new FincaRepository();
-	    IngenioRepository ingenioRepository = new IngenioRepository();
-	    EmpleadoRepository empleadoRepository = new EmpleadoRepository();
-	    CamionRepository camionRepository = new CamionRepository();
-	    
-	    public void save(Viaje viaje, int idOrigenDestino,  int idEmpleado, int idCamion, int idFacturaVenta){
-	        try {
-	            connection= JDBCConnection.getInstanceConnection();
-	            preparedStatement = connection.prepareStatement("INSERT INTO VIAJE (Fecha, HoraEntrada, Bruto, Tara,"
-	            		+ "Origen_Destino_idOrigen_Destino, Empleado_idEmpleado, CAMION_idCamion, FACTURA_VENTA_idFACTURA_VENTA)"
-	            		+ " values(?,?,?,?,?,?,?,?)");
-	            try {
-		            SimpleDateFormat dateFormat  = new SimpleDateFormat("dd/MM/yyyy");
-					preparedStatement.setDate(1, (java.sql.Date) dateFormat.parse(viaje.getFecha()));
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				try {
-				     DateFormat formatter = new SimpleDateFormat("HH:mm");
-			            java.sql.Time horaEntrada;
-					horaEntrada = new java.sql.Time(formatter.parse(viaje.getHoraEntrada()).getTime());
-		            preparedStatement.setTime(2, horaEntrada);
-
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-	            preparedStatement.setDouble(3, viaje.getBruto());
-	            preparedStatement.setDouble(4, viaje.getTara());
-	            preparedStatement.setInt(5, idOrigenDestino);
-	            preparedStatement.setInt(6, idEmpleado);
-	            preparedStatement.setInt(7, idCamion);
-	            preparedStatement.setInt(8, idFacturaVenta);
-	            preparedStatement.executeUpdate();
-	            preparedStatement.close();
-	            String cuerpoMsj = "Provincia " + viaje.getIdRemito()+ " agregado correctamente.\n";
-	            Alerta.alertaInfo("Viajes",cuerpoMsj);
-	        } catch (SQLException e) {
-	            e.printStackTrace();
-	        }
-
-
-	    }
-
-		public void save2(Viaje viaje, int idOrigenDestino){
+package application.repository.venta;
+
+import application.comunes.Alerta;
+import application.comunes.Calculo;
+import application.database.JDBCConnection;
+import application.model.calculo.Camion;
+import application.model.calculo.Finca;
+import application.model.calculo.Ingenio;
+import application.model.info.Empleado;
+import application.model.venta.Viaje;
+import application.repository.calculo.CamionRepository;
+import application.repository.calculo.FincaRepository;
+import application.repository.calculo.IngenioRepository;
+import application.repository.info.EmpleadoRepository;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+public class ViajeRepository {
+	Connection connection;
+	PreparedStatement preparedStatement;
+	ResultSet resultSet;
+	FincaRepository fincaRepository = new FincaRepository();
+	IngenioRepository ingenioRepository = new IngenioRepository();
+	EmpleadoRepository empleadoRepository = new EmpleadoRepository();
+	CamionRepository camionRepository = new CamionRepository();
+
+	public void save(Viaje viaje, int idOrigenDestino,  int idEmpleado, int idCamion, int idFacturaVenta){
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement = connection.prepareStatement("INSERT INTO VIAJE (Fecha, HoraEntrada, Bruto, Tara,"
+					+ "Origen_Destino_idOrigen_Destino, Empleado_idEmpleado, CAMION_idCamion, FACTURA_VENTA_idFACTURA_VENTA)"
+					+ " values(?,?,?,?,?,?,?,?)");
 			try {
-				connection= JDBCConnection.getInstanceConnection();
-				preparedStatement = connection.prepareStatement("INSERT INTO VIAJE (Fecha, HoraEntrada, Bruto, Tara,"
-						+ "Origen_Destino_idOrigen_Destino, Empleado_idEmpleado, CAMION_idCamion)"
-						+ " values(?,?,?,?,?,?,?);");
-				preparedStatement.setString(1, viaje.getFecha());
-				preparedStatement.setString(2, viaje.getHoraEntrada());
-				preparedStatement.setDouble(3, viaje.getBruto());
-				preparedStatement.setDouble(4, viaje.getTara());
-				preparedStatement.setInt(5, idOrigenDestino);
-				preparedStatement.setInt(6, viaje.getConductor().getIdEmpleado());
-				preparedStatement.setInt(7, viaje.getCamion().getId());
-				preparedStatement.executeUpdate();
-				preparedStatement.close();
-				String cuerpoMsj = "Viaje " + viaje.getIdRemito()+ " agregado correctamente.\n";
-				Alerta.alertaInfo("Viajes",cuerpoMsj);
-			} catch (SQLException e) {
+				SimpleDateFormat dateFormat  = new SimpleDateFormat("dd/MM/yyyy");
+				preparedStatement.setDate(1, (java.sql.Date) dateFormat.parse(viaje.getFecha()));
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
+			try {
+				DateFormat formatter = new SimpleDateFormat("HH:mm");
+				java.sql.Time horaEntrada;
+				horaEntrada = new java.sql.Time(formatter.parse(viaje.getHoraEntrada()).getTime());
+				preparedStatement.setTime(2, horaEntrada);
 
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			preparedStatement.setDouble(3, viaje.getBruto());
+			preparedStatement.setDouble(4, viaje.getTara());
+			preparedStatement.setInt(5, idOrigenDestino);
+			preparedStatement.setInt(6, idEmpleado);
+			preparedStatement.setInt(7, idCamion);
+			preparedStatement.setInt(8, idFacturaVenta);
+			preparedStatement.executeUpdate();
+			preparedStatement.close();
+			String cuerpoMsj = "Provincia " + viaje.getIdRemito()+ " agregado correctamente.\n";
+			Alerta.alertaInfo("Viajes",cuerpoMsj);
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+
+	}
 
+	public void save2(Viaje viaje, int idOrigenDestino){
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement = connection.prepareStatement("INSERT INTO VIAJE (Fecha, HoraEntrada, Bruto, Tara,"
+					+ "Origen_Destino_idOrigen_Destino, Empleado_idEmpleado, CAMION_idCamion)"
+					+ " values(?,?,?,?,?,?,?);");
+			preparedStatement.setString(1, viaje.getFecha());
+			preparedStatement.setString(2, viaje.getHoraEntrada());
+			preparedStatement.setDouble(3, viaje.getBruto());
+			preparedStatement.setDouble(4, viaje.getTara());
+			preparedStatement.setInt(5, idOrigenDestino);
+			preparedStatement.setInt(6, viaje.getConductor().getIdEmpleado());
+			preparedStatement.setInt(7, viaje.getCamion().getId());
+			preparedStatement.executeUpdate();
+			preparedStatement.close();
+			String cuerpoMsj = "Viaje " + viaje.getIdRemito()+ " agregado correctamente.\n";
+			Alerta.alertaInfo("Viajes",cuerpoMsj);
+		} catch (SQLException e) {
+			e.printStackTrace();
 		}
 
-		public void update2(Viaje viaje, int idOrigenDestino){
-			try {
-				connection= JDBCConnection.getInstanceConnection();
-				preparedStatement = connection.prepareStatement("UPDATE VIAJE SET Fecha=?, HoraEntrada=?, Bruto=?," +
-						" Tara=?, Origen_Destino_idOrigen_Destino=?, Empleado_idEmpleado=?, CAMION_idCamion=?" +
-						" WHERE idRemito=?;");
-				preparedStatement.setString(1, viaje.getFecha());
-				preparedStatement.setString(2, viaje.getHoraEntrada());
-				preparedStatement.setDouble(3, viaje.getBruto());
-				preparedStatement.setDouble(4, viaje.getTara());
-				preparedStatement.setInt(5, idOrigenDestino);
-				preparedStatement.setInt(6, viaje.getConductor().getIdEmpleado());
-				preparedStatement.setInt(7, viaje.getCamion().getId());
-				preparedStatement.setInt(8,viaje.getIdRemito());
-				System.out.println("UPDATE VIAJE QUERY: " + preparedStatement);
-				preparedStatement.executeUpdate();
-				preparedStatement.close();
-				String cuerpoMsj = "Viaje " + viaje.getIdRemito()+ " agregado correctamente.\n";
-				Alerta.alertaInfo("Viajes",cuerpoMsj);
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}
 
+	}
 
+	public void update2(Viaje viaje, int idOrigenDestino){
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement = connection.prepareStatement("UPDATE VIAJE SET Fecha=?, HoraEntrada=?, Bruto=?," +
+					" Tara=?, Origen_Destino_idOrigen_Destino=?, Empleado_idEmpleado=?, CAMION_idCamion=?" +
+					" WHERE idRemito=?;");
+			preparedStatement.setString(1, viaje.getFecha());
+			preparedStatement.setString(2, viaje.getHoraEntrada());
+			preparedStatement.setDouble(3, viaje.getBruto());
+			preparedStatement.setDouble(4, viaje.getTara());
+			preparedStatement.setInt(5, idOrigenDestino);
+			preparedStatement.setInt(6, viaje.getConductor().getIdEmpleado());
+			preparedStatement.setInt(7, viaje.getCamion().getId());
+			preparedStatement.setInt(8,viaje.getIdRemito());
+			System.out.println("UPDATE VIAJE QUERY: " + preparedStatement);
+			preparedStatement.executeUpdate();
+			preparedStatement.close();
+			String cuerpoMsj = "Viaje " + viaje.getIdRemito()+ " agregado correctamente.\n";
+			Alerta.alertaInfo("Viajes",cuerpoMsj);
+		} catch (SQLException e) {
+			e.printStackTrace();
 		}
-	    public void update(Viaje viaje, int idOrigenDestino,  int idEmpleado, int idCamion, int idFacturaVenta){
-	        try {
-	            connection = JDBCConnection.getInstanceConnection();
-	            preparedStatement = connection.prepareStatement("UPDATE VIAJE SET Fecha=?, HoraEntrada=?, Bruto=?, Tara=?,"
-	            		+ "Origen_Destino_idOrigen_Destino=?, Empleado_idEmpleado=?, CAMION_idCamion=?, FACTURA_VENTA_idFACTURA_VENTA=?"
-	            		+ "WHERE idRemito=?");
-	            try {
-		            SimpleDateFormat dateFormat  = new SimpleDateFormat("dd/MM/yyyy");
-					preparedStatement.setDate(1, (java.sql.Date) dateFormat.parse(viaje.getFecha()));
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				try {
-				     DateFormat formatter = new SimpleDateFormat("HH:mm");
-			            java.sql.Time horaEntrada;
-					horaEntrada = new java.sql.Time(formatter.parse(viaje.getHoraEntrada()).getTime());
-		            preparedStatement.setTime(2, horaEntrada);
-
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-	            preparedStatement.setDouble(3, viaje.getBruto());
-	            preparedStatement.setDouble(4, viaje.getTara());
-	            preparedStatement.setInt(5, idOrigenDestino);
-	            preparedStatement.setInt(6, idEmpleado);
-	            preparedStatement.setInt(7, idCamion);
-	            preparedStatement.setInt(8, idFacturaVenta);
-	            preparedStatement.setInt(9, viaje.getIdRemito());
-	            preparedStatement.close();
-	            String headerMsj="Actualización: Provincia actualizado";
-	            String cuerpoMsj = "Provincia: " + viaje.getIdRemito() + " modificado correctamente.";
-	            Alerta.alertaInfo("Provincia", headerMsj, cuerpoMsj);
-	        } catch (SQLException e) {
-	            e.printStackTrace();
-	        }
-	    }
-	    public void delete(Viaje viaje){
-	        try {
-	            connection= JDBCConnection.getInstanceConnection();
-	            preparedStatement = connection.prepareStatement(
-	                    "DELETE FROM VIAJE WHERE idRemito=?");
-	            preparedStatement.setInt(1, viaje.getIdRemito());
-	            preparedStatement.executeUpdate();
-	            preparedStatement.close();
-	        } catch (SQLException e) {
-	            e.printStackTrace();
-	        }
-	    }
-	    public ObservableList<Viaje> view(){
-
-	        ObservableList<Viaje> list = FXCollections.observableArrayList();
-	        try {
-	            connection= JDBCConnection.getInstanceConnection();
-	            preparedStatement=connection.prepareStatement("SELECT v.idRemito, v.Fecha, v.HoraEntrada, v.Bruto," +
-						" v.Tara, v.Empleado_idEmpleado, v.CAMION_idCamion, od.DistanciaKM, od.FINCA_idFinca, " +
-						"od.INGENIO_idIngenio FROM VIAJE v " +
-						"INNER JOIN ORIGEN_DESTINO od ON Origen_Destino_idOrigen_Destino= od.idOrigen_Destino;");
-	            resultSet = preparedStatement.executeQuery();
-	            while (resultSet.next()){
-	                Viaje viaje = new Viaje();
-	                viaje.setIdRemito(resultSet.getInt("idRemito"));
-	                viaje.setFecha(resultSet.getDate("Fecha").toString());
-	                viaje.setHoraEntrada(resultSet.getTime("HoraEntrada").toString());
-	                viaje.setBruto(resultSet.getDouble("Bruto"));
-	                viaje.setTara(resultSet.getDouble("Tara"));
-	                viaje.setDistanciaRecorrida(resultSet.getString("DistanciaKM"));
-					Finca finca = fincaRepository.getFincaById(resultSet.getInt("FINCA_idFinca"));
-					viaje.setFinca(finca);
-					Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
-					viaje.setIngenio(ingenio);
-					Camion camion = camionRepository.getCamionById(resultSet.getInt("CAMION_idCamion"));
-//					Empleado conductor = empleadoRepository.getEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
-//					viaje.setConductor(conductor);
-					viaje.setCamion(camion);
-	                list.add(viaje);
-	                System.out.printf("Viaje agregado%n" +
-							"idRemito: %s %n" +
-							"Fecha   : %s %n" +
-							"Bruto   : %s %n" +
-							"Tara    : %s %n",
-							viaje.getIdRemito(),
-							viaje.getFecha(),
-							viaje.getBruto(),
-							viaje.getTara());
-	            }
-	        } catch (SQLException e) {
-	            e.printStackTrace();
-	        }
-
-	        return list;
-	    }
-
-		public ObservableList<Viaje> getViajesSinLiquidar(){
-
-			ObservableList<Viaje> list = FXCollections.observableArrayList();
+
+
+	}
+	public void update(Viaje viaje, int idOrigenDestino,  int idEmpleado, int idCamion, int idFacturaVenta){
+		try {
+			connection = JDBCConnection.getInstanceConnection();
+			preparedStatement = connection.prepareStatement("UPDATE VIAJE SET Fecha=?, HoraEntrada=?, Bruto=?, Tara=?,"
+					+ "Origen_Destino_idOrigen_Destino=?, Empleado_idEmpleado=?, CAMION_idCamion=?, FACTURA_VENTA_idFACTURA_VENTA=?"
+					+ "WHERE idRemito=?");
 			try {
-				connection= JDBCConnection.getInstanceConnection();
-				preparedStatement=connection.prepareStatement("SELECT v.idRemito, v.Fecha, v.HoraEntrada, v.Bruto," +
-						" v.Tara, v.Empleado_idEmpleado, v.CAMION_idCamion, od.DistanciaKM, od.FINCA_idFinca, " +
-						"od.INGENIO_idIngenio FROM VIAJE v INNER JOIN ORIGEN_DESTINO od ON " +
-						"Origen_Destino_idOrigen_Destino= od.idOrigen_Destino " +
-						"LEFT JOIN LINEA_VIAJE lv ON v.idRemito = lv.VIAJE_idRemito WHERE lv.idLINEA_VIAJE IS NULL;");
-				resultSet = preparedStatement.executeQuery();
-				while (resultSet.next()){
-					Viaje viaje = new Viaje();
-					viaje.setIdRemito(resultSet.getInt("idRemito"));
-					viaje.setFecha(resultSet.getDate("Fecha").toString());
-					viaje.setHoraEntrada(resultSet.getTime("HoraEntrada").toString());
-					viaje.setBruto(resultSet.getDouble("Bruto"));
-					viaje.setTara(resultSet.getDouble("Tara"));
-					viaje.setDistanciaRecorrida(resultSet.getString("DistanciaKM"));
-					Finca finca = fincaRepository.getFincaById(resultSet.getInt("FINCA_idFinca"));
-					viaje.setFinca(finca);
-					Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
-					viaje.setIngenio(ingenio);
-					Camion camion = camionRepository.getCamionById(resultSet.getInt("CAMION_idCamion"));
-					Empleado conductor = empleadoRepository.buscarEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
-					viaje.setConductor(conductor);
-					viaje.setCamion(camion);
-					list.add(viaje);
-					System.out.printf("Viaje agregado%n" +
-									"idRemito: %s %n" +
-									"Fecha   : %s %n" +
-									"Bruto   : %s %n" +
-									"Tara    : %s %n",
-							viaje.getIdRemito(),
-							viaje.getFecha(),
-							viaje.getBruto(),
-							viaje.getTara());
-				}
-				preparedStatement.close();
-				resultSet.close();
-			} catch (SQLException e) {
+				SimpleDateFormat dateFormat  = new SimpleDateFormat("dd/MM/yyyy");
+				preparedStatement.setDate(1, (java.sql.Date) dateFormat.parse(viaje.getFecha()));
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-
-			return list;
-		}
-	    
-	    public Viaje search(int idViaje){
-	    	Viaje viaje = new Viaje();
-	    	try {
-	            connection= JDBCConnection.getInstanceConnection();
-	            preparedStatement=connection.prepareStatement("SELECT * FROM VIAJE INNER JOIN"
-	            		+ "FROM VIAJE v, ORIGEN_DESTINO o, EMPLEADO e, CAMION c, FACTURA_VENTA f"
-	            		+ "WHERE v.Origen_Destino_idOrigen_Destino = o.idOrigen_Destino"
-	            		+ "AND v.Empleado_idEmpleado = e.idEmpleado"
-	            		+ "AND v.Camion_idCamion = c.idCamion"
-	            		+ "AND v.FACTURA_VENTA_idFactura_VENTA = f.idFactura_Venta"
-	            		+ "AND v.idRemito=?");
-	            preparedStatement.setInt(1,idViaje);
-	            resultSet = preparedStatement.executeQuery();
-	            viaje.setIdRemito(resultSet.getInt("idRemito"));
-	            viaje.setBruto(resultSet.getDouble("Bruto"));
-	            viaje.setCamionNombre(resultSet.getString("Marca") +  " " + resultSet.getString("Modelo") );
-	            viaje.setFecha(resultSet.getString("Fecha"));
-	            viaje.setDistanciaRecorrida(resultSet.getString("DistanciaKM"));
-	            
-	        } catch (SQLException e) {
-	            e.printStackTrace();
-	        }	
-	    	return viaje;
-	    }
-
-	    public ObservableList<Viaje> getViajesByIdFactura(int idFactura){
-	    	ObservableList<Viaje> list = FXCollections.observableArrayList();
-
 			try {
-				connection= JDBCConnection.getInstanceConnection();
-				preparedStatement=connection.prepareStatement("SELECT lv.monto, lv.FACTURA_VENTA_idFACTURA_VENTA, lv.VIAJE_idRemito," +
-						" v.idRemito, v.Fecha, v.HoraEntrada, v.Bruto, v.Tara, v.Empleado_idEmpleado, v.CAMION_idCamion," +
-						" od.DistanciaKM, od.FINCA_idFinca, od.INGENIO_idIngenio" +
-						" FROM LINEA_VIAJE lv" +
-						" INNER JOIN VIAJE v ON v.idRemito = lv.VIAJE_idRemito" +
-						" INNER JOIN ORIGEN_DESTINO od ON od.idOrigen_Destino = v.Origen_Destino_idOrigen_Destino" +
-						" INNER JOIN FACTURA_VENTA fv ON fv.idFACTURA_VENTA = lv.FACTURA_VENTA_idFACTURA_VENTA" +
-						" WHERE fv.idFACTURA_VENTA = ?;");
-				preparedStatement.setInt(1 ,idFactura);
-				resultSet = preparedStatement.executeQuery();
-				while (resultSet.next()){
-					Viaje viaje = new Viaje();
-					viaje.setIdRemito(resultSet.getInt("idRemito"));
-					viaje.setFecha(resultSet.getDate("Fecha").toString());
-					viaje.setHoraEntrada(resultSet.getTime("HoraEntrada").toString());
-					viaje.setBruto(resultSet.getDouble("Bruto"));
-					viaje.setTara(resultSet.getDouble("Tara"));
-					viaje.setDistanciaRecorrida(resultSet.getString("DistanciaKM"));
-					viaje.setMonto(resultSet.getDouble("monto"));
-					Finca finca = fincaRepository.getFincaById(resultSet.getInt("FINCA_idFinca"));
-					viaje.setFinca(finca);
-					Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
-					viaje.setIngenio(ingenio);
-					Camion camion = camionRepository.getCamionById(resultSet.getInt("CAMION_idCamion"));
-//					Empleado conductor = empleadoRepository.getEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
-//					viaje.setConductor(conductor);
-					viaje.setCamion(camion);
-					list.add(viaje);
-					System.out.printf("Viaje agregado%n" +
-									"idRemito: %s %n" +
-									"Fecha   : %s %n" +
-									"Bruto   : %s %n" +
-									"Tara    : %s %n",
-							viaje.getIdRemito(),
-							viaje.getFecha(),
-							viaje.getBruto(),
-							viaje.getTara());
-				}
-			} catch (SQLException e) {
+				DateFormat formatter = new SimpleDateFormat("HH:mm");
+				java.sql.Time horaEntrada;
+				horaEntrada = new java.sql.Time(formatter.parse(viaje.getHoraEntrada()).getTime());
+				preparedStatement.setTime(2, horaEntrada);
+
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
+			preparedStatement.setDouble(3, viaje.getBruto());
+			preparedStatement.setDouble(4, viaje.getTara());
+			preparedStatement.setInt(5, idOrigenDestino);
+			preparedStatement.setInt(6, idEmpleado);
+			preparedStatement.setInt(7, idCamion);
+			preparedStatement.setInt(8, idFacturaVenta);
+			preparedStatement.setInt(9, viaje.getIdRemito());
+			preparedStatement.close();
+			String headerMsj="Actualización: Provincia actualizado";
+			String cuerpoMsj = "Provincia: " + viaje.getIdRemito() + " modificado correctamente.";
+			Alerta.alertaInfo("Provincia", headerMsj, cuerpoMsj);
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+	}
+	public void delete(Viaje viaje){
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement = connection.prepareStatement(
+					"DELETE FROM VIAJE WHERE idRemito=?");
+			preparedStatement.setInt(1, viaje.getIdRemito());
+			preparedStatement.executeUpdate();
+			preparedStatement.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+	}
+	public ObservableList<Viaje> view(){
 
-			return list;
+		ObservableList<Viaje> list = FXCollections.observableArrayList();
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement=connection.prepareStatement("SELECT v.idRemito, v.Fecha, v.HoraEntrada, v.Bruto," +
+					" v.Tara, v.Empleado_idEmpleado, v.CAMION_idCamion, od.DistanciaKM, od.FINCA_idFinca, " +
+					"od.INGENIO_idIngenio FROM VIAJE v " +
+					"INNER JOIN ORIGEN_DESTINO od ON Origen_Destino_idOrigen_Destino= od.idOrigen_Destino;");
+			resultSet = preparedStatement.executeQuery();
+			while (resultSet.next()){
+				Viaje viaje = new Viaje();
+				viaje.setIdRemito(resultSet.getInt("idRemito"));
+				viaje.setFecha(resultSet.getDate("Fecha").toString());
+				viaje.setHoraEntrada(resultSet.getTime("HoraEntrada").toString());
+				viaje.setBruto(resultSet.getDouble("Bruto"));
+				viaje.setTara(resultSet.getDouble("Tara"));
+				viaje.setDistanciaRecorrida(resultSet.getString("DistanciaKM"));
+				Finca finca = fincaRepository.getFincaById(resultSet.getInt("FINCA_idFinca"));
+				viaje.setFinca(finca);
+				Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
+				viaje.setIngenio(ingenio);
+				Camion camion = camionRepository.getCamionById(resultSet.getInt("CAMION_idCamion"));
+				Empleado conductor = empleadoRepository.getEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
+				viaje.setConductor(conductor);
+				viaje.setCamion(camion);
+				list.add(viaje);
+				System.out.printf("Viaje agregado%n" +
+								"idRemito: %s %n" +
+								"Fecha   : %s %n" +
+								"Bruto   : %s %n" +
+								"Tara    : %s %n",
+						viaje.getIdRemito(),
+						viaje.getFecha(),
+						viaje.getBruto(),
+						viaje.getTara());
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
 		}
 
-		public ObservableList<Viaje> getViajesByIdIngenio(int idIngenio){
-			ObservableList<Viaje> list = FXCollections.observableArrayList();
+		return list;
+	}
 
-			try {
-				connection= JDBCConnection.getInstanceConnection();
-				preparedStatement=connection.prepareStatement("SELECT v.idRemito, v.Fecha, v.HoraEntrada, v.Bruto, v.Tara," +
-						" od.DistanciaKM, v.Origen_Destino_idOrigen_Destino, v.Empleado_idEmpleado, v.CAMION_idCamion, " +
-						"od.FINCA_idFinca, od.INGENIO_idIngenio FROM VIAJE v INNER JOIN ORIGEN_DESTINO od ON od.idOrigen_Destino = " +
-						"v.Origen_Destino_idOrigen_Destino WHERE od.INGENIO_idIngenio = ?;");
-				preparedStatement.setInt(1 ,idIngenio);
-				resultSet = preparedStatement.executeQuery();
-				while (resultSet.next()){
-					Viaje viaje = new Viaje();
-					viaje.setIdRemito(resultSet.getInt("idRemito"));
-					viaje.setFecha(resultSet.getDate("Fecha").toString());
-					viaje.setHoraEntrada(resultSet.getTime("HoraEntrada").toString());
-					viaje.setBruto(resultSet.getDouble("Bruto"));
-					viaje.setTara(resultSet.getDouble("Tara"));
-					viaje.setDistanciaRecorrida(resultSet.getString("DistanciaKM"));
-					Finca finca = fincaRepository.getFincaById(resultSet.getInt("FINCA_idFinca"));
-					viaje.setFinca(finca);
-					Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
-					viaje.setIngenio(ingenio);
-					Camion camion = camionRepository.getCamionById(resultSet.getInt("CAMION_idCamion"));
-					Empleado conductor = empleadoRepository.buscarEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
-					viaje.setConductor(conductor);
-					viaje.setCamion(camion);
-					list.add(viaje);
-					System.out.printf("Viaje agregado%n" +
-									"idRemito: %s %n" +
-									"Fecha   : %s %n" +
-									"Bruto   : %s %n" +
-									"Tara    : %s %n",
-							viaje.getIdRemito(),
-							viaje.getFecha(),
-							viaje.getBruto(),
-							viaje.getTara());
-				}
-			} catch (SQLException e) {
-				e.printStackTrace();
+	public ObservableList<Viaje> getViajesSinLiquidar(){
+
+		ObservableList<Viaje> list = FXCollections.observableArrayList();
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement=connection.prepareStatement("SELECT v.idRemito, v.Fecha, v.HoraEntrada, v.Bruto," +
+					" v.Tara, v.Empleado_idEmpleado, v.CAMION_idCamion, od.DistanciaKM, od.FINCA_idFinca, " +
+					"od.INGENIO_idIngenio FROM VIAJE v INNER JOIN ORIGEN_DESTINO od ON " +
+					"Origen_Destino_idOrigen_Destino= od.idOrigen_Destino " +
+					"LEFT JOIN LINEA_VIAJE lv ON v.idRemito = lv.VIAJE_idRemito WHERE lv.idLINEA_VIAJE IS NULL;");
+			resultSet = preparedStatement.executeQuery();
+			while (resultSet.next()){
+				Viaje viaje = new Viaje();
+				viaje.setIdRemito(resultSet.getInt("idRemito"));
+				viaje.setFecha(resultSet.getDate("Fecha").toString());
+				viaje.setHoraEntrada(resultSet.getTime("HoraEntrada").toString());
+				viaje.setBruto(resultSet.getDouble("Bruto"));
+				viaje.setTara(resultSet.getDouble("Tara"));
+				viaje.setDistanciaRecorrida(resultSet.getString("DistanciaKM"));
+				Finca finca = fincaRepository.getFincaById(resultSet.getInt("FINCA_idFinca"));
+				viaje.setFinca(finca);
+				Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
+				viaje.setIngenio(ingenio);
+				Camion camion = camionRepository.getCamionById(resultSet.getInt("CAMION_idCamion"));
+				Empleado conductor = empleadoRepository.getEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
+				viaje.setConductor(conductor);
+				viaje.setCamion(camion);
+				list.add(viaje);
+				System.out.printf("Viaje agregado%n" +
+								"idRemito: %s %n" +
+								"Fecha   : %s %n" +
+								"Bruto   : %s %n" +
+								"Tara    : %s %n",
+						viaje.getIdRemito(),
+						viaje.getFecha(),
+						viaje.getBruto(),
+						viaje.getTara());
 			}
+			preparedStatement.close();
+			resultSet.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
 
-			return list;
+		return list;
+	}
+
+	public Viaje search(int idViaje){
+		Viaje viaje = new Viaje();
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement=connection.prepareStatement("SELECT * FROM VIAJE INNER JOIN"
+					+ "FROM VIAJE v, ORIGEN_DESTINO o, EMPLEADO e, CAMION c, FACTURA_VENTA f"
+					+ "WHERE v.Origen_Destino_idOrigen_Destino = o.idOrigen_Destino"
+					+ "AND v.Empleado_idEmpleado = e.idEmpleado"
+					+ "AND v.Camion_idCamion = c.idCamion"
+					+ "AND v.FACTURA_VENTA_idFactura_VENTA = f.idFactura_Venta"
+					+ "AND v.idRemito=?");
+			preparedStatement.setInt(1,idViaje);
+			resultSet = preparedStatement.executeQuery();
+			viaje.setIdRemito(resultSet.getInt("idRemito"));
+			viaje.setBruto(resultSet.getDouble("Bruto"));
+			viaje.setCamionNombre(resultSet.getString("Marca") +  " " + resultSet.getString("Modelo") );
+			viaje.setFecha(resultSet.getString("Fecha"));
+			viaje.setDistanciaRecorrida(resultSet.getString("DistanciaKM"));
+
+		} catch (SQLException e) {
+			e.printStackTrace();
 		}
+		return viaje;
+	}
 
-		/**
-		 * Devuelve una lista de todos lo viajes de un determinado Ingenio
-		 * que no han sido liquidados en alguna facturación
-		 *
-		 * @param idIngenio Identificador del Ingenio
-		 * @return Devuelve una Lista de Viajes de ese Ingenio que no fueron liquidados
-		 */
+	public ObservableList<Viaje> getViajesByIdFactura(int idFactura){
+		ObservableList<Viaje> list = FXCollections.observableArrayList();
 
-		public ObservableList<Viaje> getViajesSinLiqByIngenioId(int idIngenio){
-			ObservableList<Viaje> list = FXCollections.observableArrayList();
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement=connection.prepareStatement("SELECT lv.monto, lv.FACTURA_VENTA_idFACTURA_VENTA, lv.VIAJE_idRemito," +
+					" v.idRemito, v.Fecha, v.HoraEntrada, v.Bruto, v.Tara, v.Empleado_idEmpleado, v.CAMION_idCamion," +
+					" od.DistanciaKM, od.FINCA_idFinca, od.INGENIO_idIngenio" +
+					" FROM LINEA_VIAJE lv" +
+					" INNER JOIN VIAJE v ON v.idRemito = lv.VIAJE_idRemito" +
+					" INNER JOIN ORIGEN_DESTINO od ON od.idOrigen_Destino = v.Origen_Destino_idOrigen_Destino" +
+					" INNER JOIN FACTURA_VENTA fv ON fv.idFACTURA_VENTA = lv.FACTURA_VENTA_idFACTURA_VENTA" +
+					" WHERE fv.idFACTURA_VENTA = ?;");
+			preparedStatement.setInt(1 ,idFactura);
+			resultSet = preparedStatement.executeQuery();
+			while (resultSet.next()){
+				Viaje viaje = new Viaje();
+				viaje.setIdRemito(resultSet.getInt("idRemito"));
+				viaje.setFecha(resultSet.getDate("Fecha").toString());
+				viaje.setHoraEntrada(resultSet.getTime("HoraEntrada").toString());
+				viaje.setBruto(resultSet.getDouble("Bruto"));
+				viaje.setTara(resultSet.getDouble("Tara"));
+				viaje.setDistanciaRecorrida(resultSet.getString("DistanciaKM"));
+				viaje.setMonto(resultSet.getDouble("monto"));
+				Finca finca = fincaRepository.getFincaById(resultSet.getInt("FINCA_idFinca"));
+				viaje.setFinca(finca);
+				Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
+				viaje.setIngenio(ingenio);
+				Camion camion = camionRepository.getCamionById(resultSet.getInt("CAMION_idCamion"));
+				Empleado conductor = empleadoRepository.getEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
+				viaje.setConductor(conductor);
+				viaje.setCamion(camion);
+				list.add(viaje);
+				System.out.printf("Viaje agregado%n" +
+								"idRemito: %s %n" +
+								"Fecha   : %s %n" +
+								"Bruto   : %s %n" +
+								"Tara    : %s %n",
+						viaje.getIdRemito(),
+						viaje.getFecha(),
+						viaje.getBruto(),
+						viaje.getTara());
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
 
-			try {
-				connection= JDBCConnection.getInstanceConnection();
-				preparedStatement=connection.prepareStatement("SELECT v.idRemito, v.Fecha, v.HoraEntrada, v.Bruto," +
-						" v.Tara, od.DistanciaKM, v.Origen_Destino_idOrigen_Destino, v.Empleado_idEmpleado, " +
-						"v.CAMION_idCamion, od.FINCA_idFinca, od.INGENIO_idIngenio FROM VIAJE v " +
-						"INNER JOIN ORIGEN_DESTINO od ON od.idOrigen_Destino = v.Origen_Destino_idOrigen_Destino " +
-						"LEFT JOIN LINEA_VIAJE lv ON v.idRemito = lv.VIAJE_idRemito " +
-						"WHERE lv.idLINEA_VIAJE IS NULL AND od.INGENIO_idIngenio = ?;");
-				preparedStatement.setInt(1 ,idIngenio);
-				resultSet = preparedStatement.executeQuery();
-				while (resultSet.next()){
-					Viaje viaje = new Viaje();
-					viaje.setIdRemito(resultSet.getInt("idRemito"));
-					viaje.setFecha(resultSet.getDate("Fecha").toString());
-					viaje.setHoraEntrada(resultSet.getTime("HoraEntrada").toString());
-					viaje.setBruto(resultSet.getDouble("Bruto"));
-					viaje.setTara(resultSet.getDouble("Tara"));
-					viaje.setDistanciaRecorrida(resultSet.getString("DistanciaKM"));
-					Finca finca = fincaRepository.getFincaById(resultSet.getInt("FINCA_idFinca"));
-					viaje.setFinca(finca);
-					Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
-					viaje.setIngenio(ingenio);
-					Camion camion = camionRepository.getCamionById(resultSet.getInt("CAMION_idCamion"));
-					Empleado conductor = empleadoRepository.buscarEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
-					viaje.setConductor(conductor);
-					viaje.setCamion(camion);
-					list.add(viaje);
-					System.out.printf("Viaje agregado%n" +
-									"idRemito: %s %n" +
-									"Fecha   : %s %n" +
-									"Bruto   : %s %n" +
-									"Tara    : %s %n",
-							viaje.getIdRemito(),
-							viaje.getFecha(),
-							viaje.getBruto(),
-							viaje.getTara());
-				}
-			} catch (SQLException e) {
-				e.printStackTrace();
+		return list;
+	}
+
+	public ObservableList<Viaje> getViajesByIdIngenio(int idIngenio){
+		ObservableList<Viaje> list = FXCollections.observableArrayList();
+
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement=connection.prepareStatement("SELECT v.idRemito, v.Fecha, v.HoraEntrada, v.Bruto, v.Tara," +
+					" od.DistanciaKM, v.Origen_Destino_idOrigen_Destino, v.Empleado_idEmpleado, v.CAMION_idCamion, " +
+					"od.FINCA_idFinca, od.INGENIO_idIngenio FROM VIAJE v INNER JOIN ORIGEN_DESTINO od ON od.idOrigen_Destino = " +
+					"v.Origen_Destino_idOrigen_Destino WHERE od.INGENIO_idIngenio = ?;");
+			preparedStatement.setInt(1 ,idIngenio);
+			resultSet = preparedStatement.executeQuery();
+			while (resultSet.next()){
+				Viaje viaje = new Viaje();
+				viaje.setIdRemito(resultSet.getInt("idRemito"));
+				viaje.setFecha(resultSet.getDate("Fecha").toString());
+				viaje.setHoraEntrada(resultSet.getTime("HoraEntrada").toString());
+				viaje.setBruto(resultSet.getDouble("Bruto"));
+				viaje.setTara(resultSet.getDouble("Tara"));
+				viaje.setDistanciaRecorrida(resultSet.getString("DistanciaKM"));
+				Finca finca = fincaRepository.getFincaById(resultSet.getInt("FINCA_idFinca"));
+				viaje.setFinca(finca);
+				Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
+				viaje.setIngenio(ingenio);
+				Camion camion = camionRepository.getCamionById(resultSet.getInt("CAMION_idCamion"));
+				Empleado conductor = empleadoRepository.getEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
+				viaje.setConductor(conductor);
+				viaje.setCamion(camion);
+				list.add(viaje);
+				System.out.printf("Viaje agregado%n" +
+								"idRemito: %s %n" +
+								"Fecha   : %s %n" +
+								"Bruto   : %s %n" +
+								"Tara    : %s %n",
+						viaje.getIdRemito(),
+						viaje.getFecha(),
+						viaje.getBruto(),
+						viaje.getTara());
 			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
 
-			return list;
+		return list;
+	}
+
+	/**
+	 * Devuelve una lista de todos lo viajes de un determinado Ingenio
+	 * que no han sido liquidados en alguna facturación
+	 *
+	 * @param idIngenio Identificador del Ingenio
+	 * @return Devuelve una Lista de Viajes de ese Ingenio que no fueron liquidados
+	 */
+
+	public ObservableList<Viaje> getViajesSinLiqByIngenioId(int idIngenio){
+		ObservableList<Viaje> list = FXCollections.observableArrayList();
+
+		try {
+			connection= JDBCConnection.getInstanceConnection();
+			preparedStatement=connection.prepareStatement("SELECT v.idRemito, v.Fecha, v.HoraEntrada, v.Bruto," +
+					" v.Tara, od.DistanciaKM, v.Origen_Destino_idOrigen_Destino, v.Empleado_idEmpleado, " +
+					"v.CAMION_idCamion, od.FINCA_idFinca, od.INGENIO_idIngenio FROM VIAJE v " +
+					"INNER JOIN ORIGEN_DESTINO od ON od.idOrigen_Destino = v.Origen_Destino_idOrigen_Destino " +
+					"LEFT JOIN LINEA_VIAJE lv ON v.idRemito = lv.VIAJE_idRemito " +
+					"WHERE lv.idLINEA_VIAJE IS NULL AND od.INGENIO_idIngenio = ?;");
+			preparedStatement.setInt(1 ,idIngenio);
+			resultSet = preparedStatement.executeQuery();
+			while (resultSet.next()){
+				Viaje viaje = new Viaje();
+				viaje.setIdRemito(resultSet.getInt("idRemito"));
+				viaje.setFecha(resultSet.getDate("Fecha").toString());
+				viaje.setHoraEntrada(resultSet.getTime("HoraEntrada").toString());
+				viaje.setBruto(resultSet.getDouble("Bruto"));
+				viaje.setTara(resultSet.getDouble("Tara"));
+				viaje.setDistanciaRecorrida(resultSet.getString("DistanciaKM"));
+				Finca finca = fincaRepository.getFincaById(resultSet.getInt("FINCA_idFinca"));
+				viaje.setFinca(finca);
+				Ingenio ingenio = ingenioRepository.getIngenioById(resultSet.getInt("INGENIO_idIngenio"));
+				viaje.setIngenio(ingenio);
+				Camion camion = camionRepository.getCamionById(resultSet.getInt("CAMION_idCamion"));
+				Empleado conductor = empleadoRepository.getEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
+				viaje.setConductor(conductor);
+				viaje.setCamion(camion);
+				list.add(viaje);
+				System.out.printf("Viaje agregado%n" +
+								"idRemito: %s %n" +
+								"Fecha   : %s %n" +
+								"Bruto   : %s %n" +
+								"Tara    : %s %n",
+						viaje.getIdRemito(),
+						viaje.getFecha(),
+						viaje.getBruto(),
+						viaje.getTara());
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
 		}
 
+		return list;
 	}
+
+}
\ No newline at end of file
diff --git a/src/application/view/venta/cruds/ViajeEdit.fxml b/src/application/view/venta/cruds/ViajeEdit.fxml
index 4f5da28..88bf701 100644
--- a/src/application/view/venta/cruds/ViajeEdit.fxml
+++ b/src/application/view/venta/cruds/ViajeEdit.fxml
@@ -1,24 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
+
 <AnchorPane prefHeight="440.0" prefWidth="674.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.cruds.ViajeEditController">
    <children>
       <Pane prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
             <VBox prefHeight="440.0" prefWidth="674.0">
                <children>
-                  <HBox alignment="CENTER_LEFT" prefHeight="56.0" prefWidth="600.0">
+                  <HBox alignment="CENTER_LEFT" prefHeight="56.0" prefWidth="600.0" spacing="20.0">
                      <children>
-                        <Label text="Día:" textAlignment="CENTER" />
-                        <DatePicker fx:id="diaPicker" />
-                        <Label text="Hora" />
-                        <ComboBox fx:id="horaCombo" prefHeight="27.0" prefWidth="95.0" />
-                        <Label text=" : " />
-                        <ComboBox fx:id="minutosCombo" prefHeight="27.0" prefWidth="94.0" />
+                        <Label alignment="CENTER_RIGHT" prefHeight="17.0" prefWidth="43.0" text="Día:" textAlignment="CENTER" />
+                        <DatePicker fx:id="diaPicker" promptText="dd/mm/aaaa" />
+                        <Label alignment="CENTER_RIGHT" contentDisplay="RIGHT" prefHeight="17.0" prefWidth="43.0" text="Hora" />
+                        <HBox alignment="CENTER" prefHeight="56.0" prefWidth="172.0" spacing="10.0">
+                           <children>
+                              <ComboBox fx:id="horaCombo" prefHeight="27.0" prefWidth="66.0" />
+                              <Label alignment="CENTER" prefHeight="17.0" prefWidth="19.0" text=" : " />
+                              <ComboBox fx:id="minutosCombo" prefHeight="27.0" prefWidth="65.0" />
+                           </children>
+                        </HBox>
                      </children>
                   </HBox>
-                  <HBox alignment="CENTER_LEFT" prefHeight="36.0" prefWidth="600.0">
+                  <HBox alignment="CENTER" prefHeight="36.0" prefWidth="600.0" spacing="20.0">
                      <children>
                         <Label text="Peso Bruto:" />
                         <TextField fx:id="brutoTextField" onDragDetected="#setPesoNetoLabel" onInputMethodTextChanged="#setPesoNetoLabel" prefHeight="27.0" prefWidth="142.0" />
@@ -28,13 +34,13 @@
                         <Label fx:id="pesoNetoLabel" disable="true" text="\$PESO_NETO" />
                      </children>
                   </HBox>
-                  <HBox prefHeight="194.0" prefWidth="600.0">
+                  <HBox prefHeight="214.0" prefWidth="674.0">
                      <children>
-                        <VBox prefHeight="194.0" prefWidth="692.0">
+                        <VBox prefHeight="196.0" prefWidth="674.0">
                            <children>
                               <HBox prefHeight="239.0" prefWidth="674.0">
                                  <children>
-                                    <VBox prefHeight="167.0" prefWidth="334.0">
+                                    <VBox prefHeight="167.0" prefWidth="334.0" spacing="10.0">
                                        <children>
                                           <Label text="Origen:" />
                                           <TableView fx:id="origenTable" prefHeight="200.0" prefWidth="200.0">
@@ -48,7 +54,7 @@
                                        </children>
                                     </VBox>
                                     <Separator orientation="VERTICAL" prefHeight="154.0" prefWidth="23.0" />
-                                    <VBox prefHeight="167.0" prefWidth="351.0">
+                                    <VBox prefHeight="167.0" prefWidth="351.0" spacing="10.0">
                                        <children>
                                           <Label text="Destino:" />
                                           <TableView fx:id="destinoTable" prefHeight="200.0" prefWidth="200.0">
@@ -65,7 +71,7 @@
                                     </VBox>
                                  </children>
                               </HBox>
-                              <HBox alignment="CENTER" prefHeight="4.0" prefWidth="674.0">
+                              <HBox alignment="CENTER" prefHeight="34.0" prefWidth="674.0" spacing="20.0">
                                  <children>
                                     <Label alignment="CENTER" contentDisplay="CENTER" text="Distancia:" />
                                     <Label fx:id="distanciaLabel" alignment="CENTER" disable="true" text="0" />
@@ -75,7 +81,7 @@
                         </VBox>
                      </children>
                   </HBox>
-                  <HBox alignment="CENTER" prefHeight="42.0" prefWidth="674.0">
+                  <HBox alignment="CENTER" prefHeight="42.0" prefWidth="674.0" spacing="10.0">
                      <children>
                         <Label text="Conductor:" />
                         <ComboBox fx:id="conductorCombo" prefHeight="27.0" prefWidth="210.0" />
@@ -83,13 +89,13 @@
                         <ComboBox fx:id="camionCombo" prefHeight="27.0" prefWidth="306.0" />
                      </children>
                   </HBox>
-                  <HBox alignment="CENTER" prefHeight="38.0" prefWidth="674.0">
+                  <HBox alignment="CENTER" prefHeight="38.0" prefWidth="674.0" spacing="20.0">
                      <children>
                         <Label text="Precio del Viaje: " />
                         <Label fx:id="montoLabel" disable="true" text="\$PRECIO_VIAJE" />
                      </children>
                   </HBox>
-                  <HBox alignment="CENTER" prefHeight="53.0" prefWidth="674.0">
+                  <HBox alignment="CENTER" prefHeight="53.0" prefWidth="674.0" spacing="20.0">
                      <children>
                         <Button defaultButton="true" mnemonicParsing="false" onAction="#handleOk" text="Guardar Viaje" />
                         <Button cancelButton="true" mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
diff --git a/src/application/view/venta/cruds/ViajeEditController.java b/src/application/view/venta/cruds/ViajeEditController.java
index fb475fb..800cdff 100644
--- a/src/application/view/venta/cruds/ViajeEditController.java
+++ b/src/application/view/venta/cruds/ViajeEditController.java
@@ -50,7 +50,7 @@ public class ViajeEditController {
     @FXML
     private TextField brutoTextField;
     @FXML
-    private ComboBox<String> conductorCombo;
+    private ComboBox<Empleado> conductorCombo;
     @FXML
     private ComboBox<String> camionCombo;
     @FXML
@@ -77,7 +77,7 @@ public class ViajeEditController {
     private ObservableList<Empleado> conductorData = FXCollections.observableArrayList();
     private ObservableList<Camion> camionData = FXCollections.observableArrayList();
 
-    List<Empleado> conductoresList = conductorRepository.getEmpleadosByCategoriaEmpleado(2);// todo Hardcodeado
+    List<Empleado> conductoresList = conductorRepository.getConductores();
     List<Finca> fincasList = fincaRepository.view();
     List<Ingenio> ingeniosList = ingenioRepository.view();
     List<Camion> camionList = camionRepository.view();
@@ -140,10 +140,8 @@ public void setIngenioTabla(){
 
 
     public void setConductorComboBox(){
-        ObservableList<String> conList = FXCollections.observableArrayList();
-        conductorData = conductorRepository.getEmpleadosByCategoriaEmpleado(2);//TODO no hardcodear esto
-        for (Empleado conductor : conductoresList) conList.add(conductor.getNombre() + " " + conductor.getApellido());
-        conductorCombo.setItems(conList);
+        conductorData = conductorRepository.getConductores();
+        conductorCombo.setItems(conductorData);
     }
 
     private void setCamionComboBox(){

From 7dd28c9b01e4eee8e7eecd2bd778be53bef45db4 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Thu, 1 Mar 2018 12:35:23 -0300
Subject: [PATCH 14/27] reportes de recibo de sueldos por empleado

---
 .settings/org.eclipse.core.resources.prefs    |   3 +
 .../reports/DatosOrganizacion.jasper          | Bin 24933 -> 25007 bytes
 .../reports/DatosOrganizacion.jrxml           |  26 +-
 .../reports/DetalleLiquidacion.jasper         | Bin 0 -> 22116 bytes
 .../reports/DetalleLiquidacion.jrxml          |  71 +++++
 src/application/reports/ReciboSueldo.jasper   | Bin 0 -> 34490 bytes
 src/application/reports/ReciboSueldo.jrxml    | 252 +++++++++---------
 .../{ => classes}/AbstractJasperReports.java  |   3 +-
 .../reports/{ => classes}/JasperFX.java       |   2 +-
 .../reports/{ => classes}/Page.java           |   2 +-
 .../reports/{ => classes}/ReportExporter.java |   2 +-
 .../reports/{ => classes}/ZoomConverter.java  |   2 +-
 .../view/compra/ControlStockController.java   |   2 +-
 .../view/sueldo/Liquidaciones.fxml            |   2 +-
 .../view/sueldo/LiquidacionesController.java  |  17 +-
 15 files changed, 228 insertions(+), 156 deletions(-)
 create mode 100644 src/application/reports/DetalleLiquidacion.jasper
 create mode 100644 src/application/reports/DetalleLiquidacion.jrxml
 create mode 100644 src/application/reports/ReciboSueldo.jasper
 rename src/application/reports/{ => classes}/AbstractJasperReports.java (95%)
 rename src/application/reports/{ => classes}/JasperFX.java (99%)
 rename src/application/reports/{ => classes}/Page.java (98%)
 rename src/application/reports/{ => classes}/ReportExporter.java (98%)
 rename src/application/reports/{ => classes}/ZoomConverter.java (93%)

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 5c7671a..6db0041 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,6 @@
 eclipse.preferences.version=1
 encoding//src/application/reports/ControlStock.jrxml=UTF-8
 encoding//src/application/reports/DatosOrganizacion.jrxml=UTF-8
+encoding//src/application/reports/DetalleLiquidacion.jrxml=UTF-8
+encoding//src/application/reports/ReciboSueldo.jrxml=UTF-8
+encoding//target/classes/application/reports/DatosOrganizacion.jrxml=UTF-8
diff --git a/src/application/reports/DatosOrganizacion.jasper b/src/application/reports/DatosOrganizacion.jasper
index 5ada3d27db82ae60524c7cc89e98a425ccf0ff3f..0849388f8297c4331d7020eef975592ff462209d 100644
GIT binary patch
delta 1032
zcmZ|LF-XHe6oBEoY6FEr7nPz=5!{QlCILZBZM7|mDAd74ba9Qkw>VhZL99GML<F%*
zKtW5^4x+dhad8wXh~QpO#N_TGcjlVmahIRuKJM)v-#p;kNligd2%)-dXbBvOB4nDy
z9i+oie8fK2uY$eKPIY$>(fUCd?Nb(W>GVPda#NOq!p^55_(~n%YuKM&4Q`_%uE47?
zTxz&WGAwh~T^}R#v1vNbUue*9*e#rN3#XD`(x08N69U+Ry;KZef;E$;&LQHwgR-&4
zjE^pbjHbj$tHj6$!N>=}$b!$<WX6kBfg0n)_zcxq&-mgR$!JN8v`UP85R7~fj4b$!
zEoQ8zm#EPo#&;-ZJmaTpB%>`c(ke0XK``<`FtXq?w!M3tWB0g1jNee5r^Z+*fE^?m
zxZ_8%>PHHJM+$*QdO<|?6miG9$ZSCgyO=QiWTVS;DLI)B!pVFPPNu=$$_?U(uItHh
XZA?wBCni)~vupX<!2g#J-%x)6bJbcP

delta 958
zcmZwDze@sP7{KxO6+EaQ2g5-m37pGc=}C}jSDv>7r412;{RL+^yEX;I6NE)HIaE-_
zjSi7DMhZe$Qy>vYEiDc$-TS_Gah|Wk!^?eNd_KH45BQ^jYjbe{=MX{@S}GpKBN9TY
zTHZk-9L`K>XX2F;UL_Y?&YuYQNxwD<N^&1xKqt9AUM`|C-YX&JYBnS1U|RAAYUC3g
zRdtt~j}Yo@tNQOh)SxK26?T!`IUc^lLWL7lmQKz8tirQ2iO=C@K@sr1F7#319kfy#
z_?n^~$!<F892Bb*#f}`5H4LDPU`N#rR4<(u@Vkx*QdAq-izcc=P;@joC{`(o9XTj#
z7(f}pj%pgHZ)ruq4IP!Hs847unW!&<qNB?}u}V?w$U#}d0Lln<RM&i|W&NdIbkrI}
z{X#oKQL;aPbd-Y(+#g2K;6PB6-3q%nj56-9U`3h1j_R8)CFcWUWIGvnle3*wvR!0H
u&UR}U*v^7>oAqK>G#H8mLt-Ma6^q6qv)Y?-;BnhNhD#_61+Nb(1<xNtqeEu^

diff --git a/src/application/reports/DatosOrganizacion.jrxml b/src/application/reports/DatosOrganizacion.jrxml
index 3b800b2..d093c3c 100644
--- a/src/application/reports/DatosOrganizacion.jrxml
+++ b/src/application/reports/DatosOrganizacion.jrxml
@@ -54,55 +54,55 @@
 			<frame>
 				<reportElement stretchType="ElementGroupBottom" mode="Opaque" x="-20" y="-20" width="595" height="140" backcolor="#006699" uuid="2a464480-7866-4aa1-87e4-1d953cafb4a8"/>
 				<textField isStretchWithOverflow="true">
-					<reportElement x="20" y="0" width="340" height="90" forecolor="#FFFFFF" uuid="589cd6be-6cb4-4c58-b067-af24da0f1d3d">
+					<reportElement x="192" y="25" width="210" height="90" forecolor="#FFFFFF" uuid="589cd6be-6cb4-4c58-b067-af24da0f1d3d">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="9ef7ebef-557c-4eb9-a6f6-fd203f3d15a3"/>
 					</reportElement>
-					<textElement textAlignment="Left">
-						<font size="49"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font size="38"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{Nombre}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement x="460" y="10" width="125" height="21" forecolor="#FFFFFF" uuid="9755d5f7-e87c-46db-8343-e9203adca05d">
+					<reportElement x="12" y="9" width="125" height="21" forecolor="#FFFFFF" uuid="9755d5f7-e87c-46db-8343-e9203adca05d">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="6f8b35ff-2a96-4fab-af23-7689e034e597"/>
 					</reportElement>
-					<textElement textAlignment="Right">
+					<textElement textAlignment="Left">
 						<font size="14"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{CUIT}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement x="449" y="28" width="136" height="20" forecolor="#FFFFFF" uuid="77557b0f-7e91-4d03-90b7-237331a28b22">
+					<reportElement x="12" y="27" width="136" height="20" forecolor="#FFFFFF" uuid="77557b0f-7e91-4d03-90b7-237331a28b22">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="bdf93edd-7fd2-421a-aa9e-7b2094197432"/>
 					</reportElement>
-					<textElement textAlignment="Right">
+					<textElement textAlignment="Left">
 						<font size="13"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{nombreApoderado}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement x="480" y="48" width="105" height="20" forecolor="#FFFFFF" uuid="08257133-8d42-471a-a0b1-da9b19f17140">
+					<reportElement x="12" y="47" width="105" height="20" forecolor="#FFFFFF" uuid="08257133-8d42-471a-a0b1-da9b19f17140">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="dfc5f143-78c5-43d8-a2c2-8359c8b3a532"/>
 					</reportElement>
-					<textElement textAlignment="Right">
+					<textElement textAlignment="Left">
 						<font size="12"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{direccion}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement x="450" y="66" width="134" height="20" forecolor="#FFFFFF" uuid="60dddd26-5924-402b-9b4d-4f0f33510b83">
+					<reportElement x="12" y="65" width="134" height="20" forecolor="#FFFFFF" uuid="60dddd26-5924-402b-9b4d-4f0f33510b83">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="3c6ce040-c370-40bb-bc7b-9f575e076019"/>
 					</reportElement>
-					<textElement textAlignment="Right">
+					<textElement textAlignment="Left">
 						<font size="11"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{NombreLocalidad}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement x="470" y="83" width="115" height="20" forecolor="#FFFFFF" uuid="8b3f0a29-5d29-4e17-bdd9-11333b877f80">
+					<reportElement x="12" y="82" width="115" height="20" forecolor="#FFFFFF" uuid="8b3f0a29-5d29-4e17-bdd9-11333b877f80">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="a798d107-c3e5-44ca-9357-93a4547a34af"/>
 					</reportElement>
-					<textElement textAlignment="Right">
+					<textElement textAlignment="Left">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{NombreProvincia}]]></textFieldExpression>
diff --git a/src/application/reports/DetalleLiquidacion.jasper b/src/application/reports/DetalleLiquidacion.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..ebfbf4cfd0ceb17b7faf4d64f91573c68603a159
GIT binary patch
literal 22116
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

literal 0
HcmV?d00001

diff --git a/src/application/reports/DetalleLiquidacion.jrxml b/src/application/reports/DetalleLiquidacion.jrxml
new file mode 100644
index 0000000..bc38d99
--- /dev/null
+++ b/src/application/reports/DetalleLiquidacion.jrxml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="DetalleLiquidacion" pageWidth="420" pageHeight="595" columnWidth="380" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="08046d24-05bc-4814-a3c6-f8d749bba0cf">
+	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="logiserv"/>
+	<property name="com.jaspersoft.studio.unit." value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
+	<parameter name="idLiquidacion" class="java.lang.Integer"/>
+	<queryString language="SQL">
+		<![CDATA[SELECT detail.cantidad AS factor, detail.monto, concept.descripcion, concept.tipo_concepto
+	FROM LIQUIDACION_EMPLEADO 
+		INNER JOIN DETALLE_LIQUIDACION_EMPLEADO AS detail 
+			ON idLiquidacionEmpleado=LiquidacionEmpleado_idLiquidacionEmpleado
+		INNER JOIN CONCEPTO_SUELDO AS concept
+			ON idCodigoConcepto=CONCEPTO_SUELDO_idCodigoConcepto
+		WHERE idLiquidacionEmpleado=$P{idLiquidacion}]]>
+	</queryString>
+	<field name="factor" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="factor"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="detalle_liquidacion_empleado"/>
+	</field>
+	<field name="monto" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="monto"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="detalle_liquidacion_empleado"/>
+	</field>
+	<field name="descripcion" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="descripcion"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="concepto_sueldo"/>
+	</field>
+	<field name="tipo_concepto" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="tipo_concepto"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="concepto_sueldo"/>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<detail>
+		<band height="20" splitType="Stretch">
+			<frame>
+				<reportElement x="0" y="0" width="380" height="20" uuid="75020ffa-85f6-4406-8eec-03c6310d5b03"/>
+				<textField>
+					<reportElement x="0" y="3" width="140" height="17" uuid="8c0174d6-e6ed-4a7f-a10b-39e55a2ec548"/>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA[$F{descripcion}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="166" y="3" width="100" height="17" uuid="452f061a-57c2-4c1c-866f-9bbe0f7831dd"/>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA[$F{monto}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="270" y="3" width="100" height="17" uuid="e5fdffcf-d122-42a7-adf4-289c63740113"/>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA[$F{tipo_concepto}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="145" y="2" width="21" height="19" uuid="6885f6e0-9a4e-4910-87fc-a434773363f2"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle"/>
+					<text><![CDATA[$]]></text>
+				</staticText>
+			</frame>
+		</band>
+	</detail>
+</jasperReport>
diff --git a/src/application/reports/ReciboSueldo.jasper b/src/application/reports/ReciboSueldo.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..610231c113a2987c55d7f6388dd6c0626b32fd7f
GIT binary patch
literal 34490
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
R>$kR&yI=tsR2#ne{|D@<%HIG0

literal 0
HcmV?d00001

diff --git a/src/application/reports/ReciboSueldo.jrxml b/src/application/reports/ReciboSueldo.jrxml
index 98447ef..4e9eed5 100644
--- a/src/application/reports/ReciboSueldo.jrxml
+++ b/src/application/reports/ReciboSueldo.jrxml
@@ -12,33 +12,47 @@
 	<property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
-	<parameter name="idLiquidacion" class="java.lang.Integer">
-		<parameterDescription><![CDATA[idLiquidacion]]></parameterDescription>
-		<defaultValueExpression><![CDATA[0]]></defaultValueExpression>
-	</parameter>
+	<parameter name="idLiquidacion" class="java.lang.Integer"/>
 	<queryString language="SQL">
-		<![CDATA[SELECT idLiquidacionEmpleado, fecha_liquidacion, importe_neto, total_haberes_remunerativos, 
-	total_haberes_no_remunerativos, total_retenciones, total_bruto, EMPLEADO_idEmpleado, CUIT,
-	CATEGORIA_EMPLEADO_idCategoriaEmpleado, NombreCategoria,
-	 CONCAT(Apellido, ", ", Nombre) AS nombreCompleto, 
-	FechaNacimiento, inicio_periodo, fin_periodo 
-					FROM LIQUIDACION_EMPLEADO 
-					INNER JOIN EMPLEADO
-						ON EMPLEADO_idEmpleado = idEmpleado
-					INNER JOIN CATEGORIA_EMPLEADO
-						ON CATEGORIA_EMPLEADO_idCategoriaEmpleado = idCategoriaEmpleado			 
-					WHERE LIQUIDACION_idLIQUIDACION =$P{idLiquidacion}]]>
+		<![CDATA[SELECT CONCAT(emp.Apellido, ", ", emp.Nombre) AS nombreCompleto, emp.idEmpleado, emp.cuit, emp.FechaAlta,
+    cat.NombreCategoria, liq.fecha_liquidacion,liq.total_bruto, liq.importe_neto AS neto, liq.total_haberes_remunerativos,
+	liq.total_haberes_no_remunerativos, liq.total_retenciones, liq.inicio_periodo, liq.fin_periodo, liq.idLiquidacionEmpleado
+	FROM LIQUIDACION_EMPLEADO AS liq
+		INNER JOIN EMPLEADO AS emp
+			ON idEmpleado=EMPLEADO_idEmpleado
+		INNER JOIN CATEGORIA_EMPLEADO AS cat
+			ON idCategoriaEmpleado=CATEGORIA_EMPLEADO_idCategoriaEmpleado
+		WHERE idLiquidacionEmpleado=$P{idLiquidacion}]]>
 	</queryString>
-	<field name="idLiquidacionEmpleado" class="java.lang.Integer">
-		<property name="com.jaspersoft.studio.field.label" value="idLiquidacionEmpleado"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	<field name="nombreCompleto" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="nombreCompleto"/>
+	</field>
+	<field name="idEmpleado" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="idEmpleado"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
+	</field>
+	<field name="cuit" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="cuit"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
+	</field>
+	<field name="FechaAlta" class="java.sql.Date">
+		<property name="com.jaspersoft.studio.field.label" value="FechaAlta"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
+	</field>
+	<field name="NombreCategoria" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="NombreCategoria"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="categoria_empleado"/>
 	</field>
 	<field name="fecha_liquidacion" class="java.sql.Date">
 		<property name="com.jaspersoft.studio.field.label" value="fecha_liquidacion"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
-	<field name="importe_neto" class="java.lang.Double">
-		<property name="com.jaspersoft.studio.field.label" value="importe_neto"/>
+	<field name="total_bruto" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="total_bruto"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
+	<field name="neto" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="neto"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
 	<field name="total_haberes_remunerativos" class="java.lang.Double">
@@ -53,38 +67,6 @@
 		<property name="com.jaspersoft.studio.field.label" value="total_retenciones"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
-	<field name="total_bruto" class="java.lang.Double">
-		<property name="com.jaspersoft.studio.field.label" value="total_bruto"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
-	</field>
-	<field name="EMPLEADO_idEmpleado" class="java.lang.Integer">
-		<property name="com.jaspersoft.studio.field.label" value="EMPLEADO_idEmpleado"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
-	</field>
-	<field name="CUIT" class="java.lang.String">
-		<property name="com.jaspersoft.studio.field.label" value="CUIT"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
-	</field>
-	<field name="CATEGORIA_EMPLEADO_idCategoriaEmpleado" class="java.lang.Integer">
-		<property name="com.jaspersoft.studio.field.label" value="CATEGORIA_EMPLEADO_idCategoriaEmpleado"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
-	</field>
-	<field name="NombreCategoria" class="java.lang.String">
-		<property name="com.jaspersoft.studio.field.label" value="NombreCategoria"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="categoria_empleado"/>
-	</field>
-	<field name="Nombre" class="java.lang.String">
-		<property name="com.jaspersoft.studio.field.label" value="Nombre"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
-	</field>
-	<field name="Apellido" class="java.lang.String">
-		<property name="com.jaspersoft.studio.field.label" value="Apellido"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
-	</field>
-	<field name="FechaNacimiento" class="java.sql.Date">
-		<property name="com.jaspersoft.studio.field.label" value="FechaNacimiento"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="empleado"/>
-	</field>
 	<field name="inicio_periodo" class="java.sql.Date">
 		<property name="com.jaspersoft.studio.field.label" value="inicio_periodo"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
@@ -93,64 +75,84 @@
 		<property name="com.jaspersoft.studio.field.label" value="fin_periodo"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
+	<field name="idLiquidacionEmpleado" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="idLiquidacionEmpleado"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
 	<title>
 		<band height="155" splitType="Stretch">
 			<subreport>
-				<reportElement x="-20" y="0" width="397" height="154" uuid="51fe9eff-e8ec-4245-95e1-db4da6f28751"/>
+				<reportElement x="-20" y="0" width="398" height="154" uuid="51fe9eff-e8ec-4245-95e1-db4da6f28751"/>
 				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
 				<subreportExpression><![CDATA["target/classes/application/reports/DatosOrganizacion.jasper"]]></subreportExpression>
 			</subreport>
 			<staticText>
-				<reportElement x="8" y="100" width="365" height="42" forecolor="#FFFFFF" uuid="91ed0f02-eda3-48b8-a2ba-e3ecaff67e02"/>
+				<reportElement x="16" y="110" width="349" height="30" forecolor="#FFFFFF" uuid="91ed0f02-eda3-48b8-a2ba-e3ecaff67e02"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="25" isBold="true"/>
+					<font size="22" isBold="true"/>
 				</textElement>
 				<text><![CDATA[RECIBO SUELDO]]></text>
 			</staticText>
 		</band>
 	</title>
 	<pageHeader>
-		<band height="51" splitType="Stretch">
+		<band height="79" splitType="Stretch">
 			<frame>
-				<reportElement x="2" y="0" width="377" height="51" uuid="ea8faf1a-0d85-459b-9c90-a04562d91803"/>
+				<reportElement x="0" y="0" width="380" height="79" uuid="ea8faf1a-0d85-459b-9c90-a04562d91803"/>
 				<line>
 					<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToBandHeight" x="0" y="1" width="376" height="1" uuid="d025d541-f52d-4305-a0f6-ee99413c83c5"/>
 				</line>
-				<textField>
-					<reportElement x="0" y="0" width="189" height="19" uuid="0d3d5267-43c3-42b7-9a56-e71e54512780"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="12" isBold="true"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{nombreCompleto}]]></textFieldExpression>
-				</textField>
 				<staticText>
-					<reportElement x="323" y="0" width="40" height="19" uuid="907ea8ae-a2a0-4a9c-8ab7-8055430d0d54"/>
+					<reportElement x="316" y="0" width="40" height="19" uuid="907ea8ae-a2a0-4a9c-8ab7-8055430d0d54"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle"/>
 					<text><![CDATA[Legajo:]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="363" y="1" width="14" height="19" uuid="975c7c71-3a41-4c5d-a79c-9687a4fdd9c5"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle"/>
-					<textFieldExpression><![CDATA[$F{idEmpleado}]]></textFieldExpression>
-				</textField>
 				<staticText>
-					<reportElement x="0" y="20" width="50" height="30" uuid="394b9ae6-22e0-4aa1-a869-baecc7a5b348"/>
+					<reportElement x="4" y="37" width="50" height="20" uuid="394b9ae6-22e0-4aa1-a869-baecc7a5b348"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle"/>
 					<text><![CDATA[Categoria:]]></text>
 				</staticText>
+				<line>
+					<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToBandHeight" x="0" y="65" width="376" height="1" uuid="3cdad003-4a3a-45f4-ac4c-7eb950c00a69"/>
+				</line>
 				<textField>
-					<reportElement x="50" y="20" width="100" height="30" uuid="ac42ac49-48de-49e5-a101-4a38228bb16d"/>
+					<reportElement x="59" y="37" width="100" height="20" uuid="6a281955-623f-457e-aeb2-ec0a70fefac6"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle"/>
 					<textFieldExpression><![CDATA[$F{NombreCategoria}]]></textFieldExpression>
 				</textField>
-				<line>
-					<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToBandHeight" x="0" y="40" width="376" height="1" uuid="3cdad003-4a3a-45f4-ac4c-7eb950c00a69"/>
-				</line>
 				<textField>
-					<reportElement x="276" y="20" width="100" height="18" uuid="9083dc96-e753-459f-9bf0-30d9cfed4a05"/>
-					<textElement textAlignment="Right"/>
-					<textFieldExpression><![CDATA[$F{fecha_liquidacion}]]></textFieldExpression>
+					<reportElement x="357" y="1" width="20" height="18" uuid="ae7c1812-5e1b-49c7-8c0a-1a3d6923186c"/>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA[$F{idEmpleado}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="6" y="1" width="214" height="19" uuid="1b4a0159-ad2b-4521-a2f8-a0a256221d9c"/>
+					<textElement verticalAlignment="Middle">
+						<font size="14" isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{nombreCompleto}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="30" y="24" width="70" height="14" uuid="ef2ea528-3e98-4a97-adcd-f66a1b148958"/>
+					<textFieldExpression><![CDATA[$F{cuit}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="8" y="20" width="20" height="19" uuid="87553dc7-5434-437c-b7c7-6029117b89b6"/>
+					<textElement verticalAlignment="Middle"/>
+					<text><![CDATA[DNI:]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="114" y="22" width="30" height="15" uuid="a5ab15e4-8872-4bfb-b482-1574d6ce1b18"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle"/>
+					<text><![CDATA[Alta:]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="144" y="22" width="100" height="15" uuid="be2b4b1e-a4aa-4718-ac8f-a53f57f6df98"/>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA[$F{FechaAlta}]]></textFieldExpression>
 				</textField>
 			</frame>
 		</band>
@@ -159,85 +161,73 @@
 		<band height="22" splitType="Stretch">
 			<frame>
 				<reportElement x="1" y="0" width="378" height="22" uuid="e857996e-0d58-4666-b2db-6c3f6276b47b"/>
-				<textField>
-					<reportElement x="30" y="2" width="143" height="18" uuid="5f95ba8d-8d93-4b0f-adc4-49a387689534"/>
-					<textFieldExpression><![CDATA[$F{descripcion}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement x="176" y="2" width="11" height="18" uuid="7c8deb38-81bd-41e5-9ac0-acac9eed8996"/>
-					<textElement textAlignment="Right"/>
-					<text><![CDATA[$]]></text>
-				</staticText>
-				<textField>
-					<reportElement x="190" y="2" width="62" height="18" uuid="dbcda56e-fe8e-4d0c-91d7-12279223a8de"/>
-					<textFieldExpression><![CDATA[$F{monto}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="252" y="2" width="118" height="18" uuid="99e14b82-4ea2-41dd-a071-a8b2fbb8a096"/>
-					<textFieldExpression><![CDATA[$F{tipo_concepto}]]></textFieldExpression>
-				</textField>
+				<subreport>
+					<reportElement x="0" y="0" width="378" height="22" uuid="aaaaf75b-1a80-43a7-b748-6681f2502d6e"/>
+					<parametersMapExpression><![CDATA[$P{REPORT_PARAMETERS_MAP}]]></parametersMapExpression>
+					<subreportParameter name="idLiquidacion">
+						<subreportParameterExpression><![CDATA[$P{idLiquidacion}]]></subreportParameterExpression>
+					</subreportParameter>
+					<dataSourceExpression><![CDATA[$P{REPORT_DATA_SOURCE}]]></dataSourceExpression>
+					<subreportExpression><![CDATA["src/application/reports/DetalleLiquidacion.jasper"]]></subreportExpression>
+				</subreport>
 			</frame>
 		</band>
 	</detail>
 	<columnFooter>
 		<band height="52" splitType="Stretch">
-			<textField>
-				<reportElement x="321" y="19" width="58" height="18" uuid="a9e8d003-8631-4352-87da-4da0334c3c5d"/>
-				<textElement>
-					<font size="12" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{importe_neto}]]></textFieldExpression>
-			</textField>
 			<staticText>
 				<reportElement x="285" y="18" width="34" height="19" uuid="2d72aa0c-2144-435e-abd5-8a5280c28fcc"/>
 				<textElement verticalAlignment="Middle"/>
 				<text><![CDATA[NETO:]]></text>
 			</staticText>
+			<staticText>
+				<reportElement x="279" y="0" width="40" height="18" uuid="8c5cad28-6bec-4263-bd59-c40ddcf03f18"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[BRUTO:]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="2" y="2" width="46" height="15" uuid="387d9967-42ce-46d2-8f59-b54d786e0ee8"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Periodo:]]></text>
+			</staticText>
 			<textField>
-				<reportElement x="110" y="0" width="58" height="18" uuid="834e419b-8d55-4ad0-8c33-1b2d011a4edc"/>
-				<textElement>
-					<font size="12" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{total_haberes_remunerativos}]]></textFieldExpression>
+				<reportElement x="8" y="21" width="82" height="14" uuid="f227f610-c744-4c1c-bfc2-5bda0c8c0c35"/>
+				<textFieldExpression><![CDATA[$F{inicio_periodo}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="168" y="0" width="62" height="18" uuid="a5e6500b-a100-422a-8837-b9005cd3879a"/>
-				<textElement>
-					<font size="12" isBold="true"/>
+				<reportElement x="8" y="35" width="82" height="15" uuid="b4994b56-c917-42a5-a030-8ba84fbca425"/>
+				<textFieldExpression><![CDATA[$F{fin_periodo}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="90" y="0" width="100" height="21" uuid="0bdb3fa9-09f5-4079-bb4c-db84c24ada6d"/>
+				<textElement verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{total_haberes_no_remunerativos}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{total_haberes_remunerativos}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="230" y="0" width="50" height="18" uuid="7250bbd4-cfec-4477-beaf-fe030cffe797"/>
-				<textElement>
-					<font size="12" isBold="true"/>
+				<reportElement x="190" y="0" width="89" height="21" uuid="622d9eff-0db3-4782-af11-cf7e35d14c5e"/>
+				<textElement verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{total_retenciones}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement x="279" y="0" width="40" height="18" uuid="8c5cad28-6bec-4263-bd59-c40ddcf03f18"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<text><![CDATA[BRUTO:]]></text>
-			</staticText>
 			<textField>
-				<reportElement x="321" y="0" width="58" height="18" uuid="c2a637d1-bdc7-4e80-8036-c29869171d91"/>
+				<reportElement x="90" y="21" width="100" height="18" uuid="a6558cf3-6bfc-4d90-aca9-e67dde237eda"/>
 				<textElement>
-					<font size="12" isBold="true"/>
+					<font size="14" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{total_bruto}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{total_haberes_no_remunerativos}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement x="2" y="2" width="46" height="15" uuid="387d9967-42ce-46d2-8f59-b54d786e0ee8"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Periodo:]]></text>
-			</staticText>
 			<textField>
-				<reportElement x="31" y="20" width="63" height="14" uuid="dc385501-29ae-4077-8c3c-b3300b7e4ca4"/>
-				<textFieldExpression><![CDATA[$F{inicio_periodo}]]></textFieldExpression>
+				<reportElement x="319" y="3" width="60" height="13" uuid="3b838491-6018-425f-aabd-b561e1f7214d"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{total_bruto}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="30" y="34" width="64" height="15" uuid="fd9395ff-501e-45db-9593-9a7a363a3628"/>
-				<textFieldExpression><![CDATA[$F{fin_periodo}]]></textFieldExpression>
+				<reportElement x="319" y="22" width="60" height="13" uuid="7b0222f2-2d88-44c3-9bcd-2dd38a484394"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{total_bruto}]]></textFieldExpression>
 			</textField>
 		</band>
 	</columnFooter>
diff --git a/src/application/reports/AbstractJasperReports.java b/src/application/reports/classes/AbstractJasperReports.java
similarity index 95%
rename from src/application/reports/AbstractJasperReports.java
rename to src/application/reports/classes/AbstractJasperReports.java
index a372b2f..2eee135 100644
--- a/src/application/reports/AbstractJasperReports.java
+++ b/src/application/reports/classes/AbstractJasperReports.java
@@ -1,7 +1,6 @@
-package application.reports;
+package application.reports.classes;
 
 import application.database.JDBCConnection;
-import com.sun.javafx.collections.MappingChange;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperFillManager;
 import net.sf.jasperreports.engine.JasperPrint;
diff --git a/src/application/reports/JasperFX.java b/src/application/reports/classes/JasperFX.java
similarity index 99%
rename from src/application/reports/JasperFX.java
rename to src/application/reports/classes/JasperFX.java
index 0a50e10..4c46670 100644
--- a/src/application/reports/JasperFX.java
+++ b/src/application/reports/classes/JasperFX.java
@@ -1,4 +1,4 @@
-package application.reports;
+package application.reports.classes;
 
 import javafx.animation.AnimationTimer;
 import javafx.collections.FXCollections;
diff --git a/src/application/reports/Page.java b/src/application/reports/classes/Page.java
similarity index 98%
rename from src/application/reports/Page.java
rename to src/application/reports/classes/Page.java
index e16eeec..35b07c4 100644
--- a/src/application/reports/Page.java
+++ b/src/application/reports/classes/Page.java
@@ -1,4 +1,4 @@
-package application.reports;
+package application.reports.classes;
 
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
diff --git a/src/application/reports/ReportExporter.java b/src/application/reports/classes/ReportExporter.java
similarity index 98%
rename from src/application/reports/ReportExporter.java
rename to src/application/reports/classes/ReportExporter.java
index 3444fa8..d4f21a6 100644
--- a/src/application/reports/ReportExporter.java
+++ b/src/application/reports/classes/ReportExporter.java
@@ -1,4 +1,4 @@
-package application.reports;
+package application.reports.classes;
 
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperPrint;
diff --git a/src/application/reports/ZoomConverter.java b/src/application/reports/classes/ZoomConverter.java
similarity index 93%
rename from src/application/reports/ZoomConverter.java
rename to src/application/reports/classes/ZoomConverter.java
index 015b04d..7b27846 100644
--- a/src/application/reports/ZoomConverter.java
+++ b/src/application/reports/classes/ZoomConverter.java
@@ -1,4 +1,4 @@
-package application.reports;
+package application.reports.classes;
 
 import javafx.util.StringConverter;
 
diff --git a/src/application/view/compra/ControlStockController.java b/src/application/view/compra/ControlStockController.java
index 7f9fb0f..4609247 100644
--- a/src/application/view/compra/ControlStockController.java
+++ b/src/application/view/compra/ControlStockController.java
@@ -4,7 +4,7 @@
 import application.comunes.Alerta;
 import application.model.compra.Articulo;
 import application.model.compra.CategoriaArticulo;
-import application.reports.AbstractJasperReports;
+import application.reports.classes.AbstractJasperReports;
 import application.repository.compra.ArticuloRepository;
 import application.repository.compra.CategoriaArticuloRepository;
 import application.view.compra.cruds.StockEditController;
diff --git a/src/application/view/sueldo/Liquidaciones.fxml b/src/application/view/sueldo/Liquidaciones.fxml
index 1e00dc5..e77da08 100644
--- a/src/application/view/sueldo/Liquidaciones.fxml
+++ b/src/application/view/sueldo/Liquidaciones.fxml
@@ -47,7 +47,7 @@
                         <Insets />
                      </HBox.margin>
                   </Button>
-                  <Button fx:id="imprimirReciboDeEmpleado" mnemonicParsing="false" text="Imprimir recibo sueldo" />
+                  <Button fx:id="imprimirReciboDeEmpleado" mnemonicParsing="false" onAction="#handleImprimirReciboSueldo" text="Imprimir recibo sueldo" />
                </children>
             </HBox>
          </children>
diff --git a/src/application/view/sueldo/LiquidacionesController.java b/src/application/view/sueldo/LiquidacionesController.java
index 721201e..f8b3dd8 100644
--- a/src/application/view/sueldo/LiquidacionesController.java
+++ b/src/application/view/sueldo/LiquidacionesController.java
@@ -1,14 +1,12 @@
 package application.view.sueldo;
 
 import application.Main;
-import application.model.info.Empleado;
 import application.model.sueldo.LiquidacionEmpleado;
 import application.model.sueldo.Liquidacion;
-import application.reports.AbstractJasperReports;
+import application.reports.classes.AbstractJasperReports;
 import application.repository.sueldo.LiquidacionEmpleadoRepository;
 import application.repository.sueldo.LiquidacionRepository;
 import application.view.sueldo.cruds.LiquidacionSueldoController;
-import javafx.beans.binding.BooleanBinding;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -86,7 +84,7 @@ public void buscarLiquidaciones(){
 	private void buscarLiquidacionesEmpleado(int idLiquidacion){
 		this.liquidacionesEmpleado = liquidacionEmpleadoRepository.getLiqEmpleadoByIdLiq(idLiquidacion);
 		if (!liquidacionesEmpleado.isEmpty())
-		liqEmpleadosTable.setItems(liquidacionesEmpleado);
+			liqEmpleadosTable.setItems(liquidacionesEmpleado);
 	}
 
 	@Override
@@ -150,4 +148,15 @@ private void handleImprimirRecibos(){
 				"idLiquidacion", idLiquidacion);
 		AbstractJasperReports.showViewer();
 	}
+
+
+	@FXML
+	private void handleImprimirReciboSueldo(){
+		if (!liqEmpleadosTable.getSelectionModel().isEmpty()){
+			LiquidacionEmpleado empleadoLiquidado = liqEmpleadosTable.getSelectionModel().getSelectedItem();
+			AbstractJasperReports.createReport("src\\application\\reports\\ReciboSueldo.jasper",
+					"idLiquidacion", empleadoLiquidado.getId());
+			AbstractJasperReports.showViewer();
+		}
+	}
 }
\ No newline at end of file

From e62fdda9612f37d4e182fe3fa1047e66b2700341 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Thu, 1 Mar 2018 16:14:40 -0300
Subject: [PATCH 15/27] reportes de recibo de sueldos

---
 .idea/workspace.xml                           | 393 ++++++++----------
 .settings/org.eclipse.core.resources.prefs    |   1 +
 src/application/reports/ControlStock.jasper   | Bin 28880 -> 28719 bytes
 src/application/reports/ControlStock.jrxml    |  19 +-
 .../reports/DatosOrganizacion.jasper          | Bin 25007 -> 25007 bytes
 .../reports/DatosOrganizacion.jrxml           |   2 +-
 .../reports/DetalleLiquidacion.jasper         | Bin 22116 -> 22116 bytes
 src/application/reports/ReciboSueldo.jasper   | Bin 34490 -> 34537 bytes
 .../reports/RecibosPorLiquidacion.jasper      | Bin 0 -> 21544 bytes
 .../reports/RecibosPorLiquidacion.jrxml       |  58 +++
 10 files changed, 245 insertions(+), 228 deletions(-)
 create mode 100644 src/application/reports/RecibosPorLiquidacion.jasper
 create mode 100644 src/application/reports/RecibosPorLiquidacion.jrxml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a6857dd..9b47cef 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ad24a087-34e9-4c0a-89a3-9d660d897332" name="Default" comment="">
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/application/reports/RecibosPorLiquidacion.jasper" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/application/reports/RecibosPorLiquidacion.jrxml" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change beforePath="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" afterPath="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" />
-      <change beforePath="$PROJECT_DIR$/src/application/view/sueldo/Liquidaciones.fxml" afterPath="$PROJECT_DIR$/src/application/view/sueldo/Liquidaciones.fxml" />
+      <change beforePath="$PROJECT_DIR$/.settings/org.eclipse.core.resources.prefs" afterPath="$PROJECT_DIR$/.settings/org.eclipse.core.resources.prefs" />
+      <change beforePath="$PROJECT_DIR$/src/application/reports/ControlStock.jasper" afterPath="$PROJECT_DIR$/src/application/reports/ControlStock.jasper" />
+      <change beforePath="$PROJECT_DIR$/src/application/reports/ControlStock.jrxml" afterPath="$PROJECT_DIR$/src/application/reports/ControlStock.jrxml" />
+      <change beforePath="$PROJECT_DIR$/src/application/reports/DatosOrganizacion.jasper" afterPath="$PROJECT_DIR$/src/application/reports/DatosOrganizacion.jasper" />
+      <change beforePath="$PROJECT_DIR$/src/application/reports/DatosOrganizacion.jrxml" afterPath="$PROJECT_DIR$/src/application/reports/DatosOrganizacion.jrxml" />
+      <change beforePath="$PROJECT_DIR$/src/application/reports/DetalleLiquidacion.jasper" afterPath="$PROJECT_DIR$/src/application/reports/DetalleLiquidacion.jasper" />
+      <change beforePath="$PROJECT_DIR$/src/application/reports/ReciboSueldo.jasper" afterPath="$PROJECT_DIR$/src/application/reports/ReciboSueldo.jasper" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -18,48 +25,7 @@
     <favorites_list name="LogiservStudio" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/application/Main.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-16">
-              <caret line="38" column="30" lean-forward="false" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PrincipalController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/application/view/PrincipalController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="171">
-              <caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="LoginController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/application/view/LoginController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="398">
-              <caret line="77" column="25" lean-forward="false" selection-start-line="77" selection-start-column="25" selection-end-line="77" selection-end-column="25" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="EmpleadoRepository.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="361">
-              <caret line="238" column="0" lean-forward="false" selection-start-line="238" selection-start-column="0" selection-end-line="238" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -74,6 +40,9 @@
   <component name="FindInProjectRecents">
     <findStrings>
       <find>Mapº</find>
+      <find>parameter</find>
+      <find>param</find>
+      <find>subre</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -103,11 +72,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionesRepository.java" />
-        <option value="$PROJECT_DIR$/src/application/view/info/cruds/UsuarioEditDialogController.java" />
-        <option value="$PROJECT_DIR$/src/application/comunes/Alerta.java" />
-        <option value="$PROJECT_DIR$/src/application/view/info/InfoCategoriaEmpleadoController.java" />
-        <option value="$PROJECT_DIR$/src/application/view/info/CompraCompras.fxml" />
         <option value="$PROJECT_DIR$/src/application/model/info/Familiar/Familiar.java" />
         <option value="$PROJECT_DIR$/src/application/view/compra/CompraComprasController.java" />
         <option value="$PROJECT_DIR$/src/application/model/info/Familiar.java" />
@@ -122,7 +86,6 @@
         <option value="$PROJECT_DIR$/src/application/view/info/cruds/EmpleadoEditDialogController.java" />
         <option value="$PROJECT_DIR$/src/application/view/info/AdministrarEmpleadosController.java" />
         <option value="$PROJECT_DIR$/src/application/view/info/DesempleadosController.java" />
-        <option value="$PROJECT_DIR$/src/application/repository/venta/ViajeRepository.java" />
         <option value="$PROJECT_DIR$/src/application/view/inicio/HomeController.java" />
         <option value="$PROJECT_DIR$/src/application/view/css/theme.css" />
         <option value="$PROJECT_DIR$/src/application/view/inicio/OrganizacionController.java" />
@@ -138,7 +101,6 @@
         <option value="$PROJECT_DIR$/src/application/view/calculo/cruds/IngenioEditController.java" />
         <option value="$PROJECT_DIR$/src/application/view/calculo/cruds/FincaEditController.java" />
         <option value="$PROJECT_DIR$/src/application/reports/AbstractJasperReports.java" />
-        <option value="$PROJECT_DIR$/src/application/view/venta/cruds/ViajeEditController.java" />
         <option value="$PROJECT_DIR$/src/application/view/RegisterController.java" />
         <option value="$PROJECT_DIR$/src/application/repository/compra/FacturaCompraRepository.java" />
         <option value="$PROJECT_DIR$/src/application/model/sueldo/ConceptoSueldo.java" />
@@ -147,13 +109,20 @@
         <option value="$PROJECT_DIR$/src/application/repository/info/CategoriaEmpleadoRepository.java" />
         <option value="$PROJECT_DIR$/src/application/repository/sueldo/DetalleLiquidacionEmpleadoRepository.java" />
         <option value="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionRepository.java" />
-        <option value="$PROJECT_DIR$/src/application/view/sueldo/LiquidacionesController.java" />
         <option value="$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionEmpleadoRepository.java" />
         <option value="$PROJECT_DIR$/src/application/Main.java" />
         <option value="$PROJECT_DIR$/src/application/view/PrincipalController.java" />
         <option value="$PROJECT_DIR$/src/application/view/LoginController.java" />
-        <option value="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" />
         <option value="$PROJECT_DIR$/src/application/view/sueldo/Liquidaciones.fxml" />
+        <option value="$PROJECT_DIR$/src/application/repository/calculo/AcopladoRepository.java" />
+        <option value="$PROJECT_DIR$/src/application/repository/venta/ViajeRepository.java" />
+        <option value="$PROJECT_DIR$/src/application/repository/venta/FacturaVentaRepository.java" />
+        <option value="$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java" />
+        <option value="$PROJECT_DIR$/src/application/view/venta/cruds/ViajeEditController.java" />
+        <option value="$PROJECT_DIR$/src/application/reports/classes/AbstractJasperReports.java" />
+        <option value="$PROJECT_DIR$/src/application/view/sueldo/LiquidacionesController.java" />
+        <option value="$PROJECT_DIR$/src/application/reports/ReciboSueldo.jrxml" />
+        <option value="$PROJECT_DIR$/src/application/reports/DetalleLiquidacion.jrxml" />
       </list>
     </option>
   </component>
@@ -188,6 +157,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="PackagesPane">
         <subPane>
           <expand>
@@ -203,13 +173,27 @@
             <path>
               <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
               <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
-              <item name="resources" type="1f31426a:PackageElementNode" />
+              <item name="application" type="1f31426a:PackageElementNode" />
+              <item name="reports" type="1f31426a:PackageElementNode" />
+            </path>
+            <path>
+              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
+              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
+              <item name="application" type="1f31426a:PackageElementNode" />
+              <item name="view" type="1f31426a:PackageElementNode" />
+            </path>
+            <path>
+              <item name="LogiservStudio" type="58d84e3e:PackageViewProjectNode" />
+              <item name="LogiservStudio" type="616d4139:PackageViewModuleNode" />
+              <item name="application" type="1f31426a:PackageElementNode" />
+              <item name="view" type="1f31426a:PackageElementNode" />
+              <item name="sueldo" type="1f31426a:PackageElementNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -239,7 +223,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -593,7 +576,28 @@
       <option name="project" value="LOCAL" />
       <updated>1519710312225</updated>
     </task>
-    <option name="localTasksCounter" value="27" />
+    <task id="LOCAL-00027" summary="ventana de liquidaciones arreglada por nanogesima octava vez">
+      <created>1519710875340</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1519710875340</updated>
+    </task>
+    <task id="LOCAL-00028" summary="viajes sin hardcode y funcional">
+      <created>1519773867311</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1519773867311</updated>
+    </task>
+    <task id="LOCAL-00029" summary="reportes de recibo de sueldos por empleado">
+      <created>1519918523585</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1519918523586</updated>
+    </task>
+    <option name="localTasksCounter" value="30" />
     <servers />
   </component>
   <component name="TodoView">
@@ -621,7 +625,7 @@
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19756839" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20972644" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -636,35 +640,6 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
-    <layout-to-restore>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4194079" sideWeight="0.50303954" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39967105" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978722" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" x="0" y="0" width="588" height="544" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4194079" sideWeight="0.4969605" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.4969605" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27887538" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32894737" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
-    </layout-to-restore>
   </component>
   <component name="UnknownFeatures">
     <option featureType="com.intellij.fileTypeFactory" implementationName="*.css" />
@@ -690,7 +665,10 @@
     <MESSAGE value="Cambios en Liquidacion" />
     <MESSAGE value="Liquidacion actualizada" />
     <MESSAGE value="Icono del sistema agregado a ventanas de login y principal, resto de ventanas mas adelante" />
-    <option name="LAST_COMMIT_MESSAGE" value="Icono del sistema agregado a ventanas de login y principal, resto de ventanas mas adelante" />
+    <MESSAGE value="ventana de liquidaciones arreglada por nanogesima octava vez" />
+    <MESSAGE value="viajes sin hardcode y funcional" />
+    <MESSAGE value="reportes de recibo de sueldos por empleado" />
+    <option name="LAST_COMMIT_MESSAGE" value="reportes de recibo de sueldos por empleado" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -703,43 +681,15 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/application/view/info/cruds/EmpleadoEditDialogController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="155">
-          <caret line="213" column="5" lean-forward="true" selection-start-line="209" selection-start-column="4" selection-end-line="213" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/compra/ProveedoresController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
-          <caret line="88" column="106" lean-forward="false" selection-start-line="80" selection-start-column="8" selection-end-line="88" selection-end-column="106" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/info/AdministrarEmpleadosController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-423">
-          <caret line="89" column="43" lean-forward="true" selection-start-line="89" selection-start-column="43" selection-end-line="89" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/repository/compra/CategoriaArticuloRepository.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-289">
-          <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/info/Desempleados.fxml">
-      <provider editor-type-id="JavaFX-Scene-Builder">
-        <state />
-      </provider>
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
+      <provider editor-type-id="JavaFX-Scene-Builder">
+        <state />
+      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/info/DesempleadosController.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -748,13 +698,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/repository/venta/ViajeRepository.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5117">
-          <caret line="324" column="58" lean-forward="true" selection-start-line="324" selection-start-column="58" selection-end-line="324" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/inicio/crud/OrganizacionEditController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1358">
@@ -777,14 +720,14 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/calculo/cruds/AcopladoEdit.fxml">
-      <provider editor-type-id="JavaFX-Scene-Builder">
-        <state />
-      </provider>
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
           <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
         </state>
       </provider>
+      <provider editor-type-id="JavaFX-Scene-Builder">
+        <state />
+      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
@@ -829,27 +772,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/reports/VisorPDF.fxml" />
-    <entry file="file://$PROJECT_DIR$/src/application/reports/ReportExporter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="42" column="5" lean-forward="true" selection-start-line="42" selection-start-column="5" selection-end-line="42" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/reports/Page.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="10" column="27" lean-forward="false" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/reports/ZoomConverter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/calculo/CargarAcopladoController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1565">
@@ -858,24 +780,24 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/calculo/InfoIngenio.fxml">
-      <provider editor-type-id="JavaFX-Scene-Builder">
-        <state />
-      </provider>
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/Register.fxml">
       <provider editor-type-id="JavaFX-Scene-Builder">
         <state />
       </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/Register.fxml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
+      <provider editor-type-id="JavaFX-Scene-Builder">
+        <state />
+      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/css/theme.css">
       <provider selected="true" editor-type-id="text-editor">
@@ -905,20 +827,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/reports/JasperFX.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1071">
-          <caret line="92" column="23" lean-forward="false" selection-start-line="92" selection-start-column="21" selection-end-line="92" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/reports/AbstractJasperReports.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="15" column="3" lean-forward="false" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/compra/ControlStockController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="390">
@@ -926,26 +834,11 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/venta/cruds/ViajeEditController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="305">
-          <caret line="261" column="0" lean-forward="true" selection-start-line="261" selection-start-column="0" selection-end-line="261" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/venta/AdministrarViajesController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1225">
-          <caret line="22" column="13" lean-forward="false" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/application/repository/sueldo/LiquidacionesRepository.java" />
     <entry file="file://$PROJECT_DIR$/src/application/view/RegisterController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="408">
           <caret line="114" column="0" lean-forward="false" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -960,7 +853,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1530">
           <caret line="100" column="0" lean-forward="false" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -968,7 +860,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="458">
           <caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -976,7 +867,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="305">
           <caret line="113" column="39" lean-forward="false" selection-start-line="113" selection-start-column="38" selection-end-line="113" selection-end-column="39" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -984,7 +874,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="358">
           <caret line="69" column="76" lean-forward="false" selection-start-line="69" selection-start-column="76" selection-end-line="69" selection-end-column="76" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -992,10 +881,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="561">
           <caret line="46" column="16" lean-forward="false" selection-start-line="46" selection-start-column="16" selection-end-line="46" selection-end-column="16" />
-          <folding>
-            <element signature="e#1251#1252#0" expanded="false" />
-            <element signature="e#1282#1283#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1003,7 +888,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="390">
           <caret line="100" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="104" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1011,7 +895,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="254">
           <caret line="146" column="44" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="158" selection-end-column="1" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1019,15 +902,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
           <caret line="33" column="47" lean-forward="true" selection-start-line="33" selection-start-column="47" selection-end-line="33" selection-end-column="47" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/application/view/sueldo/LiquidacionesController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="48" column="36" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="152" selection-end-column="1" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1035,16 +909,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
           <caret line="426" column="24" lean-forward="true" selection-start-line="426" selection-start-column="24" selection-end-line="426" selection-end-column="24" />
-          <folding>
-            <element signature="e#3674#3675#0" expanded="false" />
-            <element signature="e#3708#3709#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-16">
+        <state relative-caret-position="493">
           <caret line="38" column="30" lean-forward="false" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="30" />
           <folding />
         </state>
@@ -1052,7 +922,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/PrincipalController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
+        <state relative-caret-position="340">
           <caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
           <folding />
         </state>
@@ -1060,27 +930,118 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="398">
+        <state relative-caret-position="969">
           <caret line="77" column="25" lean-forward="false" selection-start-line="77" selection-start-column="25" selection-end-line="77" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/view/sueldo/Liquidaciones.fxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="261">
+          <caret line="53" column="13" lean-forward="false" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
+        </state>
+      </provider>
       <provider editor-type-id="JavaFX-Scene-Builder">
         <state />
       </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/repository/calculo/AcopladoRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="261">
-          <caret line="53" column="13" lean-forward="false" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
-          <folding />
+        <state relative-caret-position="374">
+          <caret line="67" column="37" lean-forward="false" selection-start-line="67" selection-start-column="37" selection-end-line="67" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/repository/venta/ViajeRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1240">
+          <caret line="441" column="1" lean-forward="false" selection-start-line="441" selection-start-column="1" selection-end-line="441" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/repository/venta/FacturaVentaRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1206">
+          <caret line="171" column="48" lean-forward="false" selection-start-line="171" selection-start-column="48" selection-end-line="171" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/venta/AdministrarViajesController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1003">
+          <caret line="22" column="13" lean-forward="false" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/venta/cruds/ViajeEditController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="85" column="0" lean-forward="true" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/application/repository/info/EmpleadoRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="361">
-          <caret line="238" column="0" lean-forward="false" selection-start-line="238" selection-start-column="0" selection-end-line="238" selection-end-column="0" />
+        <state relative-caret-position="305">
+          <caret line="251" column="60" lean-forward="true" selection-start-line="251" selection-start-column="60" selection-end-line="251" selection-end-column="60" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/reports/classes/Page.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-7">
+          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/reports/classes/JasperFX.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-7">
+          <caret line="30" column="13" lean-forward="false" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/reports/classes/ZoomConverter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-7">
+          <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/reports/classes/ReportExporter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-7">
+          <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/reports/DetalleLiquidacion.jrxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="92">
+          <caret line="14" column="63" lean-forward="true" selection-start-line="14" selection-start-column="63" selection-end-line="14" selection-end-column="63" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/reports/ReciboSueldo.jrxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="194">
+          <caret line="170" column="31" lean-forward="false" selection-start-line="170" selection-start-column="31" selection-end-line="170" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/reports/classes/AbstractJasperReports.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="21" column="79" lean-forward="false" selection-start-line="21" selection-start-column="69" selection-end-line="21" selection-end-column="79" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/application/view/sueldo/LiquidacionesController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="147" column="20" lean-forward="true" selection-start-line="147" selection-start-column="20" selection-end-line="147" selection-end-column="20" />
           <folding />
         </state>
       </provider>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 6db0041..023e20c 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -3,4 +3,5 @@ encoding//src/application/reports/ControlStock.jrxml=UTF-8
 encoding//src/application/reports/DatosOrganizacion.jrxml=UTF-8
 encoding//src/application/reports/DetalleLiquidacion.jrxml=UTF-8
 encoding//src/application/reports/ReciboSueldo.jrxml=UTF-8
+encoding//src/application/reports/RecibosPorLiquidacion.jrxml=UTF-8
 encoding//target/classes/application/reports/DatosOrganizacion.jrxml=UTF-8
diff --git a/src/application/reports/ControlStock.jasper b/src/application/reports/ControlStock.jasper
index 28a8d9b4756d91302f936d24b9fd7c1ca0ffc6b9..c7bc03ce82ed4e26f1e34e73e50bc1e14d57f705 100644
GIT binary patch
delta 180
zcmcccka7J3#tjwD><kqJ#YGG{lND`cCLZA4{NLG<k)t};)yLI2L}9XztAu)DQAuWU
zX->Xgf^T9`a$<rG7blWXeoAUiK1gixdRIvixI}SDesVUKTadr6!saioPx+bt|KEH&
zG>=Kl($K=f(#XQxINrq4!ou8?oq>fBXgg!P^5&)pP6=Uj`4R>rkkcmbDi8wz8zwq4

delta 395
zcmZ4gfbqgZ#tjwD36V+Rmf2C^6=hMmIi-=|<)x7kUIvNbeuhcz7U@1Nu7(iom+O}s
zl<QmNY2p(el^vPoS>os7l^Ypsm>HSnTHzD!X&e=jUB%@e;%VS(6lvfaQfymMP+Y{I
zGg;AAX5s<v&C8rE8S4)RyZX2~hbZLcr=;fOr)B0P=IA9Bm1HKD=H%-oWTrSm*$Fya
zoY>X)CKe?p;*ka$j7#2DFTo|XIJqdZAUQKX50@&v;*$L2Y%aGTe_s@bZVq;R%Fpqe
zp#Tgf2l|R_4hs!p5;HclFf}qTG_i;`wlp%Zv}9*sVFdcyQCMd3`Y86z55qYngwfTM
NFc^UXX0l{~7yx!JhDrbc

diff --git a/src/application/reports/ControlStock.jrxml b/src/application/reports/ControlStock.jrxml
index 185ff7c..009e861 100644
--- a/src/application/reports/ControlStock.jrxml
+++ b/src/application/reports/ControlStock.jrxml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ControlStock" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="5b6cdc7a-91ef-49f0-8fae-91e6632039a3">
-	<property name="com.jaspersoft.studio.data.sql.tables">
-		<![CDATA[bW9kZWxvZmluYWwuYXJ0aWN1bG8gLDE1LDE1LDNmNmRmMzI4LWZkYjItNDJmYS1iYjExLWI3ZTkz
-OTI0M2Y0MTs=]]>
-	</property>
+	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="logiserv"/>
 	<queryString language="SQL">
-		<![CDATA[SELECT modelofinal.articulo.`idArticulo`,
-	modelofinal.articulo.`Marca`,
-	modelofinal.articulo.`Modelo`,
-	modelofinal.articulo.`Descripcion`,
-	modelofinal.articulo.stock
-FROM modelofinal.articulo]]>
+		<![CDATA[SELECT articulo.`idArticulo`,
+	articulo.`Marca`,
+	articulo.`Modelo`,
+	articulo.`Descripcion`,
+	articulo.stock
+FROM articulo]]>
 	</queryString>
 	<field name="idArticulo" class="java.lang.Integer">
 		<property name="com.jaspersoft.studio.field.label" value="idArticulo"/>
@@ -42,7 +39,7 @@ FROM modelofinal.articulo]]>
 				<subreportExpression><![CDATA["src/application/reports/DatosOrganizacion.jasper"]]></subreportExpression>
 			</subreport>
 			<staticText>
-				<reportElement x="98" y="98" width="365" height="42" forecolor="#FFFB00" uuid="23e99129-5bcc-404e-b033-c1495b78fc91"/>
+				<reportElement x="98" y="98" width="365" height="42" forecolor="#FFFFFF" uuid="23e99129-5bcc-404e-b033-c1495b78fc91"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="25" isBold="true"/>
 				</textElement>
diff --git a/src/application/reports/DatosOrganizacion.jasper b/src/application/reports/DatosOrganizacion.jasper
index 0849388f8297c4331d7020eef975592ff462209d..b2030c789024f6bd4fa9602afb861611376230e5 100644
GIT binary patch
delta 59
zcmZ2~m~s7K#to;v1S}0LEG&(UOfBM#j7&@oOg7*4>K7A67cF5hnw%&lGkIpB7yvx|
B5vc$G

delta 59
zcmZ2~m~s7K#to;v1S~8pOpMJ9%}nBrOwBCJjW*x*>K7A67cF5hnw%&lGkIpB7yv%8
B5xW2Y

diff --git a/src/application/reports/DatosOrganizacion.jrxml b/src/application/reports/DatosOrganizacion.jrxml
index d093c3c..8ade43b 100644
--- a/src/application/reports/DatosOrganizacion.jrxml
+++ b/src/application/reports/DatosOrganizacion.jrxml
@@ -54,7 +54,7 @@
 			<frame>
 				<reportElement stretchType="ElementGroupBottom" mode="Opaque" x="-20" y="-20" width="595" height="140" backcolor="#006699" uuid="2a464480-7866-4aa1-87e4-1d953cafb4a8"/>
 				<textField isStretchWithOverflow="true">
-					<reportElement x="192" y="25" width="210" height="90" forecolor="#FFFFFF" uuid="589cd6be-6cb4-4c58-b067-af24da0f1d3d">
+					<reportElement x="163" y="0" width="210" height="90" forecolor="#FFFFFF" uuid="589cd6be-6cb4-4c58-b067-af24da0f1d3d">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="9ef7ebef-557c-4eb9-a6f6-fd203f3d15a3"/>
 					</reportElement>
 					<textElement textAlignment="Left" verticalAlignment="Middle">
diff --git a/src/application/reports/DetalleLiquidacion.jasper b/src/application/reports/DetalleLiquidacion.jasper
index ebfbf4cfd0ceb17b7faf4d64f91573c68603a159..6c4ac15a5f3015a84d24589005c5ecd864661182 100644
GIT binary patch
delta 59
zcmaE|hVjW7#tmy6g)NN@Oe~Cy4K3o$4GqjKOxYP&CO3MiZGP%#B_e<>Iaxo<6aXwu
B5Xb-k

delta 59
zcmaE|hVjW7#tmy6g)J;BOifHIO%3Bs%#DqV%-9)NCO3MiZGP%#B_e<>Iaxo<6aX(r
B5ZnL&

diff --git a/src/application/reports/ReciboSueldo.jasper b/src/application/reports/ReciboSueldo.jasper
index 610231c113a2987c55d7f6388dd6c0626b32fd7f..051a39d7a635bd5b41943a53fd2272afe74cbf47 100644
GIT binary patch
delta 576
zcmdnh%k;9BX~Sn7!-C>MhB}631_lPfQV^>h$YKPGbuyJO2nD$Y_y>i=yEuk8#s~X{
z206QKR@VJtZB&2i->!W?rFx9g><mnd42nUi$(c#{!KJA=Df#h+riPZ5#s(%9M#g3a
z@s>tLW`^dQeKUP|+1MEc7#TDsKV*~RbxABq49+htN>1fq6q-D@%#2ZF@|7}G7I7X%
ziOqk@YB~5qw=psuVC45*&X6h0C^%WFRnt-!$g$Ac!jQg=k?Q~>h^GbQCBu0#Kwcu8
z$A{oeepUa9QFQaXW`0IXu>*|UK%J+7vZdP?#SSq11@iU+dAT4SSZ+O#R}AMZ1o8@j
zyvednYW1kD0_scx%I1UB@&b7wKwdSR=LY0ugLz0U2ik$;awre#awre#axhP411L@y
wx`E^^2D8bBnr<^n0zHz)NZkOcX?>+21+;^S0T}V3SmUr{^2Y$V$xGVA0C3u;IsgCw

delta 522
zcmaFa%e1SPX~Sn7uHr(5I)-Kj1_r^&Z&Hmm8|c2VHVQoTZ`VGckRGEXI|CCVgJMu>
za%NI~aA|5zN`AbdsiCEXg@vh!iK&@+yqTGirK!ngzf50VW)4Py$!E&U7=<P?m#eaf
z@-T{R)+w*$;IrJu$aH{_&38FNrZ6M_WY1PjOF<yVLTd{{`Zh+c1B@V^7Lb<==g9zh
ziEthtf;U;R;T5Cs=CjTGjFut?7`cHuPXlF3w=s$wVE7B<?FI63K|HYBdLXYD&RYoN
z6#{vaeVWwjQC$VpnFN&02dm`;@<M>TYB<jg$jb)vkX#P51Igu39@OPf9@OPvp3Vkf
zm@+bS1Ib$qW|KcQ-DVUAdL)mLx&gGh^_7wY&<-XBrV<8GtkG4%U^JOgOJ?%rHZcHZ
C$d;b~

diff --git a/src/application/reports/RecibosPorLiquidacion.jasper b/src/application/reports/RecibosPorLiquidacion.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..93267e50f4ed5c416efaf752109a45f5391a205c
GIT binary patch
literal 21544
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
a4n)OQbvNSnDd<+fam5b7*3Bq~sri3+m^}ah

literal 0
HcmV?d00001

diff --git a/src/application/reports/RecibosPorLiquidacion.jrxml b/src/application/reports/RecibosPorLiquidacion.jrxml
new file mode 100644
index 0000000..61742ba
--- /dev/null
+++ b/src/application/reports/RecibosPorLiquidacion.jrxml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RecibosPorLiquidacion" pageWidth="420" pageHeight="595" columnWidth="380" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="f48afb85-e5c4-43ee-b03b-0e173a4df7c0">
+	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="logiserv"/>
+	<property name="com.jaspersoft.studio.unit." value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
+	<parameter name="idLiquidacion" class="java.lang.Integer"/>
+	<queryString language="SQL">
+		<![CDATA[select idLiquidacionEmpleado
+ from liquidacion_empleado
+ where LIQUIDACION_idLIQUIDACION=$P{idLiquidacion}]]>
+	</queryString>
+	<field name="idLiquidacionEmpleado" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="idLiquidacionEmpleado"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="18" splitType="Stretch"/>
+	</title>
+	<detail>
+		<band height="241" splitType="Stretch">
+			<subreport>
+				<reportElement x="0" y="0" width="380" height="241" uuid="b2be5f25-3f9a-4760-90c4-94908925964e"/>
+				<parametersMapExpression><![CDATA[$P{REPORT_PARAMETERS_MAP}]]></parametersMapExpression>
+				<subreportParameter name="idLiquidacionEmpleado">
+					<subreportParameterExpression><![CDATA[$F{idLiquidacionEmpleado}]]></subreportParameterExpression>
+				</subreportParameter>
+				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+				<subreportExpression><![CDATA["src/application/reports/ReciboSueldo.jasper"]]></subreportExpression>
+			</subreport>
+			<textField>
+				<reportElement x="280" y="0" width="100" height="13" uuid="086ac574-22a5-47ea-abe2-2b7cbb659d33"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{idLiquidacionEmpleado}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<summary>
+		<band height="24" splitType="Stretch">
+			<textField>
+				<reportElement x="140" y="1" width="100" height="22" uuid="8dde49ce-f815-4d03-9afe-33f6959fa055"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+		</band>
+	</summary>
+</jasperReport>

From 83d95b2efb9a54d5b00a5693ba4edfacead5f247 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Fri, 2 Mar 2018 02:14:42 -0300
Subject: [PATCH 16/27] agregada validacion de fechas en nueva liquidacion

---
 .../reports/DetalleLiquidacion.jasper         | Bin 22116 -> 22116 bytes
 src/application/reports/ReciboSueldo.jasper   | Bin 34537 -> 34483 bytes
 src/application/reports/ReciboSueldo.jrxml    |   4 +-
 .../reports/RecibosPorLiquidacion.jasper      | Bin 21544 -> 20756 bytes
 .../reports/RecibosPorLiquidacion.jrxml       |  14 ++-----
 .../cruds/LiquidacionSueldoController.java    |  35 ++++++++++++++++--
 6 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/src/application/reports/DetalleLiquidacion.jasper b/src/application/reports/DetalleLiquidacion.jasper
index 6c4ac15a5f3015a84d24589005c5ecd864661182..accae702749bde6d4e4286abfa7a238b7799d384 100644
GIT binary patch
delta 57
zcmaE|hVjW7#tmy7g-py%jEoG;P2$bXP0Y-U*%??SH+rdUe(Go~!jC35SwGAa01fOA
AWB>pF

delta 57
zcmaE|hVjW7#tmy7g^UeMER2i|E#l1$4a_Y}*%??SH+rdUe(Go~!jC35SwGAa01QwN
ARsaA1

diff --git a/src/application/reports/ReciboSueldo.jasper b/src/application/reports/ReciboSueldo.jasper
index 051a39d7a635bd5b41943a53fd2272afe74cbf47..45c9b6db3d8cb9c56a176a90ccda45ada734b9d9 100644
GIT binary patch
delta 531
zcmaFa%e1+dX~P{2W|q9v&CfJ=S-6S|8R{6C85kG@C%;KG+H9cv#@Z<G)W2Q(fI@nV
zlI#pjj0}oFsmYm1`N5^BIVt(^hNgy=mL}#VM#jb_7V#z~Cgv8#oBc9<d6_vF1ty;<
zGh-B*%v`R@BFe)kwppjVmV?i78za*JMmFE&44J}={F6OfH7x~!91E>24C&h#xehRb
zcv?VSGMpy^<R!v+d_Z0*gg05T;T5Cs=CjTGjFut?7`cHuPXlF3w=s$wVE7B<?FI63
zK|HYBdLXYD&RYoN6#{vaeVWwjQC$VpnFN&02dm`;@<M>TYB<jg$jb)vkX#P51Igu3
z9@OPf9@OPvp3Vkfm@+bS1Ib$qW|KcQ-DVUAdL)mLx&gGh^_7wY&<-XBrV<8GtkG4%
OU^JOgOJ?%rHZcIA>6se<

delta 544
zcmdno%k;9BX~P|j$<69go8N2vWo9gx{6<H1a<H?=W?9|u*4*`{{_Wbwz`&r#C_Py|
zQ$p0(z{JAH*vuf_(#Xin(43utg^@vL@<TS6$qj|<oAWbOc-hz)1sEALfMRk2E{P?H
z!TF^{$*CNSLW~TClkId3nb{ddCZ8=+WfA9Ll-T^Otd@f>bQ>en0Y-k`<qVm^jDnLJ
z>oqNffgB61Eez?~7`YBGf_Pd$UNW2~1LP&bd3*@o<j3`|7)3XqYv5<J6g$Ak4b*uW
zC|kOXQS1Q2Um$NUke3VMf#uc%dBt$vLLjdY$eVn>MXesyRY09dK-qk-T3#S81jws~
z^W1>EY%mYW<v=@-Tn^<yT@K|zT@L2yYybu{BSSZkyv1NPd3V!oMoF+oCNFD=r*0sX
dw!V^=0@}mGz*NE@8gFQ7XlaQSwUg`GOaUh9pz8nt

diff --git a/src/application/reports/ReciboSueldo.jrxml b/src/application/reports/ReciboSueldo.jrxml
index 4e9eed5..00b4ed7 100644
--- a/src/application/reports/ReciboSueldo.jrxml
+++ b/src/application/reports/ReciboSueldo.jrxml
@@ -167,7 +167,7 @@
 					<subreportParameter name="idLiquidacion">
 						<subreportParameterExpression><![CDATA[$P{idLiquidacion}]]></subreportParameterExpression>
 					</subreportParameter>
-					<dataSourceExpression><![CDATA[$P{REPORT_DATA_SOURCE}]]></dataSourceExpression>
+					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
 					<subreportExpression><![CDATA["src/application/reports/DetalleLiquidacion.jasper"]]></subreportExpression>
 				</subreport>
 			</frame>
@@ -227,7 +227,7 @@
 			<textField>
 				<reportElement x="319" y="22" width="60" height="13" uuid="7b0222f2-2d88-44c3-9bcd-2dd38a484394"/>
 				<textElement verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{total_bruto}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{neto}]]></textFieldExpression>
 			</textField>
 		</band>
 	</columnFooter>
diff --git a/src/application/reports/RecibosPorLiquidacion.jasper b/src/application/reports/RecibosPorLiquidacion.jasper
index 93267e50f4ed5c416efaf752109a45f5391a205c..e121d51e536dbf33cbae6515fc56c991c176e9a8 100644
GIT binary patch
delta 1774
zcma)6TWlLe6rD+GJ53zr)r8t!zv46~wsDi-<|T;ZI!<NeS7S$|RYS6kH|bW+dh4CE
zrcx6As6c#OR78c;fP`ALf`S$zA%RFg_(Q4!;-LaX{pADbFBHMddL5i#5G&a`ch0%z
z-Z{SG8#nN)Z{hc@c0k*>wXTl96UQEFk=av{5&G#2LfE5T?;r+DfV0@J0{-!XYT9xS
z;{v!{-H@<#;8oyl9$SGX5!8H+zrY7ph?ox~cv)7?qcyY&*K9oo4Tsi72ZT6tixMeF
zL@1F819LX2_$%ju39fB^6=O}UZ91AxO=ssKsbn%5$;ML2GQV7_L#w5n&j+ZOBrFiI
zAnAH~eyg6J2tP|TW|CPw9p2~cwC%f`ODh`etrV;zWFphCbT%HXBxv0nh5;J~i*^f5
zeZkK9eZ$Vt^+)y|y1sAk3GJ21#uCxFQ>kRMy6yJAEy{|^!l{BJ=v_nD;n96^?{~nu
z(+ICP+G&Lihuc>^bElS^=cT1UB+n~Kyujy#;_g#hq3x*ER5@z1(@zz~oZYm?S?4HS
zzvgt%^`_HhtMuEHVJ=U_qVdU0CGVlr+Eu}gQ?Yn9I$eR>t|L_Dgp0YyhTy7;4Z*uE
zR$|-5oc+bc>|rh!)IRqYczq=_f!Jfd*g(Hq>8FW}#&-l6WU(aVS@3;z@HIgV`NEQ@
z2*nEw{E8sN-uJ3W-&O}dRtMiy2R{&4_8i3bRq))!_@TOR=+AoYO8GR85W4s?9djm*
z>tva|46xSca5uAZ|H=BK&;CDHzxN&QHWRcj9X=MVCAr2*VvxL3wD5=Cl=WW=bKvle
zQ_`$2(POD4#gsVh&PAxhM!4hk!cA{uvq8U!Y}Z702YVx__)H?HUka@Q+M=<%TUK5x
zqNlWhpBOX1W&bd~q;C0dn{W)|;LA7#kAg3)r{c(z7ZyockXY%{G?e*VPL!5dNYQ$E
z2Qe4LrL!cx3vMXy?Qj}NLEg<UvK<{S(Nh%BlafFJ%3|OgufQ#j9lD2jL#9+jUU<{<
zINToEz-dSi$IZ{N7PPOEGVnb<_;T19m}h@#^fGHdbD5!y0j>!E-|vO!i0wcv6t*lr
zxHe+xss+k2g%86YBfU>k7aEyIF)1fVME9jBFG@m2<`;CUvT@W>wUrSs35=PB`O(vz
zRKcv2x#2}36g3Ul9zCETgg=v^CY=y-<ZK!FZPbcSs-0sdTu&VX_m~r291q##IBL)F
zgjWO-DJ;ukUYMj2O+hj|7(ZmKTv4=hMNvtcr4?|6W;%nz!GY1>Q2*SK!I6Q%5fj>n
zkslryIoLRAQr`)Ex*tCe%P}8*TYWut+31?wM0d6jNnA($-VacA6MeRYKBiGOjr<f-
p!|7T4PuAzVSrATlsN2V%slnW%$C!}JTxs9aC_#hT7`JD;{sPsRA`t)p

delta 2360
zcma)8U2IcT96x7lYsWSm>)2P@+pgPW>BeBfwz5s2j4?jit#n<$35*N98y8CNZF>iu
z;>rsFKVIOkW-(%nhJczFObIVyf)7L=Fa!i8YW#jM5J~h!eQ^3e=iY7|mf(Fj=lnl^
z|MNTlbJ~~RqUX=k3$Iy9RaH%@gxuXr2>C7jjYTV<Dr~E<QYC$;=66aD!X9foorG7d
z_4NnQStF$f#KU6igeFH?{i3QSVq}U;Qp#<W@a>b8#k!7rgV-d1)mB@d@hIKm9SZaX
zM}vKV!C)xMlQhANMmyMS#c<44h=?a_4n#kP<0O1y6L7t*&TcaDKwv`!2=+pgUK5KI
zV6(jpeMjtqp<T|kXY5t>S#%wC)Hm4c_4OI(aKmoHxcl}7#IOhrxb_GPZ@VDO;?49{
z&D&R9kpP#4YV^G=)S>SmI8H*1qY2mR9WA(49IgVL1GPhdi;gPPU30L!_Z&`KmpE%|
zdi9Iu81=~s&7c&#&I)wiV|78&X~BS(oK8c&&gGw+u5LZSVxAx(M#o#%D@sHXqec!&
z^dpnQJ~=iahsAxeV%RvH^k8~--Azhk&{khL@}))!R5>X{*pc4J7H(?998t#QgcLu_
zj5jnw*!)Gd)2(db>ulk3c)z}8(d}&2SLsjduT%PKdb;tS1<uoYy?+vN<US#k=blkj
zgwPucVtq@(Tr6U+k8&sFe(z8SyDT&q^7=*t-u}L!{}&A_+}m7cjpVbKTu@U?`8T}n
z-bg9jbq_W?tRPy=Z$>ZPt9*E)*$v;h7h=fiW`FIHT!~RftKqNaHR$AN2~=Pag}sBm
zVgG>cJryTC*v~ddH5I@|EuDFXRTyn*Ok0;dZ=!v0cGZh?E3~!0klN}arie7A1*9m;
zxdTO242R|DI1|yjK%KRe#O3k*T40{ptm|fd7HWz*-=mOe40{q^fH+whm9*BxSnB~X
z0rxtcFw(KRU@#dcZup^dDg4~=rpf0cC5Q{L_GY-$X)PUL#qeQRO~7@t<J6U6FnelS
zcCyC^yOy7q?!}vf<}kp3r+-NfJ!ag~#53OV)L3#joL;@-ab#j4<7sm=EJZbgo8pKZ
zm4;NjCpujLm|9&)eelZaoog_lB%zzUW118<LP`zYdTC6FONO#U6ZZ}wP21(Lwx8=@
zc~>nRPH*Wl(JI~<<$Sbaf8-s>XJdwj)Q~1>^1hIi#9PL`rFZfO^^trHHJFR!C0WKT
z#;aY1_eKB0#!MJ@WHED^U`%o@Nl#|6mIHgIr*}>F_+M|R4L-Z=`(Upp!@HV~t>($J
znt78Fm!DCh8XW6#r3!+Z`!|JnO8ro_>(kSjV21hJ?2y#0;(x6<j#LlR4Y-rJCYUp%
zrs!A>i~b`-_Zu6e*pss#t0kh5;-Iuo-m5sHaixoGpZ2pn$XDq+_9WEgJ)FH1MiPU*
z_kL_X`k{1YrTM^B&2_f_Zl<mbGDpcp&j|+4hvPZu(XBb?VTKevk%OP?ka_eNh6m|6
zo+%M$R!hX7f_IOuQh1B7x63@i_Ka*1nux&#OFoQQY|z$SQC7}=@;O%y_5^hBj+qG*
z!O`vxYs5#&!=ff8B&}CDq{<O#14=Aa1U~C-tc|T*$Kl8kGtOmfo#dD?DCrq~Y~_ko
zp0;*R=cuQ%!{d1(t@iv<M9;!g8=L85`uN6^h0f3=^6?dN*?*3#a9<>Ik_)AlOXO;L
pnSU2Gq5c|r!Ks02dNuv-z%Kg8Kv)`hr|bcI4L-oXF*AY6e*p)8-irVL

diff --git a/src/application/reports/RecibosPorLiquidacion.jrxml b/src/application/reports/RecibosPorLiquidacion.jrxml
index 61742ba..04fb69f 100644
--- a/src/application/reports/RecibosPorLiquidacion.jrxml
+++ b/src/application/reports/RecibosPorLiquidacion.jrxml
@@ -2,7 +2,7 @@
 <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RecibosPorLiquidacion" pageWidth="420" pageHeight="595" columnWidth="380" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="f48afb85-e5c4-43ee-b03b-0e173a4df7c0">
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="logiserv"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
@@ -25,13 +25,10 @@
 	<background>
 		<band splitType="Stretch"/>
 	</background>
-	<title>
-		<band height="18" splitType="Stretch"/>
-	</title>
 	<detail>
-		<band height="241" splitType="Stretch">
+		<band height="430" splitType="Stretch">
 			<subreport>
-				<reportElement x="0" y="0" width="380" height="241" uuid="b2be5f25-3f9a-4760-90c4-94908925964e"/>
+				<reportElement x="0" y="0" width="380" height="430" uuid="b2be5f25-3f9a-4760-90c4-94908925964e"/>
 				<parametersMapExpression><![CDATA[$P{REPORT_PARAMETERS_MAP}]]></parametersMapExpression>
 				<subreportParameter name="idLiquidacionEmpleado">
 					<subreportParameterExpression><![CDATA[$F{idLiquidacionEmpleado}]]></subreportParameterExpression>
@@ -39,11 +36,6 @@
 				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
 				<subreportExpression><![CDATA["src/application/reports/ReciboSueldo.jasper"]]></subreportExpression>
 			</subreport>
-			<textField>
-				<reportElement x="280" y="0" width="100" height="13" uuid="086ac574-22a5-47ea-abe2-2b7cbb659d33"/>
-				<textElement verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{idLiquidacionEmpleado}]]></textFieldExpression>
-			</textField>
 		</band>
 	</detail>
 	<summary>
diff --git a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
index 01f0d0f..86f36df 100644
--- a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
+++ b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
@@ -1,5 +1,6 @@
 package application.view.sueldo.cruds;
 
+import application.comunes.Alerta;
 import application.model.info.CategoriaEmpleado;
 import application.model.info.Empleado;
 import application.model.sueldo.ConceptoCalculado;
@@ -60,7 +61,6 @@ public class LiquidacionSueldoController implements Initializable {
 
     @FXML
     private TableView<ConceptoSueldo> novedadesTableView;
-    //    @FXML
     @FXML
     private TableColumn<ConceptoSueldo, String> codigoColumn;
     @FXML
@@ -433,11 +433,40 @@ private void separarConceptosByTipoConcepto(){
         }
 
     }
+    private boolean validarFechas(){
+        boolean isOkDates = false;
+        if (desdeDatePicker.getValue() != null || hastaDatePicker.getValue() != null){
+            java.util.Date input = new Date();
+            LocalDate actual = input.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+            if ( desdeDatePicker.getValue().compareTo(hastaDatePicker.getValue()) <= 0 &&
+                    hastaDatePicker.getValue().compareTo(actual) <= 0){
+                isOkDates =true;
+            }
+        }
+        return isOkDates;
+    }
 
+    private boolean isInputValid() {
+        String errorMessage = "";
+        if (novedadesTableView.getItems().isEmpty())
+            errorMessage += "No se selecciono ningun empleado a liquidar";
+        if (!validarFechas())
+            errorMessage += "\nFechas inválidas: \n Las fechas ingresadas no pueden superar a la fecha actual \n Fecha Desde debe ser menor a Fecha Hasta";
+        if (errorMessage.length() == 0) {
+            return true;
+        } else {
+            Alerta.alertaError("Datos inválidos", errorMessage);
+            return false;
+        }
+    }
     @FXML
     public void handleOk(){
-        liquidarEmpleados();
-        owner.close();
+        //Valida que las fechas se ingresen correctamente
+        if (isInputValid()) {
+            liquidarEmpleados();
+            owner.close();
+        }
+
     }
 
 

From 49d3c180e099b55a799e81383ded02f99710e9f4 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Fri, 2 Mar 2018 04:20:13 -0300
Subject: [PATCH 17/27] Merge branch 'develop' of
 https://github.com/isamed92/LogiservStudio

# Conflicts:
#	.idea/workspace.xml
---
 .../reports/DetalleLiquidacion.jasper         | Bin 22116 -> 22114 bytes
 src/application/reports/ReciboSueldo.jasper   | Bin 34483 -> 34486 bytes
 src/application/reports/ReciboSueldo.jrxml    |   4 +--
 .../reports/RecibosPorLiquidacion.jasper      | Bin 20756 -> 20795 bytes
 .../reports/RecibosPorLiquidacion.jrxml       |  25 +++++++-----------
 .../view/sueldo/LiquidacionesController.java  |   2 +-
 6 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/application/reports/DetalleLiquidacion.jasper b/src/application/reports/DetalleLiquidacion.jasper
index accae702749bde6d4e4286abfa7a238b7799d384..749e883ff73b0c05e37faf33ff9a2bf39a0fbf00 100644
GIT binary patch
delta 103
zcmaE|hVjuF#tkiwRufPC+qI8@fkBVq9y<dQBZHbtYDr>FPO494VQFScVsd7FUc8~H
qp{1p{iMff1g}Gt8siC={0XqZB<VG*G%}*UoL_|ffshF%EW(oipLmv(R

delta 112
zcmaE~hVjW7#tkiw){{>C+qI8@fkBVq9y<dQBZIn2YDr>FPO494VQFScVsd7FUc8~H
yp{1pXxrvdHp}9%Cxw(m%nK3&9%j5<xwarf)O++L`u_`HHFq&*ABQx12Obh@wrXeH%

diff --git a/src/application/reports/ReciboSueldo.jasper b/src/application/reports/ReciboSueldo.jasper
index 45c9b6db3d8cb9c56a176a90ccda45ada734b9d9..4f4ec6236657ca3e5a054230f8d55d8acb502a37 100644
GIT binary patch
delta 88
zcmdno%e1YRX~P;%9`4-yl+>L3w9LH3oXuN3qeU25Hw(t8af_N8n46oJT3W;#8(5f|
f8nQF6Ff!;&e#j;>xuKAKaek&OKbnfkb#0~q)dv~0

delta 90
zcmdni%e1+dX~P;%PL7=X^vvSaqO#39JflTe*%%lY7$-Nzt8TW9`^zP2Vs2t&Y;0l?
hZ(?F%Zeh&Mz{1F&Gx;H#%;xM&c3FNj>B)_4rU3ic8L<EW

diff --git a/src/application/reports/ReciboSueldo.jrxml b/src/application/reports/ReciboSueldo.jrxml
index 00b4ed7..a863050 100644
--- a/src/application/reports/ReciboSueldo.jrxml
+++ b/src/application/reports/ReciboSueldo.jrxml
@@ -2,7 +2,7 @@
 <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReciboSueldo" pageWidth="420" pageHeight="595" columnWidth="380" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="5b0bdcbb-b9c4-4981-b525-d1276281a4db">
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="logiserv"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="modelofinal"/>
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
@@ -129,7 +129,7 @@
 					<textFieldExpression><![CDATA[$F{idEmpleado}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="6" y="1" width="214" height="19" uuid="1b4a0159-ad2b-4521-a2f8-a0a256221d9c"/>
+					<reportElement x="5" y="1" width="214" height="19" uuid="1b4a0159-ad2b-4521-a2f8-a0a256221d9c"/>
 					<textElement verticalAlignment="Middle">
 						<font size="14" isBold="true"/>
 					</textElement>
diff --git a/src/application/reports/RecibosPorLiquidacion.jasper b/src/application/reports/RecibosPorLiquidacion.jasper
index e121d51e536dbf33cbae6515fc56c991c176e9a8..9fa8d5ec4597b27ee42192c93078abe87ee64615 100644
GIT binary patch
delta 3129
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

delta 3028
zcma(TYiwI*_4}OINgU@LJ8@z=wp*vQ6FX}jP7|li+{P`|9Oq$YCFzvx#=cE%d+U39
zecfh-r0{d7E3M9$U?BETg%Cq%VE!P`#A6cMkhb;5UeJ~C10gYKP*EPzrj_$u$DW(G
z3`;)ueCPFj=X~dU=luM6`sDNU#oKysJ0XPPpMAbu_!7d1x&%_LGYVU^ll*ectCX5y
ze_h5*E>ttdhD^v`R~bfSS%x=)y)fmn!XpM}T}>i6A4wkl!WK9Od*JUu1B4CT&>X6!
z4!CIev*jGwBCS~lyP3LXk7mIY>bdsIdU&O7V4y8V+S8oMC8V5^;v*Zf!e_IBlwmr^
zGxGORpx5|Y+6EsP7j^y(xDjM_^4a=_Xsb0w>P|@tpOQpLVcLW6rpZDr@E6k!)c9FL
zlD0$GV}ZSm&-RkryQ3j9r4|N!=qCP(PU)es$%zgPG%X{%(iCmJ`tp-kANM>J|H(@$
zp2??=KMFs#_rY|FF>h<$qKA*7tMxf%=s0s)b3aN|;&*42)Bq>TqLAWL^l?DpWl2%9
z1M_@JSd|hvUQA2yr<OZj^t?L5o#mMk-G;20U}o!fnuSkW9dOOl(ZwX0MD0!q9k{&K
zPUcVX9_b!-kD9wZAiCbf=p1riE<`8)f!jjqSpMI8qEw@F(NXx($RJ$tEO)fWNTaMs
zGOwrtpN$DwmF;SVs$L)MhCuK4?W#)JMd4gdNOLK4aD_iBi#(T>m|Pa_wsu1OzQ5sq
zAMg7%T4#1&-EX53-1NJl*4sum!RFnA>j%A7#FxB#5x?Y}K>QcpZp2^k?SYTIEx2y*
z_2Al%a1*9|4#Y*D9r3UEoSNJ);vZ=AyS@<Op}y{33B6WH^J(rp7s#oC7>G$JPUH*W
z-J~okDzU(K4_j&qGzq@dw-=RP>SG(ck8l${>0<|U_KzcevfqXHCc;g4rhh-;uk`mL
z{?C4QO<^-XJXdFfaes%iXuo+rGCMP$TuDZzXJg@HBvIVzoZs196sk`!kz>(FY^ucn
zp})&g<QtAfW68*TQT3*O#9d^yZrgu2I-gt!$D&K+Vs2OnuqX=wHy-wKfJN*F0Tx+|
zUaeHH*PZ_`@H=`bH~Apu6CtJxwFsN>U(c@b4=T~i!Uiw0#m(}?+bXFQr8ObTE9V*W
zEtL@V{e8L6yXA{NmM`8ZU%anc%eHy1oOLTdci?rZBe%gd<fh^L)X*W?fd$hjWKs%$
zmd~ii6)C5scM!fgoX2#Fjo4`rPLKQ=>(?Kg+v`wCb$liskqZv9x*<F32EKl<3!2CD
z@T=gQ4;2iBxH5;HDyV%z$c2xvz?qX&rxg^{!^Eh=)$qAeUmCR^`dq29<I(#b@6M=Y
z%7p&RhL1-oZM(%zhp&(R=*&VqS$auy_c3U+>&v#SsvtEqeBXoHO6IF8D6(+gYhGVL
z$^~B>YaX^%a)o*F*%pQh%DcCysUYQsyJM|Q7&ODtnb^W~T-ytr<8zH#Vl2dBjB-&1
zXUGHB$9phqULK!CXb#OdnaGiFe5#NG_it|3+rHO{S=q#&=fs@$+?S>0YWqqYnb!5k
z@G%vI%$aZ|wJs^U+FwUWV3u3k*&R=kw$Ipb)z}Xqb8r#Oc9qCUNfK2-{vUQvtn-;&
z>?R?5MC3AO7&D#|wNm%PYv!oFZ9~Dv`dr;Un6!Kco9j)>Ph0#kQY&PmDu;cI1rFc5
zj`m5UqM3xM2xs`@I#%S`y2gwV6C*z+^64bMp>+@xtrxNjnY0!Qt?BvUPRB8{AL{%K
z!n>VI2$!taPafDFMJ&bsP10Dqm+?<a{hLNvdn+`!i6SzorDpi)Plx{Xjc1-+c;Z&{
z_5YZstC%@W7zdlL7#@IIT^=2s0e$!5m*`B4)QJ2kb(Uw-2z>;XGM7#ZnKiaVZk1f(
zm=s}cU7fv$U0a})WQ?jL-z#BYlx_Y7mYqU|GQ1kdo(i1ipux7KqX~Gz#<vdQY=c?C
zYhhziv_Q2zp`){~Xn)8=m)UtVum~^OBZKtOqFW`#vX-uu8SF;C>hQswqr*~Jf(>lo
zv^ByD4s&Nk5j=cxs?+s&53}ePS?r>CsTp?3j8d=pAmeCI2w@Uaq>PjhF0#8vuY{hH
zOH9F(EeMBCsXUwM7_DKOc7$is-Zs&sa;pgp<_RIKvNU6Ywc9l9;>{Rd{4v%dIGhVu
z%&K$Qg~ePIpE*%_woJQTi+?yhCem3pFl9okRE8TNE5Z*$9-4!eiB1jT7&T#`*C093
v*EBpjd|+%i_`u4@;K2if2lH1ZMvR`m|7ZTo-#%tAw(ihZwW70uXU_6pC0A?2

diff --git a/src/application/reports/RecibosPorLiquidacion.jrxml b/src/application/reports/RecibosPorLiquidacion.jrxml
index 04fb69f..6e1a36c 100644
--- a/src/application/reports/RecibosPorLiquidacion.jrxml
+++ b/src/application/reports/RecibosPorLiquidacion.jrxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RecibosPorLiquidacion" pageWidth="420" pageHeight="595" columnWidth="380" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="f48afb85-e5c4-43ee-b03b-0e173a4df7c0">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RecibosPorLiquidacion" pageWidth="380" pageHeight="555" columnWidth="380" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f48afb85-e5c4-43ee-b03b-0e173a4df7c0">
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="modelofinal"/>
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
@@ -22,29 +22,22 @@
 		<property name="com.jaspersoft.studio.field.label" value="idLiquidacionEmpleado"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
 	<detail>
-		<band height="430" splitType="Stretch">
+		<band height="451" splitType="Stretch">
 			<subreport>
-				<reportElement x="0" y="0" width="380" height="430" uuid="b2be5f25-3f9a-4760-90c4-94908925964e"/>
+				<reportElement x="0" y="0" width="380" height="420" uuid="d66b32f5-1db8-429b-bd43-a86a3e02239c"/>
 				<parametersMapExpression><![CDATA[$P{REPORT_PARAMETERS_MAP}]]></parametersMapExpression>
-				<subreportParameter name="idLiquidacionEmpleado">
+				<subreportParameter name="el id de la liquidacion del empleado">
 					<subreportParameterExpression><![CDATA[$F{idLiquidacionEmpleado}]]></subreportParameterExpression>
 				</subreportParameter>
 				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-				<subreportExpression><![CDATA["src/application/reports/ReciboSueldo.jasper"]]></subreportExpression>
+				<subreportExpression><![CDATA["src/application/reports/RecibosPorLiquidacion.jasper"]]></subreportExpression>
 			</subreport>
-		</band>
-	</detail>
-	<summary>
-		<band height="24" splitType="Stretch">
 			<textField>
-				<reportElement x="140" y="1" width="100" height="22" uuid="8dde49ce-f815-4d03-9afe-33f6959fa055"/>
-				<textElement verticalAlignment="Middle"/>
+				<reportElement x="139" y="421" width="100" height="30" uuid="99000d50-9734-44e2-877e-c3e643b8354c"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 		</band>
-	</summary>
+	</detail>
 </jasperReport>
diff --git a/src/application/view/sueldo/LiquidacionesController.java b/src/application/view/sueldo/LiquidacionesController.java
index f8b3dd8..9965792 100644
--- a/src/application/view/sueldo/LiquidacionesController.java
+++ b/src/application/view/sueldo/LiquidacionesController.java
@@ -144,7 +144,7 @@ private void handleNew(){
 	private void handleImprimirRecibos(){
 		System.out.println("se imprimieron recibos de sueldo");
 		int idLiquidacion = liquidacionTable.getSelectionModel().getSelectedItem().getId();
-		AbstractJasperReports.createReport("src\\application\\reports\\ReciboSueldo.jasper",
+		AbstractJasperReports.createReport("src\\application\\reports\\RecibosPorLiquidacion.jasper",
 				"idLiquidacion", idLiquidacion);
 		AbstractJasperReports.showViewer();
 	}

From 5a0577eec0cc51f185b416dad1322b102ab09294 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Fri, 2 Mar 2018 05:47:09 -0300
Subject: [PATCH 18/27] reportes de recibo de sueldos por liquidacion

---
 .../reports/DetalleLiquidacion.jasper         | Bin 22114 -> 22116 bytes
 src/application/reports/ReciboSueldo.jasper   | Bin 34486 -> 34483 bytes
 src/application/reports/ReciboSueldo.jrxml    |   2 +-
 .../reports/RecibosPorLiquidacion.jasper      | Bin 20795 -> 0 bytes
 .../TodosLosRecibosDeUnaLiquidacion.jasper    | Bin 0 -> 17125 bytes
 ... => TodosLosRecibosDeUnaLiquidacion.jrxml} |  28 +++++++++---------
 src/application/reports/classes/JasperFX.java |  12 ++++----
 .../view/sueldo/LiquidacionesController.java  |   4 +--
 8 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 src/application/reports/RecibosPorLiquidacion.jasper
 create mode 100644 src/application/reports/TodosLosRecibosDeUnaLiquidacion.jasper
 rename src/application/reports/{RecibosPorLiquidacion.jrxml => TodosLosRecibosDeUnaLiquidacion.jrxml} (69%)

diff --git a/src/application/reports/DetalleLiquidacion.jasper b/src/application/reports/DetalleLiquidacion.jasper
index 749e883ff73b0c05e37faf33ff9a2bf39a0fbf00..4922dbd1db2cc39bcd4439a7d030a4f170411f23 100644
GIT binary patch
delta 112
zcmaE~hVjW7#tkiw){{>C+qI8@fkBVq9y<dQBZIn2YDr>FPO494VQFScVsd7FUc8~H
yp{1pTfw6&+g@I|jiG_ucr71fD%j5<xwarf)O++L`u_`HHFq&*ABQx12Obh@vx*;F{

delta 103
zcmaE|hVjuF#tkiwRufPC+qI8@fkBVq9y<dQBZHbtYDr>FPO494VQFScVsd7FUc8~H
qp{1p{iMff1g}Gt8siC={0XqZB<VG*G%}*UoL_|ffshF%EW(oipLmv(R

diff --git a/src/application/reports/ReciboSueldo.jasper b/src/application/reports/ReciboSueldo.jasper
index 4f4ec6236657ca3e5a054230f8d55d8acb502a37..b588bbfbde7b8a88db0c5eb5cf54fabf0fc188ce 100644
GIT binary patch
delta 75
zcmdni%e1+dX~P;%PL7=X^vvSaqO#39Je%Z2Eewnej4Vvd;*Bg!4K2;t8CVz@bS6J!
Sli8e|$u7%}COx^a%@hEV?-k|%

delta 81
zcmdno%e1YRX~P;%9`4-yl+>L3w9LH3oXuN3o8(2!4b06=Of4<qjSVc!O%2%@SQr^}
YCO>48ncPswzBoTqmLE;U<hnLf07Xj}jQ{`u

diff --git a/src/application/reports/ReciboSueldo.jrxml b/src/application/reports/ReciboSueldo.jrxml
index a863050..5889816 100644
--- a/src/application/reports/ReciboSueldo.jrxml
+++ b/src/application/reports/ReciboSueldo.jrxml
@@ -2,7 +2,7 @@
 <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReciboSueldo" pageWidth="420" pageHeight="595" columnWidth="380" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="5b0bdcbb-b9c4-4981-b525-d1276281a4db">
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="modelofinal"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="logiserv"/>
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
diff --git a/src/application/reports/RecibosPorLiquidacion.jasper b/src/application/reports/RecibosPorLiquidacion.jasper
deleted file mode 100644
index 9fa8d5ec4597b27ee42192c93078abe87ee64615..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20795
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

diff --git a/src/application/reports/TodosLosRecibosDeUnaLiquidacion.jasper b/src/application/reports/TodosLosRecibosDeUnaLiquidacion.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..9a5e969d104ac4c076952b10bbe7af839ffe661a
GIT binary patch
literal 17125
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

literal 0
HcmV?d00001

diff --git a/src/application/reports/RecibosPorLiquidacion.jrxml b/src/application/reports/TodosLosRecibosDeUnaLiquidacion.jrxml
similarity index 69%
rename from src/application/reports/RecibosPorLiquidacion.jrxml
rename to src/application/reports/TodosLosRecibosDeUnaLiquidacion.jrxml
index 6e1a36c..1721c20 100644
--- a/src/application/reports/RecibosPorLiquidacion.jrxml
+++ b/src/application/reports/TodosLosRecibosDeUnaLiquidacion.jrxml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RecibosPorLiquidacion" pageWidth="380" pageHeight="555" columnWidth="380" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f48afb85-e5c4-43ee-b03b-0e173a4df7c0">
-	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="modelofinal"/>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="TodosLosRecibosDeUnaLiquidacion" pageWidth="420" pageHeight="595" columnWidth="380" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="629d93d4-859a-4d60-add8-515ef1accfe1">
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="logiserv"/>
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
+	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/>
@@ -13,7 +13,7 @@
 	<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
 	<parameter name="idLiquidacion" class="java.lang.Integer"/>
-	<queryString language="SQL">
+	<queryString>
 		<![CDATA[select idLiquidacionEmpleado
  from liquidacion_empleado
  where LIQUIDACION_idLIQUIDACION=$P{idLiquidacion}]]>
@@ -22,22 +22,22 @@
 		<property name="com.jaspersoft.studio.field.label" value="idLiquidacionEmpleado"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="liquidacion_empleado"/>
 	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
 	<detail>
-		<band height="451" splitType="Stretch">
+		<band height="554" splitType="Stretch">
 			<subreport>
-				<reportElement x="0" y="0" width="380" height="420" uuid="d66b32f5-1db8-429b-bd43-a86a3e02239c"/>
-				<parametersMapExpression><![CDATA[$P{REPORT_PARAMETERS_MAP}]]></parametersMapExpression>
-				<subreportParameter name="el id de la liquidacion del empleado">
+				<reportElement x="0" y="0" width="380" height="554" uuid="78d80424-229a-4cbb-98f8-718ab906e1c6"/>
+				<subreportParameter name="idLiquidacion">
 					<subreportParameterExpression><![CDATA[$F{idLiquidacionEmpleado}]]></subreportParameterExpression>
 				</subreportParameter>
 				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-				<subreportExpression><![CDATA["src/application/reports/RecibosPorLiquidacion.jasper"]]></subreportExpression>
+				<subreportExpression><![CDATA["src/application/reports/ReciboSueldo.jasper"]]></subreportExpression>
 			</subreport>
-			<textField>
-				<reportElement x="139" y="421" width="100" height="30" uuid="99000d50-9734-44e2-877e-c3e643b8354c"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
 		</band>
 	</detail>
 </jasperReport>
diff --git a/src/application/reports/classes/JasperFX.java b/src/application/reports/classes/JasperFX.java
index 4c46670..f8789d2 100644
--- a/src/application/reports/classes/JasperFX.java
+++ b/src/application/reports/classes/JasperFX.java
@@ -140,12 +140,12 @@ private Scene createScene(Page page, int width, int height) {
         canvas.heightProperty().bind(sbVertical.heightProperty());
         canvas.widthProperty().bind(sbHorizontal.widthProperty());
 
-        Button btnNext = new Button("Next");
-        Button btnPrev = new Button("Prev");
-        Button btnLast = new Button("Last");
-        Button btnFirst = new Button("First");
-        Button btnSave = new Button("Save");
-        Button btnPrint = new Button("Print");
+        Button btnNext = new Button("Siguiente");
+        Button btnPrev = new Button("Anterior");
+        Button btnLast = new Button("Ultimo");
+        Button btnFirst = new Button("Primero");
+        Button btnSave = new Button("Guardar");
+        Button btnPrint = new Button("Imprimir");
 
         btnPrint.setOnAction(ae -> printReport());
         btnSave.setOnAction(ae -> saveReport());
diff --git a/src/application/view/sueldo/LiquidacionesController.java b/src/application/view/sueldo/LiquidacionesController.java
index 9965792..2dab61c 100644
--- a/src/application/view/sueldo/LiquidacionesController.java
+++ b/src/application/view/sueldo/LiquidacionesController.java
@@ -142,9 +142,9 @@ private void handleNew(){
 
 	@FXML
 	private void handleImprimirRecibos(){
-		System.out.println("se imprimieron recibos de sueldo");
 		int idLiquidacion = liquidacionTable.getSelectionModel().getSelectedItem().getId();
-		AbstractJasperReports.createReport("src\\application\\reports\\RecibosPorLiquidacion.jasper",
+		System.out.println("se imprimieron recibos de sueldo "+ idLiquidacion);
+		AbstractJasperReports.createReport("src\\application\\reports\\TodosLosRecibosDeUnaLiquidacion.jasper",
 				"idLiquidacion", idLiquidacion);
 		AbstractJasperReports.showViewer();
 	}

From 732b8ccb6aadd42ad5358fefef9db4cca9c1548b Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Fri, 2 Mar 2018 05:58:25 -0300
Subject: [PATCH 19/27] CORRECION DE ERRORES 1.0: MODULO COMPRAS       -
 Eliminado boton y funcionalidad de "Articulo.fxml" y
 "ArticuloController.java"

---
 src/application/view/compra/Articulos.fxml        |  5 ++++-
 .../view/compra/ArticulosController.java          | 15 ---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/application/view/compra/Articulos.fxml b/src/application/view/compra/Articulos.fxml
index 449efda..68a5dea 100644
--- a/src/application/view/compra/Articulos.fxml
+++ b/src/application/view/compra/Articulos.fxml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+
 <AnchorPane prefHeight="445.0" prefWidth="627.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.ArticulosController">
   <children>
 <VBox alignment="CENTER_LEFT" layoutX="20.0" prefHeight="445.0" prefWidth="643.0" spacing="10.0">
@@ -23,7 +27,6 @@
       <children>
         <Button fx:id="buttonNew" alignment="CENTER" mnemonicParsing="false" onAction="#handleNew" text="Nuevo Artículo" />
         <Button fx:id="buttonUpdate" alignment="CENTER" mnemonicParsing="false" onAction="#handleUpdate" text="Editar Artículo" />
-        <Button fx:id="buttonDelete" alignment="CENTER" mnemonicParsing="false" onAction="#handleDelete" text="Eliminar Artículo" />
       </children>
       <padding>
         <Insets top="30.0" />
diff --git a/src/application/view/compra/ArticulosController.java b/src/application/view/compra/ArticulosController.java
index 952edd6..0bd7e71 100644
--- a/src/application/view/compra/ArticulosController.java
+++ b/src/application/view/compra/ArticulosController.java
@@ -27,8 +27,6 @@ public class ArticulosController {
     @FXML
     private Button buttonUpdate;
     @FXML
-    private Button buttonDelete;
-    @FXML
     private TableView<Articulo> articuloTableView;
     @FXML
     private TableColumn<Articulo, String> marcaTableColumn;
@@ -71,19 +69,6 @@ public void handleUpdate(){
 
     }
 
-    @FXML
-    public void handleDelete(){
-        Articulo articulo = articuloTableView.getSelectionModel().getSelectedItem();
-        Optional<ButtonType> resultado = Alerta.alertaConfirmacion("Eliminar Artículo",
-                null, "¿Desea eliminar el artículo seleccionado?");
-        if (resultado.isPresent() && resultado.get()==ButtonType.OK){
-            articuloTableView.getItems().remove(
-                    articuloTableView.getSelectionModel().getSelectedIndex());
-            articuloRepository.delete(articulo.getIdArticulo());
-        }else
-            Alerta.alertaError("Seleccionar Artículo", "Por favor seleccione un artículo en la tabla.");
-
-    }
     public boolean showEdit(Articulo articulo, boolean tipo) {
         try {
             // Load the fxml file and create a new stage for the popup dialog.

From 7805a91c87e308d527b12154e3c9a62d646f9167 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Fri, 2 Mar 2018 17:29:40 -0300
Subject: [PATCH 20/27] =?UTF-8?q?CORRECION=20DE=20ERRORES=201.1:=20MODULO?=
 =?UTF-8?q?=20view/COMPRAS=20y=20view/INFO=20=20=20=20=20=20=20-=20cambiad?=
 =?UTF-8?q?os=20los=20textos=20en=20ingles=20a=20espa=C3=B1ol=20para=20dar?=
 =?UTF-8?q?=20consistencia?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/application/view/Login.fxml                   | 15 +++++++++------
 src/application/view/RegisterController.java      |  5 -----
 .../view/compra/cruds/ArticuloEditController.java | 12 ++++++------
 .../cruds/CategoriaEmpleadoEditController.java    |  2 +-
 .../info/cruds/EmpleadoEditDialogController.java  |  6 +++---
 .../info/cruds/UsuarioEditDialogController.java   |  8 ++++----
 6 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/application/view/Login.fxml b/src/application/view/Login.fxml
index 4c1f51a..eb06988 100644
--- a/src/application/view/Login.fxml
+++ b/src/application/view/Login.fxml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
+
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" stylesheets="@css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.LoginController">
    <center>
       <AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
@@ -19,15 +22,15 @@
                         <GridPane>
                            <children>
                               <Label alignment="CENTER" contentDisplay="CENTER" prefHeight="17.0" prefWidth="369.0" text="Sign In" GridPane.columnSpan="2147483647" />
-                              <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="1">
+                              <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="1">
                                  <children>
-                                    <Label prefHeight="17.0" prefWidth="60.0" text="Usuario:" />
+                                    <Label prefHeight="17.0" prefWidth="62.0" text="Usuario:" />
                                     <TextField fx:id="usuarioField" onAction="#pfUserNameOnHitEnter" />
                                  </children>
                               </HBox>
-                              <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="2">
+                              <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="2">
                                  <children>
-                                    <Label prefHeight="17.0" prefWidth="60.0" text="Password:" />
+                                    <Label text="Contraseña:" />
                                     <PasswordField fx:id="passwordField" onAction="#pfUserPassOnHitEnter" />
                                  </children>
                               </HBox>
@@ -36,14 +39,14 @@
                                     <VBox alignment="CENTER" prefHeight="72.0" prefWidth="259.0" spacing="10.0">
                                        <children>
                                           <Label fx:id="errorLoginLabel" alignment="CENTER" prefHeight="17.0" prefWidth="257.0" text=" " textFill="RED" />
-                                          <Button fx:id="btnLogin" mnemonicParsing="false" onAction="#btnLogin" onKeyPressed="#btnLogin" text="Login" />
+                                          <Button fx:id="btnLogin" mnemonicParsing="false" onAction="#btnLogin" onKeyPressed="#btnLogin" text="Iniciar sesión" />
                                        </children>
                                     </VBox>
                                  </children>
                               </HBox>
                               <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="6">
                                  <children>
-                                    <Hyperlink fx:id="hlCrateAccount" onAction="#hlCreateAnAccount" text="Create an account" />
+                                    <Hyperlink fx:id="hlCrateAccount" onAction="#hlCreateAnAccount" text="Crear una cuenta" />
                                  </children>
                               </HBox>
                            </children>
diff --git a/src/application/view/RegisterController.java b/src/application/view/RegisterController.java
index 408dddd..4cb3c9c 100644
--- a/src/application/view/RegisterController.java
+++ b/src/application/view/RegisterController.java
@@ -19,7 +19,6 @@
 import java.net.URL;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.time.chrono.HijrahChronology;
 import java.util.Date;
 import java.util.ResourceBundle;
 
@@ -51,7 +50,6 @@ public class RegisterController implements Initializable {
     @FXML
     private Button registrarButton;
 
-    private Stage owner;
     private Stage dialogStage;
 
     private CategoriaEmpleadoRepository categoriaEmpleadoRepository = new CategoriaEmpleadoRepository();
@@ -114,9 +112,6 @@ public void initialize(URL location, ResourceBundle resources) {
         cargarLocalidades();
 
     }
-    public void setOwner(Stage owner){
-        this.owner = owner;
-    }
 
     public void setDialogStage(Stage dialogStage) {
         this.dialogStage = dialogStage;
diff --git a/src/application/view/compra/cruds/ArticuloEditController.java b/src/application/view/compra/cruds/ArticuloEditController.java
index dd22136..1089b68 100644
--- a/src/application/view/compra/cruds/ArticuloEditController.java
+++ b/src/application/view/compra/cruds/ArticuloEditController.java
@@ -107,17 +107,17 @@ public void handleCancel(){
     public boolean isInputValid() {
         String errorMessage = "";
         if (marcaTextField.getText() == null || marcaTextField.getText().length() == 0) {
-            errorMessage += "No valid brand name!\n";
+            errorMessage += "No se ingresó una marca válida\n";
         }
         if (modeloTextField.getText() == null || modeloTextField.getText().length() == 0) {
-            errorMessage += "No valid model name!\n";
+            errorMessage += "No se ingresó un modelo válido\n";
         }
         if (descripcionTextArea.getText() == null || descripcionTextArea.getText().length() == 0) {
-            errorMessage += "No valid description!\n";
+            errorMessage += "No se ingresó una descripción válida\n";
+        }
+        if (categoriaComboBox.getSelectionModel().isEmpty()) {
+            errorMessage += "No se seleccionó una categoria correctamente.\n";
         }
-       /* if (categoriaComboBox.is == null || modeloTextField.getText().length() == 0) {
-            errorMessage += "No valid model name!\n";
-        }*/
         if (errorMessage.length() == 0) {
             return true;
         } else {
diff --git a/src/application/view/info/cruds/CategoriaEmpleadoEditController.java b/src/application/view/info/cruds/CategoriaEmpleadoEditController.java
index 8d7b629..676c614 100644
--- a/src/application/view/info/cruds/CategoriaEmpleadoEditController.java
+++ b/src/application/view/info/cruds/CategoriaEmpleadoEditController.java
@@ -65,7 +65,7 @@ private boolean isInputValid() {
 	        String errorMessage = "";
 
 	        if (nombreCategoriaField.getText() == null || nombreCategoriaField.getText().length() == 0) {
-	            errorMessage += "No valid Category name!\n";
+	            errorMessage += "No se ingresó una categoria válida\n";
 	        }
 	        if (errorMessage.length() == 0) {
 	            return true;
diff --git a/src/application/view/info/cruds/EmpleadoEditDialogController.java b/src/application/view/info/cruds/EmpleadoEditDialogController.java
index a479dee..2166125 100644
--- a/src/application/view/info/cruds/EmpleadoEditDialogController.java
+++ b/src/application/view/info/cruds/EmpleadoEditDialogController.java
@@ -158,10 +158,10 @@ private boolean isInputValid() {
 		String errorMessage = "";
 
 		if (nombreField.getText() == null || nombreField.getText().length() == 0) {
-			errorMessage += "No valid first name!\n"; 
+			errorMessage += "No se ingresó un nombre válido\n";
 		}
 		if (apellidoField.getText() == null || apellidoField.getText().length() == 0) {
-			errorMessage += "No valid last name!\n"; 
+			errorMessage += "No se ingresó un apellido válido\n";
 		}
 
 		if (errorMessage.length() == 0) {
@@ -169,7 +169,7 @@ private boolean isInputValid() {
 		} else {
 			// Show the error message.
 			Alert alert = new Alert(AlertType.ERROR);
-			alert.setTitle("Datos Invalidos");
+			alert.setTitle("Datos Inválidos");
 			alert.setHeaderText(null);
 			alert.setContentText(errorMessage);
 			alert.showAndWait();
diff --git a/src/application/view/info/cruds/UsuarioEditDialogController.java b/src/application/view/info/cruds/UsuarioEditDialogController.java
index 704d8de..914602f 100644
--- a/src/application/view/info/cruds/UsuarioEditDialogController.java
+++ b/src/application/view/info/cruds/UsuarioEditDialogController.java
@@ -82,7 +82,7 @@ private void handleOk() {
 		Alert alert = new Alert(AlertType.WARNING);
 		alert.setTitle("Verifique los datos");
 		alert.setHeaderText(null);
-		alert.setContentText("Alguno de los datos ingresados es incorrecto o no selecciono un empleado");
+		alert.setContentText("Alguno de los datos ingresados es incorrecto o no seleccionó un empleado");
 		alert.showAndWait();
 		}
 	}
@@ -99,10 +99,10 @@ private boolean isInputValid() {
 		String errorMessage = "";
 
 		if (usuarioField.getText() == null || usuarioField.getText().length() == 0) {
-			errorMessage += "No valid user name!\n"; 
+			errorMessage += "No se ingresó un usuario válido\n";
 		}
 		if (passwordField.getText() == null || passwordField.getText().length() == 0) {
-			errorMessage += "No valid password!\n"; 
+			errorMessage += "No se ingresó una contraseña válida\n";
 		}
 
 		if (errorMessage.length() == 0) {
@@ -110,7 +110,7 @@ private boolean isInputValid() {
 		} else {
 			// Show the error message.
 			Alert alert = new Alert(AlertType.ERROR);
-			alert.setTitle("Datos Invalidos");
+			alert.setTitle("Datos Inválidos");
 			alert.setHeaderText(null);
 			alert.setContentText(errorMessage);
 			alert.showAndWait();

From db054ceefbe5c38accb9e6934c7fd015ddf94286 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Fri, 2 Mar 2018 21:29:06 -0300
Subject: [PATCH 21/27] CORRECION DE ERRORES 1.2: MODULO view/CALCULO       -
 Arreglados errores varios en modulo calculo.       - Ajustados ABM de
 acoplado y camiones para que reflejen los datos de la base de datos.       -
 En la seccion de distancias se puede buscar por ingenio correctamente.      
 - En la seccion de distancias NO ESTA implementada la opcion de evitar
 repetidos.

---
 src/application/comunes/Alerta.java           |  4 +-
 src/application/model/calculo/Acoplado.java   | 18 +++++++-
 src/application/model/calculo/Camion.java     | 32 ++++++++++++-
 src/application/model/calculo/Ingenio.java    |  4 ++
 .../calculo/AcopladoRepository.java           | 22 +++------
 .../repository/calculo/CamionRepository.java  | 27 ++++-------
 .../calculo/OrigenDestinoRepository.java      | 46 +++++++++++++++++++
 .../repository/info/LocalidadRepository.java  |  7 ++-
 src/application/view/RegisterController.java  |  3 +-
 .../view/calculo/CargarAcoplado.fxml          |  6 ++-
 .../calculo/CargarAcopladoController.java     |  8 ++--
 .../view/calculo/CargarCamion.fxml            | 12 ++++-
 .../view/calculo/CargarCamionController.java  | 12 +++--
 .../view/calculo/InfoOrigenDestino.fxml       |  6 ++-
 .../calculo/InfoOrigenDestinoController.java  | 14 ++++--
 .../view/calculo/cruds/AcopladoEdit.fxml      | 13 ++++--
 .../calculo/cruds/AcopladoEditController.java | 13 +++++-
 .../view/calculo/cruds/CamionEdit.fxml        | 17 +++++--
 .../calculo/cruds/CamionEditController.java   | 29 ++++++++----
 .../view/calculo/cruds/DistanciasEdit.fxml    | 10 +++-
 .../venta/cruds/EmitirFacturaController.java  | 12 +++--
 21 files changed, 231 insertions(+), 84 deletions(-)

diff --git a/src/application/comunes/Alerta.java b/src/application/comunes/Alerta.java
index f39e9be..2eb9150 100644
--- a/src/application/comunes/Alerta.java
+++ b/src/application/comunes/Alerta.java
@@ -11,7 +11,7 @@ protected Alerta(){
 
     }
     public static void alertaInfo(String titulo, String contenido){
-        Alert alert = new Alert(Alert.AlertType.WARNING);
+        Alert alert = new Alert(Alert.AlertType.INFORMATION);
         alert.setTitle(titulo);
         alert.setContentText(contenido);
         alert.initStyle(StageStyle.UNDECORATED);
@@ -19,7 +19,7 @@ public static void alertaInfo(String titulo, String contenido){
 
     }
     public static void alertaInfo(String titulo, String header, String contenido){
-        Alert alert = new Alert(Alert.AlertType.WARNING);
+        Alert alert = new Alert(Alert.AlertType.INFORMATION);
         alert.setTitle(titulo);
         alert.setHeaderText(header);
         alert.setContentText(contenido);
diff --git a/src/application/model/calculo/Acoplado.java b/src/application/model/calculo/Acoplado.java
index 9e9fada..56d9d0b 100644
--- a/src/application/model/calculo/Acoplado.java
+++ b/src/application/model/calculo/Acoplado.java
@@ -9,6 +9,19 @@ public class Acoplado {
     private IntegerProperty id;
     private StringProperty marca;
     private StringProperty patente;
+    private StringProperty chasisNumero;
+
+    public String getChasisNumero() {
+        return chasisNumero.get();
+    }
+
+    public StringProperty chasisNumeroProperty() {
+        return chasisNumero;
+    }
+
+    public void setChasisNumero(String chasisNumero) {
+        this.chasisNumero.set(chasisNumero);
+    }
 
     public int getId() {
         return id.get();
@@ -46,13 +59,14 @@ public void setPatente(String patente) {
         this.patente.set(patente);
     }
 
-    public Acoplado(Integer id, String marca, String patente) {
+    public Acoplado(Integer id, String marca, String patente, String chasisNumero) {
         this.id = new SimpleIntegerProperty(id);
         this.marca = new SimpleStringProperty(marca);
         this.patente = new SimpleStringProperty(patente);
+        this.chasisNumero = new SimpleStringProperty(chasisNumero);
     }
 
     public Acoplado() {
-        this(0,null,null);
+        this(0,null,null,null);
     }
 }
diff --git a/src/application/model/calculo/Camion.java b/src/application/model/calculo/Camion.java
index 745b95c..1c911be 100644
--- a/src/application/model/calculo/Camion.java
+++ b/src/application/model/calculo/Camion.java
@@ -10,6 +10,32 @@ public class Camion {
     private StringProperty marca;
     private StringProperty modelo;
     private StringProperty patente;
+    private StringProperty motor;
+    private StringProperty chasis;
+
+    public String getMotor() {
+        return motor.get();
+    }
+
+    public StringProperty motorProperty() {
+        return motor;
+    }
+
+    public void setMotor(String motor) {
+        this.motor.set(motor);
+    }
+
+    public String getChasis() {
+        return chasis.get();
+    }
+
+    public StringProperty chasisProperty() {
+        return chasis;
+    }
+
+    public void setChasis(String chasis) {
+        this.chasis.set(chasis);
+    }
 
     public int getId() {
         return id.get();
@@ -59,14 +85,16 @@ public void setPatente(String patente) {
         this.patente.set(patente);
     }
 
-    public Camion(Integer id, String marca, String modelo, String patente) {
+    public Camion(Integer id, String marca, String modelo, String patente, String motor, String chasis) {
         this.id = new SimpleIntegerProperty(id);
         this.marca = new SimpleStringProperty(marca);
         this.modelo = new SimpleStringProperty(modelo);
         this.patente = new SimpleStringProperty(patente);
+        this.motor = new SimpleStringProperty(motor);
+        this.chasis = new SimpleStringProperty(chasis);
     }
 
     public Camion() {
-        this(0,null,null,null);
+        this(0,null,null,null, null,null);
     }
 }
diff --git a/src/application/model/calculo/Ingenio.java b/src/application/model/calculo/Ingenio.java
index a773c07..415e6d1 100644
--- a/src/application/model/calculo/Ingenio.java
+++ b/src/application/model/calculo/Ingenio.java
@@ -97,4 +97,8 @@ public Ingenio() {
         this(0,0.0,0.0,null,0.0,0.0);
     }
 
+    @Override
+    public String toString() {
+        return getNombre();
+    }
 }
diff --git a/src/application/repository/calculo/AcopladoRepository.java b/src/application/repository/calculo/AcopladoRepository.java
index 9422416..0266fc0 100644
--- a/src/application/repository/calculo/AcopladoRepository.java
+++ b/src/application/repository/calculo/AcopladoRepository.java
@@ -18,10 +18,11 @@ public class AcopladoRepository {
     public void save(Acoplado acoplado){
         try {
             connection= JDBCConnection.getInstanceConnection();
-            preparedStatement = connection.prepareStatement("INSERT INTO ACOPLADO values(?,?,?)");
+            preparedStatement = connection.prepareStatement("INSERT INTO ACOPLADO values(?,?,?,?)");
             preparedStatement.setString(1,null);
             preparedStatement.setString(2, acoplado.getMarca());
             preparedStatement.setString(3, acoplado.getPatente());
+            preparedStatement.setString(4, acoplado.getChasisNumero());
             preparedStatement.executeUpdate();
             String cuerpoMsj = "Acoplado \n Marca: " + acoplado.getMarca() + "\nPatente: "+acoplado.getPatente() +"\nagregado correctamente.\n";
             Alerta.alertaInfo("Acoplados",cuerpoMsj);
@@ -35,11 +36,12 @@ public void update(Acoplado acoplado){
         try {
             connection = JDBCConnection.getInstanceConnection();
             preparedStatement= connection.prepareStatement("UPDATE ACOPLADO " +
-                    "SET Marca=?, Patente=?" +
+                    "SET Marca=?, Patente=?, ChasisNumero=?" +
                     "WHERE idAcoplado=?");
             preparedStatement.setString(1, acoplado.getMarca());
             preparedStatement.setString(2, acoplado.getPatente());
-            preparedStatement.setInt(3, acoplado.getId());
+            preparedStatement.setString(3, acoplado.getChasisNumero());
+            preparedStatement.setInt(4, acoplado.getId());
             preparedStatement.executeUpdate();
             String headerMsj="Actualización: Acoplado actualizado";
             String cuerpoMsj = "Acoplado: \n\tMarca: " + acoplado.getMarca() + "\n\tPatente: " +
@@ -73,6 +75,7 @@ public ObservableList<Acoplado> view(){
                 acoplado.setId(resultSet.getInt(1));
                 acoplado.setMarca(resultSet.getString(2));
                 acoplado.setPatente(resultSet.getString(3));
+                acoplado.setChasisNumero(resultSet.getString(4));
                 list.add(acoplado);
             }
         } catch (SQLException e) {
@@ -81,17 +84,7 @@ public ObservableList<Acoplado> view(){
 
         return list;
     }
-    public void search(Acoplado acoplado){
-        try {
-            connection= JDBCConnection.getInstanceConnection();
-            preparedStatement=connection.prepareStatement("SELECT * FROM ACOPLADO where idAcoplado=?");
-            preparedStatement.setInt(1,acoplado.getId());
-            preparedStatement.executeUpdate();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
 
-    }
 
     public Acoplado getAcopladoById(int idAcoplado){
         Acoplado acoplado = new Acoplado();
@@ -104,13 +97,12 @@ public Acoplado getAcopladoById(int idAcoplado){
                 acoplado.setId(resultSet.getInt("idAcoplado"));
                 acoplado.setMarca(resultSet.getString("Marca"));
                 acoplado.setPatente(resultSet.getString("Patente"));
+                acoplado.setChasisNumero(resultSet.getString("ChasisNumero"));
             }
         } catch (SQLException e) {
             e.printStackTrace();
         }
-
         return acoplado;
-
     }
 
 
diff --git a/src/application/repository/calculo/CamionRepository.java b/src/application/repository/calculo/CamionRepository.java
index 0947202..7a7496f 100644
--- a/src/application/repository/calculo/CamionRepository.java
+++ b/src/application/repository/calculo/CamionRepository.java
@@ -23,8 +23,8 @@ public void save(Camion camion){
             preparedStatement.setString(2,camion.getMarca());
             preparedStatement.setString(3,camion.getModelo());
             preparedStatement.setString(4,camion.getPatente());
-            preparedStatement.setString(5, null);
-            preparedStatement.setString(6, null);
+            preparedStatement.setString(5, camion.getMotor());
+            preparedStatement.setString(6, camion.getChasis());
             preparedStatement.execute();
             String cuerpoMsj = "Camión: " + camion.getMarca() + " agregado correctamente.\n";
             Alerta.alertaInfo("Camiones",cuerpoMsj);
@@ -37,12 +37,14 @@ public void update(Camion camion){
             connection = JDBCConnection.getInstanceConnection();
             preparedStatement= connection.prepareStatement("" +
                     "UPDATE CAMION " +
-                    "SET Marca=?, Modelo=?, Patente=? " +
+                    "SET Marca=?, Modelo=?, Patente=?, MotorNumero=?, ChasisNumero=? " +
                     "WHERE idCamion=?");
             preparedStatement.setString(1,camion.getMarca());
             preparedStatement.setString(2,camion.getModelo());
             preparedStatement.setString(3,camion.getPatente());
-            preparedStatement.setInt(4,camion.getId());
+            preparedStatement.setString(4, camion.getMotor());
+            preparedStatement.setString(5, camion.getChasis());
+            preparedStatement.setInt(6,camion.getId());
             preparedStatement.execute();
             String headerMsj="Actualización: Camión actualizado";
             String cuerpoMsj = "Camión: " + camion.getMarca() + " modificado correctamente.";
@@ -76,6 +78,8 @@ public ObservableList<Camion> view(){
                 camion.setMarca(resultSet.getString(2));
                 camion.setModelo(resultSet.getString(3));
                 camion.setPatente(resultSet.getString(4));
+                camion.setMotor(resultSet.getString(5));
+                camion.setChasis(resultSet.getString(6));
                 list.add(camion);
             }
 
@@ -84,17 +88,6 @@ public ObservableList<Camion> view(){
         }
         return list;
     }
-    public void search(Camion camion){
-        try {
-            connection= JDBCConnection.getInstanceConnection();
-            preparedStatement=connection.prepareStatement("SELECT * FROM CAMION where idCamion=?");
-            preparedStatement.setInt(1,camion.getId());
-            preparedStatement.execute();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-
-    }
 
     public Camion getCamionById(int idCamion){
         Camion camion = new Camion();
@@ -108,12 +101,12 @@ public Camion getCamionById(int idCamion){
                 camion.setMarca(resultSet.getString("Marca"));
                 camion.setModelo(resultSet.getString("Modelo"));
                 camion.setPatente(resultSet.getString("PATENTE"));
+                camion.setMotor(resultSet.getString("MotorNumero"));
+                camion.setChasis(resultSet.getString("ChasisNumero"));
             }
         } catch (SQLException e) {
             e.printStackTrace();
         }
-
         return camion;
-
     }
 }
diff --git a/src/application/repository/calculo/OrigenDestinoRepository.java b/src/application/repository/calculo/OrigenDestinoRepository.java
index 92688ba..3702f20 100644
--- a/src/application/repository/calculo/OrigenDestinoRepository.java
+++ b/src/application/repository/calculo/OrigenDestinoRepository.java
@@ -134,4 +134,50 @@ public int getIdByFincaIngenio(int idFinca, int idIngenio){
 
         return idOrigenDestino;
   }
+
+    public ObservableList<OrigenDestino> viewByIngenio(int idIngenio) {
+        ObservableList<OrigenDestino> list = FXCollections.observableArrayList();
+        try {
+            connection= JDBCConnection.getInstanceConnection();
+            preparedStatement=connection.prepareStatement("" +
+                    " SELECT o.idOrigen_Destino, f.nombre, i.nombre, o.distanciakm " +
+                    "FROM origen_destino AS o, finca AS f, ingenio AS i " +
+                    "WHERE o.FINCA_idFinca = f.idfinca AND o.INGENIO_idIngenio = i.idIngenio AND i.idIngenio=?");
+            preparedStatement.setInt(1, idIngenio);
+            resultSet = preparedStatement.executeQuery();
+            while (resultSet.next()){
+                OrigenDestino origenDestino = new OrigenDestino();
+                origenDestino.setIdOrigenDestino(resultSet.getInt(1));
+                origenDestino.setNombreFinca(resultSet.getString(2));
+                origenDestino.setNombreIngenio(resultSet.getString(3));
+                origenDestino.setDistanciaKM(resultSet.getFloat(4));
+                list.add(origenDestino);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return list;
+
+    }
+    public boolean isDuplicated(int idIngenio, int idFinca) {
+        boolean isDuplicated = false;
+        try {
+            connection= JDBCConnection.getInstanceConnection();
+            preparedStatement=connection.prepareStatement("" +
+                    " SELECT FINCA_idFinca, INGENIO_idIngenio FROM origen_destino " +
+                    "WHERE FINCA_idFinca=? AND INGENIO_idIngenio =?");
+            preparedStatement.setInt(1, idFinca);
+            preparedStatement.setInt(2, idIngenio);
+            resultSet = preparedStatement.executeQuery();
+            if (resultSet.absolute(1)){
+               isDuplicated=true;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return isDuplicated;
+
+    }
 }
diff --git a/src/application/repository/info/LocalidadRepository.java b/src/application/repository/info/LocalidadRepository.java
index 4b3e2f4..5f4f61f 100644
--- a/src/application/repository/info/LocalidadRepository.java
+++ b/src/application/repository/info/LocalidadRepository.java
@@ -83,15 +83,14 @@ public ObservableList<Localidad> view(int idProvincia){
 	        return list;
 	    }
 
-	    public ObservableList<Localidad> view2(int idProvincia){
+	    public ObservableList<Localidad> localidadesDeTucuman(){
 
 	        ObservableList<Localidad> list = FXCollections.observableArrayList();
 	        try {
 	            connection= JDBCConnection.getInstanceConnection();
-	            preparedStatement=connection.prepareStatement("SELECT * FROM LOCALIDAD WHERE PROVINCIA_idProvincia = ?");
-	            preparedStatement.setInt(1,idProvincia);
+	            preparedStatement=connection.prepareStatement("SELECT idLocalidad, NombreLocalidad " +
+						"FROM LOCALIDAD, PROVINCIA where PROVINCIA_idProvincia = idProvincia AND NombreProvincia like 'tuc%';");
 	            resultSet = preparedStatement.executeQuery();
-
 	            while (resultSet.next()){
 	                Localidad localidad = new Localidad();
 	                localidad.setIdLocalidad(resultSet.getInt("idLocalidad"));
diff --git a/src/application/view/RegisterController.java b/src/application/view/RegisterController.java
index 4cb3c9c..5df7354 100644
--- a/src/application/view/RegisterController.java
+++ b/src/application/view/RegisterController.java
@@ -160,8 +160,7 @@ private void cargarCategorias() {
         categoriaEmpleadoComboBox.setItems(categoriaEmpleadoRepository.view());
     }
     private void cargarLocalidades() {
-        int idTucuman = 23; //hardcode id tucuman
-        localidadComboBox.setItems(localidadRepository.view(idTucuman));
+        localidadComboBox.setItems(localidadRepository.localidadesDeTucuman());
     }
 
     @FXML
diff --git a/src/application/view/calculo/CargarAcoplado.fxml b/src/application/view/calculo/CargarAcoplado.fxml
index aec6f0c..16b2b57 100644
--- a/src/application/view/calculo/CargarAcoplado.fxml
+++ b/src/application/view/calculo/CargarAcoplado.fxml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.CargarAcopladoController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="11.0" prefHeight="389.0" prefWidth="581.0" spacing="20.0">
@@ -12,9 +16,9 @@
             <Label text="Acoplados" />
             <TableView fx:id="acopladoTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
               <columns>
-                <TableColumn fx:id="idAcopladoTableColumn" minWidth="0.0" prefWidth="0.0" text="id" />
                 <TableColumn fx:id="marcaTableColumn" prefWidth="203.20001220703125" text="Marca" />
                   <TableColumn fx:id="patenteTableColumn" prefWidth="192.79998779296875" text="Patente" />
+                <TableColumn fx:id="chasisColumn" minWidth="0.0" prefWidth="0.0" text="Chasis" />
               </columns>
                <columnResizePolicy>
                   <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
diff --git a/src/application/view/calculo/CargarAcopladoController.java b/src/application/view/calculo/CargarAcopladoController.java
index 1fb62c1..716b75d 100644
--- a/src/application/view/calculo/CargarAcopladoController.java
+++ b/src/application/view/calculo/CargarAcopladoController.java
@@ -31,11 +31,11 @@ public class CargarAcopladoController {
     @FXML
     private TableView<Acoplado> acopladoTableView;
     @FXML
-    private TableColumn<Acoplado, String> idAcopladoTableColumn;
-    @FXML
     private TableColumn<Acoplado, String> marcaTableColumn;
     @FXML
     private TableColumn<Acoplado, String> patenteTableColumn;
+    @FXML
+    private TableColumn<Acoplado, String> chasisColumn;
 
     private Stage owner;
     private ObservableList<Acoplado> acopladoData = FXCollections.observableArrayList();
@@ -47,7 +47,7 @@ public class CargarAcopladoController {
      */
     @FXML
     private void initialize(){
-        idAcopladoTableColumn.setCellValueFactory(cellData -> cellData.getValue().idProperty().asString());
+        chasisColumn.setCellValueFactory(cellData -> cellData.getValue().chasisNumeroProperty());
         marcaTableColumn.setCellValueFactory(cellData -> cellData.getValue().marcaProperty());
         patenteTableColumn.setCellValueFactory(cellData -> cellData.getValue().patenteProperty());
 
@@ -58,7 +58,7 @@ public void handleNewAcoplado(){
         Acoplado tempAcoplado = new Acoplado();
         boolean okClicked = this.showAcopladoEdit(tempAcoplado,true);
         if(okClicked)
-            acopladoData.add(tempAcoplado);
+           buscarAcoplados();
     }
 
 
diff --git a/src/application/view/calculo/CargarCamion.fxml b/src/application/view/calculo/CargarCamion.fxml
index 0826fbb..aa7de98 100644
--- a/src/application/view/calculo/CargarCamion.fxml
+++ b/src/application/view/calculo/CargarCamion.fxml
@@ -1,22 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.CargarCamionController">
+
+<AnchorPane prefHeight="400.0" prefWidth="625.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.CargarCamionController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="17.0" layoutY="15.0" prefHeight="385.0" prefWidth="583.0" spacing="20.0">
          <children>
             <Label text="Camiones" />
             <TableView fx:id="camionTableView" pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
               <columns>
-                <TableColumn fx:id="idCamionTableColumn" minWidth="0.0" prefWidth="0.0" text="id" />
                 <TableColumn fx:id="marcaTableColumn" prefWidth="203.20001220703125" text="Marca" />
                   <TableColumn fx:id="modeloTableColumn" prefWidth="206.4000244140625" text="Modelo" />
                   <TableColumn fx:id="patenteTableColumn" prefWidth="192.79998779296875" text="Patente" />
+                  <TableColumn fx:id="motorColumn" prefWidth="75.0" text="Motor" />
+                  <TableColumn fx:id="chasisColumn" prefWidth="75.0" text="Chasis" />
               </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
             </TableView>
             <HBox alignment="CENTER" prefHeight="152.0" prefWidth="600.0" spacing="10.0">
                <children>
diff --git a/src/application/view/calculo/CargarCamionController.java b/src/application/view/calculo/CargarCamionController.java
index 6eb7737..2e7e866 100644
--- a/src/application/view/calculo/CargarCamionController.java
+++ b/src/application/view/calculo/CargarCamionController.java
@@ -31,13 +31,15 @@ public class CargarCamionController {
     @FXML
     private TableView<Camion> camionTableView;
     @FXML
-    private TableColumn<Camion, String> idCamionTableColumn;
-    @FXML
     private TableColumn<Camion, String> marcaTableColumn;
     @FXML
     private TableColumn<Camion, String> modeloTableColumn;
     @FXML
     private TableColumn<Camion, String> patenteTableColumn;
+    @FXML
+    private TableColumn<Camion, String> motorColumn;
+    @FXML
+    private TableColumn<Camion, String> chasisColumn;
 
     private Stage owner;
     private ObservableList<Camion> camionData = FXCollections.observableArrayList();
@@ -49,11 +51,11 @@ public class CargarCamionController {
      */
     @FXML
     private void initialize(){
-        idCamionTableColumn.setCellValueFactory(cellData -> cellData.getValue().idProperty().asString());
         marcaTableColumn.setCellValueFactory(cellData -> cellData.getValue().marcaProperty());
         modeloTableColumn.setCellValueFactory(cellData -> cellData.getValue().modeloProperty());
         patenteTableColumn.setCellValueFactory(cellData -> cellData.getValue().patenteProperty());
-
+        motorColumn.setCellValueFactory(cellData -> cellData.getValue().motorProperty());
+        chasisColumn.setCellValueFactory(cellData -> cellData.getValue().chasisProperty());
     }
 
     @FXML
@@ -61,7 +63,7 @@ public void handleNewCamion(){
         Camion tempCamion = new Camion();
         boolean okClicked = this.showCamionEdit(tempCamion,true);
         if(okClicked)
-            camionData.add(tempCamion);
+           buscarCamiones();
     }
 
 
diff --git a/src/application/view/calculo/InfoOrigenDestino.fxml b/src/application/view/calculo/InfoOrigenDestino.fxml
index 2279a04..0d55973 100644
--- a/src/application/view/calculo/InfoOrigenDestino.fxml
+++ b/src/application/view/calculo/InfoOrigenDestino.fxml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
+
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.InfoOrigenDestinoController">
     <children>
             <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="15.0" prefHeight="433.0" prefWidth="581.0" spacing="20.0">
@@ -11,8 +14,7 @@
             <HBox alignment="CENTER" prefHeight="51.0" prefWidth="581.0" spacing="20.0">
                <children>
                             <Label text="Buscar por Ingenio:" />
-                            <TextField fx:id="buscarPorIngenioField" />
-                            <Button fx:id="searchButton" mnemonicParsing="false" text="Buscar" />
+                  <ComboBox fx:id="buscarPorIngenioComboBox" onAction="#buscarDistancias" prefHeight="25.0" prefWidth="218.0" promptText="Lista de Ingenios" />
                </children>
             </HBox>
                     <TableView fx:id="tableView" pickOnBounds="false" prefHeight="269.0" prefWidth="600.0">
diff --git a/src/application/view/calculo/InfoOrigenDestinoController.java b/src/application/view/calculo/InfoOrigenDestinoController.java
index dd5c6f0..ee3f8b7 100644
--- a/src/application/view/calculo/InfoOrigenDestinoController.java
+++ b/src/application/view/calculo/InfoOrigenDestinoController.java
@@ -2,6 +2,7 @@
 
 import application.Main;
 import application.comunes.Alerta;
+import application.model.calculo.Ingenio;
 import application.model.calculo.OrigenDestino;
 import application.repository.calculo.FincaRepository;
 import application.repository.calculo.IngenioRepository;
@@ -35,15 +36,13 @@ public class InfoOrigenDestinoController implements Initializable {
     @FXML
     private TableColumn<OrigenDestino, String> distanciaColumn;
     @FXML
-    private TextField buscarPorIngenioField;
+    private ComboBox<Ingenio> buscarPorIngenioComboBox;
     @FXML
     private Button newButton;
     @FXML
     private Button editButton;
     @FXML
     private Button eliminarButton;
-    @FXML
-    private Button searchButton;
 
 
     private Stage owner;
@@ -132,6 +131,7 @@ private boolean showEdit(OrigenDestino distancia, boolean b) {
     }
     @Override
     public void initialize(URL location, ResourceBundle resources) {
+        cargarIngenioComboBox();
         idColumn.setCellValueFactory(cellData -> cellData.getValue().idOrigenDestinoProperty().asString());
         ingenioColumn.setCellValueFactory(cellData -> cellData.getValue().nombreIngenioProperty());
         fincaColumn.setCellValueFactory(cellData -> cellData.getValue().nombreFincaProperty());
@@ -139,8 +139,16 @@ public void initialize(URL location, ResourceBundle resources) {
 
     }
 
+    private void cargarIngenioComboBox() {
+        buscarPorIngenioComboBox.setItems(ingenioRepository.view());
+    }
+
     public void buscarDistancias(){
         this.distancias = distanciasRepository.view();
         tableView.setItems(distancias);
+        if (!buscarPorIngenioComboBox.getSelectionModel().isEmpty()){
+            distancias = distanciasRepository.viewByIngenio(buscarPorIngenioComboBox.getSelectionModel().getSelectedItem().getIdIngenio());
+            tableView.setItems(distancias);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/application/view/calculo/cruds/AcopladoEdit.fxml b/src/application/view/calculo/cruds/AcopladoEdit.fxml
index 9c12d1c..d83eb28 100644
--- a/src/application/view/calculo/cruds/AcopladoEdit.fxml
+++ b/src/application/view/calculo/cruds/AcopladoEdit.fxml
@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.Group?>
 <?import javafx.scene.layout.*?>
+
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.AcopladoEditController">
   <children>
-    <AnchorPane prefHeight="246.0" prefWidth="473.0">
+    <AnchorPane prefHeight="352.0" prefWidth="473.0">
       <children>
-        <GridPane layoutX="16.0" layoutY="29.0" prefHeight="165.0" prefWidth="442.0" AnchorPane.leftAnchor="16.0" AnchorPane.rightAnchor="15.0">
+        <GridPane layoutX="16.0" layoutY="29.0" prefHeight="248.0" prefWidth="442.0" AnchorPane.leftAnchor="16.0" AnchorPane.rightAnchor="15.0">
           <children>
             <Label text="Marca:" />
             <Label text="Patente:" GridPane.rowIndex="2" />
             <TextField fx:id="marcaField" GridPane.columnSpan="2" GridPane.rowIndex="1" />
             <TextField fx:id="patenteField" GridPane.columnSpan="2" GridPane.rowIndex="3" />
+                  <Label text="Chasis nro:" GridPane.rowIndex="4" />
+                  <TextField fx:id="chasisField" GridPane.rowIndex="5" />
           </children>
           <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" maxWidth="226.0" minWidth="10.0" prefWidth="205.0" />
@@ -22,11 +27,13 @@
           <rowConstraints>
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
           </rowConstraints>
         </GridPane>
-        <HBox layoutX="170.0" layoutY="207.0" spacing="15.0">
+        <HBox layoutX="170.0" layoutY="313.0" spacing="15.0">
           <children>
             <Button fx:id="btnOk" defaultButton="true" mnemonicParsing="false" onAction="#handleOk" text="Aceptar" />
             <Button fx:id="btnCancel" cancelButton="true" mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
diff --git a/src/application/view/calculo/cruds/AcopladoEditController.java b/src/application/view/calculo/cruds/AcopladoEditController.java
index bc61b55..4e2c6f0 100644
--- a/src/application/view/calculo/cruds/AcopladoEditController.java
+++ b/src/application/view/calculo/cruds/AcopladoEditController.java
@@ -14,6 +14,8 @@ public class AcopladoEditController {
     private TextField marcaField;
     @FXML
     private TextField patenteField;
+    @FXML
+    private TextField chasisField;
 
     @FXML
     private Button btnOk;
@@ -37,6 +39,7 @@ public void handleOk(){
         if (isInputValid()){
             acoplado.setMarca(marcaField.getText());
             acoplado.setPatente(patenteField.getText());
+            acoplado.setChasisNumero(chasisField.getText());
             if (isNew){
                 repository.save(acoplado);
             }else {
@@ -57,8 +60,11 @@ public void setDialogStage(Stage dialogStage) {
 
     public void setAcoplado(Acoplado acoplado){
         this.acoplado = acoplado;
-        marcaField.setText(acoplado.getMarca());
-        patenteField.setText(acoplado.getPatente());
+        if (!isNew){
+            marcaField.setText(acoplado.getMarca());
+            patenteField.setText(acoplado.getPatente());
+            chasisField.setText(acoplado.getChasisNumero());
+        }
     }
     public boolean isOkClicked(){
         return okClicked;
@@ -72,6 +78,9 @@ private boolean isInputValid() {
         if (patenteField.getText() == null || patenteField.getText().length() == 0 || patenteField.getText().length() > 6 ) {
             errorMessage += "Patente no Ingresado correctamente (6 digitos).\n";
         }
+        if (chasisField.getText() == null || chasisField.getText().length() == 0) {
+            errorMessage += "Chasis no ingresado correctamente (17 digitos).\n";
+        }
         if (errorMessage.length() == 0) {
             return true;
         } else {
diff --git a/src/application/view/calculo/cruds/CamionEdit.fxml b/src/application/view/calculo/cruds/CamionEdit.fxml
index 84b4ed4..b26f986 100644
--- a/src/application/view/calculo/cruds/CamionEdit.fxml
+++ b/src/application/view/calculo/cruds/CamionEdit.fxml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.Group?>
 <?import javafx.scene.layout.*?>
+
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.CamionEditController">
   <children>
-    <AnchorPane prefHeight="246.0" prefWidth="473.0">
+    <AnchorPane prefHeight="435.0" prefWidth="474.0">
       <children>
-        <GridPane layoutX="16.0" layoutY="29.0" prefHeight="165.0" prefWidth="442.0" AnchorPane.leftAnchor="16.0" AnchorPane.rightAnchor="15.0">
+        <GridPane layoutX="16.0" layoutY="29.0" prefHeight="290.0" prefWidth="443.0" AnchorPane.leftAnchor="16.0" AnchorPane.rightAnchor="15.0">
           <children>
             <Label text="Marca:" />
             <Label text="Modelo:" GridPane.rowIndex="2" />
@@ -15,6 +18,10 @@
             <TextField fx:id="marcaField" GridPane.columnSpan="2" GridPane.rowIndex="1" />
             <TextField fx:id="modeloField" GridPane.columnSpan="2" GridPane.rowIndex="3" />
                   <TextField fx:id="patenteField" GridPane.rowIndex="5" />
+                  <Label text="Motor número:" GridPane.rowIndex="6" />
+                  <Label text="Chasis número:" GridPane.rowIndex="8" />
+                  <TextField fx:id="motorField" GridPane.rowIndex="7" />
+                  <TextField fx:id="chasisField" GridPane.rowIndex="9" />
           </children>
           <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" maxWidth="226.0" minWidth="10.0" prefWidth="205.0" />
@@ -28,9 +35,13 @@
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
           </rowConstraints>
         </GridPane>
-        <HBox layoutX="170.0" layoutY="207.0" spacing="15.0">
+        <HBox alignment="CENTER" layoutX="1.0" layoutY="339.0" prefHeight="82.0" prefWidth="473.0" spacing="15.0">
           <children>
             <Button fx:id="btnOk" defaultButton="true" mnemonicParsing="false" onAction="#handleOk" text="Aceptar" />
             <Button fx:id="btnCancel" cancelButton="true" mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
diff --git a/src/application/view/calculo/cruds/CamionEditController.java b/src/application/view/calculo/cruds/CamionEditController.java
index b22e53c..81d7910 100644
--- a/src/application/view/calculo/cruds/CamionEditController.java
+++ b/src/application/view/calculo/cruds/CamionEditController.java
@@ -16,6 +16,10 @@ public class CamionEditController {
     private TextField modeloField;
     @FXML
     private TextField patenteField;
+    @FXML
+    private TextField motorField;
+    @FXML
+    private TextField chasisField;
 
     @FXML
     private Button btnOk;
@@ -40,6 +44,8 @@ public void handleOk(){
             camion.setMarca(marcaField.getText());
             camion.setModelo(modeloField.getText());
             camion.setPatente(patenteField.getText());
+            camion.setMotor(motorField.getText());
+            camion.setChasis(chasisField.getText());
             if (isNew){
                 repository.save(camion);
             }else {
@@ -60,9 +66,13 @@ public void setDialogStage(Stage dialogStage) {
 
     public void setCamion(Camion camion){
         this.camion = camion;
-        marcaField.setText(camion.getMarca());
-        modeloField.setText(camion.getModelo());
-        patenteField.setText(camion.getPatente());
+        if (!isNew){
+            marcaField.setText(camion.getMarca());
+            modeloField.setText(camion.getModelo());
+            patenteField.setText(camion.getPatente());
+            motorField.setText(camion.getMotor());
+            chasisField.setText(camion.getChasis());
+        }
     }
     public boolean isOkClicked(){
         return okClicked;
@@ -70,15 +80,16 @@ public boolean isOkClicked(){
     private boolean isInputValid() {
         String errorMessage = "";
 
-        if (marcaField.getText() == null || marcaField.getText().length() == 0) {
+        if (marcaField.getText() == null || marcaField.getText().length() == 0)
             errorMessage += "Marca no Ingresada\n";
-        }
-        if (modeloField.getText() == null || modeloField.getText().length() == 0) {
+        if (modeloField.getText() == null || modeloField.getText().length() == 0)
             errorMessage += "Modelo no Ingresado\n";
-        }
-        if (patenteField.getText() == null || patenteField.getText().length() == 0 || patenteField.getText().length() > 6 ) {
+        if (patenteField.getText() == null || patenteField.getText().length() == 0 || patenteField.getText().length() > 6 )
             errorMessage += "Patente no Ingresado correctamente (6 digitos).\n";
-        }
+        if (motorField.getText() == null || motorField.getText().length() == 0 || motorField.getText().length() > 17 )
+            errorMessage += "numero de motor no Ingresado correctamente (17 digitos).\n";
+        if (chasisField.getText() == null || chasisField.getText().length() == 0 || chasisField.getText().length() > 17 )
+            errorMessage += "numero de chasis no Ingresado correctamente (17 digitos).\n";
         if (errorMessage.length() == 0) {
             return true;
         } else {
diff --git a/src/application/view/calculo/cruds/DistanciasEdit.fxml b/src/application/view/calculo/cruds/DistanciasEdit.fxml
index 8edf288..b3b464b 100644
--- a/src/application/view/calculo/cruds/DistanciasEdit.fxml
+++ b/src/application/view/calculo/cruds/DistanciasEdit.fxml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.Group?>
 <?import javafx.scene.layout.*?>
+
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.calculo.cruds.DistanciasEditController">
     <children>
         <AnchorPane prefHeight="550.0" prefWidth="528.0">
@@ -27,7 +30,12 @@
                         <Label alignment="CENTER" contentDisplay="CENTER" prefHeight="18.0" prefWidth="206.0" text="Ingenios" />
                         <ListView fx:id="fincaListView" prefHeight="304.0" prefWidth="408.0" GridPane.columnIndex="2" GridPane.rowIndex="1" GridPane.rowSpan="3" />
                         <ListView fx:id="ingenioListView" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1" GridPane.rowSpan="3" />
-                        <TextField fx:id="distanciaTextField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+                  <HBox alignment="CENTER_LEFT" spacing="10.0" GridPane.columnIndex="2" GridPane.rowIndex="5">
+                     <children>
+                              <TextField fx:id="distanciaTextField" prefHeight="25.0" prefWidth="152.0" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+                        <Label text="Km" />
+                     </children>
+                  </HBox>
                         <Label alignment="CENTER_RIGHT" prefHeight="17.0" prefWidth="227.0" text="Distancia:" GridPane.rowIndex="5" />
                         <CheckBox fx:id="fincaCheckBox" mnemonicParsing="false" onAction="#enableListFinca" text="Edit" GridPane.columnIndex="2" GridPane.rowIndex="4" />
                         <CheckBox fx:id="ingenioCheckBox" mnemonicParsing="false" onAction="#enableListIngenio" text="Edit" GridPane.rowIndex="4" />
diff --git a/src/application/view/venta/cruds/EmitirFacturaController.java b/src/application/view/venta/cruds/EmitirFacturaController.java
index e2df858..9da5d9a 100644
--- a/src/application/view/venta/cruds/EmitirFacturaController.java
+++ b/src/application/view/venta/cruds/EmitirFacturaController.java
@@ -2,7 +2,9 @@
 
 import application.comunes.Alerta;
 import application.model.calculo.Ingenio;
+import application.model.sueldo.ConceptoSueldo;
 import application.model.venta.Cliente;
+import application.model.venta.FacturaVenta;
 import application.model.venta.Organizacion;
 import application.model.venta.Viaje;
 import application.repository.calculo.IngenioRepository;
@@ -134,10 +136,10 @@ public void setViajeTableViewByIngenio(){
         if (ingenioComboBox.getSelectionModel().getSelectedItem() == "Todos"){
             buscarViajes();
         }else{
-        viajeData = viajeRepository.getViajesSinLiqByIngenioId
-                (ingenioData.get(ingenioComboBox.getSelectionModel().getSelectedIndex()).getIdIngenio());
-        viajeTableView.setItems(viajeData);
-    }
+            viajeData = viajeRepository.getViajesSinLiqByIngenioId
+                    (ingenioData.get(ingenioComboBox.getSelectionModel().getSelectedIndex()).getIdIngenio());
+            viajeTableView.setItems(viajeData);
+        }
 
     }
 
@@ -149,7 +151,7 @@ public void handleOk(){
             dialogStage.close();
             okClicked = true;
         }
-        }
+    }
 
     @FXML
     private void handleCancel(){

From 45d9ad66fd4e1756a8e5a05768d200521ba2a2aa Mon Sep 17 00:00:00 2001
From: isaias <isamed92@gmail.com>
Date: Sat, 3 Mar 2018 00:12:39 -0300
Subject: [PATCH 22/27] CORRECION DE ERRORES 1.3: MODULOS VARIOS

---
 src/application/view/Login.fxml               |  6 ++--
 src/application/view/LoginController.java     |  8 +++++
 .../view/compra/cruds/FacturaEdit.fxml        |  7 +++-
 .../compra/cruds/FacturaEditController.java   |  5 +++
 .../view/info/cruds/EditarEmpleadoDialog.fxml |  3 +-
 .../cruds/EmpleadoEditDialogController.java   | 10 ++----
 src/application/view/inicio/Organizacion.fxml | 21 ++----------
 .../view/inicio/OrganizacionController.java   |  5 ---
 .../view/inicio/crud/OrganizacionEdit.fxml    | 33 ++++++++-----------
 .../crud/OrganizacionEditController.java      | 22 ++++++-------
 .../sueldo/cruds/ConceptoEditController.java  |  2 --
 11 files changed, 55 insertions(+), 67 deletions(-)

diff --git a/src/application/view/Login.fxml b/src/application/view/Login.fxml
index eb06988..189439e 100644
--- a/src/application/view/Login.fxml
+++ b/src/application/view/Login.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.image.*?>
 <?import java.lang.*?>
 <?import javafx.scene.text.*?>
 <?import javafx.scene.control.*?>
@@ -14,9 +15,9 @@
                <children>
                   <VBox alignment="CENTER" prefHeight="400.0" prefWidth="358.0">
                      <children>
-                        <Label alignment="CENTER" text="LogiServ">
+                        <Label alignment="CENTER_RIGHT" prefHeight="98.0" prefWidth="202.0" text="LogiServ">
                            <font>
-                              <Font size="32.0" />
+                              <Font size="50.0" />
                            </font>
                         </Label>
                         <GridPane>
@@ -66,6 +67,7 @@
                         </GridPane>
                      </children>
                   </VBox>
+                  <ImageView fx:id="logo" fitHeight="331.0" fitWidth="274.0" pickOnBounds="true" preserveRatio="true" />
                </children>
             </HBox>
          </children>
diff --git a/src/application/view/LoginController.java b/src/application/view/LoginController.java
index 0c053c3..6c56f5a 100644
--- a/src/application/view/LoginController.java
+++ b/src/application/view/LoginController.java
@@ -12,10 +12,13 @@
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
@@ -31,6 +34,8 @@ public class LoginController implements Initializable {
     private Hyperlink hlCrateAccount;
     @FXML
     private Label errorLoginLabel;
+    @FXML
+    private ImageView logo;
 
     private String nombreUsuario;
     private String password;
@@ -39,6 +44,9 @@ public class LoginController implements Initializable {
     UsuarioRepository usuarioRepository = new UsuarioRepository();
 
     public void initialize(URL url, ResourceBundle rb) {
+        File file = new File("src/resources/logiserv-icon.png");
+        Image image = new Image(file.toURI().toString());
+        logo.setImage(image);
         BooleanBinding boolenBinding = usuarioField.textProperty().isEmpty()
                 .or(passwordField.textProperty().isEmpty());
         btnLogin.disableProperty().bind(boolenBinding);
diff --git a/src/application/view/compra/cruds/FacturaEdit.fxml b/src/application/view/compra/cruds/FacturaEdit.fxml
index 0c3b9ef..98d7467 100644
--- a/src/application/view/compra/cruds/FacturaEdit.fxml
+++ b/src/application/view/compra/cruds/FacturaEdit.fxml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.Group?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
+
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.compra.cruds.FacturaEditController">
   <children>
     <AnchorPane layoutX="0.0" layoutY="0.0" prefHeight="523.0" prefWidth="647.0">
@@ -43,7 +48,7 @@
                   <Label fx:id="stockLabel" prefHeight="17.0" prefWidth="132.0" GridPane.columnIndex="1" GridPane.rowIndex="8" />
                   <Label fx:id="idFacturaLabel" prefHeight="17.0" prefWidth="126.0" text=" " GridPane.columnIndex="1" />
                   <Button fx:id="newProveedorButton" mnemonicParsing="false" onAction="#handleNewProveedor" prefHeight="25.0" prefWidth="39.0" text="+" GridPane.columnIndex="3" GridPane.rowIndex="2" />
-                  <TextField fx:id="cantidadField" onAction="#handleNewLine" GridPane.columnIndex="3" GridPane.rowIndex="10" />
+                  <TextField fx:id="cantidadField" onAction="#handleAddArticuleOnEnter" GridPane.columnIndex="3" GridPane.rowIndex="10" />
                   <Button fx:id="agregarLineaButton" mnemonicParsing="false" onAction="#handleNewLine" text="+" GridPane.columnIndex="5" GridPane.rowIndex="12" />
                   <Button fx:id="quitarLineaButton" mnemonicParsing="false" onAction="#handleQuitLine" prefHeight="25.0" prefWidth="25.0" text="-" GridPane.columnIndex="5" GridPane.rowIndex="13" />
                   <Label fx:id="impedirUpdateLineasLabel" prefHeight="17.0" prefWidth="441.0" text="Por Razones de integridad en los datos no se permite modificar lineas de compra" textFill="#f20000" GridPane.columnIndex="1" GridPane.columnSpan="4" GridPane.rowIndex="9">
diff --git a/src/application/view/compra/cruds/FacturaEditController.java b/src/application/view/compra/cruds/FacturaEditController.java
index 14825c0..72e93e0 100644
--- a/src/application/view/compra/cruds/FacturaEditController.java
+++ b/src/application/view/compra/cruds/FacturaEditController.java
@@ -330,4 +330,9 @@ public boolean isFieldsSetted() {
                 isFieldsSetted=true;
         return isFieldsSetted;
     }
+
+    @FXML
+    private void handleAddArticuleOnEnter(){
+        handleNewLine();
+    }
 }
diff --git a/src/application/view/info/cruds/EditarEmpleadoDialog.fxml b/src/application/view/info/cruds/EditarEmpleadoDialog.fxml
index 950daaa..d06a219 100644
--- a/src/application/view/info/cruds/EditarEmpleadoDialog.fxml
+++ b/src/application/view/info/cruds/EditarEmpleadoDialog.fxml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
+
 <AnchorPane prefHeight="329.0" prefWidth="593.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.EmpleadoEditDialogController">
    <children>
       <VBox layoutX="13.0" layoutY="46.0">
@@ -55,7 +57,6 @@
                   <ComboBox fx:id="provinciaComboBox" prefHeight="27.0" prefWidth="166.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
                   <ComboBox fx:id="categoriaComboBox" prefHeight="27.0" prefWidth="163.0" GridPane.columnIndex="4" GridPane.rowIndex="1" />
                   <ComboBox fx:id="localidadComboBox" prefHeight="27.0" prefWidth="185.0" GridPane.columnIndex="4" GridPane.rowIndex="2" />
-                  <Button fx:id="familiarButton" mnemonicParsing="false" onAction="#mostrarFamiliares" text="Personas a cargo" GridPane.columnIndex="1" GridPane.rowIndex="4" />
                   <Button mnemonicParsing="false" onAction="#handleNewCategoriaEmpleado" text="+" GridPane.columnIndex="5" GridPane.rowIndex="1" />
                </children>
             </GridPane>
diff --git a/src/application/view/info/cruds/EmpleadoEditDialogController.java b/src/application/view/info/cruds/EmpleadoEditDialogController.java
index 2166125..7fae6e4 100644
--- a/src/application/view/info/cruds/EmpleadoEditDialogController.java
+++ b/src/application/view/info/cruds/EmpleadoEditDialogController.java
@@ -36,8 +36,7 @@ public class EmpleadoEditDialogController {
 	private ComboBox<Localidad> localidadComboBox;
 	@FXML
 	private Button aceptarButton;
-	@FXML
-	private Button familiarButton;
+
 	private boolean isNew;
 	private EmpleadoRepository empleadoRepository = new EmpleadoRepository();
 	private CategoriaEmpleadoRepository categoriaEmpleadoRepository = new CategoriaEmpleadoRepository();
@@ -90,10 +89,8 @@ public void setDialogStage(Stage dialogStage) {
 	}
 
 	public void setPerson(Empleado empleado) {
-		familiarButton.setDisable(true);
 		this.empleado = empleado;
 		if (!isNew){
-			familiarButton.setDisable(false);
 			nombreField.setText(empleado.getNombre());
 			apellidoField.setText(empleado.getApellido());
 			cuitField.setText(empleado.getCuit());
@@ -183,10 +180,7 @@ private void handleNewCategoriaEmpleado(){
 		controller.showCategoriaEmpleadoEdit(new CategoriaEmpleado(), true);
 		setCategoriaComboBox();
 	}
-	@FXML
-	private void mostrarFamiliares(){
-		//todo: hacer metodo
-	}
+
 
 	private void ponerFechaAlta(){
 		java.util.Date input = new Date();
diff --git a/src/application/view/inicio/Organizacion.fxml b/src/application/view/inicio/Organizacion.fxml
index 5967d1c..80d030b 100644
--- a/src/application/view/inicio/Organizacion.fxml
+++ b/src/application/view/inicio/Organizacion.fxml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.image.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
+
 <AnchorPane prefHeight="551.0" prefWidth="820.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.inicio.OrganizacionController">
    <children>
       <VBox alignment="CENTER" layoutY="40.0" prefHeight="265.0" prefWidth="600.0" AnchorPane.bottomAnchor="95.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="40.0">
@@ -26,15 +29,6 @@
                      </font></Label>
                </children>
             </HBox>
-            <HBox alignment="CENTER" prefHeight="40.0" prefWidth="600.0" spacing="20.0">
-               <children>
-                  <Label prefHeight="34.0" prefWidth="74.0" text="Razon Social:" />
-                  <Label fx:id="razonSocialOrganizacionLabel" prefHeight="17.0" prefWidth="182.0" text="LogiServ SRL">
-                     <font>
-                        <Font size="20.0" />
-                     </font></Label>
-               </children>
-            </HBox>
             <HBox alignment="CENTER" prefHeight="40.0" prefWidth="600.0" spacing="20.0">
                <children>
                   <Label prefHeight="37.0" prefWidth="69.0" text="Apoderado:" />
@@ -53,15 +47,6 @@
                      </font></Label>
                </children>
             </HBox>
-            <HBox alignment="TOP_CENTER" prefHeight="59.0" prefWidth="600.0" spacing="20.0">
-               <children>
-                  <Label prefHeight="28.0" prefWidth="53.0" text="Telefono:" />
-                  <Label fx:id="telefonoOrganizacionLabel" prefHeight="17.0" prefWidth="180.0" text="0381 - 4235689">
-                     <font>
-                        <Font size="20.0" />
-                     </font></Label>
-               </children>
-            </HBox>
             <Button fx:id="actualizarDatosOrganizacionLabel" mnemonicParsing="false" onAction="#handleNew" text="Actualizar Datos" />
          </children>
       </VBox>
diff --git a/src/application/view/inicio/OrganizacionController.java b/src/application/view/inicio/OrganizacionController.java
index ca29390..469fbcc 100644
--- a/src/application/view/inicio/OrganizacionController.java
+++ b/src/application/view/inicio/OrganizacionController.java
@@ -27,16 +27,11 @@ public class OrganizacionController implements Initializable{
     @FXML
     private Label cuitOrganizacionLabel;
     @FXML
-    private Label razonSocialOrganizacionLabel;
-    @FXML
     private Label apoderadoOrganizacionLabel;
     @FXML
     private Label domicilioOrganizacionLabel;
     @FXML
-    private Label telefonoOrganizacionLabel;
-    @FXML
     private Button actualizarDatosOrganizacionLabel;
-
     @FXML
     private ImageView imagenCamion;
 
diff --git a/src/application/view/inicio/crud/OrganizacionEdit.fxml b/src/application/view/inicio/crud/OrganizacionEdit.fxml
index edb9c06..32aa3dc 100644
--- a/src/application/view/inicio/crud/OrganizacionEdit.fxml
+++ b/src/application/view/inicio/crud/OrganizacionEdit.fxml
@@ -1,32 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.Group?>
 <?import javafx.scene.layout.*?>
+
 <Group stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.inicio.crud.OrganizacionEditController">
    <children>
-      <AnchorPane prefHeight="548.0" prefWidth="528.0">
+      <AnchorPane prefHeight="439.0" prefWidth="528.0">
          <children>
             <Label alignment="CENTER" prefHeight="44.0" prefWidth="511.0" text="Actualizar datos de la organización" />
             <GridPane layoutX="51.0" layoutY="44.0" AnchorPane.leftAnchor="60.0" AnchorPane.rightAnchor="60.0">
                <children>
                   <Label prefHeight="17.0" prefWidth="156.0" text="Nombre de la organización:" GridPane.columnSpan="2147483647" />
                   <Label text="CUIT:" GridPane.rowIndex="2" />
-                  <Label text="Domicilio:" GridPane.rowIndex="8" />
+                  <Label text="Domicilio:" GridPane.rowIndex="6" />
                   <TextField fx:id="nombreTextField" GridPane.columnSpan="3" GridPane.rowIndex="1" />
                   <TextField fx:id="cuitTextField" GridPane.columnSpan="2" GridPane.rowIndex="3" />
-                  <Label alignment="CENTER_RIGHT" prefHeight="17.0" prefWidth="59.0" text="Calle:" GridPane.rowIndex="9" />
-                  <Label alignment="CENTER_RIGHT" contentDisplay="CENTER" prefHeight="17.0" prefWidth="40.0" text="Nº:" textAlignment="RIGHT" GridPane.columnIndex="2" GridPane.rowIndex="9" />
-                  <TextField fx:id="domicilioCalleField" prefHeight="25.0" prefWidth="124.0" GridPane.columnIndex="1" GridPane.rowIndex="9" />
-                  <TextField fx:id="domicilioNumeroField" prefHeight="25.0" prefWidth="103.0" GridPane.columnIndex="3" GridPane.rowIndex="9" />
-                  <Label text="Localidad:" GridPane.rowIndex="10" />
-                  <ComboBox fx:id="localidadComboBox" prefHeight="25.0" prefWidth="238.0" GridPane.columnSpan="2" GridPane.rowIndex="11" />
-                  <Label text="Apoderado:" GridPane.rowIndex="6" />
-                  <ComboBox fx:id="apoderadoComboBox" prefHeight="25.0" prefWidth="271.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="7" />
-                  <Label text="Razón Social:" GridPane.rowIndex="4" />
-                  <TextField fx:id="razonSocialField" GridPane.columnSpan="2" GridPane.rowIndex="5" />
-                  <Label text="Telefono:" GridPane.rowIndex="12" />
-                  <TextField fx:id="telefonoField" GridPane.columnSpan="2" GridPane.rowIndex="13" />
+                  <Label alignment="CENTER_RIGHT" prefHeight="17.0" prefWidth="59.0" text="Calle:" GridPane.rowIndex="7" />
+                  <Label alignment="CENTER_RIGHT" contentDisplay="CENTER" prefHeight="17.0" prefWidth="40.0" text="Nº:" textAlignment="RIGHT" GridPane.columnIndex="2" GridPane.rowIndex="7" />
+                  <TextField fx:id="domicilioCalleField" prefHeight="25.0" prefWidth="124.0" GridPane.columnIndex="1" GridPane.rowIndex="7" />
+                  <TextField fx:id="domicilioNumeroField" prefHeight="25.0" prefWidth="121.0" GridPane.columnIndex="3" GridPane.rowIndex="7" />
+                  <Label text="Localidad:" GridPane.rowIndex="8" />
+                  <ComboBox fx:id="localidadComboBox" prefHeight="25.0" prefWidth="238.0" GridPane.columnSpan="2" GridPane.rowIndex="9" />
+                  <Label text="Apoderado:" GridPane.rowIndex="4" />
+                  <ComboBox fx:id="apoderadoComboBox" prefHeight="25.0" prefWidth="271.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="5" />
                </children>
                <columnConstraints>
                   <ColumnConstraints hgrow="SOMETIMES" maxWidth="226.0" minWidth="10.0" prefWidth="86.0" />
@@ -45,13 +44,9 @@
                   <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                   <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                   <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                </rowConstraints>
             </GridPane>
-            <HBox alignment="CENTER" layoutY="482.0" prefHeight="52.0" prefWidth="528.0" spacing="15.0">
+            <HBox alignment="CENTER" layoutY="373.0" prefHeight="52.0" prefWidth="528.0" spacing="15.0">
                <children>
                   <Button fx:id="btnOk" defaultButton="true" layoutX="172.0" layoutY="273.0" mnemonicParsing="false" onAction="#handleOk" text="Aceptar" />
                   <Button fx:id="btnCancel" cancelButton="true" layoutX="305.0" layoutY="273.0" mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
diff --git a/src/application/view/inicio/crud/OrganizacionEditController.java b/src/application/view/inicio/crud/OrganizacionEditController.java
index ebaef24..db07ca2 100644
--- a/src/application/view/inicio/crud/OrganizacionEditController.java
+++ b/src/application/view/inicio/crud/OrganizacionEditController.java
@@ -1,5 +1,6 @@
 package application.view.inicio.crud;
 
+import application.comunes.Alerta;
 import application.model.info.Empleado;
 import application.model.info.Localidad;
 import application.model.venta.Organizacion;
@@ -23,8 +24,6 @@ public class OrganizacionEditController implements Initializable{
     @FXML
     private TextField cuitTextField;
     @FXML
-    private TextField razonSocialField;
-    @FXML
     private ComboBox<Empleado> apoderadoComboBox;
     @FXML
     private TextField domicilioCalleField;
@@ -33,8 +32,6 @@ public class OrganizacionEditController implements Initializable{
     @FXML
     private ComboBox<Localidad> localidadComboBox;
     @FXML
-    private TextField telefonoField;
-    @FXML
     private Button btnOk;
     @FXML
     private Button btnCancel;
@@ -74,28 +71,31 @@ public boolean isOkClicked(){
     }
 
     private boolean isInputValid() {
-        /*String errorMessage = "";
+        String errorMessage = "";
 
         if (nombreTextField.getText() == null || nombreTextField.getText().length() == 0) {
-            errorMessage += "No valid supplier name!\n";
+            errorMessage += "Nombre de la organización no ingresado.\n";
         }
         if(cuitTextField.getText()==null || cuitTextField.getText().length() == 0){
-            errorMessage += "No valid CUIT \n";
+            errorMessage += "CUIT de la organización no ingresado correctamente.\n";
         }
+        if (apoderadoComboBox.getSelectionModel().isEmpty())
+            errorMessage += "Apoderado no seleccionado.\n";
         if(domicilioCalleField.getText()==null || domicilioCalleField.getText().length() == 0){
-            errorMessage += "No valid street name\n";
+            errorMessage += "Calle no ingresada correctamente.\n";
         }
         if(domicilioNumeroField.getText()==null || domicilioNumeroField.getText().length() == 0){
-            errorMessage += "No valid street number \n";
+            errorMessage += "Número no ingresado correctamente. \n";
         }
+        if (localidadComboBox.getSelectionModel().isEmpty())
+            errorMessage += "Localidad no seleccionada.";
 
         if (errorMessage.length() == 0) {
             return true;
         } else {
             Alerta.alertaError("Datos inválidos", errorMessage);
             return false;
-        }*/
-        return true;
+        }
     }
 
     @FXML
diff --git a/src/application/view/sueldo/cruds/ConceptoEditController.java b/src/application/view/sueldo/cruds/ConceptoEditController.java
index bf003b5..7be8bbb 100644
--- a/src/application/view/sueldo/cruds/ConceptoEditController.java
+++ b/src/application/view/sueldo/cruds/ConceptoEditController.java
@@ -168,9 +168,7 @@ public void initialize(URL location, ResourceBundle resources) {
     }
 
     private void cargarCategorias(){
-        //todo: hacer que cuando se seleccione esta fila se guarden todas las categorias.
         categorias = categoriaEmpleadoRepository.view();
-        categorias.add(new CategoriaEmpleado(0, "Todos"));
         categoriaEmpleadoTableView.setItems(categorias);
     }
     private void setComboBox(){

From 667159c4b77943bf7b981ff788e55c889d5bca04 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Sat, 3 Mar 2018 00:39:10 -0300
Subject: [PATCH 23/27] CORRECION DE ERRORES 1.4: MODULOS SUELDOS  - Arreglado
 boton cancelar para nueva liquidacion  - agregado boton "imprimir factura" en
 el modulo ventas

---
 src/application/view/sueldo/cruds/LiquidacionSueldo.fxml  | 4 +++-
 .../view/sueldo/cruds/LiquidacionSueldoController.java    | 4 ++++
 src/application/view/venta/Facturacion.fxml               | 8 ++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml b/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml
index 3ae77f4..e730277 100644
--- a/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml
+++ b/src/application/view/sueldo/cruds/LiquidacionSueldo.fxml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
+
 <AnchorPane prefHeight="615.0" prefWidth="673.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.sueldo.cruds.LiquidacionSueldoController">
    <children>
       <GridPane layoutX="33.0" layoutY="14.0" prefHeight="498.0" prefWidth="653.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0">
@@ -87,7 +89,7 @@
       <HBox alignment="CENTER" layoutX="5.0" layoutY="508.0" prefHeight="100.0" prefWidth="310.0" spacing="20.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0">
          <children>
             <Button fx:id="liquidarButton" defaultButton="true" mnemonicParsing="false" onAction="#handleOk" text="Liquidar" />
-            <Button fx:id="cancelButton" cancelButton="true" mnemonicParsing="false" text="Cancelar" />
+            <Button fx:id="cancelButton" cancelButton="true" mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
          </children>
       </HBox>
    </children>
diff --git a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
index 86f36df..b26df96 100644
--- a/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
+++ b/src/application/view/sueldo/cruds/LiquidacionSueldoController.java
@@ -468,6 +468,10 @@ public void handleOk(){
         }
 
     }
+    @FXML
+    public void handleCancel(){
+        owner.close();
+    }
 
 
 
diff --git a/src/application/view/venta/Facturacion.fxml b/src/application/view/venta/Facturacion.fxml
index 106d9d1..43f884c 100644
--- a/src/application/view/venta/Facturacion.fxml
+++ b/src/application/view/venta/Facturacion.fxml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
+
 <AnchorPane prefHeight="450.0" prefWidth="740.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.venta.FacturacionController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="13.0" prefHeight="437.0" prefWidth="721.0" spacing="10.0">
@@ -45,13 +48,14 @@
                   </TableView>
                </children>
             </HBox>
-            <HBox alignment="CENTER" prefHeight="72.0" prefWidth="740.0">
+            <HBox alignment="CENTER" prefHeight="72.0" prefWidth="740.0" spacing="20.0">
                <children>
-                  <Button fx:id="nuevaFacturaButton" alignment="CENTER" contentDisplay="CENTER" defaultButton="true" mnemonicParsing="false" onAction="#handleNew" prefHeight="31.0" prefWidth="145.0" text="Emitir Factura" textAlignment="CENTER">
+                  <Button fx:id="nuevaFacturaButton" alignment="CENTER" contentDisplay="CENTER" defaultButton="true" mnemonicParsing="false" onAction="#handleNew" prefHeight="20.0" prefWidth="145.0" text="Emitir Factura" textAlignment="CENTER">
                      <HBox.margin>
                         <Insets />
                      </HBox.margin>
                   </Button>
+                  <Button mnemonicParsing="false" text="Imprimir Factura" />
                </children>
             </HBox>
          </children>

From 7d730324803c19482f1365cf71f7b5fb3b1695f3 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Sat, 3 Mar 2018 03:20:37 -0300
Subject: [PATCH 24/27] CORRECION DE ERRORES 1.5: MODULOS INFO  - Corregida
 toda la funcionalidad de usuarios  - Agregada sesion y cerrar la sesion desde
 cualquier parte del programa.  - Se PUEDE eliminar cualquier usuario que no
 sea el de la sesion actual.  - Ahora se puede hacer la edicion de usuario mas
 no permitir la modificacion del nombre de usuario.

---
 .../repository/info/UsuarioRepository.java    |  42 ++---
 src/application/view/LoginController.java     |   4 +-
 src/application/view/Principal.fxml           |  40 +++--
 src/application/view/PrincipalController.java |  55 ++++++-
 src/application/view/RegisterController.java  |   4 +
 .../view/info/AdministrarUsuarios.fxml        |   8 +-
 .../info/AdministrarUsuariosController.java   |  79 +++++++---
 src/application/view/info/InfoDomicilio.fxml  |  37 -----
 .../view/info/cruds/EditarUsuarioDialog.fxml  |  38 -----
 .../view/info/cruds/UsuarioEdit.fxml          |  48 ++++++
 .../info/cruds/UsuarioEditController.java     | 148 ++++++++++++++++++
 .../cruds/UsuarioEditDialogController.java    | 122 ---------------
 12 files changed, 360 insertions(+), 265 deletions(-)
 delete mode 100644 src/application/view/info/InfoDomicilio.fxml
 delete mode 100644 src/application/view/info/cruds/EditarUsuarioDialog.fxml
 create mode 100644 src/application/view/info/cruds/UsuarioEdit.fxml
 create mode 100644 src/application/view/info/cruds/UsuarioEditController.java
 delete mode 100644 src/application/view/info/cruds/UsuarioEditDialogController.java

diff --git a/src/application/repository/info/UsuarioRepository.java b/src/application/repository/info/UsuarioRepository.java
index 63b0ce0..9579534 100644
--- a/src/application/repository/info/UsuarioRepository.java
+++ b/src/application/repository/info/UsuarioRepository.java
@@ -1,11 +1,13 @@
 package application.repository.info;
 
+import application.comunes.Alerta;
 import application.database.JDBCConnection;
 import application.model.info.Empleado;
 import application.model.info.Usuario;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import javax.swing.undo.UndoableEditSupport;
 import java.sql.*;
 
 public class UsuarioRepository {
@@ -21,24 +23,25 @@ public static ObservableList<Usuario> buscarUsuarios(){
 		
 		try {
 			statement = JDBCConnection.getInstanceConnection().createStatement();
-			resultSet = statement.executeQuery("select * from USUARIO");
-			
+			resultSet = statement.executeQuery("SELECT idUsuario, NombreUsuario, Password, idEmpleado, Nombre, Apellido " +
+					"FROM USUARIO INNER JOIN EMPLEADO " +
+					"ON Empleado_idEmpleado=idEmpleado");
+
 			while(resultSet.next()){
-			Usuario usuario = new Usuario();
-			usuario.setIdUsuario(resultSet.getInt("idUsuario"));
-			usuario.setNombre_usuario(resultSet.getString("NombreUsuario"));
-			usuario.setPassword(resultSet.getString("Password"));
-			usuario.setEmpleado(new Empleado());
-			usuario.getEmpleado().setIdEmpleado(resultSet.getInt("Empleado_idEmpleado"));
-			usuarios.add(usuario);
+				Usuario usuario = new Usuario();
+				usuario.setIdUsuario(resultSet.getInt(1));
+				usuario.setNombre_usuario(resultSet.getString(2));
+				usuario.setPassword(resultSet.getString(3));
+				usuario.setEmpleado(new Empleado());
+				usuario.getEmpleado().setIdEmpleado(resultSet.getInt(4));
+				usuario.getEmpleado().setNombre(resultSet.getString(5));
+				usuario.getEmpleado().setApellido(resultSet.getString(6));
+				usuarios.add(usuario);
 			}
 		} catch (SQLException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
 		return usuarios;
-		
 	}
 	
 	public void create(Usuario usuario){
@@ -57,19 +60,20 @@ public void create(Usuario usuario){
 		}
 	}
 
-	public static void edit(Usuario usuario, int idEmpleado){
+	public static void edit(Usuario usuario){
 		PreparedStatement preparedstatement;
-
 		try {
 			preparedstatement = JDBCConnection.getInstanceConnection().prepareStatement(
-					"UPDATE USUARIO SET NombreUsuario=?, Password=?, Empleado_idEmpleado=? WHERE idUsuario=?)");
+					"UPDATE USUARIO SET NombreUsuario=?, Password=MD5(?), Empleado_idEmpleado=? WHERE idUsuario=?");
 			preparedstatement.setString(1, usuario.getNombre_usuario());
 			preparedstatement.setString(2, usuario.getPassword());
-			preparedstatement.setInt(3, idEmpleado);
+			preparedstatement.setInt(3, usuario.getEmpleado().getIdEmpleado());
 			preparedstatement.setInt(4, usuario.getIdUsuario());
 			preparedstatement.executeUpdate();
+			String headerMsj="Actualización: usuario actualizado";
+			String cuerpoMsj = "Usuario: " + usuario.getNombre_usuario() + " modificado correctamente.";
+			Alerta.alertaInfo("Usuarios", headerMsj, cuerpoMsj);
 		} catch (SQLException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 
@@ -83,11 +87,7 @@ public static void delete(Usuario usuario){
 					"DELETE FROM USUARIO WHERE idUsuario=?");
 			preparedstatement.setInt(1, usuario.getIdUsuario());
 			preparedstatement.executeUpdate();
-			preparedstatement.close();
-
-
 		} catch (SQLException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 
diff --git a/src/application/view/LoginController.java b/src/application/view/LoginController.java
index 6c56f5a..fb20262 100644
--- a/src/application/view/LoginController.java
+++ b/src/application/view/LoginController.java
@@ -61,7 +61,8 @@ private void hlCreateAnAccount(){
     private void btnLogin(ActionEvent event){
         nombreUsuario = usuarioField.getText();
         password = passwordField.getText();
-
+        usuario.setNombre_usuario(nombreUsuario);
+        usuario.setPassword(password);
         String passMD5 = usuario.encryptMD5(password);
         boolean okLogin = usuarioRepository.login(nombreUsuario,passMD5);
 
@@ -78,6 +79,7 @@ private void btnLogin(ActionEvent event){
                 adminPanelStage.setTitle("LogiServ app - usuario: " + nombreUsuario + " conectado.");
 //                adminPanelStage.setMaximized(true);
                 PrincipalController controller = loader.getController();
+                controller.setUserOn(usuario);
                 controller.setPrimaryStage(adminPanelStage);
                 controller.setRootLayout(root);
                 controller.setHome();
diff --git a/src/application/view/Principal.fxml b/src/application/view/Principal.fxml
index 5c23068..c458787 100644
--- a/src/application/view/Principal.fxml
+++ b/src/application/view/Principal.fxml
@@ -1,30 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.text.*?>
+<?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
+
 <BorderPane prefHeight="600.0" prefWidth="900.0" stylesheets="@css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.PrincipalController">
-   <top>
-      <MenuBar BorderPane.alignment="CENTER">
-        <menus>
-          <Menu mnemonicParsing="false" text="File">
-            <items>
-                  <MenuItem mnemonicParsing="false" onAction="#cerrarSesion" text="Cerrar sesión" />
-              <MenuItem mnemonicParsing="false" text="Close" />
-            </items>
-          </Menu>
-          <Menu mnemonicParsing="false" text="Edit">
-            <items>
-              <MenuItem mnemonicParsing="false" text="Delete" />
-            </items>
-          </Menu>
-          <Menu mnemonicParsing="false" text="Help">
-            <items>
-              <MenuItem mnemonicParsing="false" text="About" />
-            </items>
-          </Menu>
-        </menus>
-      </MenuBar>
-   </top>
    <left>
           <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="571.0" prefWidth="221.0" BorderPane.alignment="CENTER">
                <children>
@@ -128,4 +109,19 @@
    <center>
       <Pane prefHeight="541.0" prefWidth="623.0" BorderPane.alignment="CENTER" />
    </center>
+   <top>
+      <HBox alignment="CENTER_RIGHT" prefHeight="24.0" prefWidth="900.0" spacing="10.0" BorderPane.alignment="CENTER">
+         <children>
+            <Label text="Usuario:  " />
+            <Label fx:id="usuarioLabel" text=" ">
+               <font>
+                  <Font size="13.0" />
+               </font></Label>
+            <Hyperlink fx:id="cerrarSesion" onAction="#handleCerrarSesion" text="cerrar sesión">
+               <font>
+                  <Font name="System Italic" size="12.0" />
+               </font></Hyperlink>
+         </children>
+      </HBox>
+   </top>
       </BorderPane>
diff --git a/src/application/view/PrincipalController.java b/src/application/view/PrincipalController.java
index 8857f5f..9213a3c 100644
--- a/src/application/view/PrincipalController.java
+++ b/src/application/view/PrincipalController.java
@@ -1,6 +1,7 @@
 package application.view;
 
 import application.Main;
+import application.model.info.Usuario;
 import application.view.calculo.*;
 import application.view.compra.*;
 import application.view.info.*;
@@ -13,13 +14,18 @@
 import application.view.venta.VentaClienteController;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
 import javafx.scene.control.Accordion;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.control.Label;
 import javafx.scene.control.TitledPane;
 import javafx.scene.image.Image;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.BorderPane;
+import javafx.stage.Modality;
 import javafx.stage.Stage;
 
+import javax.swing.text.Style;
 import java.io.IOException;
 
 public class PrincipalController {
@@ -30,7 +36,53 @@ public class PrincipalController {
 	private Accordion modulosAccordion;
     @FXML
     private TitledPane inicioTitledPane;
-	public void setRootLayout(BorderPane root){
+    @FXML
+    private Label usuarioLabel;
+    @FXML
+    private Hyperlink cerrarSesion;
+
+    private Usuario userOn;
+
+    @FXML
+    private void handleCerrarSesion(){
+        try {
+            // Load the fxml file and create a new stage for the popup dialog.
+            FXMLLoader loader = new FXMLLoader();
+            loader.setLocation(Main.class.getResource("view/Login.fxml"));
+            BorderPane page = loader.load();
+
+            // Create the dialog Stage.
+            Stage dialogStage = new Stage();
+            dialogStage.setTitle("Acceso a LogiServ App");
+            dialogStage.initModality(Modality.WINDOW_MODAL);
+            Scene scene = new Scene(page);
+            dialogStage.setScene(scene);
+
+
+            LoginController controller = loader.getController();
+
+
+            // Show the dialog and wait until the user closes it
+            dialogStage.show();
+
+            //Cierro la ventana de login
+            Stage stage = (Stage) primaryStage.getScene().getWindow();
+            stage.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
+
+
+    public void setUserOn(Usuario userOn) {
+        this.userOn = userOn;
+        usuarioLabel.setText(userOn.getNombre_usuario());
+    }
+
+    public void setRootLayout(BorderPane root){
 		this.rootLayout = root;
 
 	}
@@ -416,6 +468,7 @@ private void showUsuarioOverview() {
               AdministrarUsuariosController usercontroller = loaderusuario.getController();
               usercontroller.setOwner(primaryStage);
               usercontroller.buscarUsuarios();
+              usercontroller.setUserSesion(userOn);
 
           } catch (IOException e) {
               e.printStackTrace();
diff --git a/src/application/view/RegisterController.java b/src/application/view/RegisterController.java
index 5df7354..b5a3efc 100644
--- a/src/application/view/RegisterController.java
+++ b/src/application/view/RegisterController.java
@@ -23,6 +23,10 @@
 import java.util.ResourceBundle;
 
 public class RegisterController implements Initializable {
+    public Hyperlink getHlLogin() {
+        return hlLogin;
+    }
+
     @FXML
     private Hyperlink hlLogin;
     @FXML
diff --git a/src/application/view/info/AdministrarUsuarios.fxml b/src/application/view/info/AdministrarUsuarios.fxml
index ef4f582..1386257 100644
--- a/src/application/view/info/AdministrarUsuarios.fxml
+++ b/src/application/view/info/AdministrarUsuarios.fxml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.AdministrarUsuariosController">
+
+<AnchorPane prefHeight="400.0" prefWidth="627.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.AdministrarUsuariosController">
    <children>
       <VBox alignment="CENTER_LEFT" layoutX="18.0" layoutY="13.0" prefHeight="387.0" prefWidth="582.0" spacing="20.0">
          <children>
@@ -13,8 +17,8 @@
             <TableView fx:id="usuarioTable" pickOnBounds="false" prefHeight="316.0" prefWidth="600.0">
               <columns>
                 <TableColumn fx:id="usuarioColumn" prefWidth="75.0" text="Usuario" />
-                  <TableColumn fx:id="nombreColumn" prefWidth="75.0" text="Nombre" />
                   <TableColumn fx:id="apellidoColumn" prefWidth="75.0" text="Apellido" />
+                  <TableColumn fx:id="nombreColumn" prefWidth="75.0" text="Nombre" />
               </columns>
                <columnResizePolicy>
                   <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
diff --git a/src/application/view/info/AdministrarUsuariosController.java b/src/application/view/info/AdministrarUsuariosController.java
index 1e8ad31..64ae69b 100644
--- a/src/application/view/info/AdministrarUsuariosController.java
+++ b/src/application/view/info/AdministrarUsuariosController.java
@@ -1,16 +1,21 @@
 package application.view.info;
 
 import application.Main;
+import application.comunes.Alerta;
 import application.model.info.Usuario;
 import application.repository.info.UsuarioRepository;
-import application.view.info.cruds.UsuarioEditDialogController;
+import application.view.LoginController;
+import application.view.RegisterController;
+import application.view.info.cruds.UsuarioEditController;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.layout.AnchorPane;
@@ -18,6 +23,7 @@
 import javafx.stage.Stage;
 
 import java.io.IOException;
+import java.util.Optional;
 
 public class AdministrarUsuariosController {
 	
@@ -33,7 +39,8 @@ public class AdministrarUsuariosController {
 	private ObservableList<Usuario> usuarioData = FXCollections.observableArrayList();
 	
 	Stage owner;
-	
+	private Usuario userSesion;
+
 	public void buscarUsuarios(){
 		this.usuarioData = UsuarioRepository.buscarUsuarios();
 		usuarioTable.setItems(usuarioData);
@@ -48,27 +55,55 @@ private void initialize(){
 	
 	@FXML
 	private void handleDeleteUsuario(){
-		int selectedIndex = usuarioTable.getSelectionModel().getSelectedIndex();
-		if(selectedIndex >= 0){
-			usuarioTable.getItems().remove(selectedIndex);
-		} else {
-			Alert alert = new Alert(AlertType.WARNING);
-			alert.setTitle("Seleccionar Usuario");
-			alert.setHeaderText(null);
-			alert.setContentText("Por favor selecciona un usuario en la tabla");
-			alert.showAndWait();
+		Usuario selectedItem = usuarioTable.getSelectionModel().getSelectedItem();
+		Optional<ButtonType> resultado = Alerta.alertaConfirmacion("Eliminar usuario",
+				null,"¿Desea eliminar el usuario seleccionado?");
+		if (!selectedItem.getNombre_usuario().matches(userSesion.getNombre_usuario())){
+			if (resultado.isPresent() && resultado.get()==ButtonType.OK){
+				usuarioTable.getItems().remove(
+						usuarioTable.getSelectionModel().getSelectedIndex());
+				UsuarioRepository.delete(selectedItem);
+			}
+
+		}else {
+			Alerta.alertaError("Seleccionar usuario", "Por favor seleccione un usuario válido en la tabla." +
+					"\n (No se puede borrar la cuenta actual).");
 		}
 	}
 	
 	@FXML
 	private void handleNewUsuario() {
-		Usuario tempUsuario = new Usuario();
-		boolean okClicked = this.showUsuarioEditDialog(tempUsuario);
-		if (okClicked) {
-			usuarioData.add(tempUsuario);
+		loadRegistration();
+	}
+
+	private void loadRegistration() {
+		try {
+			// Load the fxml file and create a new stage for the popup dialog.
+			FXMLLoader loader = new FXMLLoader();
+			loader.setLocation(Main.class.getResource("view/Register.fxml"));
+			Group page = loader.load();
+
+			// Create the dialog Stage.
+			Stage dialogStage = new Stage();
+			dialogStage.setTitle("Nuevo usuario");
+			dialogStage.initModality(Modality.WINDOW_MODAL);
+			Scene scene = new Scene(page);
+			dialogStage.setScene(scene);
+
+
+			RegisterController controller = loader.getController();
+			controller.setDialogStage(dialogStage);
+			controller.getHlLogin().setVisible(false);
+
+
+
+			// Show the dialog and wait until the user closes it
+			dialogStage.show();
+		} catch (IOException e) {
+			e.printStackTrace();
 		}
 	}
-	
+
 	public void setOwner(Stage owner){
 		this.owner = owner;
 		
@@ -95,7 +130,7 @@ public boolean showUsuarioEditDialog(Usuario usuario) {
         try {
             // Load the fxml file and create a new stage for the popup dialog.
             FXMLLoader loader = new FXMLLoader();
-            loader.setLocation(Main.class.getResource("view/info/cruds/EditarUsuarioDialog.fxml"));
+            loader.setLocation(Main.class.getResource("view/info/cruds/UsuarioEdit.fxml"));
             AnchorPane page = (AnchorPane) loader.load();
 
             // Create the dialog Stage.
@@ -107,7 +142,7 @@ public boolean showUsuarioEditDialog(Usuario usuario) {
             dialogStage.setScene(scene);
 
             // Set the person into the controller.
-            UsuarioEditDialogController controller = loader.getController();
+            UsuarioEditController controller = loader.getController();
             controller.setDialogStage(dialogStage);
             controller.setUsuario(usuario);
 
@@ -120,7 +155,9 @@ public boolean showUsuarioEditDialog(Usuario usuario) {
             return false;
         }
     }
-	
-	
-	
+
+
+	public void setUserSesion(Usuario userSesion) {
+		this.userSesion = userSesion;
+	}
 }
\ No newline at end of file
diff --git a/src/application/view/info/InfoDomicilio.fxml b/src/application/view/info/InfoDomicilio.fxml
deleted file mode 100644
index 119af39..0000000
--- a/src/application/view/info/InfoDomicilio.fxml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
-   <children>
-      <VBox alignment="CENTER_LEFT" layoutX="19.0" layoutY="17.0" prefHeight="383.0" prefWidth="581.0" spacing="20.0">
-         <children>
-            <Label text="Domicilio" />
-            <TableView pickOnBounds="false" prefHeight="233.0" prefWidth="600.0">
-              <columns>
-                <TableColumn prefWidth="75.0" text="id" />
-                  <TableColumn prefWidth="75.0" text="Calle" />
-                  <TableColumn prefWidth="75.0" text="Numero" />
-                  <TableColumn prefWidth="75.0" text="Localidad" />
-              </columns>
-               <columnResizePolicy>
-                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-               </columnResizePolicy>
-            </TableView>
-            <HBox alignment="CENTER" prefHeight="83.0" prefWidth="600.0" spacing="20.0">
-               <children>
-                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleNewEmpleado" text="Nuevo Domicilio" />
-                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleEditPerson" text="Editar Domiclio" />
-                  <Button alignment="CENTER" mnemonicParsing="false" onAction="#handleDeleteEmpleado" text="Eliminar Domicilio" />
-               </children>
-               <VBox.margin>
-                  <Insets />
-               </VBox.margin>
-            </HBox>
-         </children>
-      </VBox>
-   </children>
-</AnchorPane>
diff --git a/src/application/view/info/cruds/EditarUsuarioDialog.fxml b/src/application/view/info/cruds/EditarUsuarioDialog.fxml
deleted file mode 100644
index a620dbe..0000000
--- a/src/application/view/info/cruds/EditarUsuarioDialog.fxml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<AnchorPane prefHeight="472.0" prefWidth="617.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.UsuarioEditDialogController">
-   <children>
-      <GridPane prefHeight="90.0" prefWidth="400.0" AnchorPane.leftAnchor="100.0" AnchorPane.topAnchor="100.0">
-        <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="203.0" minWidth="10.0" prefWidth="86.0" />
-          <ColumnConstraints hgrow="SOMETIMES" maxWidth="328.0" minWidth="10.0" prefWidth="314.0" />
-        </columnConstraints>
-        <rowConstraints>
-          <RowConstraints maxHeight="60.0" minHeight="10.0" prefHeight="26.0" vgrow="SOMETIMES" />
-          <RowConstraints maxHeight="34.0" minHeight="0.0" prefHeight="34.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="34.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
-        </rowConstraints>
-         <children>
-            <Label text="Usuario" />
-            <Label text="Contraseña" GridPane.rowIndex="1" />
-            <TextField fx:id="usuarioField" GridPane.columnIndex="1" />
-            <TextField fx:id="passwordField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-            <Label prefHeight="17.0" prefWidth="78.0" text="Empleado" GridPane.rowIndex="2" />
-         </children>
-      </GridPane>
-      <Button fx:id="aceptarButton" defaultButton="true" layoutX="467.0" layoutY="412.0" mnemonicParsing="false" onAction="#handleOk" text="Aceptar" />
-      <Button layoutX="386.0" layoutY="412.0" mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
-      <TableView fx:id="empleadoTable" layoutX="186.0" layoutY="162.0" prefHeight="200.0" prefWidth="314.0">
-        <columns>
-          <TableColumn fx:id="nombreColumn" prefWidth="75.0" text="Nombre" />
-          <TableColumn fx:id="apellidoColumn" prefWidth="75.0" text="Apellido" />
-            <TableColumn fx:id="cuitColumn" prefWidth="75.0" text="CUIT" />
-        </columns>
-         <columnResizePolicy>
-            <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-         </columnResizePolicy>
-      </TableView>
-   </children>
-</AnchorPane>
diff --git a/src/application/view/info/cruds/UsuarioEdit.fxml b/src/application/view/info/cruds/UsuarioEdit.fxml
new file mode 100644
index 0000000..81485ef
--- /dev/null
+++ b/src/application/view/info/cruds/UsuarioEdit.fxml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane prefHeight="331.0" prefWidth="397.0" stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.view.info.cruds.UsuarioEditController">
+   <children>
+      <VBox alignment="CENTER" prefHeight="340.0" prefWidth="432.0" spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+            <GridPane prefHeight="247.0" prefWidth="397.0">
+              <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="131.0" minWidth="10.0" prefWidth="131.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="138.0" minWidth="10.0" prefWidth="125.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+              </columnConstraints>
+              <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+               <children>
+                  <Label alignment="CENTER_RIGHT" prefHeight="17.0" prefWidth="121.0" text="Nombre de Usuario:" GridPane.rowIndex="1" />
+                  <Label alignment="CENTER_RIGHT" prefHeight="17.0" prefWidth="121.0" text="Repetir contraseña:" GridPane.rowIndex="4" />
+                  <Label alignment="CENTER_RIGHT" prefHeight="17.0" prefWidth="121.0" text="Nueva contraseña:" GridPane.rowIndex="3" />
+                  <Label alignment="CENTER_RIGHT" prefHeight="17.0" prefWidth="121.0" text="Contraseña:" GridPane.rowIndex="2" />
+                  <Label alignment="CENTER_RIGHT" prefHeight="17.0" prefWidth="121.0" text="Empleado:" GridPane.rowIndex="5" />
+                  <TextField fx:id="usuarioField" disable="true" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                  <PasswordField fx:id="passwordField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                  <PasswordField fx:id="newPasswordField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                  <PasswordField fx:id="reNewPasswordField" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                  <ComboBox fx:id="empleadoComboBox" prefHeight="25.0" prefWidth="250.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="5" />
+               </children>
+            </GridPane>
+            <HBox alignment="CENTER" prefHeight="123.0" prefWidth="397.0" spacing="20.0">
+               <children>
+                  <Button fx:id="aceptarButton" defaultButton="true" layoutX="467.0" layoutY="412.0" mnemonicParsing="false" onAction="#handleOk" text="Aceptar" />
+                  <Button cancelButton="true" layoutX="386.0" layoutY="412.0" mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+   </children>
+</AnchorPane>
diff --git a/src/application/view/info/cruds/UsuarioEditController.java b/src/application/view/info/cruds/UsuarioEditController.java
new file mode 100644
index 0000000..4425673
--- /dev/null
+++ b/src/application/view/info/cruds/UsuarioEditController.java
@@ -0,0 +1,148 @@
+package application.view.info.cruds;
+
+import application.model.info.Empleado;
+import application.model.info.Usuario;
+import application.repository.info.EmpleadoRepository;
+import application.repository.info.UsuarioRepository;
+import javafx.beans.property.StringProperty;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.*;
+import javafx.scene.control.Alert.AlertType;
+import javafx.stage.Stage;
+
+import java.net.URL;
+import java.util.ResourceBundle;
+
+public class UsuarioEditController implements Initializable{
+
+	@FXML
+	private TextField usuarioField;
+	@FXML
+	private PasswordField passwordField;
+	@FXML
+	private PasswordField newPasswordField;
+	@FXML
+	private PasswordField reNewPasswordField;
+	@FXML
+	private ComboBox<Empleado> empleadoComboBox;
+
+	@FXML
+	private Button aceptarButton;
+
+	private Stage dialogStage;
+	private Usuario usuario;
+	private boolean okClicked = false;
+
+	EmpleadoRepository empleadoRepository = new EmpleadoRepository();
+	private ObservableList<Empleado> empleadoList = empleadoRepository.buscarEmpleados();
+    UsuarioRepository usuarioRepository = new UsuarioRepository();
+	/**
+	 * Sets the stage of this dialog.
+	 * 
+	 * @param dialogStage
+	 */
+	public void setDialogStage(Stage dialogStage) {
+		this.dialogStage = dialogStage;
+	}
+
+	public void setUsuario(Usuario usuario) {
+		this.usuario = usuario;
+		usuarioField.setText(usuario.getNombre_usuario());
+		empleadoComboBox.getSelectionModel().select(usuario.getEmpleado());
+	}
+	
+	
+	public boolean isOkClicked(){
+		return okClicked;
+	}
+	
+
+	@FXML
+	private void handleOk() {
+		if (isInputValid()){
+			usuario.setPassword(newPasswordField.getText());
+			usuario.setEmpleado(empleadoComboBox.getValue());
+			usuarioRepository.edit(usuario);
+			dialogStage.close();
+		}
+
+	}
+
+	@FXML
+	private void handleCancel() {
+		dialogStage.close();
+	}
+	
+	
+	
+	
+	private boolean isInputValid() {
+		String errorMessage = "";
+		if (usuarioField.getText() == null || usuarioField.getText().length() == 0)
+			errorMessage += "No se ingresó un usuario válido\n";
+		if (passwordField.getText() == null || passwordField.getText().length() == 0)
+			errorMessage += "No se ingresó una contraseña válida\n";
+		if (!passMatch())
+			errorMessage += "La contraseña nueva no coincide, por favor ingreselas correctamente.\n";
+		if (!isDiferentPassword())
+			errorMessage += "La contraseña nueva es identica a la antigua.\n";
+		if (!isCorrectPassword())
+			errorMessage += "Contraseña incorrecta";
+
+		if (errorMessage.length() == 0) {
+			return true;
+		} else {
+			// Show the error message.
+			Alert alert = new Alert(AlertType.ERROR);
+			alert.setTitle("Datos Inválidos");
+			alert.setHeaderText(null);
+			alert.setContentText(errorMessage);
+			alert.showAndWait();
+			return false;
+		}
+	}
+
+	@Override
+	public void initialize(URL location, ResourceBundle resources) {
+		cargarComboBoxEmpleados();
+
+	}
+
+	private void cargarComboBoxEmpleados() {
+		empleadoComboBox.setItems(empleadoRepository.buscarEmpleados());
+	}
+
+	private boolean passMatch() {
+		boolean passMatch;
+		String password = newPasswordField.getText();
+		String rePass = reNewPasswordField.getText();
+		if (password.matches(rePass)) {
+			passMatch = true;
+		} else {
+			passMatch = false;
+		}
+		return passMatch;
+	}
+	private boolean isDiferentPassword(){
+		boolean isDiferent;
+		String oldPassword = passwordField.getText();
+		String newPassword = newPasswordField.getText();
+
+		if (oldPassword.matches(newPassword))
+			isDiferent = false;
+		else
+			isDiferent = true;
+
+		return isDiferent;
+	}
+
+	private boolean isCorrectPassword(){
+		String passMD5 = usuario.encryptMD5(passwordField.getText());
+		boolean okLogin = usuarioRepository.login(usuario.getNombre_usuario(), passMD5);
+		System.out.println("Login: " + okLogin);
+		return okLogin;
+	}
+
+}
diff --git a/src/application/view/info/cruds/UsuarioEditDialogController.java b/src/application/view/info/cruds/UsuarioEditDialogController.java
deleted file mode 100644
index 914602f..0000000
--- a/src/application/view/info/cruds/UsuarioEditDialogController.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package application.view.info.cruds;
-
-import application.model.info.Empleado;
-import application.model.info.Usuario;
-import application.repository.info.EmpleadoRepository;
-import application.repository.info.UsuarioRepository;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import javafx.scene.control.Alert.AlertType;
-import javafx.stage.Stage;
-
-public class UsuarioEditDialogController {
-
-	@FXML
-	private TextField usuarioField;
-	@FXML
-	private TextField passwordField;
-	@FXML
-	private TableView<Empleado> empleadoTable;
-	@FXML
-	private TableColumn<Empleado, String> nombreColumn;
-	@FXML
-	private TableColumn<Empleado, String> apellidoColumn;
-	@FXML
-	private TableColumn<Empleado, String> cuitColumn;
-	@FXML
-	private Button aceptarButton;
-
-	private Stage dialogStage;
-	private Usuario usuario;
-	private boolean okClicked = false;
-
-	EmpleadoRepository empleadoRepository = new EmpleadoRepository();
-	private ObservableList<Empleado> empleadoList = empleadoRepository.buscarEmpleados();
-
-	@FXML
-	private	void initialize(){
-		empleadoTable.setItems(empleadoList);
-		nombreColumn.setCellValueFactory(cellData -> cellData.getValue().nombreProperty());
-		apellidoColumn.setCellValueFactory(cellData -> cellData.getValue().apellidoProperty());
-		//TODO cuitColumn.setCellValueFactory(cellData -> cellData.getValue().);
-		
-		}
-UsuarioRepository usuarioRepository = new UsuarioRepository();
-	/**
-	 * Sets the stage of this dialog.
-	 * 
-	 * @param dialogStage
-	 */
-	public void setDialogStage(Stage dialogStage) {
-		this.dialogStage = dialogStage;
-	}
-
-	public void setUsuario(Usuario usuario) {
-		this.usuario = usuario;
-
-		usuarioField.setText(usuario.getNombre_usuario());
-		passwordField.setText(usuario.getPassword());
-		
-
-	}
-	
-	
-	public boolean isOkClicked(){
-		return okClicked;
-	}
-	
-
-	@FXML
-	private void handleOk() {
-		Empleado empleado = empleadoTable.getSelectionModel().getSelectedItem();
-		if (isInputValid() && empleado != null ) {
-			usuario.setNombre_usuario(usuarioField.getText());
-			usuario.setPassword(passwordField.getText());
-			usuario.setEmpleado(empleado);
-			usuarioRepository.create(usuario);
-			okClicked = true;
-			dialogStage.close();
-		}else {
-			// Nothing selected.
-		Alert alert = new Alert(AlertType.WARNING);
-		alert.setTitle("Verifique los datos");
-		alert.setHeaderText(null);
-		alert.setContentText("Alguno de los datos ingresados es incorrecto o no seleccionó un empleado");
-		alert.showAndWait();
-		}
-	}
-
-	@FXML
-	private void handleCancel() {
-		dialogStage.close();
-	}
-	
-	
-	
-	
-	private boolean isInputValid() {
-		String errorMessage = "";
-
-		if (usuarioField.getText() == null || usuarioField.getText().length() == 0) {
-			errorMessage += "No se ingresó un usuario válido\n";
-		}
-		if (passwordField.getText() == null || passwordField.getText().length() == 0) {
-			errorMessage += "No se ingresó una contraseña válida\n";
-		}
-
-		if (errorMessage.length() == 0) {
-			return true;
-		} else {
-			// Show the error message.
-			Alert alert = new Alert(AlertType.ERROR);
-			alert.setTitle("Datos Inválidos");
-			alert.setHeaderText(null);
-			alert.setContentText(errorMessage);
-			alert.showAndWait();
-
-			return false;
-		}
-	}
-
-}

From fe179a3331294c49c6a21f695bedb899c072caa5 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Sun, 4 Mar 2018 23:42:57 -0300
Subject: [PATCH 25/27] Arreglos en facturacion y viajes

---
 src/application/model/venta/FacturaVenta.java |  7 +++--
 .../repository/info/EmpleadoRepository.java   | 30 +++++++++----------
 .../venta/FacturaVentaRepository.java         | 16 ++++++++++
 .../repository/venta/ViajeRepository.java     | 15 ++++++++++
 src/application/view/LoginController.java     |  1 +
 src/application/view/Register.fxml            |  2 +-
 .../view/info/cruds/EditarEmpleadoDialog.fxml |  2 +-
 src/application/view/inicio/Organizacion.fxml |  8 ++---
 .../crud/OrganizacionEditController.java      |  4 +--
 .../view/venta/FacturacionController.java     |  6 ++--
 .../venta/cruds/EmitirFacturaController.java  |  2 +-
 11 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/src/application/model/venta/FacturaVenta.java b/src/application/model/venta/FacturaVenta.java
index e3101c7..e05cd97 100644
--- a/src/application/model/venta/FacturaVenta.java
+++ b/src/application/model/venta/FacturaVenta.java
@@ -116,16 +116,17 @@ public void setOrganizacion(Organizacion organizacion) {
 
 
     public FacturaVenta(Integer idFacturaVenta, String cuit, String nombreEmpresa,
-                        String fechaEmision, String nombreCliente, String cuitCliente) {
+                        String fechaEmision, String nombreCliente, String cuitCliente, Double montoTotal) {
         this.idFacturaVenta = new SimpleIntegerProperty(idFacturaVenta);
         this.cuit = new SimpleStringProperty(cuit);
         this.nombreEmpresa = new SimpleStringProperty(nombreEmpresa);
         this.fechaEmision = new SimpleStringProperty(fechaEmision);
         this.nombreCliente = new SimpleStringProperty(nombreCliente);
         this.cuitCliente = new SimpleStringProperty(cuitCliente);
+        this.montoFactura = new SimpleDoubleProperty(montoTotal);
     }
 
     public FacturaVenta() {
-        this(0,null,null,null,null,null);
+        this(0,null,null,null,null,null,0.0);
     }
-}
+}
\ No newline at end of file
diff --git a/src/application/repository/info/EmpleadoRepository.java b/src/application/repository/info/EmpleadoRepository.java
index f1e9623..bea9d01 100644
--- a/src/application/repository/info/EmpleadoRepository.java
+++ b/src/application/repository/info/EmpleadoRepository.java
@@ -222,20 +222,20 @@ public Empleado getEmpleadoById(int idEmpleado){
 		return empleado;
 	}
 
-    public int getLastID() {
+	public int getLastID() {
 		int lastId=0;
-        try {
-            connection = JDBCConnection.getInstanceConnection();
-            preparedStatement=connection.prepareStatement("SELECT MAX(idEmpleado) FROM EMPLEADO");
-            resultSet = preparedStatement.executeQuery();
-            while (resultSet.next())
-                lastId= resultSet.getInt(1);
-            return lastId;
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return lastId;
-    }
+		try {
+			connection = JDBCConnection.getInstanceConnection();
+			preparedStatement=connection.prepareStatement("SELECT MAX(idEmpleado) FROM EMPLEADO");
+			resultSet = preparedStatement.executeQuery();
+			while (resultSet.next())
+				lastId= resultSet.getInt(1);
+			return lastId;
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+		return lastId;
+	}
 	public ObservableList<Empleado> getConductores(){
 		ObservableList<Empleado> list = FXCollections.observableArrayList();
 		try {
@@ -243,7 +243,7 @@ public ObservableList<Empleado> getConductores(){
 			PreparedStatement preparedStatement=connection.prepareStatement("SELECT idEmpleado, Apellido, Nombre \n" +
 					"\t\tFROM Empleado INNER JOIN categoria_empleado \n" +
 					"\t\t\tON CATEGORIA_EMPLEADO_idCategoriaEmpleado = idCategoriaEmpleado\n" +
-					"\t\tWHERE nombreCategoria like 'conductor'\n" +
+					"\t\tWHERE nombreCategoria like 'con%'\n" +
 					"\t\t\tAND FechaBaja is null;");
 
 			ResultSet resultSet = preparedStatement.executeQuery();
@@ -261,4 +261,4 @@ public ObservableList<Empleado> getConductores(){
 		return list;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/src/application/repository/venta/FacturaVentaRepository.java b/src/application/repository/venta/FacturaVentaRepository.java
index 2fcc2e5..b52677e 100644
--- a/src/application/repository/venta/FacturaVentaRepository.java
+++ b/src/application/repository/venta/FacturaVentaRepository.java
@@ -104,6 +104,7 @@ public ObservableList<FacturaVenta> view(){
 				facturaVenta.setCliente(cliente);
 				Organizacion organizacion = organizacionRepository.getOrganizacionById(resultSet.getInt("ORGANIZACION_idORGANIZACION"));
 				facturaVenta.setOrganizacion(organizacion);
+				setTotalMonto(facturaVenta);
 				list.add(facturaVenta);
 			}
 		} catch (SQLException e) {
@@ -112,6 +113,21 @@ public ObservableList<FacturaVenta> view(){
 
 		return list;
 	}
+
+	public void setTotalMonto(FacturaVenta facturaVenta){
+
+		try {
+			Connection con = JDBCConnection.getInstanceConnection();
+			PreparedStatement pS = con.prepareStatement("SELECT SUM(monto) FROM linea_viaje WHERE FACTURA_VENTA_idFACTURA_VENTA=?;");
+			pS.setInt(1, facturaVenta.getIdFacturaVenta());
+			ResultSet result = pS.executeQuery();
+			if (result.next()) facturaVenta.setMontoFactura(result.getDouble(1));
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+	}
+
 	public void search(FacturaVenta facturaVenta){
 		try {
 			connection= JDBCConnection.getInstanceConnection();
diff --git a/src/application/repository/venta/ViajeRepository.java b/src/application/repository/venta/ViajeRepository.java
index 8b43b5e..87e4b5d 100644
--- a/src/application/repository/venta/ViajeRepository.java
+++ b/src/application/repository/venta/ViajeRepository.java
@@ -217,6 +217,7 @@ public ObservableList<Viaje> view(){
 		return list;
 	}
 
+	//todo devolver monto viaje
 	public ObservableList<Viaje> getViajesSinLiquidar(){
 
 		ObservableList<Viaje> list = FXCollections.observableArrayList();
@@ -244,6 +245,7 @@ public ObservableList<Viaje> getViajesSinLiquidar(){
 				Empleado conductor = empleadoRepository.getEmpleadoById(resultSet.getInt("EMPLEADO_idEmpleado"));
 				viaje.setConductor(conductor);
 				viaje.setCamion(camion);
+				setMontoViaje(viaje);
 				list.add(viaje);
 				System.out.printf("Viaje agregado%n" +
 								"idRemito: %s %n" +
@@ -264,6 +266,19 @@ public ObservableList<Viaje> getViajesSinLiquidar(){
 		return list;
 	}
 
+	public void setMontoViaje(Viaje viaje){
+
+		BigDecimal distancia = BigDecimal.valueOf(Double.valueOf(viaje.getDistanciaRecorrida()));
+		BigDecimal bruto = BigDecimal.valueOf(Double.valueOf(viaje.getBruto()));
+		BigDecimal tara = BigDecimal.valueOf(Double.valueOf(viaje.getTara()));
+		BigDecimal pesoNeto = bruto.subtract(tara);
+		BigDecimal precioKm = BigDecimal.valueOf(viaje.getIngenio().getTarifa());//todo cambiar metodo p/ cambiar ingenio automat...
+		BigDecimal arranque = BigDecimal.valueOf(viaje.getIngenio().getArranque());
+		BigDecimal precioUnitario = distancia.multiply(precioKm).add(arranque);
+		BigDecimal montoViaje = precioUnitario.multiply(pesoNeto).multiply(BigDecimal.valueOf(0.001));
+		viaje.setMonto(montoViaje.doubleValue());
+	}
+
 	public Viaje search(int idViaje){
 		Viaje viaje = new Viaje();
 		try {
diff --git a/src/application/view/LoginController.java b/src/application/view/LoginController.java
index fb20262..e6b1f64 100644
--- a/src/application/view/LoginController.java
+++ b/src/application/view/LoginController.java
@@ -77,6 +77,7 @@ private void btnLogin(ActionEvent event){
                 Parent parent = loader.getRoot();
                 Stage adminPanelStage = new Stage();
                 adminPanelStage.setTitle("LogiServ app - usuario: " + nombreUsuario + " conectado.");
+                adminPanelStage.setWidth(1100);
 //                adminPanelStage.setMaximized(true);
                 PrincipalController controller = loader.getController();
                 controller.setUserOn(usuario);
diff --git a/src/application/view/Register.fxml b/src/application/view/Register.fxml
index f661b6b..18c9496 100644
--- a/src/application/view/Register.fxml
+++ b/src/application/view/Register.fxml
@@ -70,7 +70,7 @@
                   <HBox alignment="CENTER" prefHeight="53.0" prefWidth="547.0" spacing="20.0">
                      <children>
                         <Button fx:id="registrarButton" defaultButton="true" mnemonicParsing="false" onAction="#handleRegistro" text="Registrar" />
-                        <Button cancelButton="true" mnemonicParsing="false" onAction="#handleCancel" text="Cancelar" />
+                        <Button cancelButton="true" mnemonicParsing="false" onAction="#handleLogin" text="Cancelar" />
                      </children>
                   </HBox>
                   <Hyperlink fx:id="hlLogin" onAction="#handleLogin" prefHeight="43.0" prefWidth="165.0" text="¿Ya tienes una cuenta? Login " />
diff --git a/src/application/view/info/cruds/EditarEmpleadoDialog.fxml b/src/application/view/info/cruds/EditarEmpleadoDialog.fxml
index d06a219..85d3ab1 100644
--- a/src/application/view/info/cruds/EditarEmpleadoDialog.fxml
+++ b/src/application/view/info/cruds/EditarEmpleadoDialog.fxml
@@ -44,7 +44,7 @@
               </rowConstraints>
                <children>
                   <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Fecha Nacimiento:" wrappingWidth="103.9375" GridPane.columnIndex="2" />
-                  <DatePicker fx:id="nacimientoPicker" editable="false" GridPane.columnIndex="4" />
+                  <DatePicker fx:id="nacimientoPicker" promptText="dd/mm/aaaa" GridPane.columnIndex="4" />
                   <Text strokeType="OUTSIDE" strokeWidth="0.0" text="CUIT:" GridPane.rowIndex="1" />
                   <TextField fx:id="cuitField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
                   <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Categoría:" GridPane.columnIndex="3" GridPane.rowIndex="1" />
diff --git a/src/application/view/inicio/Organizacion.fxml b/src/application/view/inicio/Organizacion.fxml
index 80d030b..a7a6e85 100644
--- a/src/application/view/inicio/Organizacion.fxml
+++ b/src/application/view/inicio/Organizacion.fxml
@@ -14,7 +14,7 @@
             <HBox alignment="CENTER" prefHeight="40.0" prefWidth="600.0" spacing="20.0">
                <children>
                   <Label prefHeight="39.0" prefWidth="53.0" text="Nombre:" />
-                  <Label fx:id="nombreOrganizacionLabel" prefHeight="17.0" prefWidth="185.0" text=" ">
+                  <Label fx:id="nombreOrganizacionLabel" text=" ">
                      <font>
                         <Font size="20.0" />
                      </font></Label>
@@ -23,7 +23,7 @@
             <HBox alignment="CENTER" prefHeight="40.0" prefWidth="600.0" spacing="20.0">
                <children>
                   <Label prefHeight="34.0" prefWidth="34.0" text="CUIT:" />
-                  <Label fx:id="cuitOrganizacionLabel" prefHeight="17.0" prefWidth="184.0" text=" ">
+                  <Label fx:id="cuitOrganizacionLabel" text=" ">
                      <font>
                         <Font size="20.0" />
                      </font></Label>
@@ -32,7 +32,7 @@
             <HBox alignment="CENTER" prefHeight="40.0" prefWidth="600.0" spacing="20.0">
                <children>
                   <Label prefHeight="37.0" prefWidth="69.0" text="Apoderado:" />
-                  <Label fx:id="apoderadoOrganizacionLabel" prefHeight="17.0" prefWidth="189.0" text=" ">
+                  <Label fx:id="apoderadoOrganizacionLabel" text=" ">
                      <font>
                         <Font size="20.0" />
                      </font></Label>
@@ -41,7 +41,7 @@
             <HBox alignment="CENTER" prefHeight="40.0" prefWidth="600.0" spacing="20.0">
                <children>
                   <Label prefHeight="33.0" prefWidth="57.0" text="Domicilio:" />
-                  <Label fx:id="domicilioOrganizacionLabel" prefHeight="17.0" prefWidth="192.0" text=" ">
+                  <Label fx:id="domicilioOrganizacionLabel" text=" ">
                      <font>
                         <Font size="20.0" />
                      </font></Label>
diff --git a/src/application/view/inicio/crud/OrganizacionEditController.java b/src/application/view/inicio/crud/OrganizacionEditController.java
index db07ca2..5cf5615 100644
--- a/src/application/view/inicio/crud/OrganizacionEditController.java
+++ b/src/application/view/inicio/crud/OrganizacionEditController.java
@@ -79,7 +79,7 @@ private boolean isInputValid() {
         if(cuitTextField.getText()==null || cuitTextField.getText().length() == 0){
             errorMessage += "CUIT de la organización no ingresado correctamente.\n";
         }
-        if (apoderadoComboBox.getSelectionModel().isEmpty())
+        if (!apoderadoComboBox.getSelectionModel().isEmpty())
             errorMessage += "Apoderado no seleccionado.\n";
         if(domicilioCalleField.getText()==null || domicilioCalleField.getText().length() == 0){
             errorMessage += "Calle no ingresada correctamente.\n";
@@ -87,7 +87,7 @@ private boolean isInputValid() {
         if(domicilioNumeroField.getText()==null || domicilioNumeroField.getText().length() == 0){
             errorMessage += "Número no ingresado correctamente. \n";
         }
-        if (localidadComboBox.getSelectionModel().isEmpty())
+        if (!localidadComboBox.getSelectionModel().isEmpty())
             errorMessage += "Localidad no seleccionada.";
 
         if (errorMessage.length() == 0) {
diff --git a/src/application/view/venta/FacturacionController.java b/src/application/view/venta/FacturacionController.java
index 0aba4af..699cb67 100644
--- a/src/application/view/venta/FacturacionController.java
+++ b/src/application/view/venta/FacturacionController.java
@@ -79,7 +79,7 @@ public void initialize() {
 		idFacturacion.setCellValueFactory(cellData -> cellData.getValue().idFacturaVentaProperty().asString());
 		fechaColumn.setCellValueFactory(cellData -> cellData.getValue().fechaEmisionProperty());
 		clienteColumn.setCellValueFactory(cellData -> cellData.getValue().getCliente().nombreProperty());
-		//montoTotal.setCellValueFactory(cellData -> cellData.getValue().montoFacturaProperty().asString());//TODO: inicializar este dato
+		montoTotal.setCellValueFactory(cellData -> cellData.getValue().montoFacturaProperty().asString());
 
 		facturacionesTable.getSelectionModel().selectedItemProperty().addListener((obs, oldSelection, newSelection) -> {
 			if (newSelection != null) {
@@ -99,7 +99,7 @@ public void initialize() {
 	@FXML
 	private void handleNew() {
 
-			this.showEdit();
+		this.showEdit();
 
 
 	}
@@ -113,7 +113,7 @@ private boolean showEdit() {
 
 			// Create the dialog Stage.
 			Stage dialogStage = new Stage();
-			dialogStage.setTitle("Nuevo cliente");
+			dialogStage.setTitle("Nuevo Factura");
 			dialogStage.initModality(Modality.WINDOW_MODAL);
 			dialogStage.initOwner(owner);
 			Scene scene = new Scene(page);
diff --git a/src/application/view/venta/cruds/EmitirFacturaController.java b/src/application/view/venta/cruds/EmitirFacturaController.java
index 9da5d9a..e9da5cd 100644
--- a/src/application/view/venta/cruds/EmitirFacturaController.java
+++ b/src/application/view/venta/cruds/EmitirFacturaController.java
@@ -93,7 +93,7 @@ public void initialize(){
         apellidoConductorColumn.setCellValueFactory(cellData -> cellData.getValue().getConductor().apellidoProperty());
         fincaColumn.setCellValueFactory(cellData -> cellData.getValue().getFinca().nombreProperty());
         ingenioColumn.setCellValueFactory(cellData -> cellData.getValue().getIngenio().nombreProperty());
-        //montoColumn.setCellValueFactory(cellData -> cellData.getValue().montoProperty().asString());
+        montoColumn.setCellValueFactory(cellData -> cellData.getValue().montoProperty().asString());
 
         checkColumn.setCellValueFactory(new PropertyValueFactory<Viaje, String>("select"));
         checkColumn.setStyle( "-fx-alignment: CENTER;");

From 30fb785e228444e65a646329e47daceb0cbcba18 Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Mon, 5 Mar 2018 02:18:37 -0300
Subject: [PATCH 26/27] reportes de facturas

---
 src/application/reports/FacturaA.jrxml | 376 +++++++++++++++++++++++++
 1 file changed, 376 insertions(+)
 create mode 100644 src/application/reports/FacturaA.jrxml

diff --git a/src/application/reports/FacturaA.jrxml b/src/application/reports/FacturaA.jrxml
new file mode 100644
index 0000000..692c7db
--- /dev/null
+++ b/src/application/reports/FacturaA.jrxml
@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="FacturaA" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="f2c13c28-2177-469c-bf18-4fe5fb45ed8c">
+	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="modelofinal"/>
+	<queryString language="SQL">
+		<![CDATA[]]>
+	</queryString>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="48" splitType="Stretch">
+			<rectangle>
+				<reportElement mode="Transparent" x="0" y="0" width="555" height="48" uuid="05e40af5-4211-4c53-83d3-025d545dd1d1"/>
+			</rectangle>
+			<staticText>
+				<reportElement x="227" y="9" width="100" height="30" uuid="9a0fef0d-a9af-49e1-9c65-5ca632b33d55"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="19"/>
+				</textElement>
+				<text><![CDATA[ORIGINAL]]></text>
+			</staticText>
+		</band>
+	</title>
+	<pageHeader>
+		<band height="169" splitType="Stretch">
+			<frame>
+				<reportElement x="0" y="0" width="555" height="169" uuid="6e43dbc5-d0b3-46f2-a89d-a4629906f893"/>
+				<rectangle>
+					<reportElement mode="Transparent" x="0" y="0" width="280" height="169" uuid="8024803b-70ba-49f1-b020-107f80e94961"/>
+				</rectangle>
+				<rectangle>
+					<reportElement mode="Transparent" x="280" y="0" width="275" height="169" uuid="dd2efa94-896f-4a32-bdb8-64b4bb10c384"/>
+				</rectangle>
+				<rectangle>
+					<reportElement x="252" y="0" width="50" height="50" uuid="65b1f4c1-e116-4f07-acd0-fba0c0ba0ce4"/>
+				</rectangle>
+				<staticText>
+					<reportElement x="252" y="0" width="50" height="30" uuid="cd46d7c3-a1f5-48c9-83e8-053821e6f00b"/>
+					<textElement textAlignment="Center">
+						<font size="23"/>
+					</textElement>
+					<text><![CDATA[A]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="252" y="30" width="50" height="20" uuid="25786617-08cc-4cc2-9182-f5d1259e6efe"/>
+					<textElement textAlignment="Center">
+						<font size="12"/>
+					</textElement>
+					<text><![CDATA[COD.01]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="60" y="15" width="140" height="50" uuid="34c53ef9-b197-4800-a23a-e09d67846eb8"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="29"/>
+					</textElement>
+					<textFieldExpression><![CDATA["LogiServ"]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="4" y="70" width="66" height="30" uuid="f0f4668b-a832-4fbe-a7c1-3d9427aab7db"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Razón Social:]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="74" y="70" width="134" height="30" uuid="c8ab5bfc-cd35-4217-a8b3-e822b7691f71"/>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA["ZAFE OMAR FERNANDO"]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="4" y="100" width="100" height="30" uuid="9f679654-2b6d-46e5-9eb2-daefcf8595c8"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Domicilio Comercial:]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="110" y="100" width="160" height="30" uuid="bef5b175-781c-45be-80a8-a5d7aeda7a8e"/>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA["direccion+localidad+provincia"]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="4" y="130" width="116" height="30" uuid="97f60999-6ab8-4d4d-98b4-d80a1a0c5b8e"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Condicion frente al IVA:]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="126" y="131" width="144" height="30" uuid="a4961299-35c0-4588-ab1b-4bc26ce72c20"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[IVA Responsable Inscripto]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="320" y="0" width="138" height="50" uuid="6f5ab745-bae6-48a0-b4aa-e73f9707546c"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="25" isBold="true"/>
+					</textElement>
+					<text><![CDATA[FACTURA]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="320" y="50" width="100" height="20" uuid="36705bd5-eb8f-49e3-975a-09b28e9ee7f0"/>
+					<textElement verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Punto de Venta: 003]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="423" y="50" width="96" height="20" uuid="81cdaa28-2d77-4457-b508-5af36c4c88a6"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Comprobante nro:]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="519" y="50" width="30" height="20" uuid="2cbb001b-5185-4982-8a9c-169400000169"/>
+					<textFieldExpression><![CDATA["nro Factura"]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="320" y="70" width="100" height="30" uuid="57d4cf6f-83c6-4f44-a884-78866ef91920"/>
+					<textElement verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Fecha de Emisión:]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="423" y="70" width="100" height="30" uuid="99077910-82e9-4f28-bf39-6a3249cf7d78"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font size="12" isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA["Fecha factura"]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="320" y="100" width="40" height="20" uuid="0a34024b-d8e1-42b1-ade8-96ba86bc93d8"/>
+					<textElement verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[CUIT:]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="360" y="100" width="120" height="20" uuid="76caa60f-d7d3-4808-ab18-b4d39033d740"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA["CUIT empresa"]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="320" y="120" width="90" height="20" uuid="2eeac347-a0d0-4c0f-957a-8f87ab924490"/>
+					<textElement verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Ingresos Brutos:]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="410" y="120" width="134" height="20" uuid="b2d8b95e-e521-4dce-a90a-a3a65f679dd4"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA["CUIT empresa"]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="320" y="140" width="150" height="20" uuid="e6bef7ba-648f-4d0c-aa23-a71ca801e167"/>
+					<textElement verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Fecha de inicio de actividades:]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="470" y="140" width="84" height="20" uuid="9bc362d8-7926-49ad-a641-0c520b829dcb"/>
+					<textElement verticalAlignment="Middle">
+						<font isBold="false"/>
+					</textElement>
+					<text><![CDATA[27/03/2012]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="288" y="200" width="100" height="30" uuid="9d1c2172-78bf-4028-bd60-ed4690a96475"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Domicilio Comercial:]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="394" y="200" width="160" height="30" uuid="50a0621e-5802-43c9-a48d-dbad2a385585"/>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA["direccion+localidad+provincia"]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="239" y="170" width="158" height="30" uuid="00a4fa65-b0d0-4d9d-a378-823898e94d88"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Apellido y Nombre/Razón Social:]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="400" y="169" width="154" height="30" uuid="c736a7be-d838-41be-af98-bf129edf354c"/>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA["ZAFE OMAR FERNANDO"]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="140" y="200" width="120" height="30" uuid="d06b6919-e18c-432f-a355-09e1d7e248ff"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font isBold="false"/>
+					</textElement>
+					<text><![CDATA[IVA Responsable Inscripto]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="23" y="200" width="116" height="30" uuid="9110a3bf-e693-4e96-a1a2-efccb17d81b3"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Condicion frente al IVA:]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="23" y="170" width="40" height="30" uuid="6d0686a2-a0a2-4d6f-b7a8-5b6b37f70314"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[CUIT:]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="63" y="170" width="110" height="30" uuid="3a1819d9-016c-44ab-a26e-8555dd32bd2a"/>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA["CUIT DEL CLIENTE"]]></textFieldExpression>
+				</textField>
+			</frame>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band height="102" splitType="Stretch">
+			<rectangle>
+				<reportElement mode="Transparent" x="0" y="0" width="555" height="69" uuid="e30ea71d-ad41-424f-9e1d-200d74066ca4"/>
+			</rectangle>
+			<staticText>
+				<reportElement mode="Opaque" x="0" y="69" width="44" height="30" backcolor="#BFBFBF" uuid="58385de6-d9e3-49e7-bfa8-baac36193fcf"/>
+				<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[Codigo]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="44" y="69" width="156" height="30" backcolor="#BFBFBF" uuid="2c41538d-1438-4bec-9319-daac7b674640"/>
+				<box>
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[Producto/Servicio]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="200" y="69" width="52" height="30" backcolor="#BFBFBF" uuid="66314284-139b-43ac-b7f3-c872a94ecf85"/>
+				<box>
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[Cantidad]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="252" y="69" width="56" height="30" backcolor="#BFBFBF" uuid="4d0b6ba2-694c-4b4c-99d5-912777c92fdb"/>
+				<box>
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[U.Medidas]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="308" y="69" width="62" height="30" backcolor="#BFBFBF" uuid="471b91db-d28e-4e66-badd-3824347a7452"/>
+				<box>
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[Precio Unit.]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="370" y="69" width="62" height="30" backcolor="#BFBFBF" uuid="910a5470-df00-4f12-a711-9fb90a915972"/>
+				<box>
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[Subtotal]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="432" y="69" width="52" height="30" backcolor="#BFBFBF" uuid="5742d90a-8ef7-4a4b-a9ea-706f348c7d13"/>
+				<box>
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[Alicuota IVA]]></text>
+			</staticText>
+			<staticText>
+				<reportElement mode="Opaque" x="484" y="69" width="70" height="30" backcolor="#BFBFBF" uuid="9481b552-cce1-4245-9231-e9163d224950"/>
+				<box>
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[Subtotal c/IVA]]></text>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="38" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="44" height="30" uuid="30dd81f1-e5b9-435a-a7aa-f5129cce0901"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="44" y="0" width="156" height="30" uuid="a5a77b5d-c171-4510-9c3b-4eaf88929c6d"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="200" y="0" width="52" height="30" uuid="9636b987-a0b2-4762-a373-790d93e8821e"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="252" y="0" width="56" height="30" uuid="d4146f6c-6b30-4a77-8388-316d9172ff50"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="310" y="0" width="60" height="30" uuid="903a708f-717f-40f6-85a0-1d8318255704"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="370" y="0" width="62" height="30" uuid="f3789bcd-0496-4ee8-96fc-9b072f60caf5"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="432" y="0" width="52" height="30" uuid="d695c275-df61-48b8-a3d0-7fbb549c0449"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[21%]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="484" y="0" width="70" height="30" uuid="d7beaffa-3124-48ce-a3f2-389db4da3cd7"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band height="69" splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="54" splitType="Stretch"/>
+	</pageFooter>
+	<summary>
+		<band height="42" splitType="Stretch"/>
+	</summary>
+</jasperReport>

From 22171107dd50d362fa1b0add58b7b31432423fde Mon Sep 17 00:00:00 2001
From: Isaias <isamed92@gmail.com>
Date: Mon, 5 Mar 2018 12:28:58 -0300
Subject: [PATCH 27/27] imprimir factura de venta funcional

---
 .../reports/DetalleLiquidacion.jasper         | Bin 22116 -> 22116 bytes
 src/application/reports/FacturaA.jasper       | Bin 0 -> 41926 bytes
 src/application/reports/FacturaA.jrxml        | 209 ++++++++++++------
 src/application/reports/ReciboSueldo.jasper   | Bin 34483 -> 34483 bytes
 .../classes/AbstractJasperReports.java        |  13 ++
 src/application/view/venta/Facturacion.fxml   |   2 +-
 .../view/venta/FacturacionController.java     |  10 +
 src/resources/pie_factura_datos_CAE.jpeg      | Bin 0 -> 46080 bytes
 8 files changed, 161 insertions(+), 73 deletions(-)
 create mode 100644 src/application/reports/FacturaA.jasper
 create mode 100644 src/resources/pie_factura_datos_CAE.jpeg

diff --git a/src/application/reports/DetalleLiquidacion.jasper b/src/application/reports/DetalleLiquidacion.jasper
index 4922dbd1db2cc39bcd4439a7d030a4f170411f23..0320b874fe144c9248ed631130dbd5343897fdbd 100644
GIT binary patch
delta 62
zcmaE|hVjW7#to|+MU4!MjLeM<EDbEo<BiPBER0Rr8CWJadZ}%G>S!S%h#@^$FU$-8
DSws<9

delta 62
zcmaE|hVjW7#to|+MGY-2Eewnej4TXH<4r6qj4Vyr8CWJadZ}%G>S!S%h#@^$FU$-8
DTt5+T

diff --git a/src/application/reports/FacturaA.jasper b/src/application/reports/FacturaA.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..3475116c17bbb1383eb65f384620b4bddecc613a
GIT binary patch
literal 41926
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

literal 0
HcmV?d00001

diff --git a/src/application/reports/FacturaA.jrxml b/src/application/reports/FacturaA.jrxml
index 692c7db..6ad79f0 100644
--- a/src/application/reports/FacturaA.jrxml
+++ b/src/application/reports/FacturaA.jrxml
@@ -2,10 +2,67 @@
 <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="FacturaA" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="f2c13c28-2177-469c-bf18-4fe5fb45ed8c">
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="modelofinal"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="logiserv"/>
+	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w1" value="223"/>
+	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w2" value="766"/>
+	<parameter name="importeTotal" class="java.lang.Double"/>
+	<parameter name="idFactura" class="java.lang.Integer"/>
 	<queryString language="SQL">
-		<![CDATA[]]>
+		<![CDATA[SELECT 
+	f.idFACTURA_VENTA,
+	f.FechaEmision, 
+	cli.CUIT AS CUIT_CLIENTE,
+	cli.Nombre AS nombreCompletoCliente, 
+	lv.monto,
+	v.idRemito, 
+	CONCAT(finc.nombre, ", ", ing.nombre) AS descripcion,
+	lv.monto*1.21 AS montoIVA,
+	CONCAT(dom.Calle, " ", dom.Numero," - ", loc.NombreLocalidad, " - ",prov.NombreProvincia ) AS domicilioCompletoCliente		
+	FROM factura_venta AS f
+	    INNER JOIN CLIENTE AS cli ON (f.CLIENTE_idCLIENTE = cli.idCLIENTE)
+	    INNER JOIN DOMICILIO AS dom ON cli.DOMICILIO_idDomicilio=dom.idDomicilio
+		INNER JOIN LOCALIDAD AS loc ON dom.LOCALIDAD_idLocalidad=loc.idLocalidad
+		INNER JOIN PROVINCIA AS prov ON loc.PROVINCIA_idProvincia=prov.idProvincia
+	    INNER JOIN LINEA_VIAJE AS lv ON (f.idFACTURA_VENTA = lv.FACTURA_VENTA_idFACTURA_VENTA)
+	    INNER JOIN VIAJE AS v ON (lv.VIAJE_idRemito = v.idRemito)
+	    INNER JOIN ORIGEN_DESTINO AS distancia ON (v.Origen_Destino_idOrigen_Destino= distancia.idOrigen_Destino)
+	    INNER JOIN FINCA AS finc ON distancia.FINCA_idFinca = finc.idFinca
+	    INNER JOIN INGENIO AS ing ON distancia.INGENIO_idIngenio = ing.idIngenio
+	WHERE f.idFACTURA_VENTA= $P{idFactura}]]>
 	</queryString>
+	<field name="idFACTURA_VENTA" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="idFACTURA_VENTA"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="factura_venta"/>
+	</field>
+	<field name="FechaEmision" class="java.sql.Date">
+		<property name="com.jaspersoft.studio.field.label" value="FechaEmision"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="factura_venta"/>
+	</field>
+	<field name="CUIT_CLIENTE" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="CUIT_CLIENTE"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="cliente"/>
+	</field>
+	<field name="nombreCompletoCliente" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="nombreCompletoCliente"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="cliente"/>
+	</field>
+	<field name="monto" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="monto"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="linea_viaje"/>
+	</field>
+	<field name="idRemito" class="java.lang.Integer">
+		<property name="com.jaspersoft.studio.field.label" value="idRemito"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="viaje"/>
+	</field>
+	<field name="descripcion" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="descripcion"/>
+	</field>
+	<field name="montoIVA" class="java.lang.Double">
+		<property name="com.jaspersoft.studio.field.label" value="montoIVA"/>
+	</field>
+	<field name="domicilioCompletoCliente" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="domicilioCompletoCliente"/>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -50,13 +107,6 @@
 					</textElement>
 					<text><![CDATA[COD.01]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="60" y="15" width="140" height="50" uuid="34c53ef9-b197-4800-a23a-e09d67846eb8"/>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="29"/>
-					</textElement>
-					<textFieldExpression><![CDATA["LogiServ"]]></textFieldExpression>
-				</textField>
 				<staticText>
 					<reportElement x="4" y="70" width="66" height="30" uuid="f0f4668b-a832-4fbe-a7c1-3d9427aab7db"/>
 					<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -64,23 +114,13 @@
 					</textElement>
 					<text><![CDATA[Razón Social:]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="74" y="70" width="134" height="30" uuid="c8ab5bfc-cd35-4217-a8b3-e822b7691f71"/>
-					<textElement verticalAlignment="Middle"/>
-					<textFieldExpression><![CDATA["ZAFE OMAR FERNANDO"]]></textFieldExpression>
-				</textField>
 				<staticText>
-					<reportElement x="4" y="100" width="100" height="30" uuid="9f679654-2b6d-46e5-9eb2-daefcf8595c8"/>
+					<reportElement x="1" y="100" width="100" height="30" uuid="9f679654-2b6d-46e5-9eb2-daefcf8595c8"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Domicilio Comercial:]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="110" y="100" width="160" height="30" uuid="bef5b175-781c-45be-80a8-a5d7aeda7a8e"/>
-					<textElement verticalAlignment="Middle"/>
-					<textFieldExpression><![CDATA["direccion+localidad+provincia"]]></textFieldExpression>
-				</textField>
 				<staticText>
 					<reportElement x="4" y="130" width="116" height="30" uuid="97f60999-6ab8-4d4d-98b4-d80a1a0c5b8e"/>
 					<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -118,7 +158,8 @@
 				</staticText>
 				<textField>
 					<reportElement x="519" y="50" width="30" height="20" uuid="2cbb001b-5185-4982-8a9c-169400000169"/>
-					<textFieldExpression><![CDATA["nro Factura"]]></textFieldExpression>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA[$F{idFACTURA_VENTA}]]></textFieldExpression>
 				</textField>
 				<staticText>
 					<reportElement x="320" y="70" width="100" height="30" uuid="57d4cf6f-83c6-4f44-a884-78866ef91920"/>
@@ -132,34 +173,24 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="12" isBold="true"/>
 					</textElement>
-					<textFieldExpression><![CDATA["Fecha factura"]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{FechaEmision}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="320" y="100" width="40" height="20" uuid="0a34024b-d8e1-42b1-ade8-96ba86bc93d8"/>
+					<reportElement x="310" y="100" width="40" height="20" uuid="0a34024b-d8e1-42b1-ade8-96ba86bc93d8"/>
 					<textElement verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[CUIT:]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="360" y="100" width="120" height="20" uuid="76caa60f-d7d3-4808-ab18-b4d39033d740"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle"/>
-					<textFieldExpression><![CDATA["CUIT empresa"]]></textFieldExpression>
-				</textField>
 				<staticText>
-					<reportElement x="320" y="120" width="90" height="20" uuid="2eeac347-a0d0-4c0f-957a-8f87ab924490"/>
+					<reportElement x="310" y="120" width="90" height="20" uuid="2eeac347-a0d0-4c0f-957a-8f87ab924490"/>
 					<textElement verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Ingresos Brutos:]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="410" y="120" width="134" height="20" uuid="b2d8b95e-e521-4dce-a90a-a3a65f679dd4"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle"/>
-					<textFieldExpression><![CDATA["CUIT empresa"]]></textFieldExpression>
-				</textField>
 				<staticText>
-					<reportElement x="320" y="140" width="150" height="20" uuid="e6bef7ba-648f-4d0c-aa23-a71ca801e167"/>
+					<reportElement x="310" y="140" width="150" height="20" uuid="e6bef7ba-648f-4d0c-aa23-a71ca801e167"/>
 					<textElement verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
@@ -173,16 +204,16 @@
 					<text><![CDATA[27/03/2012]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="288" y="200" width="100" height="30" uuid="9d1c2172-78bf-4028-bd60-ed4690a96475"/>
+					<reportElement x="260" y="200" width="100" height="30" uuid="9d1c2172-78bf-4028-bd60-ed4690a96475"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Domicilio Comercial:]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="394" y="200" width="160" height="30" uuid="50a0621e-5802-43c9-a48d-dbad2a385585"/>
+					<reportElement x="360" y="200" width="195" height="30" uuid="50a0621e-5802-43c9-a48d-dbad2a385585"/>
 					<textElement verticalAlignment="Middle"/>
-					<textFieldExpression><![CDATA["direccion+localidad+provincia"]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{domicilioCompletoCliente}]]></textFieldExpression>
 				</textField>
 				<staticText>
 					<reportElement x="239" y="170" width="158" height="30" uuid="00a4fa65-b0d0-4d9d-a378-823898e94d88"/>
@@ -194,17 +225,17 @@
 				<textField>
 					<reportElement x="400" y="169" width="154" height="30" uuid="c736a7be-d838-41be-af98-bf129edf354c"/>
 					<textElement verticalAlignment="Middle"/>
-					<textFieldExpression><![CDATA["ZAFE OMAR FERNANDO"]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{nombreCompletoCliente}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="140" y="200" width="120" height="30" uuid="d06b6919-e18c-432f-a355-09e1d7e248ff"/>
+					<reportElement x="128" y="200" width="120" height="30" uuid="d06b6919-e18c-432f-a355-09e1d7e248ff"/>
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font isBold="false"/>
 					</textElement>
 					<text><![CDATA[IVA Responsable Inscripto]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="23" y="200" width="116" height="30" uuid="9110a3bf-e693-4e96-a1a2-efccb17d81b3"/>
+					<reportElement x="10" y="200" width="116" height="30" uuid="9110a3bf-e693-4e96-a1a2-efccb17d81b3"/>
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
@@ -220,16 +251,40 @@
 				<textField>
 					<reportElement x="63" y="170" width="110" height="30" uuid="3a1819d9-016c-44ab-a26e-8555dd32bd2a"/>
 					<textElement verticalAlignment="Middle"/>
-					<textFieldExpression><![CDATA["CUIT DEL CLIENTE"]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{CUIT_CLIENTE}]]></textFieldExpression>
 				</textField>
+				<staticText>
+					<reportElement x="102" y="100" width="178" height="30" uuid="29693ec9-fbee-4991-b849-cf93398994ed"/>
+					<textElement verticalAlignment="Middle"/>
+					<text><![CDATA[Esq. Sarmiento 0, La Florida Tucuman]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="70" y="70" width="100" height="30" uuid="f04c63a8-5eb4-450f-bba0-d1b277c74a32"/>
+					<textElement verticalAlignment="Middle"/>
+					<text><![CDATA[Zafe José Omar]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="10" y="0" width="229" height="60" uuid="4b7688da-7578-4a85-85aa-889c587cd41b"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="37"/>
+					</textElement>
+					<text><![CDATA[LOGISERV]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="362" y="100" width="100" height="20" uuid="1534730d-0e06-4b4b-8d85-f71a5e22b5e1"/>
+					<textElement verticalAlignment="Middle"/>
+					<text><![CDATA[20213360982]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="410" y="120" width="100" height="20" uuid="d20cf1e6-f82e-49cd-abd3-d874f4794451"/>
+					<textElement verticalAlignment="Middle"/>
+					<text><![CDATA[20213360982]]></text>
+				</staticText>
 			</frame>
 		</band>
 	</pageHeader>
 	<columnHeader>
 		<band height="102" splitType="Stretch">
-			<rectangle>
-				<reportElement mode="Transparent" x="0" y="0" width="555" height="69" uuid="e30ea71d-ad41-424f-9e1d-200d74066ca4"/>
-			</rectangle>
 			<staticText>
 				<reportElement mode="Opaque" x="0" y="69" width="44" height="30" backcolor="#BFBFBF" uuid="58385de6-d9e3-49e7-bfa8-baac36193fcf"/>
 				<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
@@ -321,36 +376,21 @@
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="38" splitType="Stretch">
-			<textField>
-				<reportElement x="0" y="0" width="44" height="30" uuid="30dd81f1-e5b9-435a-a7aa-f5129cce0901"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
-			</textField>
+		<band height="47" splitType="Stretch">
 			<textField>
 				<reportElement x="44" y="0" width="156" height="30" uuid="a5a77b5d-c171-4510-9c3b-4eaf88929c6d"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="200" y="0" width="52" height="30" uuid="9636b987-a0b2-4762-a373-790d93e8821e"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="252" y="0" width="56" height="30" uuid="d4146f6c-6b30-4a77-8388-316d9172ff50"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{descripcion}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="310" y="0" width="60" height="30" uuid="903a708f-717f-40f6-85a0-1d8318255704"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{monto}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="370" y="0" width="62" height="30" uuid="f3789bcd-0496-4ee8-96fc-9b072f60caf5"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{monto}]]></textFieldExpression>
 			</textField>
 			<staticText>
 				<reportElement x="432" y="0" width="52" height="30" uuid="d695c275-df61-48b8-a3d0-7fbb549c0449"/>
@@ -360,17 +400,42 @@
 			<textField>
 				<reportElement x="484" y="0" width="70" height="30" uuid="d7beaffa-3124-48ce-a3f2-389db4da3cd7"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA["Text Field"]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{montoIVA}]]></textFieldExpression>
 			</textField>
+			<staticText>
+				<reportElement x="200" y="0" width="52" height="30" uuid="44f6afb8-615b-45eb-b323-83ac478bbcdf"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[1]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="252" y="0" width="56" height="30" uuid="051add40-a6bd-400c-a959-f44974c4abd5"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[Unidades]]></text>
+			</staticText>
 		</band>
 	</detail>
-	<columnFooter>
-		<band height="69" splitType="Stretch"/>
-	</columnFooter>
-	<pageFooter>
-		<band height="54" splitType="Stretch"/>
-	</pageFooter>
 	<summary>
-		<band height="42" splitType="Stretch"/>
+		<band height="116" splitType="Stretch">
+			<image>
+				<reportElement x="0" y="31" width="554" height="85" uuid="095b5003-a2a9-40f1-93fd-498bf2d4219b"/>
+				<imageExpression><![CDATA["src/resources/pie_factura_datos_CAE.jpeg"]]></imageExpression>
+			</image>
+			<textField>
+				<reportElement x="462" y="1" width="92" height="20" uuid="b8c17af3-f62a-4b89-ab04-312ed5ada24e"/>
+				<textFieldExpression><![CDATA[$P{importeTotal}*1.21]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="444" y="1" width="14" height="20" uuid="b99b3848-2876-4b2e-8ad6-599ed78932bf"/>
+				<textElement textAlignment="Right"/>
+				<text><![CDATA[$]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="343" y="1" width="100" height="20" uuid="9b1c346b-79cf-4a3a-a464-3d28e821524d"/>
+				<textElement textAlignment="Right">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Importe Total:]]></text>
+			</staticText>
+		</band>
 	</summary>
 </jasperReport>
diff --git a/src/application/reports/ReciboSueldo.jasper b/src/application/reports/ReciboSueldo.jasper
index b588bbfbde7b8a88db0c5eb5cf54fabf0fc188ce..096215794a2dd70bea99fe51b19bc6f25d1b036d 100644
GIT binary patch
delta 70
zcmdno%e1+dX@g0ogpq-fk-4#fg^8hQys@E)k%<XA0}CUA&g6$|GLst$**E8B{*@8J
KR5iJ-%@hE#;uA{%

delta 70
zcmdno%e1+dX@g0ogrTLSg@Lhwk%fs_ype^ep`|%H0}CUA&g6$|GLst$**E8B{*@8J
KR5iJ-%@hE-j1z|d

diff --git a/src/application/reports/classes/AbstractJasperReports.java b/src/application/reports/classes/AbstractJasperReports.java
index 2eee135..9b0ed25 100644
--- a/src/application/reports/classes/AbstractJasperReports.java
+++ b/src/application/reports/classes/AbstractJasperReports.java
@@ -35,6 +35,19 @@ public static void createReport(String path,String nombreParametro, int id){
             e.printStackTrace();
         }
 
+    }
+    public static void createReport(String path,String nombreParametro, int id, String nombreParamete2, double value){
+        try {
+            Connection connection = JDBCConnection.getInstanceConnection();
+            report = (JasperReport) JRLoader.loadObjectFromFile(path);
+            Map<String, Object> parameter = new HashMap<>();
+            parameter.put(nombreParametro,id);
+            parameter.put(nombreParamete2, value);
+            reportFilled = JasperFillManager.fillReport(report, parameter, connection);
+        }catch (JRException e){
+            e.printStackTrace();
+        }
+
     }
     public static void showViewer(){
         viewer = new JasperFX(reportFilled);
diff --git a/src/application/view/venta/Facturacion.fxml b/src/application/view/venta/Facturacion.fxml
index 43f884c..ef403b4 100644
--- a/src/application/view/venta/Facturacion.fxml
+++ b/src/application/view/venta/Facturacion.fxml
@@ -55,7 +55,7 @@
                         <Insets />
                      </HBox.margin>
                   </Button>
-                  <Button mnemonicParsing="false" text="Imprimir Factura" />
+                  <Button mnemonicParsing="false" onAction="#handleImprimirFactura" text="Imprimir Factura" />
                </children>
             </HBox>
          </children>
diff --git a/src/application/view/venta/FacturacionController.java b/src/application/view/venta/FacturacionController.java
index 699cb67..65f4e3f 100644
--- a/src/application/view/venta/FacturacionController.java
+++ b/src/application/view/venta/FacturacionController.java
@@ -3,6 +3,7 @@
 import application.Main;
 import application.model.venta.FacturaVenta;
 import application.model.venta.Viaje;
+import application.reports.classes.AbstractJasperReports;
 import application.repository.venta.FacturaVentaRepository;
 import application.repository.venta.ViajeRepository;
 import application.view.venta.cruds.EmitirFacturaController;
@@ -148,5 +149,14 @@ public void cargarViajes() {
 			viajeTableView.setItems(viajes);
 		}
 	}
+	@FXML
+	private void handleImprimirFactura(){
+		if (!facturacionesTable.getSelectionModel().isEmpty()){
+			FacturaVenta selectedItem = facturacionesTable.getSelectionModel().getSelectedItem();
+			AbstractJasperReports.createReport("src\\application\\reports\\FacturaA.jasper",
+					"idFactura", selectedItem.getIdFacturaVenta(), "importeTotal", selectedItem.getMontoFactura());
+			AbstractJasperReports.showViewer();
+		}
+	}
 
 }
\ No newline at end of file
diff --git a/src/resources/pie_factura_datos_CAE.jpeg b/src/resources/pie_factura_datos_CAE.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..1db97c4ee118bf55ed168887780b40b3155c8c67
GIT binary patch
literal 46080
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
Xj@3S?yce6I5B>ko|0NoTY>fU76JjR2

literal 0
HcmV?d00001