From f6a615e4cbe699e58f5a758076023c016fd9e59c Mon Sep 17 00:00:00 2001
From: Daniel Cortes <daniel.cortes.p159@gmail.com>
Date: Thu, 3 Jan 2019 14:34:19 -0300
Subject: [PATCH] Comodidades! Arreglado el problema de index al ordenar las
 tablas

---
 .idea/workspace.xml                           | 679 ++++++++-------
 database.sqlite                               | Bin 32768 -> 32768 bytes
 .../xyz/controllers/ArqueoController.java     |  16 +-
 .../xyz/controllers/EgresosController.java    |  10 +-
 .../xyz/controllers/IngresosController.java   |   7 +-
 src/danielcortes/xyz/views/ArqueoView.form    | 824 +++++++++---------
 src/danielcortes/xyz/views/ArqueoView.java    | 241 ++---
 src/danielcortes/xyz/views/EgresosView.form   |   4 +-
 src/danielcortes/xyz/views/EgresosView.java   |  14 +-
 src/danielcortes/xyz/views/IngresosView.java  |   6 +-
 .../views/components/EgresosTableModel.java   |  12 +
 .../views/components/IngresosTableModel.java  |  12 +
 12 files changed, 939 insertions(+), 886 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5a98dc8..8d12732 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,20 +6,23 @@
     </artifacts-to-build>
   </component>
   <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" line="425" mnemonic="0" />
+    <bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" line="426" mnemonic="0" />
     <bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" line="54" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/actions/NextAction.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/database.sqlite" beforeDir="false" afterPath="$PROJECT_DIR$/database.sqlite" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/IngresosTableModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/IngresosTableModel.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path=".idea/" />
@@ -79,8 +82,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="324">
-              <caret line="132" lean-forward="true" selection-start-line="132" selection-end-line="132" />
+            <state relative-caret-position="161">
+              <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="198" selection-end-column="108" />
               <folding>
                 <element signature="docComment;class#EgresosController#0" />
                 <element signature="docComment;method#EgresosController#0;class#EgresosController#0" />
@@ -94,12 +97,12 @@
                 <element signature="docComment;method#fillEgresosTable#0;class#EgresosController#0" />
                 <element signature="method#fillEgresosTable#0;class#EgresosController#0" />
                 <element signature="docComment;method#setUpViewEvents#0;class#EgresosController#0" />
+                <element signature="method#setUpViewEvents#0;class#EgresosController#0" />
                 <element signature="docComment;method#guardarActionListener#0;class#EgresosController#0" />
                 <element signature="method#guardarActionListener#0;class#EgresosController#0" />
                 <element signature="docComment;method#eliminarActionListener#0;class#EgresosController#0" />
                 <element signature="method#eliminarActionListener#0;class#EgresosController#0" />
                 <element signature="docComment;method#editarActionListener#0;class#EgresosController#0" />
-                <element signature="method#editarActionListener#0;class#EgresosController#0" />
                 <element signature="docComment;method#updateTotalEgresos#0;class#EgresosController#0" />
                 <element signature="method#updateTotalEgresos#0;class#EgresosController#0" />
                 <element signature="docComment;method#updateButtonsEnabled#0;class#EgresosController#0" />
@@ -134,73 +137,83 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-155">
-              <caret line="197" column="35" lean-forward="true" selection-start-line="197" selection-start-column="35" selection-end-line="197" selection-end-column="35" />
+            <state relative-caret-position="255">
+              <caret line="210" lean-forward="true" selection-start-line="210" selection-end-line="210" />
               <folding>
-                <element signature="docComment;class#ArqueoController#0" />
-                <element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
-                <element signature="method#ArqueoController#0;class#ArqueoController#0" />
-                <element signature="docComment;method#updateCaja#0;class#ArqueoController#0" />
-                <element signature="method#updateCaja#0;class#ArqueoController#0" />
-                <element signature="docComment;method#updateResumen#0;class#ArqueoController#0" />
-                <element signature="docComment;method#fillEfectivo#0;class#ArqueoController#0" />
-                <element signature="method#fillEfectivo#0;class#ArqueoController#0" />
-                <element signature="docComment;method#fillDocumentos#0;class#ArqueoController#0" />
-                <element signature="method#fillDocumentos#0;class#ArqueoController#0" />
-                <element signature="docComment;method#fillResumen#0;class#ArqueoController#0" />
-                <element signature="method#fillResumen#0;class#ArqueoController#0" />
-                <element signature="docComment;method#updateResumenEfectivo#0;class#ArqueoController#0" />
-                <element signature="method#updateResumenEfectivo#0;class#ArqueoController#0" />
-                <element signature="docComment;method#updateResumenDocumentos#0;class#ArqueoController#0" />
-                <element signature="method#updateResumenDocumentos#0;class#ArqueoController#0" />
-                <element signature="docComment;method#updateResumenIngresos#0;class#ArqueoController#0" />
-                <element signature="method#updateResumenIngresos#0;class#ArqueoController#0" />
-                <element signature="docComment;method#updateResumenEgresos#0;class#ArqueoController#0" />
-                <element signature="method#updateResumenEgresos#0;class#ArqueoController#0" />
-                <element signature="docComment;method#updateResumenArqueo#0;class#ArqueoController#0" />
-                <element signature="method#updateResumenArqueo#0;class#ArqueoController#0" />
-                <element signature="e#7218#7303#1" />
-                <element signature="e#7307#7390#1" />
-                <element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
-                <element signature="method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
-                <element signature="method#guardarEfectivoActionListener#1;class#ArqueoController#0" />
-                <element signature="docComment;method#guardarEfectivo#0;class#ArqueoController#0" />
-                <element signature="method#guardarEfectivo#0;class#ArqueoController#0" />
-                <element signature="e#11243#11962#1" />
-                <element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
-                <element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
-                <element signature="e#12451#12742#1" />
-                <element signature="docComment;method#validateEfectivoInput#0;class#ArqueoController#0" />
-                <element signature="method#validateEfectivoInput#0;class#ArqueoController#0" />
-                <element signature="docComment;method#validateDocumentosInput#0;class#ArqueoController#0" />
-                <element signature="method#validateDocumentosInput#0;class#ArqueoController#0" />
-                <element signature="docComment;method#validateEfectivoMoneda#0;class#ArqueoController#0" />
-                <element signature="method#validateEfectivoMoneda#0;class#ArqueoController#0" />
-                <element signature="e#15134#15278#1" />
-                <element signature="e#15309#15442#1" />
-                <element signature="e#15501#15632#1" />
-                <element signature="e#15667#15819#1" />
-                <element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
-                <element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
-                <element signature="e#16338#16482#1" />
-                <element signature="e#16513#16646#1" />
-                <element signature="e#16705#16836#1" />
-                <element signature="e#16871#17023#1" />
-                <element signature="docComment;method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
-                <element signature="method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
-                <element signature="docComment;method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
-                <element signature="method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
-                <element signature="docComment;method#normalizeEfectivoInput#0;class#ArqueoController#0" />
-                <element signature="method#normalizeEfectivoInput#0;class#ArqueoController#0" />
-                <element signature="docComment;method#normalizeDocumentosInput#0;class#ArqueoController#0" />
-                <element signature="method#normalizeDocumentosInput#0;class#ArqueoController#0" />
-                <element signature="class#GuardarAction#0;class#ArqueoController#0" />
-                <element signature="n#!!block;n#GuardarAction#0;n#GuardarAction#0;n#ArqueoController#0" />
-                <element signature="class#GuardarEfectivoAction#1;class#ArqueoController#0" />
-                <element signature="n#!!block;n#GuardarEfectivoAction#0;n#GuardarEfectivoAction#1;n#ArqueoController#0" />
+                <element signature="docComment;class#IngresosController#0" />
+                <element signature="docComment;method#IngresosController#0;class#IngresosController#0" />
+                <element signature="method#IngresosController#0;class#IngresosController#0" />
+                <element signature="docComment;method#getIngresoDAO#0;class#IngresosController#0" />
+                <element signature="docComment;method#getTipoIngresoDAO#0;class#IngresosController#0" />
+                <element signature="docComment;method#updateCaja#0;class#IngresosController#0" />
+                <element signature="method#updateCaja#0;class#IngresosController#0" />
+                <element signature="docComment;method#fillTipoIngresoCombo#0;class#IngresosController#0" />
+                <element signature="method#fillTipoIngresoCombo#0;class#IngresosController#0" />
+                <element signature="docComment;method#fillIngresosTable#0;class#IngresosController#0" />
+                <element signature="method#fillIngresosTable#0;class#IngresosController#0" />
+                <element signature="docComment;method#setupViewEvents#0;class#IngresosController#0" />
+                <element signature="docComment;method#guardarActionListener#0;class#IngresosController#0" />
+                <element signature="docComment;method#eliminarActionListener#0;class#IngresosController#0" />
+                <element signature="method#eliminarActionListener#0;class#IngresosController#0" />
+                <element signature="docComment;method#editarActionListener#0;class#IngresosController#0" />
+                <element signature="docComment;method#updateTotalIngresos#0;class#IngresosController#0" />
+                <element signature="method#updateTotalIngresos#0;class#IngresosController#0" />
+                <element signature="docComment;method#updateButtonsEnabled#0;class#IngresosController#0" />
+                <element signature="method#updateButtonsEnabled#0;class#IngresosController#0" />
+                <element signature="docComment;method#guardarIngreso#0;class#IngresosController#0" />
+                <element signature="method#guardarIngreso#0;class#IngresosController#0" />
+                <element signature="docComment;method#editarIngreso#0;class#IngresosController#0" />
+                <element signature="method#editarIngreso#0;class#IngresosController#0" />
+                <element signature="docComment;method#validateInput#0;class#IngresosController#0" />
+                <element signature="method#validateInput#0;class#IngresosController#0" />
+                <element signature="docComment;method#validateCaja#0;class#IngresosController#0" />
+                <element signature="docComment;method#validateValor#0;class#IngresosController#0" />
+                <element signature="method#validateValor#0;class#IngresosController#0" />
+                <element signature="docComment;method#validateNroInicial#0;class#IngresosController#0" />
+                <element signature="method#validateNroInicial#0;class#IngresosController#0" />
+                <element signature="docComment;method#validateNroFinal#0;class#IngresosController#0" />
+                <element signature="method#validateNroFinal#0;class#IngresosController#0" />
+                <element signature="docComment;method#validateTipoIngreso#0;class#IngresosController#0" />
+                <element signature="method#validateTipoIngreso#0;class#IngresosController#0" />
+                <element signature="docComment;method#hideErrorMessages#0;class#IngresosController#0" />
+                <element signature="method#hideErrorMessages#0;class#IngresosController#0" />
+                <element signature="docComment;method#clearInputs#0;class#IngresosController#0" />
+                <element signature="method#clearInputs#0;class#IngresosController#0" />
+                <element signature="docComment;method#normalizeInputs#0;class#IngresosController#0" />
+                <element signature="method#normalizeInputs#0;class#IngresosController#0" />
+                <element signature="docComment;method#resetFocus#0;class#IngresosController#0" />
+                <element signature="class#NextAction#0;class#IngresosController#0" />
+                <element signature="n#!!block;n#NextAction#0;n#NextAction#0;n#IngresosController#0" />
+                <element signature="class#GuardarAction#0;class#IngresosController#0" />
+                <element signature="n#!!block;n#GuardarAction#0;n#GuardarAction#0;n#IngresosController#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="172">
+              <caret line="64" column="58" selection-start-line="64" selection-start-column="58" selection-end-line="64" selection-end-column="58" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/javax/swing/table/TableRowSorter.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="161">
+              <caret line="161" column="11" selection-start-line="161" selection-start-column="11" selection-end-line="161" selection-end-column="11" />
+              <folding>
+                <element signature="e#6738#6739#0" expanded="true" />
+                <element signature="e#6769#6770#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -219,7 +232,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>getValueAt</find>
       <find>getColumn</find>
       <find>select</find>
       <find>addRow</find>
@@ -249,6 +261,7 @@
       <find>mysql</find>
       <find>updateB</find>
       <find>inputmap</find>
+      <find>editar</find>
     </findStrings>
     <replaceStrings>
       <replace>2018 Daniel Cortes</replace>
@@ -268,10 +281,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/controllers/IngresosController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/components/IngresosTableModel.java" />
-        <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/ArqueoView.java" />
-        <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/controllers/ArqueoController.java" />
         <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/ArqueoView.form" />
         <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/data/Connection.java" />
         <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/data/SqliteConnection.java" />
@@ -308,17 +317,21 @@
         <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/TipoIngresoDAO.java" />
         <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/MysqlTipoIngresoDAO.java" />
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java" />
-        <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" />
-        <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" />
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java" />
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java" />
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" />
-        <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" />
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/AbstractController.java" />
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/actions/NextAction.java" />
-        <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" />
+        <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" />
+        <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" />
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" />
+        <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.form" />
+        <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java" />
+        <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/IngresosTableModel.java" />
+        <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" />
+        <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" />
+        <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" />
+        <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java" />
       </list>
     </option>
   </component>
@@ -373,7 +386,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -404,13 +416,29 @@
               <item name="caja" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="xyz" type="462c0819:PsiDirectoryNode" />
-              <item name="controllers" type="462c0819:PsiDirectoryNode" />
-              <item name="actions" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="caja" type="b2602c69:ProjectViewProjectNode" />
+              <item name="caja" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="xyz" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="components" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="caja" type="b2602c69:ProjectViewProjectNode" />
+              <item name="caja" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="xyz" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="EgresosView" type="e9f4de52:FormNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="PackagesPane" />
     </panes>
   </component>
@@ -425,7 +453,7 @@
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.STATE" value="ToolWindow" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546407672821" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546536823111" />
     <property name="com.intellij.ide.scratch.LRUPopupBuilder$1/Change SQL Dialect" value="SQLite" />
     <property name="database.console.LAST_STATE" value="false" />
     <property name="extract.method.default.visibility" value="private" />
@@ -599,7 +627,8 @@
       <workItem from="1546408047784" duration="2341000" />
       <workItem from="1546412576852" duration="574000" />
       <workItem from="1546481590691" duration="518000" />
-      <workItem from="1546482678909" duration="3047000" />
+      <workItem from="1546482678909" duration="5004000" />
+      <workItem from="1546533252017" duration="1846000" />
     </task>
     <task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora">
       <created>1545280618093</created>
@@ -769,11 +798,18 @@
       <option name="project" value="LOCAL" />
       <updated>1546303228134</updated>
     </task>
-    <option name="localTasksCounter" value="25" />
+    <task id="LOCAL-00025" summary="Mas documentacion y cambiados la mayoria de los action listeners por keybindings">
+      <created>1546485955113</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1546485955116</updated>
+    </task>
+    <option name="localTasksCounter" value="26" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="195498000" />
+    <option name="totallyTimeSpent" value="199301000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -788,7 +824,7 @@
     <frame x="0" y="-18" width="1366" height="765" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.20471841" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.20471841" />
       <window_info id="Image Layers" order="1" />
       <window_info id="Designer" order="2" />
       <window_info x="458" y="95" width="450" height="453" id="UI Designer" order="3" weight="0.32952815" />
@@ -899,79 +935,14 @@
     <MESSAGE value="Documentado el controlador de egresos" />
     <MESSAGE value="Documentado el controlador de ingresos" />
     <MESSAGE value="Mas documentacion!! &#10;Bendita documentacion &lt;3" />
-    <option name="LAST_COMMIT_MESSAGE" value="Mas documentacion!! &#10;Bendita documentacion &lt;3" />
+    <MESSAGE value="Mas documentacion y cambiados la mayoria de los action listeners por keybindings" />
+    <option name="LAST_COMMIT_MESSAGE" value="Mas documentacion y cambiados la mayoria de los action listeners por keybindings" />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/Main.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/data/SQLiteConnectionHolder.java" />
-    <entry file="uml://JAVA/danielcortes.xyz">
-      <provider selected="true" editor-type-id="UmlEditorProvider">
-        <state>
-          <ID>JAVA</ID>
-          <OriginalElement>danielcortes.xyz</OriginalElement>
-          <nodes>
-            <node x="" y="">danielcortes.xyz.views.components.EgresosTableModel</node>
-            <node x="" y="">danielcortes.xyz.controllers.IngresosController</node>
-            <node x="" y="">danielcortes.xyz.models.documentos.DocumentosDAO</node>
-            <node x="" y="">danielcortes.xyz.models.caja.MysqlCajaDAO</node>
-            <node x="" y="">danielcortes.xyz.models.caja.Caja</node>
-            <node x="" y="">danielcortes.xyz.models.tipo_egreso.TipoEgresoDAO</node>
-            <node x="" y="">danielcortes.xyz.models.efectivo.EfectivoDAO</node>
-            <node x="" y="">danielcortes.xyz.data.Properties</node>
-            <node x="" y="">danielcortes.xyz.models.tipo_egreso.TipoEgreso</node>
-            <node x="" y="">danielcortes.xyz.models.ingreso.MysqlIngresoDAO</node>
-            <node x="" y="">danielcortes.xyz.models.efectivo.MysqlEfectivoDAO</node>
-            <node x="" y="">danielcortes.xyz.views.IngresosView</node>
-            <node x="" y="">danielcortes.xyz.models.caja.SQLiteCajaDAO</node>
-            <node x="" y="">danielcortes.xyz.models.ingreso.IngresoDAO</node>
-            <node x="" y="">danielcortes.xyz.models.documentos.Documentos</node>
-            <node x="" y="">danielcortes.xyz.controllers.ManagerController</node>
-            <node x="" y="">danielcortes.xyz.models.efectivo.Efectivo</node>
-            <node x="" y="">danielcortes.xyz.controllers.ArqueoController</node>
-            <node x="" y="">danielcortes.xyz.models.documentos.SQLiteDocumentosDAO</node>
-            <node x="" y="">danielcortes.xyz.models.egreso.MysqlEgresoDAO</node>
-            <node x="" y="">danielcortes.xyz.data.MysqlConnectionHolder</node>
-            <node x="" y="">danielcortes.xyz.models.egreso.SQLiteEgresoDAO</node>
-            <node x="" y="">danielcortes.xyz.data.SQLiteConnectionHolder</node>
-            <node x="" y="">danielcortes.xyz.Main</node>
-            <node x="" y="">danielcortes.xyz.models.tipo_ingreso.SQLiteTipoIngresoDAO</node>
-            <node x="" y="">danielcortes.xyz.models.tipo_egreso.MysqlTipoEgresoDAO</node>
-            <node x="" y="">danielcortes.xyz.models.egreso.Egreso</node>
-            <node x="" y="">danielcortes.xyz.models.ingreso.Ingreso</node>
-            <node x="" y="">danielcortes.xyz.models.egreso.EgresoDAO</node>
-            <node x="" y="">danielcortes.xyz.models.tipo_ingreso.TipoIngresoDAO</node>
-            <node x="" y="">danielcortes.xyz.controllers.EgresosController</node>
-            <node x="" y="">danielcortes.xyz.views.ArqueoView</node>
-            <node x="" y="">danielcortes.xyz.models.caja.CajaDAO</node>
-            <node x="" y="">danielcortes.xyz.models.ingreso.SQLiteIngresoDAO</node>
-            <node x="" y="">danielcortes.xyz.models.tipo_egreso.SQLiteTipoEgresoDAO</node>
-            <node x="" y="">danielcortes.xyz.views.EgresosView</node>
-            <node x="" y="">danielcortes.xyz.views.ManagerView</node>
-            <node x="" y="">danielcortes.xyz.models.tipo_ingreso.TipoIngreso</node>
-            <node x="" y="">danielcortes.xyz.data.ConnectionHolder</node>
-            <node x="" y="">danielcortes.xyz.models.documentos.MysqlDocumentosDAO</node>
-            <node x="" y="">danielcortes.xyz.views.components.IngresosTableModel</node>
-            <node x="" y="">danielcortes.xyz.models.tipo_ingreso.MysqlTipoIngresoDAO</node>
-            <node x="" y="">danielcortes.xyz.models.efectivo.SQLiteEfectivoDAO</node>
-          </nodes>
-          <notes />
-          <edges />
-          <settings layout="Hierarchic Group" zoom="0.27432150313152404" x="2385.0" y="866.0" />
-          <SelectedNodes />
-          <Categories />
-          <SCOPE>All</SCOPE>
-          <VISIBILITY>private</VISIBILITY>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/caja/MysqlCajaDAO.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/caja/CajaDAO.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/documentos/MysqlDocumentosDAO.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/caja/SQLiteCajaDAO.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/documentos/DocumentosDAO.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/efectivo/SQLiteEfectivoDAO.java" />
@@ -1010,16 +981,6 @@
     <entry file="file://$PROJECT_DIR$/src/META-INF/MANIFEST.MF">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="92">
@@ -1027,16 +988,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="25" selection-start-line="25" selection-end-line="25" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/caja/Caja.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="138">
@@ -1093,84 +1044,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="163">
-          <caret line="429" column="5" selection-start-line="429" selection-start-column="5" selection-end-line="429" selection-end-column="5" />
-          <folding>
-            <element signature="docComment;class#IngresosController#0" />
-            <element signature="docComment;method#IngresosController#0;class#IngresosController#0" />
-            <element signature="method#IngresosController#0;class#IngresosController#0" />
-            <element signature="docComment;method#getIngresoDAO#0;class#IngresosController#0" />
-            <element signature="docComment;method#getTipoIngresoDAO#0;class#IngresosController#0" />
-            <element signature="docComment;method#updateCaja#0;class#IngresosController#0" />
-            <element signature="method#updateCaja#0;class#IngresosController#0" />
-            <element signature="docComment;method#fillTipoIngresoCombo#0;class#IngresosController#0" />
-            <element signature="method#fillTipoIngresoCombo#0;class#IngresosController#0" />
-            <element signature="e#3553#3601#1" />
-            <element signature="docComment;method#fillIngresosTable#0;class#IngresosController#0" />
-            <element signature="method#fillIngresosTable#0;class#IngresosController#0" />
-            <element signature="e#3941#4000#1" />
-            <element signature="docComment;method#setupViewEvents#0;class#IngresosController#0" />
-            <element signature="e#5786#5873#1" />
-            <element signature="docComment;method#guardarActionListener#0;class#IngresosController#0" />
-            <element signature="e#6649#6745#1" />
-            <element signature="e#6751#6848#1" />
-            <element signature="docComment;method#eliminarActionListener#0;class#IngresosController#0" />
-            <element signature="method#eliminarActionListener#0;class#IngresosController#0" />
-            <element signature="e#7318#7619#1" />
-            <element signature="docComment;method#editarActionListener#0;class#IngresosController#0" />
-            <element signature="method#editarActionListener#0;class#IngresosController#0" />
-            <element signature="e#8136#8699#1" />
-            <element signature="docComment;method#updateTotalIngresos#0;class#IngresosController#0" />
-            <element signature="method#updateTotalIngresos#0;class#IngresosController#0" />
-            <element signature="docComment;method#updateButtonsEnabled#0;class#IngresosController#0" />
-            <element signature="method#updateButtonsEnabled#0;class#IngresosController#0" />
-            <element signature="e#9303#9432#1" />
-            <element signature="e#9436#9567#1" />
-            <element signature="docComment;method#guardarIngreso#0;class#IngresosController#0" />
-            <element signature="method#guardarIngreso#0;class#IngresosController#0" />
-            <element signature="e#9970#10443#1" />
-            <element signature="docComment;method#editarIngreso#0;class#IngresosController#0" />
-            <element signature="method#editarIngreso#0;class#IngresosController#0" />
-            <element signature="e#10882#11399#1" />
-            <element signature="docComment;method#validateInput#0;class#IngresosController#0" />
-            <element signature="method#validateInput#0;class#IngresosController#0" />
-            <element signature="docComment;method#validateCaja#0;class#IngresosController#0" />
-            <element signature="docComment;method#validateValor#0;class#IngresosController#0" />
-            <element signature="method#validateValor#0;class#IngresosController#0" />
-            <element signature="e#12865#13039#1" />
-            <element signature="e#13070#13233#1" />
-            <element signature="e#13292#13453#1" />
-            <element signature="e#13486#13668#1" />
-            <element signature="docComment;method#validateNroInicial#0;class#IngresosController#0" />
-            <element signature="method#validateNroInicial#0;class#IngresosController#0" />
-            <element signature="e#14109#14293#1" />
-            <element signature="e#14329#14502#1" />
-            <element signature="docComment;method#validateNroFinal#0;class#IngresosController#0" />
-            <element signature="method#validateNroFinal#0;class#IngresosController#0" />
-            <element signature="e#14933#15113#1" />
-            <element signature="e#15147#15316#1" />
-            <element signature="docComment;method#validateTipoIngreso#0;class#IngresosController#0" />
-            <element signature="method#validateTipoIngreso#0;class#IngresosController#0" />
-            <element signature="e#15682#15868#1" />
-            <element signature="docComment;method#hideErrorMessages#0;class#IngresosController#0" />
-            <element signature="method#hideErrorMessages#0;class#IngresosController#0" />
-            <element signature="docComment;method#clearInputs#0;class#IngresosController#0" />
-            <element signature="method#clearInputs#0;class#IngresosController#0" />
-            <element signature="docComment;method#normalizeInputs#0;class#IngresosController#0" />
-            <element signature="method#normalizeInputs#0;class#IngresosController#0" />
-            <element signature="docComment;method#resetFocus#0;class#IngresosController#0" />
-            <element signature="e#17047#17048#0" expanded="true" />
-            <element signature="e#17102#17103#0" expanded="true" />
-            <element signature="class#NextAction#0;class#IngresosController#0" />
-            <element signature="n#!!block;n#NextAction#0;n#NextAction#0;n#IngresosController#0" />
-            <element signature="class#GuardarAction#0;class#IngresosController#0" />
-            <element signature="n#!!block;n#GuardarAction#0;n#GuardarAction#0;n#IngresosController#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/AbstractController.java" />
     <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1212,18 +1085,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="73" column="19" selection-start-line="73" selection-start-column="19" selection-end-line="73" selection-end-column="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#2698#2699#0" expanded="true" />
-            <element signature="e#2735#2736#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/java/beans/BeanProperty.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="483">
@@ -1252,10 +1113,142 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="508">
+          <caret line="442" selection-start-line="442" selection-end-line="442" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form">
+      <provider selected="true" editor-type-id="ui-designer" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form">
+      <provider selected="true" editor-type-id="ui-designer" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.form">
+      <provider selected="true" editor-type-id="ui-designer" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="29">
+          <caret line="98" lean-forward="true" selection-start-line="98" selection-end-line="105" selection-end-column="5" />
+          <folding>
+            <element signature="method#EgresosTableModel#0;class#EgresosTableModel#0" />
+            <element signature="method#addRow#0;class#EgresosTableModel#0" />
+            <element signature="method#removeRow#0;class#EgresosTableModel#0" />
+            <element signature="method#removeRows#0;class#EgresosTableModel#0" />
+            <element signature="method#setEgreso#0;class#EgresosTableModel#0" />
+            <element signature="method#getValueAt#0;class#EgresosTableModel#0" />
+            <element signature="n#!!block;n#getEgreso#0;n#EgresosTableModel#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/IngresosTableModel.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="190">
+          <caret line="100" column="28" lean-forward="true" selection-start-line="100" selection-start-column="28" selection-end-line="100" selection-end-column="28" />
+          <folding>
+            <element signature="method#IngresosTableModel#0;class#IngresosTableModel#0" />
+            <element signature="method#addRow#0;class#IngresosTableModel#0" />
+            <element signature="method#removeRow#0;class#IngresosTableModel#0" />
+            <element signature="method#removeRows#0;class#IngresosTableModel#0" />
+            <element signature="method#getValueAt#0;class#IngresosTableModel#0" />
+            <element signature="method#setIngreso#0;class#IngresosTableModel#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="236">
+          <caret line="62" lean-forward="true" selection-start-line="62" selection-end-line="62" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="174" column="18" selection-start-line="174" selection-start-column="18" selection-end-line="174" selection-end-column="18" />
+          <folding>
+            <element signature="docComment;class#ArqueoController#0" />
+            <element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
+            <element signature="method#ArqueoController#0;class#ArqueoController#0" />
+            <element signature="docComment;method#updateCaja#0;class#ArqueoController#0" />
+            <element signature="method#updateCaja#0;class#ArqueoController#0" />
+            <element signature="docComment;method#updateResumen#0;class#ArqueoController#0" />
+            <element signature="docComment;method#fillEfectivo#0;class#ArqueoController#0" />
+            <element signature="method#fillEfectivo#0;class#ArqueoController#0" />
+            <element signature="docComment;method#fillDocumentos#0;class#ArqueoController#0" />
+            <element signature="method#fillDocumentos#0;class#ArqueoController#0" />
+            <element signature="docComment;method#fillResumen#0;class#ArqueoController#0" />
+            <element signature="method#fillResumen#0;class#ArqueoController#0" />
+            <element signature="docComment;method#updateResumenEfectivo#0;class#ArqueoController#0" />
+            <element signature="method#updateResumenEfectivo#0;class#ArqueoController#0" />
+            <element signature="docComment;method#updateResumenDocumentos#0;class#ArqueoController#0" />
+            <element signature="method#updateResumenDocumentos#0;class#ArqueoController#0" />
+            <element signature="docComment;method#updateResumenIngresos#0;class#ArqueoController#0" />
+            <element signature="method#updateResumenIngresos#0;class#ArqueoController#0" />
+            <element signature="docComment;method#updateResumenEgresos#0;class#ArqueoController#0" />
+            <element signature="method#updateResumenEgresos#0;class#ArqueoController#0" />
+            <element signature="docComment;method#updateResumenArqueo#0;class#ArqueoController#0" />
+            <element signature="e#7241#7330#1" />
+            <element signature="e#7334#7421#1" />
+            <element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
+            <element signature="method#setUpViewEvents#0;class#ArqueoController#0" />
+            <element signature="docComment;method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
+            <element signature="method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
+            <element signature="docComment;method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
+            <element signature="method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
+            <element signature="docComment;method#guardarEfectivo#0;class#ArqueoController#0" />
+            <element signature="method#guardarEfectivo#0;class#ArqueoController#0" />
+            <element signature="e#12054#12773#1" />
+            <element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
+            <element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
+            <element signature="e#13262#13553#1" />
+            <element signature="docComment;method#validateEfectivoInput#0;class#ArqueoController#0" />
+            <element signature="method#validateEfectivoInput#0;class#ArqueoController#0" />
+            <element signature="docComment;method#validateDocumentosInput#0;class#ArqueoController#0" />
+            <element signature="method#validateDocumentosInput#0;class#ArqueoController#0" />
+            <element signature="docComment;method#validateEfectivoMoneda#0;class#ArqueoController#0" />
+            <element signature="method#validateEfectivoMoneda#0;class#ArqueoController#0" />
+            <element signature="e#15945#16089#1" />
+            <element signature="e#16120#16253#1" />
+            <element signature="e#16312#16443#1" />
+            <element signature="e#16478#16630#1" />
+            <element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
+            <element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
+            <element signature="e#17149#17293#1" />
+            <element signature="e#17324#17457#1" />
+            <element signature="e#17516#17647#1" />
+            <element signature="e#17682#17834#1" />
+            <element signature="docComment;method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
+            <element signature="method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
+            <element signature="docComment;method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
+            <element signature="method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
+            <element signature="docComment;method#normalizeEfectivoInput#0;class#ArqueoController#0" />
+            <element signature="method#normalizeEfectivoInput#0;class#ArqueoController#0" />
+            <element signature="docComment;method#normalizeDocumentosInput#0;class#ArqueoController#0" />
+            <element signature="method#normalizeDocumentosInput#0;class#ArqueoController#0" />
+            <element signature="class#GuardarEfectivoAction#0;class#ArqueoController#0" />
+            <element signature="n#!!block;n#GuardarEfectivoAction#0;n#GuardarEfectivoAction#0;n#ArqueoController#0" />
+            <element signature="class#GuardarDocumentosAction#0;class#ArqueoController#0" />
+            <element signature="n#!!block;n#GuardarDocumentosAction#0;n#GuardarDocumentosAction#0;n#ArqueoController#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="132" lean-forward="true" selection-start-line="132" selection-end-line="132" />
+        <state relative-caret-position="161">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="198" selection-end-column="108" />
           <folding>
             <element signature="docComment;class#EgresosController#0" />
             <element signature="docComment;method#EgresosController#0;class#EgresosController#0" />
@@ -1269,12 +1262,12 @@
             <element signature="docComment;method#fillEgresosTable#0;class#EgresosController#0" />
             <element signature="method#fillEgresosTable#0;class#EgresosController#0" />
             <element signature="docComment;method#setUpViewEvents#0;class#EgresosController#0" />
+            <element signature="method#setUpViewEvents#0;class#EgresosController#0" />
             <element signature="docComment;method#guardarActionListener#0;class#EgresosController#0" />
             <element signature="method#guardarActionListener#0;class#EgresosController#0" />
             <element signature="docComment;method#eliminarActionListener#0;class#EgresosController#0" />
             <element signature="method#eliminarActionListener#0;class#EgresosController#0" />
             <element signature="docComment;method#editarActionListener#0;class#EgresosController#0" />
-            <element signature="method#editarActionListener#0;class#EgresosController#0" />
             <element signature="docComment;method#updateTotalEgresos#0;class#EgresosController#0" />
             <element signature="method#updateTotalEgresos#0;class#EgresosController#0" />
             <element signature="docComment;method#updateButtonsEnabled#0;class#EgresosController#0" />
@@ -1308,72 +1301,88 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java">
+    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-155">
-          <caret line="197" column="35" lean-forward="true" selection-start-line="197" selection-start-column="35" selection-end-line="197" selection-end-column="35" />
+        <state relative-caret-position="255">
+          <caret line="210" lean-forward="true" selection-start-line="210" selection-end-line="210" />
           <folding>
-            <element signature="docComment;class#ArqueoController#0" />
-            <element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
-            <element signature="method#ArqueoController#0;class#ArqueoController#0" />
-            <element signature="docComment;method#updateCaja#0;class#ArqueoController#0" />
-            <element signature="method#updateCaja#0;class#ArqueoController#0" />
-            <element signature="docComment;method#updateResumen#0;class#ArqueoController#0" />
-            <element signature="docComment;method#fillEfectivo#0;class#ArqueoController#0" />
-            <element signature="method#fillEfectivo#0;class#ArqueoController#0" />
-            <element signature="docComment;method#fillDocumentos#0;class#ArqueoController#0" />
-            <element signature="method#fillDocumentos#0;class#ArqueoController#0" />
-            <element signature="docComment;method#fillResumen#0;class#ArqueoController#0" />
-            <element signature="method#fillResumen#0;class#ArqueoController#0" />
-            <element signature="docComment;method#updateResumenEfectivo#0;class#ArqueoController#0" />
-            <element signature="method#updateResumenEfectivo#0;class#ArqueoController#0" />
-            <element signature="docComment;method#updateResumenDocumentos#0;class#ArqueoController#0" />
-            <element signature="method#updateResumenDocumentos#0;class#ArqueoController#0" />
-            <element signature="docComment;method#updateResumenIngresos#0;class#ArqueoController#0" />
-            <element signature="method#updateResumenIngresos#0;class#ArqueoController#0" />
-            <element signature="docComment;method#updateResumenEgresos#0;class#ArqueoController#0" />
-            <element signature="method#updateResumenEgresos#0;class#ArqueoController#0" />
-            <element signature="docComment;method#updateResumenArqueo#0;class#ArqueoController#0" />
-            <element signature="method#updateResumenArqueo#0;class#ArqueoController#0" />
-            <element signature="e#7218#7303#1" />
-            <element signature="e#7307#7390#1" />
-            <element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
-            <element signature="method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
-            <element signature="method#guardarEfectivoActionListener#1;class#ArqueoController#0" />
-            <element signature="docComment;method#guardarEfectivo#0;class#ArqueoController#0" />
-            <element signature="method#guardarEfectivo#0;class#ArqueoController#0" />
-            <element signature="e#11243#11962#1" />
-            <element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
-            <element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
-            <element signature="e#12451#12742#1" />
-            <element signature="docComment;method#validateEfectivoInput#0;class#ArqueoController#0" />
-            <element signature="method#validateEfectivoInput#0;class#ArqueoController#0" />
-            <element signature="docComment;method#validateDocumentosInput#0;class#ArqueoController#0" />
-            <element signature="method#validateDocumentosInput#0;class#ArqueoController#0" />
-            <element signature="docComment;method#validateEfectivoMoneda#0;class#ArqueoController#0" />
-            <element signature="method#validateEfectivoMoneda#0;class#ArqueoController#0" />
-            <element signature="e#15134#15278#1" />
-            <element signature="e#15309#15442#1" />
-            <element signature="e#15501#15632#1" />
-            <element signature="e#15667#15819#1" />
-            <element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
-            <element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
-            <element signature="e#16338#16482#1" />
-            <element signature="e#16513#16646#1" />
-            <element signature="e#16705#16836#1" />
-            <element signature="e#16871#17023#1" />
-            <element signature="docComment;method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
-            <element signature="method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
-            <element signature="docComment;method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
-            <element signature="method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
-            <element signature="docComment;method#normalizeEfectivoInput#0;class#ArqueoController#0" />
-            <element signature="method#normalizeEfectivoInput#0;class#ArqueoController#0" />
-            <element signature="docComment;method#normalizeDocumentosInput#0;class#ArqueoController#0" />
-            <element signature="method#normalizeDocumentosInput#0;class#ArqueoController#0" />
-            <element signature="class#GuardarAction#0;class#ArqueoController#0" />
-            <element signature="n#!!block;n#GuardarAction#0;n#GuardarAction#0;n#ArqueoController#0" />
-            <element signature="class#GuardarEfectivoAction#1;class#ArqueoController#0" />
-            <element signature="n#!!block;n#GuardarEfectivoAction#0;n#GuardarEfectivoAction#1;n#ArqueoController#0" />
+            <element signature="docComment;class#IngresosController#0" />
+            <element signature="docComment;method#IngresosController#0;class#IngresosController#0" />
+            <element signature="method#IngresosController#0;class#IngresosController#0" />
+            <element signature="docComment;method#getIngresoDAO#0;class#IngresosController#0" />
+            <element signature="docComment;method#getTipoIngresoDAO#0;class#IngresosController#0" />
+            <element signature="docComment;method#updateCaja#0;class#IngresosController#0" />
+            <element signature="method#updateCaja#0;class#IngresosController#0" />
+            <element signature="docComment;method#fillTipoIngresoCombo#0;class#IngresosController#0" />
+            <element signature="method#fillTipoIngresoCombo#0;class#IngresosController#0" />
+            <element signature="docComment;method#fillIngresosTable#0;class#IngresosController#0" />
+            <element signature="method#fillIngresosTable#0;class#IngresosController#0" />
+            <element signature="docComment;method#setupViewEvents#0;class#IngresosController#0" />
+            <element signature="docComment;method#guardarActionListener#0;class#IngresosController#0" />
+            <element signature="docComment;method#eliminarActionListener#0;class#IngresosController#0" />
+            <element signature="method#eliminarActionListener#0;class#IngresosController#0" />
+            <element signature="docComment;method#editarActionListener#0;class#IngresosController#0" />
+            <element signature="docComment;method#updateTotalIngresos#0;class#IngresosController#0" />
+            <element signature="method#updateTotalIngresos#0;class#IngresosController#0" />
+            <element signature="docComment;method#updateButtonsEnabled#0;class#IngresosController#0" />
+            <element signature="method#updateButtonsEnabled#0;class#IngresosController#0" />
+            <element signature="docComment;method#guardarIngreso#0;class#IngresosController#0" />
+            <element signature="method#guardarIngreso#0;class#IngresosController#0" />
+            <element signature="docComment;method#editarIngreso#0;class#IngresosController#0" />
+            <element signature="method#editarIngreso#0;class#IngresosController#0" />
+            <element signature="docComment;method#validateInput#0;class#IngresosController#0" />
+            <element signature="method#validateInput#0;class#IngresosController#0" />
+            <element signature="docComment;method#validateCaja#0;class#IngresosController#0" />
+            <element signature="docComment;method#validateValor#0;class#IngresosController#0" />
+            <element signature="method#validateValor#0;class#IngresosController#0" />
+            <element signature="docComment;method#validateNroInicial#0;class#IngresosController#0" />
+            <element signature="method#validateNroInicial#0;class#IngresosController#0" />
+            <element signature="docComment;method#validateNroFinal#0;class#IngresosController#0" />
+            <element signature="method#validateNroFinal#0;class#IngresosController#0" />
+            <element signature="docComment;method#validateTipoIngreso#0;class#IngresosController#0" />
+            <element signature="method#validateTipoIngreso#0;class#IngresosController#0" />
+            <element signature="docComment;method#hideErrorMessages#0;class#IngresosController#0" />
+            <element signature="method#hideErrorMessages#0;class#IngresosController#0" />
+            <element signature="docComment;method#clearInputs#0;class#IngresosController#0" />
+            <element signature="method#clearInputs#0;class#IngresosController#0" />
+            <element signature="docComment;method#normalizeInputs#0;class#IngresosController#0" />
+            <element signature="method#normalizeInputs#0;class#IngresosController#0" />
+            <element signature="docComment;method#resetFocus#0;class#IngresosController#0" />
+            <element signature="class#NextAction#0;class#IngresosController#0" />
+            <element signature="n#!!block;n#NextAction#0;n#NextAction#0;n#IngresosController#0" />
+            <element signature="class#GuardarAction#0;class#IngresosController#0" />
+            <element signature="n#!!block;n#GuardarAction#0;n#GuardarAction#0;n#IngresosController#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/javax/swing/RowSorter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2438">
+          <caret line="129" column="40" selection-start-line="129" selection-start-column="25" selection-end-line="129" selection-end-column="40" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="172">
+          <caret line="64" column="58" selection-start-line="64" selection-start-column="58" selection-end-line="64" selection-end-column="58" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/javax/swing/table/TableRowSorter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="161" column="11" selection-start-line="161" selection-start-column="11" selection-end-line="161" selection-end-column="11" />
+          <folding>
+            <element signature="e#6738#6739#0" expanded="true" />
+            <element signature="e#6769#6770#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/database.sqlite b/database.sqlite
index 3996d83f1267e6a7d2d6d831bd43ff9eedf87878..f3a435ee9ab1f50f01837ea8f9d777a65f3f2c5e 100644
GIT binary patch
delta 164
zcmZo@U}|V!njp<MX`+lX<D`uVOZ1r~dCyE{H_+zb{mlD}_a^U|&4vP#c#XNG*ctfw
z895nEOjx+NC7~Q+V`gq{2`I<Nh>4p^9K_+|WHdD7-u&N|$w-zzh=Gq^kb(ab|6~61
z{0I0q@-O0_%-_Oaz@Nx3xLK~?GoK(oHxB~`2NMSvFba2YPgbfoU}0cj;GY~;zX|}a
Ca3Vnf

delta 88
zcmV-e0H^<efC7Mk0+1U4jgcHf0gbU>q%Q*%4gZq|Fe|e$5X}v<|2+aS9RL6T4i6##
u5AqM=56=(453vuT50ejs4{#4*4^p!paPtn4kP(w2e=r0M3k(30R)4D5f*Y;?

diff --git a/src/danielcortes/xyz/controllers/ArqueoController.java b/src/danielcortes/xyz/controllers/ArqueoController.java
index 51bb980..6e655ab 100644
--- a/src/danielcortes/xyz/controllers/ArqueoController.java
+++ b/src/danielcortes/xyz/controllers/ArqueoController.java
@@ -177,17 +177,17 @@ public class ArqueoController {
         int totalIngresos = Integer.parseInt(this.view.getIngresosField().getText());
         int totalEgresos = Integer.parseInt(this.view.getEgresosField().getText());
 
-        int arqueo = totalDocumentos + totalEfectivo + totalEgresos;
-        int ajuste = arqueo - totalIngresos;
+        int rendido = totalDocumentos + totalEfectivo + totalEgresos;
+        int diferencia = rendido - totalIngresos;
 
-        this.view.getArqueoField().setText(String.valueOf(arqueo));
-        this.view.getRendidoField().setText(String.valueOf(totalIngresos));
-        this.view.getAjusteField().setText(String.valueOf(ajuste));
+        this.view.getRendidoField().setText(String.valueOf(rendido));
+        this.view.getDebeRendirField().setText(String.valueOf(totalIngresos));
+        this.view.getDiferenciaField().setText(String.valueOf(diferencia));
 
-        if(ajuste < 0) {
-            this.view.getAjusteField().setForeground(new Color(255,0,0));
+        if(diferencia < 0) {
+            this.view.getDiferenciaField().setForeground(new Color(255,0,0));
         }else{
-            this.view.getAjusteField().setForeground(new Color(0,0,0));
+            this.view.getDiferenciaField().setForeground(new Color(0,0,0));
         }
 
     }
diff --git a/src/danielcortes/xyz/controllers/EgresosController.java b/src/danielcortes/xyz/controllers/EgresosController.java
index f97b86c..d38372d 100644
--- a/src/danielcortes/xyz/controllers/EgresosController.java
+++ b/src/danielcortes/xyz/controllers/EgresosController.java
@@ -194,11 +194,13 @@ public class EgresosController {
     private void editarActionListener() {
         this.hideErrorMessages();
 
-        int selectedID = this.view.getEgresosTable().getSelectedRow();
-        if (selectedID >= 0) {
-            Egreso egreso = this.view.getEgresosTableModel().getEgreso(selectedID);
 
-            this.editingId = selectedID;
+        int selectedID = this.view.getEgresosTable().getSelectedRow();
+        int selectedModelID = this.view.getEgresosTable().getRowSorter().convertRowIndexToModel(selectedID);
+        if (selectedModelID >= 0) {
+            Egreso egreso = this.view.getEgresosTableModel().getEgreso(selectedModelID);
+
+            this.editingId = selectedModelID;
             this.editingEgreso = egreso;
             this.editing = true;
 
diff --git a/src/danielcortes/xyz/controllers/IngresosController.java b/src/danielcortes/xyz/controllers/IngresosController.java
index add907d..6f4d556 100644
--- a/src/danielcortes/xyz/controllers/IngresosController.java
+++ b/src/danielcortes/xyz/controllers/IngresosController.java
@@ -194,10 +194,11 @@ public class IngresosController {
         this.hideErrorMessages();
 
         int selectedID = this.view.getIngresosTable().getSelectedRow();
-        if(selectedID >= 0) {
-            Ingreso ingreso = this.view.getIngresosTableModel().getIngreso(selectedID);
+        int selectedModelID = this.view.getIngresosTable().getRowSorter().convertRowIndexToModel(selectedID);
+        if(selectedModelID >= 0) {
+            Ingreso ingreso = this.view.getIngresosTableModel().getIngreso(selectedModelID);
 
-            this.editingId = selectedID;
+            this.editingId = selectedModelID;
             this.editingIngreso = ingreso;
             this.editing = true;
 
diff --git a/src/danielcortes/xyz/views/ArqueoView.form b/src/danielcortes/xyz/views/ArqueoView.form
index d6c0746..25e8ce3 100644
--- a/src/danielcortes/xyz/views/ArqueoView.form
+++ b/src/danielcortes/xyz/views/ArqueoView.form
@@ -1,156 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="danielcortes.xyz.views.ArqueoView">
-  <grid id="27dc6" binding="contentPanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="contentPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="616" height="646"/>
+      <xy x="20" y="20" width="642" height="837"/>
     </constraints>
     <properties/>
     <border type="none">
       <font/>
     </border>
     <children>
-      <grid id="1ca11" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="84446" layout-manager="GridLayoutManager" row-count="8" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="10" left="10" bottom="10" right="10"/>
         <constraints>
           <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
-        <border type="etched" title="Detalle Documentos">
-          <font/>
-        </border>
-        <children>
-          <component id="1b69f" class="javax.swing.JTextField" binding="chequesField">
-            <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value="0"/>
-            </properties>
-          </component>
-          <component id="d49a7" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Tarjetas de Credito"/>
-            </properties>
-          </component>
-          <component id="7049f" class="javax.swing.JTextField" binding="tarjetasField">
-            <constraints>
-              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value="0"/>
-            </properties>
-          </component>
-          <component id="1681b" class="javax.swing.JButton" binding="guardarDocumentosButton">
-            <constraints>
-              <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Guardar"/>
-            </properties>
-          </component>
-          <component id="a438" class="javax.swing.JLabel" binding="errorCheques">
-            <constraints>
-              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <foreground color="-65536"/>
-              <text value="Error"/>
-              <visible value="false"/>
-            </properties>
-          </component>
-          <component id="b855f" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Cheques al Dia"/>
-            </properties>
-          </component>
-          <component id="4f33f" class="javax.swing.JLabel" binding="errorTarjetas">
-            <constraints>
-              <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <foreground color="-65536"/>
-              <text value="Error"/>
-              <visible value="false"/>
-            </properties>
-          </component>
-        </children>
-      </grid>
-      <grid id="84446" layout-manager="GridLayoutManager" row-count="8" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="10" left="10" bottom="10" right="10"/>
-        <constraints>
-          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
         <border type="etched" title="Resumen"/>
         <children>
-          <component id="1dc40" class="javax.swing.JLabel">
+          <component id="6dc0a" class="javax.swing.JLabel">
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Efectivo"/>
-            </properties>
-          </component>
-          <component id="df645" class="javax.swing.JTextField" binding="efectivoField">
-            <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <editable value="false"/>
-              <text value="0"/>
-            </properties>
-          </component>
-          <component id="440ad" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Documentos"/>
-            </properties>
-          </component>
-          <component id="42661" class="javax.swing.JTextField" binding="documentosField">
-            <constraints>
-              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <editable value="false"/>
-              <text value="0"/>
-            </properties>
-          </component>
-          <component id="66420" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Ingresos"/>
-            </properties>
-          </component>
-          <component id="6dc0a" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Egresos"/>
+              <text value="Total Egresos"/>
             </properties>
           </component>
           <component id="3093a" class="javax.swing.JTextField" binding="egresosField">
             <constraints>
-              <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -159,38 +37,7 @@
               <text value="0"/>
             </properties>
           </component>
-          <component id="8094" class="javax.swing.JTextField" binding="ingresosField">
-            <constraints>
-              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <editable value="false"/>
-              <text value="0"/>
-            </properties>
-          </component>
-          <component id="cee37" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Rendido"/>
-            </properties>
-          </component>
-          <component id="b0664" class="javax.swing.JTextField" binding="arqueoField">
-            <constraints>
-              <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <editable value="false"/>
-              <font style="1"/>
-              <text value="0"/>
-            </properties>
-          </component>
-          <component id="509b2" class="javax.swing.JTextField" binding="ajusteField">
+          <component id="509b2" class="javax.swing.JTextField" binding="diferenciaField">
             <constraints>
               <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
@@ -207,7 +54,7 @@
               <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Ajuste "/>
+              <text value="Diferencia"/>
             </properties>
           </component>
           <component id="679e2" class="javax.swing.JSeparator">
@@ -218,307 +65,466 @@
           </component>
           <component id="fb43c" class="javax.swing.JLabel">
             <constraints>
-              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Debe Rendir"/>
             </properties>
           </component>
-          <component id="b117a" class="javax.swing.JTextField" binding="rendidoField">
+          <component id="b117a" class="javax.swing.JTextField" binding="debeRendirField">
+            <constraints>
+              <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties>
+              <editable value="false"/>
+              <font style="1"/>
+              <text value="0"/>
+            </properties>
+          </component>
+          <component id="b0664" class="javax.swing.JTextField" binding="rendidoField">
             <constraints>
               <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
             <properties>
+              <editable value="false"/>
               <font style="1"/>
               <text value="0"/>
             </properties>
           </component>
-        </children>
-      </grid>
-      <grid id="3f85f" layout-manager="GridLayoutManager" row-count="19" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="10" left="10" bottom="10" right="10"/>
-        <constraints>
-          <grid row="0" column="0" row-span="3" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="etched" title="Detalle Efectivo">
-          <font/>
-        </border>
-        <children>
-          <component id="10824" class="javax.swing.JLabel">
+          <component id="cee37" class="javax.swing.JLabel">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="$20000"/>
+              <text value="Rendido"/>
             </properties>
           </component>
-          <component id="99f2e" class="javax.swing.JTextField" binding="veinteMilField">
+          <component id="66420" class="javax.swing.JLabel">
             <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="200" height="-1"/>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Total Ingresos"/>
+            </properties>
+          </component>
+          <component id="8094" class="javax.swing.JTextField" binding="ingresosField">
+            <constraints>
+              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
             <properties>
+              <editable value="false"/>
               <text value="0"/>
             </properties>
           </component>
-          <component id="584ed" class="javax.swing.JLabel">
+          <component id="1dc40" class="javax.swing.JLabel">
             <constraints>
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="$10000"/>
+              <text value="Total Efectivo"/>
             </properties>
           </component>
-          <component id="5431d" class="javax.swing.JTextField" binding="diezMilField">
+          <component id="df645" class="javax.swing.JTextField" binding="efectivoField">
             <constraints>
               <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="200" height="-1"/>
+                <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
             <properties>
+              <editable value="false"/>
               <text value="0"/>
             </properties>
           </component>
-          <component id="af49b" class="javax.swing.JTextField" binding="cincoMilField">
+          <component id="440ad" class="javax.swing.JLabel">
             <constraints>
-              <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="200" height="-1"/>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Total Documentos"/>
+            </properties>
+          </component>
+          <component id="42661" class="javax.swing.JTextField" binding="documentosField">
+            <constraints>
+              <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
             <properties>
+              <editable value="false"/>
               <text value="0"/>
             </properties>
           </component>
-          <component id="8d468" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="$5000"/>
-            </properties>
-          </component>
-          <component id="7a8c3" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="$2000"/>
-            </properties>
-          </component>
-          <component id="bbb4" class="javax.swing.JTextField" binding="dosMilField">
-            <constraints>
-              <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="200" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value="0"/>
-            </properties>
-          </component>
-          <component id="4807e" class="javax.swing.JTextField" binding="milField">
-            <constraints>
-              <grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="200" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value="0"/>
-            </properties>
-          </component>
-          <component id="e80c8" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="$1000"/>
-            </properties>
-          </component>
-          <component id="62d5d" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="$500"/>
-            </properties>
-          </component>
-          <component id="3d6c3" class="javax.swing.JTextField" binding="quinientosField">
-            <constraints>
-              <grid row="10" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="200" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value="0"/>
-            </properties>
-          </component>
-          <component id="7910b" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="12" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="$100"/>
-            </properties>
-          </component>
-          <component id="8f6e8" class="javax.swing.JTextField" binding="cienField">
-            <constraints>
-              <grid row="12" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="200" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value="0"/>
-            </properties>
-          </component>
-          <component id="e105f" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="14" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="$50"/>
-            </properties>
-          </component>
-          <component id="22b2c" class="javax.swing.JTextField" binding="cincuentaField">
-            <constraints>
-              <grid row="14" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="200" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value="0"/>
-            </properties>
-          </component>
-          <component id="fcf59" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="16" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="$10"/>
-            </properties>
-          </component>
-          <component id="6f156" class="javax.swing.JTextField" binding="diezField">
-            <constraints>
-              <grid row="16" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="200" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value="0"/>
-            </properties>
-          </component>
-          <component id="a2c3f" class="javax.swing.JButton" binding="guardarEfectivoButton">
-            <constraints>
-              <grid row="18" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="200" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value="Guardar"/>
-            </properties>
-          </component>
-          <component id="92070" class="javax.swing.JLabel" binding="errorVeinteMil">
-            <constraints>
-              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <foreground color="-65536"/>
-              <text value="Error"/>
-              <visible value="false"/>
-            </properties>
-          </component>
-          <component id="52622" class="javax.swing.JLabel" binding="errorDiezMil">
-            <constraints>
-              <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <foreground color="-65536"/>
-              <text value="Error"/>
-              <visible value="false"/>
-            </properties>
-          </component>
-          <component id="12e87" class="javax.swing.JLabel" binding="errorCincoMil">
-            <constraints>
-              <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <foreground color="-65536"/>
-              <text value="Error"/>
-              <visible value="false"/>
-            </properties>
-          </component>
-          <component id="c4ae2" class="javax.swing.JLabel" binding="errorDosMil">
-            <constraints>
-              <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <foreground color="-65536"/>
-              <text value="Error"/>
-              <visible value="false"/>
-            </properties>
-          </component>
-          <component id="78dc8" class="javax.swing.JLabel" binding="errorMil">
-            <constraints>
-              <grid row="9" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <foreground color="-65536"/>
-              <text value="Error"/>
-              <visible value="false"/>
-            </properties>
-          </component>
-          <component id="f9374" class="javax.swing.JLabel" binding="errorQuinientos">
-            <constraints>
-              <grid row="11" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <foreground color="-65536"/>
-              <text value="Error"/>
-              <visible value="false"/>
-            </properties>
-          </component>
-          <component id="b7c59" class="javax.swing.JLabel" binding="errorCien">
-            <constraints>
-              <grid row="13" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <foreground color="-65536"/>
-              <text value="Error"/>
-              <visible value="false"/>
-            </properties>
-          </component>
-          <component id="c66e5" class="javax.swing.JLabel" binding="errorCincuenta">
-            <constraints>
-              <grid row="15" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <foreground color="-65536"/>
-              <text value="Error"/>
-              <visible value="false"/>
-            </properties>
-          </component>
-          <component id="fa2bc" class="javax.swing.JLabel" binding="errorDiez">
-            <constraints>
-              <grid row="17" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <foreground color="-65536"/>
-              <text value="Error"/>
-              <visible value="false"/>
-            </properties>
-          </component>
         </children>
       </grid>
-      <vspacer id="28775">
+      <grid id="b1b74" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="2" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
-      </vspacer>
-      <vspacer id="93947">
+        <properties/>
+        <border type="none"/>
+        <children>
+          <grid id="3f85f" layout-manager="GridLayoutManager" row-count="19" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="10" left="10" bottom="10" right="10"/>
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="etched" title="Detalle Efectivo">
+              <font/>
+            </border>
+            <children>
+              <component id="10824" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="$20000"/>
+                </properties>
+              </component>
+              <component id="99f2e" class="javax.swing.JTextField" binding="veinteMilField">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="200" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <text value="0"/>
+                </properties>
+              </component>
+              <component id="584ed" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="$10000"/>
+                </properties>
+              </component>
+              <component id="5431d" class="javax.swing.JTextField" binding="diezMilField">
+                <constraints>
+                  <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="200" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <text value="0"/>
+                </properties>
+              </component>
+              <component id="af49b" class="javax.swing.JTextField" binding="cincoMilField">
+                <constraints>
+                  <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="200" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <text value="0"/>
+                </properties>
+              </component>
+              <component id="8d468" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="$5000"/>
+                </properties>
+              </component>
+              <component id="7a8c3" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="$2000"/>
+                </properties>
+              </component>
+              <component id="bbb4" class="javax.swing.JTextField" binding="dosMilField">
+                <constraints>
+                  <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="200" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <text value="0"/>
+                </properties>
+              </component>
+              <component id="4807e" class="javax.swing.JTextField" binding="milField">
+                <constraints>
+                  <grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="200" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <text value="0"/>
+                </properties>
+              </component>
+              <component id="e80c8" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="$1000"/>
+                </properties>
+              </component>
+              <component id="62d5d" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="$500"/>
+                </properties>
+              </component>
+              <component id="3d6c3" class="javax.swing.JTextField" binding="quinientosField">
+                <constraints>
+                  <grid row="10" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="200" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <text value="0"/>
+                </properties>
+              </component>
+              <component id="7910b" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="12" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="$100"/>
+                </properties>
+              </component>
+              <component id="8f6e8" class="javax.swing.JTextField" binding="cienField">
+                <constraints>
+                  <grid row="12" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="200" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <text value="0"/>
+                </properties>
+              </component>
+              <component id="e105f" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="14" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="$50"/>
+                </properties>
+              </component>
+              <component id="22b2c" class="javax.swing.JTextField" binding="cincuentaField">
+                <constraints>
+                  <grid row="14" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="200" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <text value="0"/>
+                </properties>
+              </component>
+              <component id="fcf59" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="16" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="$10"/>
+                </properties>
+              </component>
+              <component id="6f156" class="javax.swing.JTextField" binding="diezField">
+                <constraints>
+                  <grid row="16" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="200" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <text value="0"/>
+                </properties>
+              </component>
+              <component id="a2c3f" class="javax.swing.JButton" binding="guardarEfectivoButton">
+                <constraints>
+                  <grid row="18" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="200" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <text value="Guardar"/>
+                </properties>
+              </component>
+              <component id="92070" class="javax.swing.JLabel" binding="errorVeinteMil">
+                <constraints>
+                  <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <foreground color="-65536"/>
+                  <text value="Error"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
+              <component id="52622" class="javax.swing.JLabel" binding="errorDiezMil">
+                <constraints>
+                  <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <foreground color="-65536"/>
+                  <text value="Error"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
+              <component id="12e87" class="javax.swing.JLabel" binding="errorCincoMil">
+                <constraints>
+                  <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <foreground color="-65536"/>
+                  <text value="Error"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
+              <component id="c4ae2" class="javax.swing.JLabel" binding="errorDosMil">
+                <constraints>
+                  <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <foreground color="-65536"/>
+                  <text value="Error"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
+              <component id="78dc8" class="javax.swing.JLabel" binding="errorMil">
+                <constraints>
+                  <grid row="9" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <foreground color="-65536"/>
+                  <text value="Error"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
+              <component id="f9374" class="javax.swing.JLabel" binding="errorQuinientos">
+                <constraints>
+                  <grid row="11" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <foreground color="-65536"/>
+                  <text value="Error"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
+              <component id="b7c59" class="javax.swing.JLabel" binding="errorCien">
+                <constraints>
+                  <grid row="13" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <foreground color="-65536"/>
+                  <text value="Error"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
+              <component id="c66e5" class="javax.swing.JLabel" binding="errorCincuenta">
+                <constraints>
+                  <grid row="15" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <foreground color="-65536"/>
+                  <text value="Error"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
+              <component id="fa2bc" class="javax.swing.JLabel" binding="errorDiez">
+                <constraints>
+                  <grid row="17" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <foreground color="-65536"/>
+                  <text value="Error"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+          <grid id="1ca11" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="10" left="10" bottom="10" right="10"/>
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="etched" title="Detalle Documentos">
+              <font/>
+            </border>
+            <children>
+              <component id="1b69f" class="javax.swing.JTextField" binding="chequesField">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="150" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <text value="0"/>
+                </properties>
+              </component>
+              <component id="d49a7" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="Tarjetas de Credito"/>
+                </properties>
+              </component>
+              <component id="7049f" class="javax.swing.JTextField" binding="tarjetasField">
+                <constraints>
+                  <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                    <preferred-size width="150" height="-1"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <text value="0"/>
+                </properties>
+              </component>
+              <component id="1681b" class="javax.swing.JButton" binding="guardarDocumentosButton">
+                <constraints>
+                  <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="Guardar"/>
+                </properties>
+              </component>
+              <component id="a438" class="javax.swing.JLabel" binding="errorCheques">
+                <constraints>
+                  <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <foreground color="-65536"/>
+                  <text value="Error"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
+              <component id="b855f" class="javax.swing.JLabel">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="Cheques al Dia"/>
+                </properties>
+              </component>
+              <component id="4f33f" class="javax.swing.JLabel" binding="errorTarjetas">
+                <constraints>
+                  <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <foreground color="-65536"/>
+                  <text value="Error"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+        </children>
+      </grid>
+      <vspacer id="d3dd4">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
     </children>
diff --git a/src/danielcortes/xyz/views/ArqueoView.java b/src/danielcortes/xyz/views/ArqueoView.java
index dccb2ec..55ef68e 100644
--- a/src/danielcortes/xyz/views/ArqueoView.java
+++ b/src/danielcortes/xyz/views/ArqueoView.java
@@ -50,7 +50,7 @@ public class ArqueoView {
     private JTextField documentosField;
     private JTextField egresosField;
     private JTextField ingresosField;
-    private JTextField arqueoField;
+    private JTextField rendidoField;
     private JButton guardarEfectivoButton;
     private JButton guardarDocumentosButton;
     private JLabel errorVeinteMil;
@@ -64,8 +64,8 @@ public class ArqueoView {
     private JLabel errorDiez;
     private JLabel errorCheques;
     private JLabel errorTarjetas;
-    private JTextField ajusteField;
-    private JTextField rendidoField;
+    private JTextField diferenciaField;
+    private JTextField debeRendirField;
 
     public JPanel getContentPanel() {
         return contentPanel;
@@ -131,16 +131,16 @@ public class ArqueoView {
         return ingresosField;
     }
 
-    public JTextField getArqueoField() {
-        return arqueoField;
-    }
-
     public JTextField getRendidoField() {
         return rendidoField;
     }
 
-    public JTextField getAjusteField() {
-        return ajusteField;
+    public JTextField getDebeRendirField() {
+        return debeRendirField;
+    }
+
+    public JTextField getDiferenciaField() {
+        return diferenciaField;
     }
 
     public JButton getGuardarEfectivoButton() {
@@ -211,151 +211,126 @@ public class ArqueoView {
      */
     private void $$$setupUI$$$() {
         contentPanel = new JPanel();
-        contentPanel.setLayout(new GridLayoutManager(4, 2, new Insets(0, 0, 0, 0), -1, -1));
+        contentPanel.setLayout(new GridLayoutManager(2, 2, new Insets(0, 0, 0, 0), -1, -1));
         final JPanel panel1 = new JPanel();
-        panel1.setLayout(new GridLayoutManager(5, 2, new Insets(10, 10, 10, 10), -1, -1));
+        panel1.setLayout(new GridLayoutManager(8, 2, new Insets(10, 10, 10, 10), -1, -1));
         contentPanel.add(panel1, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
-        panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Detalle Documentos", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, -1, -1, panel1.getFont())));
-        chequesField = new JTextField();
-        chequesField.setText("0");
-        panel1.add(chequesField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+        panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Resumen"));
         final JLabel label1 = new JLabel();
-        label1.setText("Tarjetas de Credito");
-        panel1.add(label1, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        tarjetasField = new JTextField();
-        tarjetasField.setText("0");
-        panel1.add(tarjetasField, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
-        guardarDocumentosButton = new JButton();
-        guardarDocumentosButton.setText("Guardar");
-        panel1.add(guardarDocumentosButton, new GridConstraints(4, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        errorCheques = new JLabel();
-        errorCheques.setForeground(new Color(-65536));
-        errorCheques.setText("Error");
-        errorCheques.setVisible(false);
-        panel1.add(errorCheques, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        final JLabel label2 = new JLabel();
-        label2.setText("Cheques al Dia");
-        panel1.add(label2, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        errorTarjetas = new JLabel();
-        errorTarjetas.setForeground(new Color(-65536));
-        errorTarjetas.setText("Error");
-        errorTarjetas.setVisible(false);
-        panel1.add(errorTarjetas, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        final JPanel panel2 = new JPanel();
-        panel2.setLayout(new GridLayoutManager(8, 2, new Insets(10, 10, 10, 10), -1, -1));
-        contentPanel.add(panel2, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
-        panel2.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Resumen"));
-        final JLabel label3 = new JLabel();
-        label3.setText("Efectivo");
-        panel2.add(label3, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        efectivoField = new JTextField();
-        efectivoField.setEditable(false);
-        efectivoField.setText("0");
-        panel2.add(efectivoField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
-        final JLabel label4 = new JLabel();
-        label4.setText("Documentos");
-        panel2.add(label4, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        documentosField = new JTextField();
-        documentosField.setEditable(false);
-        documentosField.setText("0");
-        panel2.add(documentosField, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
-        final JLabel label5 = new JLabel();
-        label5.setText("Ingresos");
-        panel2.add(label5, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        final JLabel label6 = new JLabel();
-        label6.setText("Egresos");
-        panel2.add(label6, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        label1.setText("Total Egresos");
+        panel1.add(label1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         egresosField = new JTextField();
         egresosField.setEditable(false);
         egresosField.setText("0");
-        panel2.add(egresosField, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
-        ingresosField = new JTextField();
-        ingresosField.setEditable(false);
-        ingresosField.setText("0");
-        panel2.add(ingresosField, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
-        final JLabel label7 = new JLabel();
-        label7.setText("Rendido");
-        panel2.add(label7, new GridConstraints(6, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        arqueoField = new JTextField();
-        arqueoField.setEditable(false);
-        Font arqueoFieldFont = this.$$$getFont$$$(null, Font.BOLD, -1, arqueoField.getFont());
-        if (arqueoFieldFont != null) arqueoField.setFont(arqueoFieldFont);
-        arqueoField.setText("0");
-        panel2.add(arqueoField, new GridConstraints(6, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
-        ajusteField = new JTextField();
-        ajusteField.setEditable(false);
-        Font ajusteFieldFont = this.$$$getFont$$$(null, Font.BOLD, -1, ajusteField.getFont());
-        if (ajusteFieldFont != null) ajusteField.setFont(ajusteFieldFont);
-        ajusteField.setText("0");
-        panel2.add(ajusteField, new GridConstraints(7, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
-        final JLabel label8 = new JLabel();
-        label8.setText("Ajuste ");
-        panel2.add(label8, new GridConstraints(7, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        panel1.add(egresosField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+        diferenciaField = new JTextField();
+        diferenciaField.setEditable(false);
+        Font diferenciaFieldFont = this.$$$getFont$$$(null, Font.BOLD, -1, diferenciaField.getFont());
+        if (diferenciaFieldFont != null) diferenciaField.setFont(diferenciaFieldFont);
+        diferenciaField.setText("0");
+        panel1.add(diferenciaField, new GridConstraints(7, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+        final JLabel label2 = new JLabel();
+        label2.setText("Diferencia");
+        panel1.add(label2, new GridConstraints(7, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final JSeparator separator1 = new JSeparator();
-        panel2.add(separator1, new GridConstraints(4, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
-        final JLabel label9 = new JLabel();
-        label9.setText("Debe Rendir");
-        panel2.add(label9, new GridConstraints(5, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        panel1.add(separator1, new GridConstraints(4, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
+        final JLabel label3 = new JLabel();
+        label3.setText("Debe Rendir");
+        panel1.add(label3, new GridConstraints(6, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        debeRendirField = new JTextField();
+        debeRendirField.setEditable(false);
+        Font debeRendirFieldFont = this.$$$getFont$$$(null, Font.BOLD, -1, debeRendirField.getFont());
+        if (debeRendirFieldFont != null) debeRendirField.setFont(debeRendirFieldFont);
+        debeRendirField.setText("0");
+        panel1.add(debeRendirField, new GridConstraints(6, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
         rendidoField = new JTextField();
+        rendidoField.setEditable(false);
         Font rendidoFieldFont = this.$$$getFont$$$(null, Font.BOLD, -1, rendidoField.getFont());
         if (rendidoFieldFont != null) rendidoField.setFont(rendidoFieldFont);
         rendidoField.setText("0");
-        panel2.add(rendidoField, new GridConstraints(5, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+        panel1.add(rendidoField, new GridConstraints(5, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+        final JLabel label4 = new JLabel();
+        label4.setText("Rendido");
+        panel1.add(label4, new GridConstraints(5, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final JLabel label5 = new JLabel();
+        label5.setText("Total Ingresos");
+        panel1.add(label5, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        ingresosField = new JTextField();
+        ingresosField.setEditable(false);
+        ingresosField.setText("0");
+        panel1.add(ingresosField, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+        final JLabel label6 = new JLabel();
+        label6.setText("Total Efectivo");
+        panel1.add(label6, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        efectivoField = new JTextField();
+        efectivoField.setEditable(false);
+        efectivoField.setText("0");
+        panel1.add(efectivoField, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+        final JLabel label7 = new JLabel();
+        label7.setText("Total Documentos");
+        panel1.add(label7, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        documentosField = new JTextField();
+        documentosField.setEditable(false);
+        documentosField.setText("0");
+        panel1.add(documentosField, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+        final JPanel panel2 = new JPanel();
+        panel2.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1));
+        contentPanel.add(panel2, new GridConstraints(0, 0, 2, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
         final JPanel panel3 = new JPanel();
         panel3.setLayout(new GridLayoutManager(19, 2, new Insets(10, 10, 10, 10), -1, -1));
-        contentPanel.add(panel3, new GridConstraints(0, 0, 3, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
+        panel2.add(panel3, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
         panel3.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Detalle Efectivo", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, -1, -1, panel3.getFont())));
-        final JLabel label10 = new JLabel();
-        label10.setText("$20000");
-        panel3.add(label10, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final JLabel label8 = new JLabel();
+        label8.setText("$20000");
+        panel3.add(label8, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         veinteMilField = new JTextField();
         veinteMilField.setText("0");
         panel3.add(veinteMilField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
-        final JLabel label11 = new JLabel();
-        label11.setText("$10000");
-        panel3.add(label11, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final JLabel label9 = new JLabel();
+        label9.setText("$10000");
+        panel3.add(label9, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         diezMilField = new JTextField();
         diezMilField.setText("0");
         panel3.add(diezMilField, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
         cincoMilField = new JTextField();
         cincoMilField.setText("0");
         panel3.add(cincoMilField, new GridConstraints(4, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
-        final JLabel label12 = new JLabel();
-        label12.setText("$5000");
-        panel3.add(label12, new GridConstraints(4, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        final JLabel label13 = new JLabel();
-        label13.setText("$2000");
-        panel3.add(label13, new GridConstraints(6, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final JLabel label10 = new JLabel();
+        label10.setText("$5000");
+        panel3.add(label10, new GridConstraints(4, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final JLabel label11 = new JLabel();
+        label11.setText("$2000");
+        panel3.add(label11, new GridConstraints(6, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         dosMilField = new JTextField();
         dosMilField.setText("0");
         panel3.add(dosMilField, new GridConstraints(6, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
         milField = new JTextField();
         milField.setText("0");
         panel3.add(milField, new GridConstraints(8, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
-        final JLabel label14 = new JLabel();
-        label14.setText("$1000");
-        panel3.add(label14, new GridConstraints(8, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        final JLabel label15 = new JLabel();
-        label15.setText("$500");
-        panel3.add(label15, new GridConstraints(10, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final JLabel label12 = new JLabel();
+        label12.setText("$1000");
+        panel3.add(label12, new GridConstraints(8, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final JLabel label13 = new JLabel();
+        label13.setText("$500");
+        panel3.add(label13, new GridConstraints(10, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         quinientosField = new JTextField();
         quinientosField.setText("0");
         panel3.add(quinientosField, new GridConstraints(10, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
-        final JLabel label16 = new JLabel();
-        label16.setText("$100");
-        panel3.add(label16, new GridConstraints(12, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final JLabel label14 = new JLabel();
+        label14.setText("$100");
+        panel3.add(label14, new GridConstraints(12, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         cienField = new JTextField();
         cienField.setText("0");
         panel3.add(cienField, new GridConstraints(12, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
-        final JLabel label17 = new JLabel();
-        label17.setText("$50");
-        panel3.add(label17, new GridConstraints(14, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final JLabel label15 = new JLabel();
+        label15.setText("$50");
+        panel3.add(label15, new GridConstraints(14, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         cincuentaField = new JTextField();
         cincuentaField.setText("0");
         panel3.add(cincuentaField, new GridConstraints(14, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
-        final JLabel label18 = new JLabel();
-        label18.setText("$10");
-        panel3.add(label18, new GridConstraints(16, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final JLabel label16 = new JLabel();
+        label16.setText("$10");
+        panel3.add(label16, new GridConstraints(16, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         diezField = new JTextField();
         diezField.setText("0");
         panel3.add(diezField, new GridConstraints(16, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
@@ -407,10 +382,37 @@ public class ArqueoView {
         errorDiez.setText("Error");
         errorDiez.setVisible(false);
         panel3.add(errorDiez, new GridConstraints(17, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final JPanel panel4 = new JPanel();
+        panel4.setLayout(new GridLayoutManager(5, 2, new Insets(10, 10, 10, 10), -1, -1));
+        panel2.add(panel4, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
+        panel4.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Detalle Documentos", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, -1, -1, panel4.getFont())));
+        chequesField = new JTextField();
+        chequesField.setText("0");
+        panel4.add(chequesField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+        final JLabel label17 = new JLabel();
+        label17.setText("Tarjetas de Credito");
+        panel4.add(label17, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        tarjetasField = new JTextField();
+        tarjetasField.setText("0");
+        panel4.add(tarjetasField, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+        guardarDocumentosButton = new JButton();
+        guardarDocumentosButton.setText("Guardar");
+        panel4.add(guardarDocumentosButton, new GridConstraints(4, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        errorCheques = new JLabel();
+        errorCheques.setForeground(new Color(-65536));
+        errorCheques.setText("Error");
+        errorCheques.setVisible(false);
+        panel4.add(errorCheques, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final JLabel label18 = new JLabel();
+        label18.setText("Cheques al Dia");
+        panel4.add(label18, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        errorTarjetas = new JLabel();
+        errorTarjetas.setForeground(new Color(-65536));
+        errorTarjetas.setText("Error");
+        errorTarjetas.setVisible(false);
+        panel4.add(errorTarjetas, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final Spacer spacer1 = new Spacer();
-        contentPanel.add(spacer1, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
-        final Spacer spacer2 = new Spacer();
-        contentPanel.add(spacer2, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
+        contentPanel.add(spacer1, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
     }
 
     /**
@@ -438,4 +440,5 @@ public class ArqueoView {
     public JComponent $$$getRootComponent$$$() {
         return contentPanel;
     }
+
 }
diff --git a/src/danielcortes/xyz/views/EgresosView.form b/src/danielcortes/xyz/views/EgresosView.form
index 56c9c05..17bc1d5 100644
--- a/src/danielcortes/xyz/views/EgresosView.form
+++ b/src/danielcortes/xyz/views/EgresosView.form
@@ -170,7 +170,7 @@
                       </grid>
                     </constraints>
                     <properties>
-                      <text value="&amp;Guardar"/>
+                      <text value="&amp;Añadir"/>
                     </properties>
                   </component>
                   <component id="ee598" class="javax.swing.JButton" binding="eliminarButton" default-binding="true">
@@ -192,7 +192,7 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text value="&amp;Editar"/>
+                      <text value="E&amp;ditar"/>
                     </properties>
                   </component>
                 </children>
diff --git a/src/danielcortes/xyz/views/EgresosView.java b/src/danielcortes/xyz/views/EgresosView.java
index a21aa4f..38fcc9d 100644
--- a/src/danielcortes/xyz/views/EgresosView.java
+++ b/src/danielcortes/xyz/views/EgresosView.java
@@ -31,6 +31,7 @@ import danielcortes.xyz.models.tipo_egreso.TipoEgreso;
 import danielcortes.xyz.views.components.EgresosTableModel;
 
 import javax.swing.*;
+import javax.swing.table.TableRowSorter;
 import java.awt.*;
 
 public class EgresosView {
@@ -60,7 +61,9 @@ public class EgresosView {
     private void createEgresosTable() {
         egresosTableModel = new EgresosTableModel();
         egresosTable = new JTable(egresosTableModel);
-        egresosTable.setAutoCreateRowSorter(true);
+
+        RowSorter<EgresosTableModel> sorter = new TableRowSorter<>(egresosTableModel);
+        egresosTable.setRowSorter(sorter);
         egresosTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     }
 
@@ -203,8 +206,8 @@ public class EgresosView {
         panel4.setLayout(new GridLayoutManager(1, 3, new Insets(0, 0, 0, 0), -1, -1));
         panel3.add(panel4, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
         guardarButton = new JButton();
-        guardarButton.setText("Guardar");
-        guardarButton.setMnemonic('G');
+        guardarButton.setText("Añadir");
+        guardarButton.setMnemonic('A');
         guardarButton.setDisplayedMnemonicIndex(0);
         panel4.add(guardarButton, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
         eliminarButton = new JButton();
@@ -216,8 +219,8 @@ public class EgresosView {
         editarButton = new JButton();
         editarButton.setEnabled(false);
         editarButton.setText("Editar");
-        editarButton.setMnemonic('E');
-        editarButton.setDisplayedMnemonicIndex(0);
+        editarButton.setMnemonic('D');
+        editarButton.setDisplayedMnemonicIndex(1);
         panel4.add(editarButton, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
         final Spacer spacer1 = new Spacer();
         panel3.add(spacer1, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
@@ -238,4 +241,5 @@ public class EgresosView {
     public JComponent $$$getRootComponent$$$() {
         return contentPanel;
     }
+
 }
diff --git a/src/danielcortes/xyz/views/IngresosView.java b/src/danielcortes/xyz/views/IngresosView.java
index 50e8751..12d5930 100644
--- a/src/danielcortes/xyz/views/IngresosView.java
+++ b/src/danielcortes/xyz/views/IngresosView.java
@@ -28,9 +28,11 @@ import com.intellij.uiDesigner.core.GridConstraints;
 import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.uiDesigner.core.Spacer;
 import danielcortes.xyz.models.tipo_ingreso.TipoIngreso;
+import danielcortes.xyz.views.components.EgresosTableModel;
 import danielcortes.xyz.views.components.IngresosTableModel;
 
 import javax.swing.*;
+import javax.swing.table.TableRowSorter;
 import java.awt.*;
 
 public class IngresosView {
@@ -58,7 +60,9 @@ public class IngresosView {
     private void createIngresosTable() {
         this.ingresosTableModel = new IngresosTableModel();
         this.ingresosTable = new JTable(ingresosTableModel);
-        this.ingresosTable.setAutoCreateRowSorter(true);
+
+        RowSorter<IngresosTableModel> sorter = new TableRowSorter<>(ingresosTableModel);
+        this.ingresosTable.setRowSorter(sorter);
         this.ingresosTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     }
 
diff --git a/src/danielcortes/xyz/views/components/EgresosTableModel.java b/src/danielcortes/xyz/views/components/EgresosTableModel.java
index 7b1403e..4f97a63 100644
--- a/src/danielcortes/xyz/views/components/EgresosTableModel.java
+++ b/src/danielcortes/xyz/views/components/EgresosTableModel.java
@@ -39,14 +39,17 @@ public class EgresosTableModel extends AbstractTableModel {
         this.rows = new ArrayList<>();
     }
 
+    @Override
     public String getColumnName(int col) {
         return columns[col];
     }
 
+    @Override
     public int getColumnCount() {
         return columns.length;
     }
 
+    @Override
     public int getRowCount() {
         return rows.size();
     }
@@ -75,6 +78,7 @@ public class EgresosTableModel extends AbstractTableModel {
         this.fireTableRowsUpdated(0,getRowCount()-1);
     }
 
+    @Override
     public Object getValueAt(int row, int col) {
         switch (col){
             case 0:
@@ -93,4 +97,12 @@ public class EgresosTableModel extends AbstractTableModel {
         return rows.get(row);
     }
 
+    @Override
+    public Class<?> getColumnClass(int columnIndex) {
+        if (rows.isEmpty()) {
+            return Object.class;
+        }
+        return getValueAt(0, columnIndex).getClass();
+    }
+
 }
diff --git a/src/danielcortes/xyz/views/components/IngresosTableModel.java b/src/danielcortes/xyz/views/components/IngresosTableModel.java
index e7d4aaa..1b60d23 100644
--- a/src/danielcortes/xyz/views/components/IngresosTableModel.java
+++ b/src/danielcortes/xyz/views/components/IngresosTableModel.java
@@ -39,14 +39,17 @@ public class IngresosTableModel extends AbstractTableModel {
         this.rows = new ArrayList<>();
     }
 
+    @Override
     public String getColumnName(int col) {
         return this.columns[col];
     }
 
+    @Override
     public int getColumnCount() {
         return this.columns.length;
     }
 
+    @Override
     public int getRowCount() {
         return this.rows.size();
     }
@@ -69,6 +72,7 @@ public class IngresosTableModel extends AbstractTableModel {
         }
     }
 
+    @Override
     public Object getValueAt(int row, int col) {
         switch (col) {
             case 0:
@@ -91,4 +95,12 @@ public class IngresosTableModel extends AbstractTableModel {
         this.rows.set(editingId, ingreso);
         this.fireTableRowsUpdated(getRowCount() - 2, getRowCount() - 1);
     }
+
+    @Override
+    public Class<?> getColumnClass(int columnIndex) {
+        if (rows.isEmpty()) {
+            return Object.class;
+        }
+        return getValueAt(0, columnIndex).getClass();
+    }
 }