diff --git a/apc-web/src/main/java/com/arrebol/apc/web/beans/admin/people/PersonCustomerBean.java b/apc-web/src/main/java/com/arrebol/apc/web/beans/admin/people/PersonCustomerBean.java
index bf673e9..af8a97c 100644
--- a/apc-web/src/main/java/com/arrebol/apc/web/beans/admin/people/PersonCustomerBean.java
+++ b/apc-web/src/main/java/com/arrebol/apc/web/beans/admin/people/PersonCustomerBean.java
@@ -366,6 +366,7 @@ public class PersonCustomerBean extends GenericBean implements Serializable {
          Object[] param = {getBundlePropertyFile().getString("people"), getBundlePropertyFile().getString("created")};
 
          buildAndSendMessage(param, messafeFormat, severity, getBundlePropertyFile().getString("people"));
+         loadingLazyDataTable();
       } catch (Exception e) {
          logger.error("savePeople", e);
          Object[] param = {getBundlePropertyFile().getString("created")};
diff --git a/apc-web/src/main/java/com/arrebol/apc/web/beans/dashboard/DashboardBean.java b/apc-web/src/main/java/com/arrebol/apc/web/beans/dashboard/DashboardBean.java
index 386a3dd..4821d3d 100644
--- a/apc-web/src/main/java/com/arrebol/apc/web/beans/dashboard/DashboardBean.java
+++ b/apc-web/src/main/java/com/arrebol/apc/web/beans/dashboard/DashboardBean.java
@@ -7,14 +7,65 @@
  */
 package com.arrebol.apc.web.beans.dashboard;
 
+import com.arrebol.apc.controller.BitacoraController;
+import com.arrebol.apc.controller.GenericController;
+import com.arrebol.apc.controller.GenericValidationController;
+import com.arrebol.apc.controller.admin.ClosingDayController;
+import com.arrebol.apc.controller.admin.CustomerController;
+import com.arrebol.apc.controller.admin.EndorsementController;
+import com.arrebol.apc.controller.admin.LoanController;
+import com.arrebol.apc.controller.catalog.LoanTypeController;
+import com.arrebol.apc.controller.catalog.RouteController;
 import com.arrebol.apc.controller.dashboard.CustomerWithoutRenovationViewService;
+import com.arrebol.apc.controller.dashboard.DashboardController;
+import com.arrebol.apc.model.catalog.People;
+import com.arrebol.apc.model.catalog.RouteCtlg;
+import com.arrebol.apc.model.core.Office;
+import com.arrebol.apc.model.core.User;
+import com.arrebol.apc.model.enums.ActiveStatus;
+import com.arrebol.apc.model.enums.CustomerClassification;
+import com.arrebol.apc.model.enums.FeeStatus;
+import com.arrebol.apc.model.enums.LoanDetailsType;
+import com.arrebol.apc.model.enums.LoanStatus;
+import com.arrebol.apc.model.enums.OwnerLoan;
+import com.arrebol.apc.model.enums.PeopleType;
+import com.arrebol.apc.model.enums.TransferStatus;
+import com.arrebol.apc.model.enums.UserType;
+import com.arrebol.apc.model.loan.Loan;
+import com.arrebol.apc.model.loan.LoanByUser;
+import com.arrebol.apc.model.loan.LoanByUserId;
+import com.arrebol.apc.model.loan.LoanDetails;
+import com.arrebol.apc.model.loan.LoanFeeNotification;
+import com.arrebol.apc.model.loan.LoanType;
+import com.arrebol.apc.model.payroll.TotalExpectedPaymentDailyByUser;
+import com.arrebol.apc.model.system.logs.Bitacora;
+import com.arrebol.apc.model.views.AdvanceUserDailyDetail;
+import com.arrebol.apc.model.views.AdvanceUserDailyView;
+import com.arrebol.apc.model.views.CustomerWithoutRenovationView;
+import com.arrebol.apc.model.views.LoanDetailZeroView;
+import com.arrebol.apc.model.views.LoanFinishedView;
+import com.arrebol.apc.model.views.TotalCashByCurdateDashboardView;
+import com.arrebol.apc.model.views.TotalClosingDayByCurdateView;
 import com.arrebol.apc.service.admin.CustomerService;
 import com.arrebol.apc.web.beans.GenericBean;
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import javax.annotation.PostConstruct;
+import javax.faces.application.FacesMessage;
 import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
+import org.primefaces.model.LazyDataModel;
+import org.primefaces.model.SortOrder;
+import org.primefaces.model.chart.BarChartModel;
+import org.primefaces.model.chart.PieChartModel;
 
 /**
  *
@@ -24,14 +75,1396 @@ import javax.inject.Named;
 @ViewScoped
 public class DashboardBean extends GenericBean implements Serializable {
 
+   public String detailCustomer(String outcome) {
+      return outcome;
+   }
+
+   public void deleteFeeLoan() {
+
+      if (selectedLoan.getLoanStatus() == LoanStatus.APPROVED || selectedLoan.getLoanStatus() == LoanStatus.PENDING_RENOVATION) {
+
+         List<LoanDetails> details = loanCtrl.getLoanDetailsFeeCurdatebyIdLoan(selectedLoan.getId());
+         if (details != null && !details.isEmpty()) {
+            Loan loanUpdate = loanCtrl.getLoanById(selectedLoan.getId());
+            Bitacora bitacora = new Bitacora();
+            bitacora.setAction("Eliminar multa");
+            bitacora.setCommentsUser(commentsBitacora);
+            bitacora.setCreatedBy(getLoggedUser().getUser().getId());
+            bitacora.setCreatedOn(new Date());
+            bitacora.setNameUser(getLoggedUser().getUser().getUserName());
+            bitacora.setOffice(new Office(getLoggedUser().getOffice().getId()));
+            BigDecimal tempMonto = BigDecimal.ZERO;
+            for (LoanDetails detail : details) {
+               loanUpdate.setAmountToPay(loanUpdate.getAmountToPay().subtract(detail.getPaymentAmount()));
+               tempMonto = tempMonto.add(detail.getPaymentAmount());
+            }
+            bitacora.setDescription("La venta del cliente " + loanUpdate.getCustomer().getFullName() + " del asesor " + loanUpdate.getAsesor() + " con monto a vender de $" + loanUpdate.getLoanType().getPayment() + " "
+                    + "se eliminó una multa de $" + tempMonto.toString());
+            if (loanCtrl.deleteLoanDetailsFeeByLoanCurdate(selectedLoan)) {
+               loanCtrl.deleteLoanFeeNotificationByLoanCurdate(selectedLoan);
+
+               Date date = new Date();
+               Calendar calendar = Calendar.getInstance();
+               calendar.setTime(date);
+               calendar.add(Calendar.DAY_OF_YEAR, -1);
+               date = calendar.getTime();
+               loanUpdate.setLastUpdatedOn(date);
+
+               loanCtrl.updateLoan(loanUpdate);
+               loan.clear();
+               loan = customerCtrl.findLoanByCustomer(customerId);
+               bitacoraCtrl.saveBitacora(bitacora);
+               commentsBitacora = "";
+               selectedLoan = null;
+               showMessage(FacesMessage.SEVERITY_INFO, "Multas eliminadas", "Se eliminó el/las multas del día de hoy correctamente.");
+            }
+         } else {
+            showMessage(FacesMessage.SEVERITY_WARN, "Advertencia", "La venta no tiene registrado multas el día de hoy");
+         }
+      } else {
+         showMessage(FacesMessage.SEVERITY_WARN, "No se puede eliminar la multa", "Solo puedes eliminar la multa de ventas en estatus Aprobados o Pendiente por renovación");
+         return;
+      }
+
+   }
+
+   public void changeRoute() {
+      if (!routeId.isEmpty()) {
+         if (loanCtrl.updateRouteById(new RouteCtlg(routeId), selectedLoan.getId(), getLoggedUser().getUser().getId())) {
+            showMessage(FacesMessage.SEVERITY_INFO, "Ruta modificada", "Se modificó correctamente.");
+            if (loanCtrl.updatePeopleRoute(new RouteCtlg(routeId), selectedLoan.getCustomer())) {
+               showMessage(FacesMessage.SEVERITY_INFO, "Cliente modificado", "Se modificó correctamente.");
+            }
+            if (loanCtrl.updatePeopleRoute(new RouteCtlg(routeId), selectedLoan.getEndorsement())) {
+               showMessage(FacesMessage.SEVERITY_INFO, "Aval modificado", "Se modificó correctamente.");
+            }
+         } else {
+            showMessage(FacesMessage.SEVERITY_WARN, "Ruta modificada", "Ocurrió un error durante el proceso.");
+         }
+
+      }
+   }
+
+   /**
+    *
+    * @param outcome
+    * @return
+    */
+   public String detailLoan(String outcome) {
+      return outcome;
+   }
+
+   /**
+    *
+    * @param outcome
+    * @return
+    */
+   public String detailLoanEndorsement(String outcome) {
+      return outcome;
+   }
+
+   public List<AdvanceUserDailyView> fillAdvanceUserDaily() {
+      return dashboardCtrl.fillAllAdvanceUserDailyByOffice(getLoggedUser().getOffice().getId());
+   }
+
+   public void getAdvanceDetailsByUser() {
+      advancesDetail = dashboardCtrl.findAllAdvancesUserDailyDetailByUser(userId);
+   }
+
+   public void getLoansByCustomer() {
+      loan = customerCtrl.findLoanByCustomer(customerId);
+   }
+
+   public void getLoansJuridical() {
+      String idUser = "aad0c673-eb93-11ea-b7e1-02907d0fb4e6";
+      loanJuridical = customerCtrl.findLoanJuridical(idUser);
+   }
+
+   public void getLoansZero() {
+      loanZero = customerCtrl.findLoanZero();
+   }
+
+   public void getLoansFinished() {
+      loanFinished = customerCtrl.findLoanFinished();
+   }
+
+   public void getLoansByEndorsement() {
+      loanEndorsement = endorsementCtrl.findLoanByEndorsement(endorsementId);
+   }
+
+   public List<CustomerWithoutRenovationView> findAllCustomerWithOutRenovationByOffice() {
+      return dashboardCtrl.findAllCustomerWithOutRenovationByOffice(getLoggedUser().getOffice().getId());
+   }
+
+   public void getPaymentDailyExpectByUser() {
+      List<User> usersTmp = genericCtrl.getAllUsersByOffice(getLoggedUser().getOffice().getId());
+      if (usersTmp != null && !usersTmp.isEmpty()) {
+         usersTmp.stream().filter(user -> (user.getUserType() == UserType.MOBILE && user.getCertifier() == ActiveStatus.DISABLED)).map(user -> {
+            BigDecimal amountByUser = BigDecimal.valueOf(dashboardCtrl.getLoansSumPaymentDailyByUser(user.getId()));
+            BigDecimal amountMoneyByUser = dashboardCtrl.getLoansSumPaymentDailyByUserMoney(user.getId());
+            TotalExpectedPaymentDailyByUser expectedToday = new TotalExpectedPaymentDailyByUser();
+            expectedToday.setActiveStatus(ActiveStatus.ENEBLED);
+            expectedToday.setOffice(new Office(getLoggedUser().getOffice().getId()));
+            expectedToday.setCreatedBy(getLoggedUser().getUser().getId());
+            expectedToday.setCreatedOn(new Date());
+            if (amountByUser != null) {
+               expectedToday.setTotalExpected(amountByUser);
+            } else {
+               expectedToday.setTotalExpected(BigDecimal.ZERO);
+            }
+            if (amountMoneyByUser != null) {
+               expectedToday.setTotalExpectedPayment(amountMoneyByUser);
+            } else {
+               expectedToday.setTotalExpectedPayment(BigDecimal.ZERO);
+            }
+            expectedToday.setUser(new User(user.getId()));
+            return expectedToday;
+         }).map(expectedToday -> {
+            expectedToday.setLastUpdatedOn(new Date());
+            return expectedToday;
+         }).forEachOrdered(expectedToday -> {
+            dashboardCtrl.saveTotalExpectedPaymentDailyByUser(expectedToday);
+         });
+      }
+   }
+
+   public void getResumenLoans() {
+
+      totalExpectedToday = new BigDecimal(BigInteger.ONE);
+      totalExpectedToday = dashboardCtrl.sumLoansApprovedByOffice(getLoggedUser().getOffice().getId());
+      if (totalExpectedToday == null || totalExpectedToday == BigDecimal.ZERO) {
+         totalExpectedToday = new BigDecimal(BigInteger.ONE);
+      }
+
+   }
+
+   public void getResumenDaily() {
+
+      List<TotalCashByCurdateDashboardView> listTotal = closingDayCtrl.getAllTotalCashByCurdateDashboardView(getLoggedUser().getOffice().getId());
+      totalAmountDaily = BigDecimal.ZERO;
+      totalTransferSenderDaily = BigDecimal.ZERO;
+      totalTransferReceiverDaily = BigDecimal.ZERO;
+      totalMoneyDailyDaily = BigDecimal.ZERO;
+      totalDeliveryDaily = BigDecimal.ZERO;
+      totalDepositDaily = BigDecimal.ZERO;
+      totalFinalDaily = BigDecimal.ZERO;
+      totalCajaDaily = BigDecimal.ZERO;
+      totalOtherExpenseDaily = BigDecimal.ZERO;
+
+      for (TotalCashByCurdateDashboardView temp : listTotal) {
+         totalAmountDaily = totalAmountDaily.add(temp.getPaymentDaily());
+         totalTransferSenderDaily = totalTransferSenderDaily.add(temp.getTransferSender());
+         totalTransferReceiverDaily = totalTransferReceiverDaily.add(temp.getTransferReceiver());
+         totalMoneyDailyDaily = totalMoneyDailyDaily.add(temp.getMoneyDaily());
+         totalDeliveryDaily = totalDeliveryDaily.add(temp.getDelivery());
+         totalDepositDaily = totalDepositDaily.add(temp.getDepositDaily());
+         totalFinalDaily = totalFinalDaily.add(temp.getTotal());
+         totalOtherExpenseDaily = totalOtherExpenseDaily.add(temp.getOtherExpense());
+      }
+
+      List<TotalClosingDayByCurdateView> closingTotal = closingDayCtrl.findAllClosingDayByCurdate(getLoggedUser().getOffice().getId());
+      if (closingTotal != null && !closingTotal.isEmpty()) {
+         for (TotalClosingDayByCurdateView temp : closingTotal) {
+            totalCajaDaily = totalCajaDaily.add(temp.getAmountPaid());
+         }
+      }
+
+   }
+
+   public void deletePaymentLoan() {
+
+      if (selectedLoan.getLoanStatus() == LoanStatus.APPROVED || selectedLoan.getLoanStatus() == LoanStatus.PENDING_RENOVATION) {
+
+         List<LoanDetails> details = loanCtrl.getLoanDetailsCurdatebyIdLoan(selectedLoan.getId());
+         if (details != null && !details.isEmpty()) {
+            Loan loanUpdate = loanCtrl.getLoanById(selectedLoan.getId());
+            Bitacora bitacora = new Bitacora();
+            bitacora.setAction("Eliminar abono");
+            bitacora.setCommentsUser(commentsBitacora);
+            bitacora.setCreatedBy(getLoggedUser().getUser().getId());
+            bitacora.setCreatedOn(new Date());
+            bitacora.setNameUser(getLoggedUser().getUser().getUserName());
+            bitacora.setOffice(new Office(getLoggedUser().getOffice().getId()));
+            BigDecimal tempMonto = BigDecimal.ZERO;
+            for (LoanDetails detail : details) {
+               loanUpdate.setAmountPaid(loanUpdate.getAmountPaid().subtract(detail.getPaymentAmount()));
+               loanUpdate.setLastReferenceNumber(loanUpdate.getLastReferenceNumber() - 1);
+               tempMonto = tempMonto.add(detail.getPaymentAmount());
+            }
+            bitacora.setDescription("La venta del cliente " + loanUpdate.getCustomer().getFullName() + " del asesor " + loanUpdate.getAsesor() + " con monto a vender de $" + loanUpdate.getLoanType().getPayment() + " "
+                    + "se eliminó un abono de $" + tempMonto.toString());
+            if (loanCtrl.deleteLoanDetailsByLoanCurdate(selectedLoan)) {
+               Date date = new Date();
+               Calendar calendar = Calendar.getInstance();
+               calendar.setTime(date);
+               calendar.add(Calendar.DAY_OF_YEAR, -1);
+               date = calendar.getTime();
+               loanUpdate.setLastUpdatedOn(date);
+
+               loanCtrl.updateLoan(loanUpdate);
+               loan.clear();
+               loan = customerCtrl.findLoanByCustomer(customerId);
+               selectedLoan = null;
+               bitacoraCtrl.saveBitacora(bitacora);
+               commentsBitacora = "";
+               showMessage(FacesMessage.SEVERITY_INFO, "Abonos eliminados", "Se eliminó el/los abonos del día de hoy correctamente.");
+            }
+         } else {
+            showMessage(FacesMessage.SEVERITY_WARN, "Advertencia", "La venta no tiene registrado abonos el día de hoy");
+         }
+      } else {
+         showMessage(FacesMessage.SEVERITY_WARN, "No se puede eliminar abono", "Solo puedes eliminar el abono de ventas en estatus Aprobados o Pendiente por renovación");
+         return;
+      }
+
+   }
+
+   public void deleteLoan() {
+      Bitacora bitacora = new Bitacora();
+      Loan temp = loanCtrl.getLoanById(selectedLoan.getId());
+      bitacora.setAction("Eliminar venta");
+      bitacora.setCommentsUser(commentsBitacora);
+      bitacora.setCreatedBy(getLoggedUser().getUser().getId());
+      bitacora.setCreatedOn(new Date());
+      bitacora.setDescription("La venta del cliente " + temp.getCustomer().getFullName() + " del asesor " + temp.getAsesor() + " con monto a vender de $" + temp.getLoanType().getPayment() + " se cambió a estatus 'Eliminado' ");
+      bitacora.setNameUser(getLoggedUser().getUser().getUserName());
+      bitacora.setOffice(new Office(getLoggedUser().getOffice().getId()));
+      loanCtrl.updateLoanByStatusWeb(LoanStatus.DELETED, selectedLoan.getId(), getLoggedUser().getUser().getId());
+      loanCtrl.updateLoanByUserByStatus(LoanStatus.DELETED, selectedLoan);
+      loan.remove(selectedLoan);
+      selectedLoan = null;
+      bitacoraCtrl.saveBitacora(bitacora);
+      commentsBitacora = "";
+
+      showMessage(FacesMessage.SEVERITY_INFO, "Cambio de estatus", "La venta se cambió a estatus 'Eliminado' de forma correcta.");
+   }
+
+   public void changeApprovedStatus() {
+      Loan loanUpdate = loanCtrl.getLoanById(selectedLoan.getId());
+      Bitacora bitacora = new Bitacora();
+      bitacora.setAction("Cambio de estatus a aprobado");
+      bitacora.setCommentsUser(commentsBitacora);
+      bitacora.setCreatedBy(getLoggedUser().getUser().getId());
+      bitacora.setCreatedOn(new Date());
+      bitacora.setDescription("La venta del cliente " + loanUpdate.getCustomer().getFullName() + " del asesor " + loanUpdate.getAsesor() + " con monto a vender de $" + loanUpdate.getLoanType().getPayment() + " "
+              + "se cambia a estatus Aprobado");
+      bitacora.setNameUser(getLoggedUser().getUser().getUserName());
+      bitacora.setOffice(new Office(getLoggedUser().getOffice().getId()));
+      loanCtrl.updateLoanByStatusWeb(LoanStatus.APPROVED, selectedLoan.getId(), getLoggedUser().getUser().getId());
+      loanCtrl.updateLoanByUserByStatus(LoanStatus.APPROVED, selectedLoan);
+      loan.clear();
+      bitacoraCtrl.saveBitacora(bitacora);
+      commentsBitacora = "";
+      loan = customerCtrl.findLoanByCustomer(customerId);
+      selectedLoan = null;
+
+      showMessage(FacesMessage.SEVERITY_INFO, "Cambio de estatus", "La venta se cambió a estatus 'Aprobado' de forma correcta.");
+   }
+
+   public void changeBonusNewCustomer() {
+      loanCtrl.updateBonusNewCustomer(ActiveStatus.ENEBLED, selectedLoan.getId(), getLoggedUser().getUser().getId());
+      loan.clear();
+      loan = customerCtrl.findLoanByCustomer(customerId);
+      selectedLoan = null;
+
+      showMessage(FacesMessage.SEVERITY_INFO, "Cambio de bono", "La venta empezó a contar como bono de cliente nuevo.");
+   }
+
+   public void removeBonusNewCustomer() {
+      loanCtrl.updateBonusNewCustomer(ActiveStatus.DISABLED, selectedLoan.getId(), getLoggedUser().getUser().getId());
+      loan.clear();
+      loan = customerCtrl.findLoanByCustomer(customerId);
+      selectedLoan = null;
+
+      showMessage(FacesMessage.SEVERITY_INFO, "Cambio de bono", "La venta ya no contará como bono de cliente nuevo.");
+   }
+
+   public void updateReleaseDate() {
+      SimpleDateFormat sdf = new SimpleDateFormat("dd-MMM-yyyy");
+      Date date = new Date();
+      Loan loanUpdate = loanCtrl.getLoanById(selectedLoan.getId());
+      loanUpdate.setCreatedOn(date);
+      loanCtrl.updateLoan(loanUpdate);
+      Bitacora bitacora = new Bitacora();
+      bitacora.setAction("Cambio de fecha de liberación a " + sdf.format(date));
+      bitacora.setCommentsUser(commentsBitacora);
+      bitacora.setCreatedBy(getLoggedUser().getUser().getId());
+      bitacora.setCreatedOn(date);
+      bitacora.setDescription("La venta del cliente " + loanUpdate.getCustomer().getFullName()
+              + " del asesor " + loanUpdate.getAsesor()
+              + " con monto a vender de $" + loanUpdate.getLoanType().getPayment()
+              + " cambia a fecha de liberación del día de hoy " + sdf.format(date));
+      bitacora.setNameUser(getLoggedUser().getUser().getUserName());
+      bitacora.setOffice(new Office(getLoggedUser().getOffice().getId()));
+      loan.clear();
+      loan = customerCtrl.findLoanByCustomer(customerId);
+      selectedLoan = null;
+
+      showMessage(FacesMessage.SEVERITY_INFO, "Fecha de liberación", "Se actualizó la fecha de liberación al día de hoy " + sdf.format(date));
+   }
+
+   public void allowRenew() {
+      Loan loanUpdate = loanCtrl.getLoanById(selectedLoan.getId());
+      loanCtrl.deleteLoanFeeNotificationByLoan(loanUpdate);
+      Bitacora bitacora = new Bitacora();
+      bitacora.setAction("Se eliminan las multas dla venta " + selectedLoan.getId());
+      bitacora.setCommentsUser(commentsBitacora);
+      bitacora.setCreatedBy(getLoggedUser().getUser().getId());
+      bitacora.setCreatedOn(new Date());
+      bitacora.setDescription("La venta del cliente " + loanUpdate.getCustomer().getFullName()
+              + " del asesor " + loanUpdate.getAsesor()
+              + " con monto a vender de $" + loanUpdate.getLoanType().getPayment()
+              + " se eliminaron las multas");
+      bitacora.setNameUser(getLoggedUser().getUser().getUserName());
+      bitacora.setOffice(new Office(getLoggedUser().getOffice().getId()));
+      loan.clear();
+      loan = customerCtrl.findLoanByCustomer(customerId);
+      selectedLoan = null;
+
+      showMessage(FacesMessage.SEVERITY_INFO, "Multas eliminadas", "Se eliminó la/las multas dla venta correctamente.");
+   }
+
+   public void changeFrozenStatus(boolean freeze) {
+      Loan loanUpdate = loanCtrl.getLoanById(selectedLoan.getId());
+      Bitacora bitacora = new Bitacora();
+      if (freeze) {
+         bitacora.setAction("Cambio de estatus a congelado");
+         bitacora.setCommentsUser(commentsBitacora);
+         bitacora.setCreatedBy(getLoggedUser().getUser().getId());
+         bitacora.setCreatedOn(new Date());
+         bitacora.setDescription("La venta del cliente " + loanUpdate.getCustomer().getFullName() + " del asesor " + loanUpdate.getAsesor() + " con monto a vender de $" + loanUpdate.getLoanType().getPayment() + " "
+                 + "se cambia a estatus Congelado");
+         bitacora.setNameUser(getLoggedUser().getUser().getUserName());
+         bitacora.setOffice(new Office(getLoggedUser().getOffice().getId()));
+
+         loanUpdate.setFrozen(ActiveStatus.ENEBLED);
+         loanCtrl.updateLoan(loanUpdate);
+
+         showMessage(FacesMessage.SEVERITY_INFO, "Cambio de estatus", "La venta se cambió a estatus 'Congelado' de forma correcta.");
+      } else {
+         bitacora.setAction("Cambio de estatus a descongelado");
+         bitacora.setCommentsUser(commentsBitacora);
+         bitacora.setCreatedBy(getLoggedUser().getUser().getId());
+         bitacora.setCreatedOn(new Date());
+         bitacora.setDescription("La venta del cliente " + loanUpdate.getCustomer().getFullName() + " del asesor " + loanUpdate.getAsesor() + " con monto a vender de $" + loanUpdate.getLoanType().getPayment() + " "
+                 + "se cambia a estatus Desongelado");
+         bitacora.setNameUser(getLoggedUser().getUser().getUserName());
+         bitacora.setOffice(new Office(getLoggedUser().getOffice().getId()));
+
+         loanUpdate.setFrozen(ActiveStatus.DISABLED);
+         loanCtrl.updateLoan(loanUpdate);
+
+         showMessage(FacesMessage.SEVERITY_INFO, "Cambio de estatus", "La venta se cambió a estatus 'Descongelado' de forma correcta.");
+      }
+
+      loan.clear();
+      bitacoraCtrl.saveBitacora(bitacora);
+      commentsBitacora = "";
+      loan = customerCtrl.findLoanByCustomer(customerId);
+      selectedLoan = null;
+   }
+
+   public void changeFinishStatus() {
+      Loan loanUpdate = loanCtrl.getLoanById(selectedLoan.getId());
+      Bitacora bitacora = new Bitacora();
+      bitacora.setAction("Cambio de estatus a finalizado");
+      bitacora.setCommentsUser(commentsBitacora);
+      bitacora.setCreatedBy(getLoggedUser().getUser().getId());
+      bitacora.setCreatedOn(new Date());
+      bitacora.setDescription("La venta del cliente " + loanUpdate.getCustomer().getFullName() + " del asesor " + loanUpdate.getAsesor() + " con monto a vender de $" + loanUpdate.getLoanType().getPayment() + " "
+              + "se cambia a estatus Finalizado");
+      bitacora.setNameUser(getLoggedUser().getUser().getUserName());
+      bitacora.setOffice(new Office(getLoggedUser().getOffice().getId()));
+      loanCtrl.updateLoanByStatusWeb(LoanStatus.FINISH, selectedLoan.getId(), getLoggedUser().getUser().getId());
+      loanCtrl.updateLoanByUserByStatus(LoanStatus.FINISH, selectedLoan);
+      loan.clear();
+      bitacoraCtrl.saveBitacora(bitacora);
+      commentsBitacora = "";
+      loan = customerCtrl.findLoanByCustomer(customerId);
+      selectedLoan = null;
+
+      showMessage(FacesMessage.SEVERITY_INFO, "Cambio de estatus", "La venta se cambió a estatus 'Terminado' de forma correcta.");
+   }
+
+   public void changeOwner() {
+      /*if (selectedLoan.getLoanStatus() != LoanStatus.APPROVED) {
+            selectedLoan = null;
+            userId = "";
+            showMessage(FacesMessage.SEVERITY_WARN, "No se puede modificar propietario", "Solo puedes cambiar de propietario a ventas en estatus Aprobados");
+            return;
+        }*/
+      LoanByUser old = new LoanByUser();
+      old = loanCtrl.getLoanByUserByIdLoan(selectedLoan);
+
+      LoanByUser loanByUser = new LoanByUser();
+      LoanByUserId idRelation = new LoanByUserId();
+
+      idRelation.setIdLoan(selectedLoan.getId());
+      idRelation.setIdUser(userId);
+
+      loanByUser.setId(idRelation);
+      loanByUser.setComments(old.getComments());
+      loanByUser.setCreatedBy(old.getCreatedBy());
+      loanByUser.setLoanByUserStatus(old.getLoanByUserStatus());
+      loanByUser.setLoan(selectedLoan);
+      loanByUser.setCreatedOn(new Date());
+      loanByUser.setOrderInList(old.getOrderInList());
+      loanByUser.setOwnerLoan(OwnerLoan.CURRENT_OWNER);
+      loanByUser.setUser(new User(userId));
+      if (loanCtrl.deleteLoanByUser(old)) {
+         loanCtrl.saveLoanByUser(loanByUser);
+         selectedLoan = null;
+         userId = "";
+         loan.clear();
+         loan = customerCtrl.findLoanByCustomer(customerId);
+         showMessage(FacesMessage.SEVERITY_INFO, "Cambio de propietario", "Se reasignó la venta de forma correcta.");
+      } else {
+         selectedLoan = null;
+         showMessage(FacesMessage.SEVERITY_ERROR, "Cambio de propietario", "Ocurrió un error al intentar hacer el cambio de propietario.");
+      }
+   }
+
+   public void changeOwnerToJuridical() {
+      // Id de usuario laura.marquez
+      String idUser = "aad0c673-eb93-11ea-b7e1-02907d0fb4e6";
+//         String idUser = "3338ce43-24fc-4d35-b51e-d8ec848937fc";
+
+      Loan loanUpdate = selectedLoanJuridical;
+      loanUpdate.setJuridicalDate(new Date());
+
+      loanCtrl.updateLoan(loanUpdate);
+
+      LoanByUser old = new LoanByUser();
+      old = loanCtrl.getLoanByUserByIdLoan(selectedLoanJuridical);
+
+      LoanByUser loanByUser = new LoanByUser();
+      LoanByUserId idRelation = new LoanByUserId();
+
+      idRelation.setIdLoan(selectedLoanJuridical.getId());
+      idRelation.setIdUser(idUser);
+
+      loanByUser.setId(idRelation);
+      loanByUser.setComments(old.getComments());
+      loanByUser.setCreatedBy(old.getCreatedBy());
+      loanByUser.setLoanByUserStatus(old.getLoanByUserStatus());
+      loanByUser.setLoan(selectedLoanJuridical);
+      loanByUser.setCreatedOn(new Date());
+      loanByUser.setOrderInList(old.getOrderInList());
+      loanByUser.setOwnerLoan(OwnerLoan.CURRENT_OWNER);
+      loanByUser.setUser(new User(idUser));
+      if (loanCtrl.deleteLoanByUser(old)) {
+         loanCtrl.saveLoanByUser(loanByUser);
+         selectedLoanJuridical = null;
+         loanJuridical.clear();
+         getLoansJuridical();
+         showMessage(FacesMessage.SEVERITY_INFO, "Cambio de propietario", "Se mandó la venta a jurídico.");
+      } else {
+         selectedLoan = null;
+         showMessage(FacesMessage.SEVERITY_ERROR, "Cambio de propietario", "Ocurrió un error al intentar hacer el cambio de propietario.");
+      }
+
+      selectedLoanJuridical = null;
+   }
+
+   public void addPayment() {
+      if (selectedLoan.getLoanStatus() == LoanStatus.APPROVED || selectedLoan.getLoanStatus() == LoanStatus.PENDING_RENOVATION) {
+         LoanDetails detail = new LoanDetails();
+         detail.setComments(comments);
+         detail.setCreatedBy(getLoggedUser().getUser().getId());
+         detail.setCreatedOn(new Date());
+         detail.setLoan(selectedLoan);
+         detail.setLoanDetailsType(LoanDetailsType.PAYMENT);
+         detail.setPaymentAmount(payment);
+         detail.setPeopleType(PeopleType.CUSTOMER);
+         detail.setTransferStatus(TransferStatus.AUTHORIZED);
+         detail.setTransferNumber("N/A");
+         detail.setReferenceNumber(selectedLoan.getLastReferenceNumber() + 1);
+         detail.setUser(new User(userId));
+         if (loanCtrl.saveLoanDetail(detail)) {
+            Loan loanUpdate = loanCtrl.getLoanById(selectedLoan.getId());
+            loanUpdate.setAmountPaid(loanUpdate.getAmountPaid().add(payment));
+            loanUpdate.setLastReferenceNumber(loanUpdate.getLastReferenceNumber() + 1);
+            if (loanUpdate.getAmountToPay().compareTo(loanUpdate.getAmountPaid()) == 0) {
+
+               LoanByUser loanByUser = loanCtrl.getLoanByUserByIdLoan(loanUpdate);
+               loanByUser.setLoanByUserStatus(LoanStatus.FINISH);
+               if (loanCtrl.updateLoanByUser(loanByUser)) {
+                  loanUpdate.setLoanStatus(LoanStatus.FINISH);
+               }
+            }
+            loanCtrl.updateLoan(loanUpdate);
+            loan.clear();
+            loan = customerCtrl.findLoanByCustomer(customerId);
+            selectedLoan = null;
+            userId = "";
+            comments = "";
+            payment = BigDecimal.ZERO;
+            showMessage(FacesMessage.SEVERITY_INFO, "Agregar abono", "Se agregó el abono de forma correcta.");
+         }
+      } else {
+         selectedLoan = null;
+         userId = "";
+         comments = "";
+         payment = BigDecimal.ZERO;
+         showMessage(FacesMessage.SEVERITY_WARN, "No se puede abonar", "Solo puedes abonar ventas en estatus Aprobados o Pendientes por renovación");
+         return;
+      }
+
+   }
+
+   public void addDeposit() {
+      if (selectedLoan.getLoanStatus() == LoanStatus.APPROVED || selectedLoan.getLoanStatus() == LoanStatus.PENDING_RENOVATION) {
+         LoanDetails detail = new LoanDetails();
+         detail.setComments(comments);
+         detail.setCreatedBy(getLoggedUser().getUser().getId());
+         detail.setCreatedOn(new Date());
+         detail.setLoan(selectedLoan);
+         detail.setLoanDetailsType(LoanDetailsType.TRANSFER);
+         detail.setPaymentAmount(payment);
+         detail.setPeopleType(PeopleType.CUSTOMER);
+         detail.setTransferStatus(TransferStatus.PENDING);
+         detail.setTransferNumber("N/A");
+         detail.setReferenceNumber(selectedLoan.getLastReferenceNumber() + 1);
+         detail.setUser(new User(userId));
+         if (loanCtrl.saveLoanDetail(detail)) {
+            Loan loanUpdate = loanCtrl.getLoanById(selectedLoan.getId());
+            loanUpdate.setAmountPaid(loanUpdate.getAmountPaid().add(payment));
+            loanUpdate.setLastReferenceNumber(loanUpdate.getLastReferenceNumber() + 1);
+            if (loanUpdate.getAmountToPay().compareTo(loanUpdate.getAmountPaid()) == 0) {
+
+               LoanByUser loanByUser = loanCtrl.getLoanByUserByIdLoan(loanUpdate);
+               loanByUser.setLoanByUserStatus(LoanStatus.FINISH);
+               if (loanCtrl.updateLoanByUser(loanByUser)) {
+                  loanUpdate.setLoanStatus(LoanStatus.FINISH);
+               }
+            }
+            loanCtrl.updateLoan(loanUpdate);
+            loan.clear();
+            loan = customerCtrl.findLoanByCustomer(customerId);
+            selectedLoan = null;
+            userId = "";
+            comments = "";
+            payment = BigDecimal.ZERO;
+            showMessage(FacesMessage.SEVERITY_INFO, "Agregar depósito", "Se agregó el depósito de forma correcta.");
+         }
+      } else {
+         selectedLoan = null;
+         userId = "";
+         comments = "";
+         payment = BigDecimal.ZERO;
+         showMessage(FacesMessage.SEVERITY_WARN, "No se puede abonar", "Solo puedes abonar ventas en estatus Aprobados o Pendientes por renovación");
+         return;
+      }
+
+   }
+
+   public void addFee() {
+      if (selectedLoan.getLoanStatus() != LoanStatus.APPROVED) {
+         selectedLoan = null;
+         userId = "";
+         comments = "";
+         fee = BigDecimal.ZERO;
+         showMessage(FacesMessage.SEVERITY_WARN, "No se puede multar", "Solo puedes multar ventas en estatus Aprobados");
+         return;
+      }
+      LoanDetails detail = new LoanDetails();
+      detail.setComments(comments);
+      detail.setCreatedBy(getLoggedUser().getUser().getId());
+      detail.setCreatedOn(new Date());
+      detail.setLoan(selectedLoan);
+      detail.setLoanDetailsType(LoanDetailsType.FEE);
+      detail.setPaymentAmount(fee);
+      detail.setPeopleType(PeopleType.CUSTOMER);
+      detail.setTransferStatus(TransferStatus.AUTHORIZED);
+      detail.setTransferNumber("N/A");
+      detail.setFeeStatus(FeeStatus.TO_PAY);
+      detail.setReferenceNumber(selectedLoan.getLastReferenceNumber() + 1);
+      detail.setUser(new User(userId));
+      if (loanCtrl.saveLoanDetail(detail)) {
+         Loan loanUpdate = loanCtrl.getLoanById(selectedLoan.getId());
+         loanUpdate.setAmountToPay(loanUpdate.getAmountToPay().add(fee));
+         loanUpdate.setLastReferenceNumber(loanUpdate.getLastReferenceNumber() + 1);
+         loanCtrl.updateLoan(loanUpdate);
+
+         LoanFeeNotification notification = new LoanFeeNotification();
+         notification.setCreatedBy(getLoggedUser().getUser().getId());
+         notification.setCreatedOn(new Date());
+         notification.setLoan(loanUpdate);
+         notification.setUser(new User(userId));
+         notification.setNotificationNumber(loanUpdate.getTotalFeeByLoan() + 1);
+         loanCtrl.saveLoanNotificationFee(notification);
+
+         loan.clear();
+         loan = customerCtrl.findLoanByCustomer(customerId);
+         selectedLoan = null;
+         userId = "";
+         comments = "";
+         fee = BigDecimal.ZERO;
+         showMessage(FacesMessage.SEVERITY_INFO, "Agregar multa", "Se agregó la multa de forma correcta.");
+      }
+   }
+
+   public void changeLoanType() {
+      if (selectedLoan.getLoanStatus() != LoanStatus.TO_DELIVERY && selectedLoan.getLoanStatus() != LoanStatus.APPROVED) {
+         loanTypeId = "";
+         selectedLoan = null;
+         showMessage(FacesMessage.SEVERITY_WARN, "No se puede cambiar el tipo de venta", "Solo puedes cambiar el monto a vender de ventas en estatus Por liberar");
+         return;
+      }
+      Loan loanUpdate = loanCtrl.getLoanById(selectedLoan.getId());
+      LoanType loanTypeUpdate = loanTypeCtrl.getLoanTypeById(loanTypeId);
+      Bitacora bitacora = new Bitacora();
+      bitacora.setAction("Cambio de monto de venta");
+      bitacora.setCommentsUser(commentsBitacora);
+      bitacora.setCreatedBy(getLoggedUser().getUser().getId());
+      bitacora.setCreatedOn(new Date());
+      bitacora.setDescription("La venta del cliente " + loanUpdate.getCustomer().getFullName() + " del asesor " + loanUpdate.getAsesor() + " con monto a vender de $" + loanUpdate.getLoanType().getPayment() + " "
+              + "se cambia a monto de venta por " + loanTypeUpdate.getLoanTypeName());
+      bitacora.setNameUser(getLoggedUser().getUser().getUserName());
+      bitacora.setOffice(new Office(getLoggedUser().getOffice().getId()));
+
+      loanUpdate.setLoanType(new LoanType(loanTypeId));
+      loanUpdate.setAmountToPay(loanTypeUpdate.getPaymentTotal());
+      if (loanCtrl.updateLoan(loanUpdate)) {
+         loan.clear();
+         loan = customerCtrl.findLoanByCustomer(customerId);
+         loanTypeId = "";
+         bitacoraCtrl.saveBitacora(bitacora);
+         commentsBitacora = "";
+         selectedLoan = null;
+         showMessage(FacesMessage.SEVERITY_INFO, "Cambio de tipo de venta", "La venta se cambió correctamente");
+      }
+
+   }
+
+   public void CustomerClassification(String colorClassification) {
+      try {
+         customerService.updatePeopleByClassification(CustomerClassification.valueOf(colorClassification), getSelectedLoanFinished().getCustomerId(), getLoggedUser().getUser().getId());
+
+         showMessage(FacesMessage.SEVERITY_INFO, "Cliente", "Se clasificó correctamente.");
+      } catch (Exception e) {
+         showMessage(FacesMessage.SEVERITY_ERROR, "Cliente", "No se clasificó correctamente.");
+      }
+   }
+
+   public ClosingDayController getClosingDayCtrl() {
+      return closingDayCtrl;
+   }
+
+   public void setClosingDayCtrl(ClosingDayController closingDayCtrl) {
+      this.closingDayCtrl = closingDayCtrl;
+   }
+
+   public DashboardController getDashboardCtrl() {
+      return dashboardCtrl;
+   }
+
+   public void setDashboardCtrl(DashboardController dashboardCtrl) {
+      this.dashboardCtrl = dashboardCtrl;
+   }
+
+   public BigDecimal getTotalAmountDaily() {
+      return totalAmountDaily;
+   }
+
+   public void setTotalAmountDaily(BigDecimal totalAmountDaily) {
+      this.totalAmountDaily = totalAmountDaily;
+   }
+
+   public BigDecimal getTotalTransferSenderDaily() {
+      return totalTransferSenderDaily;
+   }
+
+   public void setTotalTransferSenderDaily(BigDecimal totalTransferSenderDaily) {
+      this.totalTransferSenderDaily = totalTransferSenderDaily;
+   }
+
+   public BigDecimal getTotalTransferReceiverDaily() {
+      return totalTransferReceiverDaily;
+   }
+
+   public void setTotalTransferReceiverDaily(BigDecimal totalTransferReceiverDaily) {
+      this.totalTransferReceiverDaily = totalTransferReceiverDaily;
+   }
+
+   public BigDecimal getTotalMoneyDailyDaily() {
+      return totalMoneyDailyDaily;
+   }
+
+   public void setTotalMoneyDailyDaily(BigDecimal totalMoneyDailyDaily) {
+      this.totalMoneyDailyDaily = totalMoneyDailyDaily;
+   }
+
+   public BigDecimal getTotalDeliveryDaily() {
+      return totalDeliveryDaily;
+   }
+
+   public void setTotalDeliveryDaily(BigDecimal totalDeliveryDaily) {
+      this.totalDeliveryDaily = totalDeliveryDaily;
+   }
+
+   public BigDecimal getTotalFinalDaily() {
+      return totalFinalDaily;
+   }
+
+   public void setTotalFinalDaily(BigDecimal totalFinalDaily) {
+      this.totalFinalDaily = totalFinalDaily;
+   }
+
+   public BigDecimal getTotalCajaDaily() {
+      return totalCajaDaily;
+   }
+
+   public void setTotalCajaDaily(BigDecimal totalCajaDaily) {
+      this.totalCajaDaily = totalCajaDaily;
+   }
+
+   public int getNumPending() {
+      return numPending;
+   }
+
+   public void setNumPending(int numPending) {
+      this.numPending = numPending;
+   }
+
+   public int getNumApproved() {
+      return numApproved;
+   }
+
+   public void setNumApproved(int numApproved) {
+      this.numApproved = numApproved;
+   }
+
+   public int getNumFinish() {
+      return numFinish;
+   }
+
+   public void setNumFinish(int numFinish) {
+      this.numFinish = numFinish;
+   }
+
+   public int getNumRejected() {
+      return numRejected;
+   }
+
+   public void setNumRejected(int numRejected) {
+      this.numRejected = numRejected;
+   }
+
+   public int getNumToDelivery() {
+      return numToDelivery;
+   }
+
+   public void setNumToDelivery(int numToDelivery) {
+      this.numToDelivery = numToDelivery;
+   }
+
+   public BigDecimal getTotalExpectedToday() {
+      return totalExpectedToday;
+   }
+
+   public void setTotalExpectedToday(BigDecimal totalExpectedToday) {
+      this.totalExpectedToday = totalExpectedToday;
+   }
+
+   public LoanController getLoanCtrl() {
+      return loanCtrl;
+   }
+
+   public void setLoanCtrl(LoanController loanCtrl) {
+      this.loanCtrl = loanCtrl;
+   }
+
+   public PieChartModel getLivePieModel() {
+
+      livePieModel.getData().put("Total cobrado", totalAmountDaily);
+      livePieModel.getData().put("Total esperado por cobro", totalExpectedToday.subtract(totalAmountDaily));
+
+      livePieModel.setTitle("Gráfica de recuperación diaria");
+      livePieModel.setLegendPosition("ne");
+
+      return livePieModel;
+   }
+
+   public void setLivePieModel(PieChartModel livePieModel) {
+      this.livePieModel = livePieModel;
+   }
+
+   public PieChartModel getPieResumenCaja() {
+      pieResumenCaja.getData().put("Total del día", totalFinalDaily.subtract(totalCajaDaily));
+      pieResumenCaja.getData().put("Total en caja", totalCajaDaily);
+
+      pieResumenCaja.setTitle("Gráfica de recuperación en caja");
+      pieResumenCaja.setLegendPosition("ne");
+
+      return pieResumenCaja;
+   }
+
+   public void setPieResumenCaja(PieChartModel pieResumenCaja) {
+      this.pieResumenCaja = pieResumenCaja;
+   }
+
+   public BarChartModel getBarResumenLoans() {
+      return barResumenLoans;
+   }
+
+   public void setBarResumenLoans(BarChartModel barResumenLoans) {
+      this.barResumenLoans = barResumenLoans;
+   }
+
+   public BigDecimal getTotalOtherExpenseDaily() {
+      return totalOtherExpenseDaily;
+   }
+
+   public void setTotalOtherExpenseDaily(BigDecimal totalOtherExpenseDaily) {
+      this.totalOtherExpenseDaily = totalOtherExpenseDaily;
+   }
+
+   public GenericController getGenericCtrl() {
+      return genericCtrl;
+   }
+
+   public void setGenericCtrl(GenericController genericCtrl) {
+      this.genericCtrl = genericCtrl;
+   }
+
+   public List<AdvanceUserDailyView> getAdvances() {
+      return advances;
+   }
+
+   public void setAdvances(List<AdvanceUserDailyView> advances) {
+      this.advances = advances;
+   }
+
+   public List<CustomerWithoutRenovationView> getCustomersWithoutRenovation() {
+      return customersWithoutRenovation;
+   }
+
+   public void setCustomersWithoutRenovation(List<CustomerWithoutRenovationView> customersWithoutRenovation) {
+      this.customersWithoutRenovation = customersWithoutRenovation;
+   }
+
+   public String getUserId() {
+      return userId;
+   }
+
+   public void setUserId(String userId) {
+      this.userId = userId;
+   }
+
+   public List<AdvanceUserDailyDetail> getAdvancesDetail() {
+      return advancesDetail;
+   }
+
+   public void setAdvancesDetail(List<AdvanceUserDailyDetail> advancesDetail) {
+      this.advancesDetail = advancesDetail;
+   }
+
+   public List<User> getUsers() {
+      return users;
+   }
+
+   public void setUsers(List<User> users) {
+      this.users = users;
+   }
+
+   public CustomerController getCustomerCtrl() {
+      return customerCtrl;
+   }
+
+   public void setCustomerCtrl(CustomerController customerCtrl) {
+      this.customerCtrl = customerCtrl;
+   }
+
+   public String getCustomerId() {
+      return customerId;
+   }
+
+   public void setCustomerId(String customerId) {
+      this.customerId = customerId;
+   }
+
+   public List<People> getCustomers() {
+      return customers;
+   }
+
+   public void setCustomers(List<People> customers) {
+      this.customers = customers;
+   }
+
+   public List<Loan> getLoan() {
+      return loan;
+   }
+
+   public void setLoan(List<Loan> loan) {
+      this.loan = loan;
+   }
+
+   public List<Loan> getLoanJuridical() {
+      return loanJuridical;
+   }
+
+   public void setLoanJuridical(List<Loan> loanJuridical) {
+      this.loanJuridical = loanJuridical;
+   }
+
+   public List<LoanDetailZeroView> getLoanZero() {
+      return loanZero;
+   }
+
+   public void setLoanZero(List<LoanDetailZeroView> loanZero) {
+      this.loanZero = loanZero;
+   }
+
+   public List<LoanFinishedView> getLoanFinished() {
+      return loanFinished;
+   }
+
+   public void setLoanFinished(List<LoanFinishedView> loanFinished) {
+      this.loanFinished = loanFinished;
+   }
+
+   public Loan getSelectedLoan() {
+      return selectedLoan;
+   }
+
+   public void setSelectedLoan(Loan selectedLoan) {
+      this.selectedLoan = selectedLoan;
+   }
+
+   public Loan getSelectedLoanJuridical() {
+      return selectedLoanJuridical;
+   }
+
+   public void setSelectedLoanJuridical(Loan selectedLoanJuridical) {
+      this.selectedLoanJuridical = selectedLoanJuridical;
+   }
+
+   public LoanDetailZeroView getSelectedLoanZero() {
+      return selectedLoanZero;
+   }
+
+   public void setSelectedLoanZero(LoanDetailZeroView selectedLoanZero) {
+      this.selectedLoanZero = selectedLoanZero;
+   }
+
+   public LoanFinishedView getSelectedLoanFinished() {
+      return selectedLoanFinished;
+   }
+
+   public void setSelectedLoanFinished(LoanFinishedView selectedLoanFinished) {
+      this.selectedLoanFinished = selectedLoanFinished;
+   }
+
+   public BigDecimal getPayment() {
+      return payment;
+   }
+
+   public void setPayment(BigDecimal payment) {
+      this.payment = payment;
+   }
+
+   public String getComments() {
+      return comments;
+   }
+
+   public void setComments(String comments) {
+      this.comments = comments;
+   }
+
+   public BigDecimal getFee() {
+      return fee;
+   }
+
+   public void setFee(BigDecimal fee) {
+      this.fee = fee;
+   }
+
+   public String getLoanTypeId() {
+      return loanTypeId;
+   }
+
+   public void setLoanTypeId(String loanTypeId) {
+      this.loanTypeId = loanTypeId;
+   }
+
+   public LoanTypeController getLoanTypeCtrl() {
+      return loanTypeCtrl;
+   }
+
+   public void setLoanTypeCtrl(LoanTypeController loanTypeCtrl) {
+      this.loanTypeCtrl = loanTypeCtrl;
+   }
+
+   public List<LoanType> getLoanType() {
+      return loanType;
+   }
+
+   public void setLoanType(List<LoanType> loanType) {
+      this.loanType = loanType;
+   }
+
+   public RouteController getRouteCtrl() {
+      return routeCtrl;
+   }
+
+   public void setRouteCtrl(RouteController routeCtrl) {
+      this.routeCtrl = routeCtrl;
+   }
+
+   public String getRouteId() {
+      return routeId;
+   }
+
+   public void setRouteId(String routeId) {
+      this.routeId = routeId;
+   }
+
+   public List<RouteCtlg> getRoute() {
+      return route;
+   }
+
+   public void setRoute(List<RouteCtlg> route) {
+      this.route = route;
+   }
+
+   public BigDecimal getTotalDepositDaily() {
+      return totalDepositDaily;
+   }
+
+   public void setTotalDepositDaily(BigDecimal totalDepositDaily) {
+      this.totalDepositDaily = totalDepositDaily;
+   }
+
+   public BigDecimal getTotalColocationApproved() {
+      return totalColocationApproved;
+   }
+
+   public void setTotalColocationApproved(BigDecimal totalColocationApproved) {
+      this.totalColocationApproved = totalColocationApproved;
+   }
+
+   public BigDecimal getTotalColocationToDelivery() {
+      return totalColocationToDelivery;
+   }
+
+   public void setTotalColocationToDelivery(BigDecimal totalColocationToDelivery) {
+      this.totalColocationToDelivery = totalColocationToDelivery;
+   }
+
+   public BigDecimal getTotalDiference() {
+      return totalDiference;
+   }
+
+   public void setTotalDiference(BigDecimal totalDiference) {
+      this.totalDiference = totalDiference;
+   }
+
+   public BigDecimal getTotalPorcentajeDiference() {
+      return totalPorcentajeDiference;
+   }
+
+   public void setTotalPorcentajeDiference(BigDecimal totalPorcentajeDiference) {
+      this.totalPorcentajeDiference = totalPorcentajeDiference;
+   }
+
+   public BigDecimal getGeneralExpectedWeek() {
+      return GeneralExpectedWeek;
+   }
+
+   public void setGeneralExpectedWeek(BigDecimal GeneralExpectedWeek) {
+      this.GeneralExpectedWeek = GeneralExpectedWeek;
+   }
+
+   public BigDecimal getGeneralReportedWeek() {
+      return generalReportedWeek;
+   }
+
+   public void setGeneralReportedWeek(BigDecimal generalReportedWeek) {
+      this.generalReportedWeek = generalReportedWeek;
+   }
+
+   public List<People> getEndorsement() {
+      return endorsement;
+   }
+
+   public void setEndorsement(List<People> endorsement) {
+      this.endorsement = endorsement;
+   }
+
+   public EndorsementController getEndorsementCtrl() {
+      return endorsementCtrl;
+   }
+
+   public void setEndorsementCtrl(EndorsementController endorsementCtrl) {
+      this.endorsementCtrl = endorsementCtrl;
+   }
+
+   public String getEndorsementId() {
+      return endorsementId;
+   }
+
+   public void setEndorsementId(String endorsementId) {
+      this.endorsementId = endorsementId;
+   }
+
+   public List<Loan> getLoanEndorsement() {
+      return loanEndorsement;
+   }
+
+   public void setLoanEndorsement(List<Loan> loanEndorsement) {
+      this.loanEndorsement = loanEndorsement;
+   }
+
+   public Loan getSelectedLoanEndorsement() {
+      return selectedLoanEndorsement;
+   }
+
+   public void setSelectedLoanEndorsement(Loan selectedLoanEndorsement) {
+      this.selectedLoanEndorsement = selectedLoanEndorsement;
+   }
+
+   public BitacoraController getBitacoraCtrl() {
+      return bitacoraCtrl;
+   }
+
+   public void setBitacoraCtrl(BitacoraController bitacoraCtrl) {
+      this.bitacoraCtrl = bitacoraCtrl;
+   }
+
+   public String getCommentsBitacora() {
+      return commentsBitacora;
+   }
+
+   public void setCommentsBitacora(String commentsBitacora) {
+      this.commentsBitacora = commentsBitacora;
+   }
+
+   public LazyDataModel<CustomerWithoutRenovationView> getCustomersWithoutRenovationPaginator() {
+      return customersWithoutRenovationPaginator;
+   }
+
+   public void setCustomersWithoutRenovationPaginator(LazyDataModel<CustomerWithoutRenovationView> customersWithoutRenovationPaginator) {
+      this.customersWithoutRenovationPaginator = customersWithoutRenovationPaginator;
+   }
+
+   public GenericValidationController getGenericValidateController() {
+      return genericValidateController;
+   }
+
+   public void setGenericValidateController(GenericValidationController genericController) {
+      this.genericValidateController = genericController;
+   }
+
+   public Date getLastStableSmallBox() {
+      return lastStableSmallBox;
+   }
+
+   public void setLastStableSmallBox(Date lastStableSmallBox) {
+      this.lastStableSmallBox = lastStableSmallBox;
+   }
+
    @Inject
    private CustomerWithoutRenovationViewService customerWithoutRenovationViewService;
+
+   private ClosingDayController closingDayCtrl;
+   private DashboardController dashboardCtrl;
+   private LoanController loanCtrl;
+   private GenericController genericCtrl;
+   private CustomerController customerCtrl;
+   private EndorsementController endorsementCtrl;
+   private LoanTypeController loanTypeCtrl;
+   private RouteController routeCtrl;
+   private BitacoraController bitacoraCtrl;
+
+   private BigDecimal totalAmountDaily;
+   private BigDecimal totalTransferSenderDaily;
+   private BigDecimal totalTransferReceiverDaily;
+   private BigDecimal totalMoneyDailyDaily;
+   private BigDecimal totalDeliveryDaily;
+   private BigDecimal totalFinalDaily;
+   private BigDecimal totalCajaDaily;
+   private BigDecimal totalOtherExpenseDaily;
+   private BigDecimal totalDepositDaily;
+
+   private BigDecimal totalExpectedToday;
+
+   private BigDecimal payment;
+   private BigDecimal fee;
+
+   private int numPending;
+   private int numApproved;
+   private int numFinish;
+   private int numRejected;
+   private int numToDelivery;
+   private String userId;
+   private String customerId;
+   private String endorsementId;
+   private String comments;
+   private String loanTypeId;
+   private String routeId;
+   private String commentsBitacora;
+   private List<User> users;
+   private List<People> customers;
+   private List<People> endorsement;
+   private List<RouteCtlg> route;
+
+   private PieChartModel livePieModel;
+   private PieChartModel pieResumenCaja;
+   private BarChartModel barResumenLoans;
+
+   private List<AdvanceUserDailyView> advances;
+   private List<CustomerWithoutRenovationView> customersWithoutRenovation;
+   private LazyDataModel<CustomerWithoutRenovationView> customersWithoutRenovationPaginator;
+   private List<AdvanceUserDailyDetail> advancesDetail;
+   private List<Loan> loan;
+   private List<Loan> loanJuridical;
+   private List<LoanDetailZeroView> loanZero;
+   private List<LoanFinishedView> loanFinished;
+   private List<Loan> loanEndorsement;
+   private List<LoanType> loanType;
+
+   private BigDecimal totalColocationApproved;
+   private BigDecimal totalColocationToDelivery;
+   private BigDecimal totalDiference;
+   private BigDecimal totalPorcentajeDiference;
+   private BigDecimal GeneralExpectedWeek;
+   private BigDecimal generalReportedWeek;
+
+   private Loan selectedLoan;
+   private Loan selectedLoanJuridical;
+   private LoanDetailZeroView selectedLoanZero;
+   private LoanFinishedView selectedLoanFinished;
+   private Loan selectedLoanEndorsement;
+
+   private GenericValidationController genericValidateController;
+   private Date lastStableSmallBox;
+   private boolean stableSmallBoxToday;
+
    @Inject
    private CustomerService customerService;
 
    @PostConstruct
    public void init() {
+      livePieModel = new PieChartModel();
+      pieResumenCaja = new PieChartModel();
+      closingDayCtrl = new ClosingDayController();
+      dashboardCtrl = new DashboardController();
+      loanCtrl = new LoanController();
+      genericCtrl = new GenericController();
+      customerCtrl = new CustomerController();
+      endorsementCtrl = new EndorsementController();
+      loanTypeCtrl = new LoanTypeController();
+      routeCtrl = new RouteController();
+      bitacoraCtrl = new BitacoraController();
+      commentsBitacora = "";
+      setGenericValidateController(new GenericValidationController());
+      setLastStableSmallBox(getGenericValidateController().lastStableSmallBoxByDate(getLoggedUser().getUser()));
 
+      if (dashboardCtrl.verifyTotalExpectedPaymentDailyByUserCreatedByOffice(getLoggedUser().getOffice().getId()) == 0) {
+         getPaymentDailyExpectByUser();
+      }
+      advances = fillAdvanceUserDaily();
+      totalColocationApproved = BigDecimal.ZERO;
+      totalColocationToDelivery = BigDecimal.ZERO;
+      GeneralExpectedWeek = BigDecimal.ZERO;
+      generalReportedWeek = BigDecimal.ZERO;
+      totalDiference = BigDecimal.ZERO;
+      totalPorcentajeDiference = BigDecimal.ZERO;
+
+      if (advances != null && !advances.isEmpty()) {
+         for (AdvanceUserDailyView advance : advances) {
+            totalColocationApproved = totalColocationApproved.add(advance.getColocationApproved());
+            totalColocationToDelivery = totalColocationToDelivery.add(advance.getColocationToDelivery());
+            GeneralExpectedWeek = GeneralExpectedWeek.add(advance.getTotalExpectedWeek());
+            generalReportedWeek = generalReportedWeek.add(advance.getTotalReportedWeek());
+
+         }
+         totalDiference = generalReportedWeek.subtract(GeneralExpectedWeek);
+         if (GeneralExpectedWeek.compareTo(BigDecimal.ZERO) == 1) {
+            totalPorcentajeDiference = ((GeneralExpectedWeek.subtract(generalReportedWeek)).multiply(new BigDecimal(100))).divide(GeneralExpectedWeek, 2, RoundingMode.HALF_UP);
+         } else {
+            totalPorcentajeDiference = BigDecimal.ZERO;
+         }
+
+      }
+      customersWithoutRenovation = findAllCustomerWithOutRenovationByOffice();
+      listenerCustomerWithoutRenovationView();
+      users = genericCtrl.getAllUsersByOffice(getLoggedUser().getOffice().getId());
+      customers = customerCtrl.fillCustomersDatatable(getLoggedUser().getOffice().getId());
+      endorsement = endorsementCtrl.fillEndorsementsDatatable(getLoggedUser().getOffice().getId());
+      loanType = loanTypeCtrl.fillLoanTypeDatatable(getLoggedUser().getOffice().getId());
+      route = routeCtrl.fillRoutesDatatable(getLoggedUser().getOffice().getId());
+      getResumenDaily();
+      getResumenLoans();
+      getLoansJuridical();
+      getLoansZero();
+   }
+
+   public boolean getAction() {
+      Date date = new Date();
+      System.out.println("Fecha: " + date);
+      if (genericCtrl.existStableSmallBoxByCreatedOn(date)) {
+         return false;
+      }
+      return true;
+   }
+
+   private void listenerCustomerWithoutRenovationView() {
+      try {
+         setCustomersWithoutRenovationPaginator(
+                 new LazyDataModel<CustomerWithoutRenovationView>() {
+
+            private List<CustomerWithoutRenovationView> listOfData;
+
+            @Override
+            public List<CustomerWithoutRenovationView> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filterBy) {
+               String generalSearch = (null != filterBy && !filterBy.isEmpty() && null != filterBy.get("globalFilter") && !filterBy.get("globalFilter").toString().equals(""))
+                       ? "%" + filterBy.get("globalFilter").toString() + "%"
+                       : "";
+
+               if (null != filterBy) {
+                  filterBy.remove("globalFilter");
+               }
+
+               Long total = customerWithoutRenovationViewService
+                       .countAllCustomerWithOutRenovationByOfficePaginator(
+                               getLoggedUser().getOffice().getId(),
+                               generalSearch,
+                               filterBy);
+
+               setRowCount(total.intValue());
+
+               listOfData = customerWithoutRenovationViewService
+                       .findAllCustomerWithOutRenovationByOfficePaginator(
+                               getLoggedUser().getOffice().getId(),
+                               first,
+                               pageSize,
+                               generalSearch,
+                               sortField,
+                               sortOrder.toString().equals("ASCENDING") ? "ASC" : "DESC",
+                               filterBy);
+
+               return listOfData;
+            }
+
+            @Override
+            public String getRowKey(CustomerWithoutRenovationView selectedRow) {
+               return selectedRow.getId();
+            }
+
+            @Override
+            public CustomerWithoutRenovationView getRowData(String rowKey) {
+               return listOfData
+                       .stream()
+                       .filter(rowData -> rowKey.equals(rowData.getId()))
+                       .findFirst()
+                       .orElse(null);
+            }
+
+         });
+      } catch (Exception e) {
+      }
    }
 
 }
diff --git a/apc-web/src/main/resources/com/arrebol/apc/i18n/app.properties b/apc-web/src/main/resources/com/arrebol/apc/i18n/app.properties
index 883a8d5..5c26c6b 100644
--- a/apc-web/src/main/resources/com/arrebol/apc/i18n/app.properties
+++ b/apc-web/src/main/resources/com/arrebol/apc/i18n/app.properties
@@ -289,7 +289,7 @@ admin.loans.datatable.empty=No hay pr\u00e9stamos por mostrar.
 admin.loans.datatable.column.customer=Cliente
 admin.loans.datatable.column.routeCtlg=Ruta
 admin.loans.datatable.column.endorsement=Aval
-admin.loans.datatable.column.amountPaid=Monto a prestar
+admin.loans.datatable.column.amountPaid=Monto a vender
 admin.loans.datatable.column.loan.amountPaid=Monto pagado
 admin.loans.datatable.column.loan.amountToPaid=Monto a pagar
 admin.loans.datatable.column.loan.saldo=Saldo insoluto
@@ -333,7 +333,7 @@ admin.closingDays.dialog.paymentDaily.title=Monto recuperado
 admin.closingDays.dialog.transferSender.title=Monto enviado por transferencia
 admin.closingDays.dialog.transferReceiver.title=Monto recibido por transferencia
 admin.closingDays.dialog.moneyDaily.title=Monto de inicio
-admin.closingDays.dialog.delivery.title=Entrega de prestamos
+admin.closingDays.dialog.delivery.title=Entrega de ventas
 admin.closingDays.dialog.otherExpense.title=Gastos
 admin.closingDays.dialog.total.title=Total
 admin.closingDays.dialog.transferPending.title=Transferencias sin autorizar
@@ -577,15 +577,15 @@ other.actions=Otras acciones
 choose.action=Elegir acci\u00f3n
 execute.action=Ejecutar acci\u00f3n
 change.owner=Cambiar asesor
-change.owner.of.loans=Cambiar los prestamos al asesor destino
+change.owner.of.loans=Cambiar las ventas al asesor destino
 current.owner.select=Elegir asesor origen
 current.owner.select.name=Nombre del asesor origen
 new.owner.select=Elegir asesor destino
 new.owner.select.name=Nombre del asesor destino
-current.owner.from=Prestamos asesor origen
-current.owner.to=Prestamos asesor destino
-dual.list.current.owner.required=Seleccione al menos un presamo a cambiar de asesor
-change.owner.confirm.question=\u00bfDesea cambiar los prestamos al asesor destino?
+current.owner.from=Ventas asesor origen
+current.owner.to=Ventas asesor destino
+dual.list.current.owner.required=Seleccione al menos una venta  a cambiar de asesor
+change.owner.confirm.question=\u00bfDesea cambiar las ventas al asesor destino?
 stats.closingday=Corte
 stats.openingFees=Comisi\u00f3n por apertura
 stats.openingFees.comisiones=Comisiones
diff --git a/apc-web/src/main/webapp/app/admin/customer/index.xhtml b/apc-web/src/main/webapp/app/admin/customer/index.xhtml
index 6c3e453..3e0e580 100644
--- a/apc-web/src/main/webapp/app/admin/customer/index.xhtml
+++ b/apc-web/src/main/webapp/app/admin/customer/index.xhtml
@@ -1442,7 +1442,7 @@
                             <p:commandButton value="#{i18n['add']}"
                                              id="btnGuardar"
                                              style="width: 100%"
-                                             update="peopleForm:tabMain, form:msgs"
+                                             update="peopleForm:tabMain, form"
                                              actionListener="#{personCustomerBean.addPeople()}"
                                              rendered="#{loginBean.isUserInRole('admin.customer.add') or  loginBean.isUserInRole('admin.endorsement.add')}">
                                 <p:confirm header="#{i18n['general.confirm.header']}" 
diff --git a/apc-web/src/main/webapp/dashboard.xhtml b/apc-web/src/main/webapp/dashboard.xhtml
index dd69cac..1b2a9a2 100644
--- a/apc-web/src/main/webapp/dashboard.xhtml
+++ b/apc-web/src/main/webapp/dashboard.xhtml
@@ -14,16 +14,431 @@
     <ui:define name="content">
         <div class="ui-g">
             <div class="ui-g-12">
-                
+
                 <h:form id="dashboardResumen">
-                    <p:growl id="msgs" showDetail="true"/>                                     
+                    <p:growl id="msgs" showDetail="true"/>
+
+                    <style type="text/css">
+                        .redRow {
+                            background-color: #ff0000 !important;
+                            background-image: none !important;
+                            color: #000000 !important;
+                        }
+                        .yellowRow {
+                            background-color: #ffff00 !important;
+                            background-image: none !important;
+                            color: #000000 !important;
+                        }
+                    </style>
+
                     <div class="ui-g-12">
                         <div class="card">
-                            
+                            <h4 style="font-weight: bold; " >Historial de ventas por cliente</h4>
+                            <p:panelGrid columns="2" layout="grid" styleClass="ui-panelgrid-blank form-group">
+
+                                <h:panelGroup id="customerLoanPnlGrp" styleClass="md-inputfield">
+                                    <p:selectOneMenu style="width:100%"
+                                                     filter="true"
+                                                     filterMatchMode="contains"
+                                                     value="#{dashboardManager.customerId}" 
+                                                     id="customerLoan"  >
+                                        <f:selectItem itemLabel="Selecciona un cliente.." itemValue="" />
+                                        <f:selectItems value="#{dashboardManager.customers}" var="customers" itemLabel="#{customers.fullName}" itemValue="#{customers.id}" />
+                                    </p:selectOneMenu>
+                                    <p:message for="customerLoan" display="text"/>
+                                </h:panelGroup>
+                                <h:panelGroup styleClass="md-inputfield">
+                                    <p:commandButton value="#{i18n['general.search']}"
+                                                     update="dtLoan"
+                                                     action="#{dashboardManager.getLoansByCustomer()}">
+                                    </p:commandButton>
+                                </h:panelGroup>
+                            </p:panelGrid>
+
+                            <p:dataTable widgetVar="dtLoan" id="dtLoan" var="loan" draggableRows="true" draggableColumns="true" value="#{dashboardManager.loan}" style="margin-bottom:20px" reflow="true" rowsPerPageTemplate="5,10,25,50,100" emptyMessage="#{i18n['admin.loans.datatable.empty']}"
+                                         rowKey="#{loan.id}" selection="#{dashboardManager.selectedLoan}" editable="true" selectionMode="single" paginator="true" rows="10" paginatorTemplate="{RowsPerPageDropdown} {FirstPageLink} {PreviousPageLink} {CurrentPageReport} {NextPageLink} {LastPageLink}">
+
+                                <f:facet name="header">
+                                    <p:commandButton id="toggler" type="button" value="Columnas" style="float:left;" styleClass="amber-btn flat" icon="ui-icon-calendar"/>
+                                    <p:columnToggler datasource="dtLoan" trigger="toggler" />
+
+                                    <p:outputPanel>
+                                        <h:outputText value="#{i18n['general.search']}: " />
+                                        <p:inputText id="globalFilter" onkeyup="PF('dtLoan').filter()" style="width:150px;color: #000000;"/>
+                                    </p:outputPanel>
+
+                                </f:facet>
+
+                                <p:column headerText="#{i18n['admin.loans.datatable.column.endorsement']}" sortBy="#{loan.endorsement.fullName}" filterBy="#{loan.endorsement.fullName}">
+                                    <h:outputText value="#{loan.endorsement.fullName}" />
+                                </p:column>
+                                <p:column headerText="#{i18n['admin.loans.datatable.column.amountPaid']}" sortBy="#{loan.loanType.payment}" filterBy="#{loan.loanType.payment}">
+                                    <h:outputText value="#{loan.loanType.payment}">
+                                        <f:convertNumber pattern="¤#,##0.00" locale="en_US" currencySymbol="$" />
+                                    </h:outputText>
+                                </p:column>
+                                <p:column headerText="Tipo de venta" sortBy="#{loan.loanTypeByDays}" filterBy="#{loan.loanTypeByDays}" filterMatchMode="contains">
+                                    <h:outputText value="#{loan.loanTypeByDays}" />
+                                </p:column>
+                                <p:column headerText="#{i18n['admin.loans.datatable.column.loan.amountToPaid']}" sortBy="#{loan.amountToPay}" filterBy="#{loan.amountToPay}">
+                                    <h:outputText value="#{loan.amountToPay}">
+                                        <f:convertNumber pattern="¤#,##0.00" locale="en_US" currencySymbol="$" />
+                                    </h:outputText>
+                                </p:column>
+                                <p:column headerText="#{i18n['admin.loans.datatable.column.loan.amountPaid']}" sortBy="#{loan.amountPaid}" filterBy="#{loan.amountPaid}">
+                                    <h:outputText value="#{loan.amountPaid}">
+                                        <f:convertNumber pattern="¤#,##0.00" locale="en_US" currencySymbol="$" />
+                                    </h:outputText>
+                                </p:column>
+                                <p:column headerText="#{i18n['admin.loans.datatable.column.loan.saldo']}" sortBy="#{loan.amountToPay - loan.amountPaid}" filterBy="#{loan.amountToPay - loan.amountPaid}">
+                                    <h:outputText value="#{loan.amountToPay - loan.amountPaid}">
+                                        <f:convertNumber pattern="¤#,##0.00" locale="en_US" currencySymbol="$" />
+                                    </h:outputText>
+                                </p:column>
+                                <p:column headerText="#{i18n['admin.customers.detail.datatable.column.totalFee']}" sortBy="#{loan.totalFeeByLoan}" filterBy="#{loan.totalFeeByLoan}">
+                                    <h:outputText value="#{loan.totalFeeByLoan}" />
+                                </p:column>
+                                <p:column headerText="#{i18n['admin.loans.datatable.column.loanStatus']}" sortBy="#{loan.loanStatus.value}" filterBy="#{loan.loanStatus.value}">
+                                    <h:outputText value="#{loan.loanStatus.value}" />
+                                </p:column>
+                                <p:column headerText="#{i18n['admin.loans.datatable.column.createdOn']}" sortBy="#{loan.createdOn}" filterBy="#{loan.createdOn}">
+                                    <h:outputText value="#{loan.createdOn}">
+                                        <f:convertDateTime type="date" locale="es" timeZone="GMT-6" pattern="dd - MMMM - yyyy"/>
+                                    </h:outputText>
+                                </p:column>
+                                <p:column headerText="#{i18n['admin.loans.datatable.column.asesor']}" sortBy="#{loan.asesor}" filterBy="#{loan.asesor}">
+                                    <h:outputText value="#{loan.asesor}" />
+                                </p:column>
+
+                                <p:column headerText="Acción" style="text-align: center">
+                                    <p:button 
+                                        icon="ui-icon-search" 
+                                        class="ui-button-icon-only green-pixcua" 
+                                        outcome="#{i18n['outcome.dashboard.loan.detail']}">
+                                        <f:param name="selectedId" value="#{loan.id}"/>
+                                    </p:button>
+                                </p:column>
+
+                            </p:dataTable>
+                            <p:contextMenu for="dtLoan">
+                                <p:menuitem value="Cambiar propietario" icon="ui-icon-people" onclick="PF('dlg2').show();" update="dtLoan,:dashboardResumen:msgs" />
+                                <p:menuitem rendered="#{dashboardManager.getAction()}" value="Agregar abono" icon="ui-icon-check" onclick="PF('dlg3').show();" update="dtLoan,:dashboardResumen:msgs"/>
+                                <p:menuitem value="Agregar depósito" icon="ui-icon-check" onclick="PF('dlg7').show();" update="dtLoan,:dashboardResumen:msgs"/>
+                                <p:menuitem rendered="#{dashboardManager.getAction()}" value="Agregar multa" icon="ui-icon-close" onclick="PF('dlg4').show();" update="dtLoan,:dashboardResumen:msgs" />
+                                <p:menuitem value="Cambiar préstamo" icon="ui-icon-edit" onclick="PF('dlg5').show();" update="dtLoan,:dashboardResumen:msgs" />
+                                <p:menuitem value="Cambiar ruta" icon="ui-icon-edit" onclick="PF('dlg6').show();" update="dtLoan,:dashboardResumen:msgs" />
+                                <p:menuitem rendered="#{loginBean.isUserInRole('admin.loan.deleted') and dashboardManager.getAction()}" onclick="PF('dlg9').show();" value="Borrar abono del día" update="dtLoan,:dashboardResumen:msgs" icon="ui-icon-remove">
+                                    <p:confirm message="#{i18n['general.confirm.confirm']}" /> 
+                                </p:menuitem>
+                                <p:menuitem rendered="#{loginBean.isUserInRole('admin.loan.deleted') and dashboardManager.getAction()}" onclick="PF('dlg10').show();" value="Borrar multa del día" update="dtLoan,:dashboardResumen:msgs" icon="ui-icon-remove">
+                                    <p:confirm message="#{i18n['general.confirm.confirm']}" /> 
+                                </p:menuitem>
+                                <p:menuitem rendered="#{loginBean.isUserInRole('admin.loan.deleted')}" onclick="PF('dlg8').show();" value="Borrar" update="dtLoan,:dashboardResumen:msgs" icon="ui-icon-close">
+                                    <p:confirm message="#{i18n['general.confirm.confirm']}" /> 
+                                </p:menuitem>
+                                <p:menuitem rendered="#{loginBean.isUserInRole('admin.loan.deleted')}" onclick="PF('dlg12').show();" value="Finalizar" update="dtLoan,:dashboardResumen:msgs" icon="ui-icon-close">
+                                    <p:confirm message="#{i18n['general.confirm.confirm']}" /> 
+                                </p:menuitem>
+                                <p:menuitem rendered="#{loginBean.isUserInRole('admin.loan.updated')}" value="Bono cliente nuevo" update="dtLoan,:dashboardResumen:msgs" icon="ui-icon-check" actionListener="#{dashboardManager.changeBonusNewCustomer()}">
+                                    <p:confirm message="#{i18n['general.confirm.confirm']}" /> 
+                                </p:menuitem>
+                                <p:menuitem rendered="#{loginBean.isUserInRole('admin.loan.updated')}" value="Bono cliente nuevo" update="dtLoan,:dashboardResumen:msgs" icon="ui-icon-close" actionListener="#{dashboardManager.removeBonusNewCustomer()}">
+                                    <p:confirm message="#{i18n['general.confirm.confirm']}" /> 
+                                </p:menuitem>
+                                <p:menuitem rendered="#{loginBean.isUserInRole('admin.loan.updated')}" value="Fecha de liberación" update="dtLoan,:dashboardResumen:msgs" icon="ui-icon-edit" actionListener="#{dashboardManager.updateReleaseDate()}">
+                                    <p:confirm message="#{i18n['general.confirm.confirm']}" /> 
+                                </p:menuitem>
+                                <p:menuitem rendered="#{loginBean.isUserInRole('admin.loan.updated')}" value="Permitir renovar" update="dtLoan,:dashboardResumen:msgs" icon="ui-icon-edit" actionListener="#{dashboardManager.allowRenew()}">
+                                    <p:confirm message="#{i18n['general.confirm.confirm']}" /> 
+                                </p:menuitem>
+                                <p:menuitem rendered="#{loginBean.isUserInRole('admin.loan.updated')}" value="Congelar" update="dtLoan,:dashboardResumen:msgs" icon="ui-icon-edit" actionListener="#{dashboardManager.changeFrozenStatus(true)}">
+                                    <p:confirm message="#{i18n['general.confirm.confirm']}" /> 
+                                </p:menuitem>
+                                <p:menuitem rendered="#{loginBean.isUserInRole('admin.loan.updated')}" value="Descongelar" update="dtLoan,:dashboardResumen:msgs" icon="ui-icon-edit" actionListener="#{dashboardManager.changeFrozenStatus(false)}">
+                                    <p:confirm message="#{i18n['general.confirm.confirm']}" /> 
+                                </p:menuitem>
+                            </p:contextMenu>
+                            <p:confirmDialog header="Confirmación" global="true" showEffect="fade" hideEffect="fade">
+                                <p:commandButton value="Si" type="button" styleClass="ui-confirmdialog-yes" icon="pi pi-check" />
+                                <p:commandButton value="No" type="button" styleClass="ui-confirmdialog-no" icon="pi pi-times" />
+                            </p:confirmDialog>
+
                         </div>
                     </div>
                 </h:form>
-                
+
+                <h:form id="loanForm">
+                    <p:growl id="msgsDialog" showDetail="true"/>
+                    <p:dialog  widgetVar="dlg2" width="30%" id="loanDialog" header="Cambiar propietario" modal="true" responsive="true" showEffect="clip" hideEffect="clip">
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:selectOneMenu style="width:100%"
+                                             filter="true"
+                                             filterMatchMode="contains"
+                                             value="#{dashboardManager.userId}" 
+                                             id="userSearch" required="true" 
+                                             requiredMessage="#{i18n['admin.loan.form.user.require.msg.empty']}">
+                                <f:selectItem itemLabel="Selecciona un asesor.." itemValue="" />
+                                <f:selectItems value="#{dashboardManager.users}" var="user" itemLabel="#{user.humanResource.firstName} #{user.humanResource.lastName}" itemValue="#{user.id}" />
+                            </p:selectOneMenu>
+                            <p:message for="userSearch" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <div class="ui-g-12">
+                            <p:commandButton id="addButton" value="#{i18n['button.save']}"  actionListener="#{dashboardManager.changeOwner}" oncomplete="validNewObjectGeneric(xhr, status, args)" update=":dashboardResumen:dtLoan,msgsDialog,loanDialog"/>
+                        </div>
+                    </p:dialog>
+                </h:form>
+
+                <h:form id="loanForm2">
+                    <p:growl id="msgsDialog2" showDetail="true"/>
+                    <p:dialog  widgetVar="dlg3" width="30%" id="loanDialog2" header="Agregar abono" modal="true" responsive="true" showEffect="clip" hideEffect="clip">
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:inputText id="payment" value="#{dashboardManager.payment}" autocomplete="off" style="width: 100%;">
+                            </p:inputText>
+                            <label>#{i18n['admin.moneyDaily.form.field.amount']}</label>
+                            <p:message for="payment" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:selectOneMenu style="width:100%"
+                                             filter="true"
+                                             filterMatchMode="contains"
+                                             value="#{dashboardManager.userId}" 
+                                             id="userSearch" required="true" 
+                                             requiredMessage="#{i18n['admin.loan.form.user.require.msg.empty']}">
+                                <f:selectItem itemLabel="Selecciona un asesor.." itemValue="" />
+                                <f:selectItems value="#{dashboardManager.users}" var="user" itemLabel="#{user.humanResource.firstName} #{user.humanResource.lastName}" itemValue="#{user.id}" />
+                            </p:selectOneMenu>
+                            <p:message for="userSearch" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:inputText id="comments" value="#{dashboardManager.comments}" autocomplete="off" style="width: 100%;">
+                            </p:inputText>
+                            <label>#{i18n['admin.loan.form.field.comments']}</label>
+                            <p:message for="comments" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <div class="ui-g-12">
+                            <p:commandButton id="addButton2" value="#{i18n['button.save']}"  actionListener="#{dashboardManager.addPayment()}" oncomplete="validNewObjectGeneric2(xhr, status, args)" update=":dashboardResumen:dtLoan,msgsDialog2,loanDialog2"/>
+                        </div>
+                    </p:dialog>
+                </h:form>
+
+                <h:form id="loanForm3">
+                    <p:growl id="msgsDialog3" showDetail="true"/>
+                    <p:dialog  widgetVar="dlg4" width="30%" id="loanDialog3" header="Agregar multa" modal="true" responsive="true" showEffect="clip" hideEffect="clip">
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:inputText id="fee" value="#{dashboardManager.fee}" autocomplete="off" style="width: 100%;">
+                            </p:inputText>
+                            <label>#{i18n['admin.moneyDaily.form.field.amount']}</label>
+                            <p:message for="fee" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:selectOneMenu style="width:100%"
+                                             filter="true"
+                                             filterMatchMode="contains"
+                                             value="#{dashboardManager.userId}" 
+                                             id="userSearch2" required="true" 
+                                             requiredMessage="#{i18n['admin.loan.form.user.require.msg.empty']}">
+                                <f:selectItem itemLabel="Selecciona un asesor.." itemValue="" />
+                                <f:selectItems value="#{dashboardManager.users}" var="user" itemLabel="#{user.humanResource.firstName} #{user.humanResource.lastName}" itemValue="#{user.id}" />
+                            </p:selectOneMenu>
+                            <p:message for="userSearch2" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:inputText id="comments2" value="#{dashboardManager.comments}" autocomplete="off" style="width: 100%;">
+                            </p:inputText>
+                            <label>#{i18n['admin.loan.form.field.comments']}</label>
+                            <p:message for="comments2" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <div class="ui-g-12">
+                            <p:commandButton id="addButton2" value="#{i18n['button.save']}"  actionListener="#{dashboardManager.addFee()}" oncomplete="validNewObjectGeneric3(xhr, status, args)" update=":dashboardResumen:dtLoan,msgsDialog3,loanDialog3"/>
+                        </div>
+                    </p:dialog>
+                </h:form>
+
+                <h:form id="loanForm4">
+                    <p:growl id="msgsDialog4" showDetail="true"/>
+                    <p:dialog  widgetVar="dlg5" width="30%" id="loanDialog4" header="Modificar monto a vender" modal="true" responsive="true" showEffect="clip" hideEffect="clip">
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:selectOneMenu style="width:100%"
+                                             filter="true"
+                                             filterMatchMode="contains"
+                                             value="#{dashboardManager.loanTypeId}" 
+                                             id="userSearch4" required="true" 
+                                             requiredMessage="El tipo de préstamo es obligatorio">
+                                <f:selectItem itemLabel="Selecciona un tipo de venta.." itemValue="" />
+                                <f:selectItems value="#{dashboardManager.loanType}" var="loanType" itemLabel="#{loanType.loanTypeName}" itemValue="#{loanType.id}" />
+                            </p:selectOneMenu>
+                            <p:message for="userSearch4" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:inputText id="commentsBitacora2" value="#{dashboardManager.commentsBitacora}" autocomplete="off" style="width: 100%;">
+                            </p:inputText>
+                            <label>Comentarios</label>
+                            <p:message for="commentsBitacora2" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <div class="ui-g-12">
+                            <p:commandButton id="addButton3" value="#{i18n['button.save']}"  actionListener="#{dashboardManager.changeLoanType()}" oncomplete="validNewObjectGeneric4(xhr, status, args)" update=":dashboardResumen:dtLoan,msgsDialog4,loanDialog4"/>
+                        </div>
+                    </p:dialog>
+                </h:form>
+
+                <h:form id="loanForm5">
+                    <p:growl id="msgsDialog5" showDetail="true"/>
+                    <p:dialog  widgetVar="dlg6" width="30%" id="loanDialog5" header="Cambiar ruta" modal="true" responsive="true" showEffect="clip" hideEffect="clip">
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:selectOneMenu style="width:100%"
+                                             filter="true"
+                                             filterMatchMode="contains"
+                                             value="#{dashboardManager.routeId}" 
+                                             id="routeSearch" required="true" 
+                                             requiredMessage="La ruta es obligatoria">
+                                <f:selectItem itemLabel="Selecciona una ruta.." itemValue="" />
+                                <f:selectItems value="#{dashboardManager.route}" var="route" itemLabel="#{route.route}" itemValue="#{route.id}" />
+                            </p:selectOneMenu>
+                            <p:message for="routeSearch" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <div class="ui-g-12">
+                            <p:commandButton id="addButton4" value="#{i18n['button.save']}"  actionListener="#{dashboardManager.changeRoute}" oncomplete="validNewObjectGeneric5(xhr, status, args)" update=":dashboardResumen:dtLoan,msgsDialog5,loanDialog5"/>
+                        </div>
+                    </p:dialog>
+                </h:form>
+
+                <h:form id="loanForm6">
+                    <p:growl id="msgsDialog6" showDetail="true"/>
+                    <p:dialog  widgetVar="dlg7" width="30%" id="loanDialog6" header="Agregar depósito" modal="true" responsive="true" showEffect="clip" hideEffect="clip">
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:inputText id="paymentDeposit" value="#{dashboardManager.payment}" autocomplete="off" style="width: 100%;">
+                            </p:inputText>
+                            <label>#{i18n['admin.moneyDaily.form.field.amount']}</label>
+                            <p:message for="paymentDeposit" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:selectOneMenu style="width:100%"
+                                             filter="true"
+                                             filterMatchMode="contains"
+                                             value="#{dashboardManager.userId}" 
+                                             id="userSearchDeposit" required="true" 
+                                             requiredMessage="#{i18n['admin.loan.form.user.require.msg.empty']}">
+                                <f:selectItem itemLabel="Selecciona un asesor.." itemValue="" />
+                                <f:selectItems value="#{dashboardManager.users}" var="user" itemLabel="#{user.humanResource.firstName} #{user.humanResource.lastName}" itemValue="#{user.id}" />
+                            </p:selectOneMenu>
+                            <p:message for="userSearchDeposit" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:inputText id="commentsDeposit" value="#{dashboardManager.comments}" autocomplete="off" style="width: 100%;">
+                            </p:inputText>
+                            <label>#{i18n['admin.loan.form.field.comments']}</label>
+                            <p:message for="commentsDeposit" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <div class="ui-g-12">
+                            <p:commandButton id="addButton5" value="#{i18n['button.save']}"  actionListener="#{dashboardManager.addDeposit()}" oncomplete="validNewObjectGeneric6(xhr, status, args)" update=":dashboardResumen:dtLoan,msgsDialog6,loanDialog6"/>
+                        </div>
+                    </p:dialog>
+                </h:form>
+
+                <h:form id="bitacoraForm">
+                    <p:growl id="msgsDialogBitacora" showDetail="true"/>
+                    <p:dialog  widgetVar="dlg8" width="30%" id="loanDialogBitacora" header="Eliminar préstamo" modal="true" responsive="true" showEffect="clip" hideEffect="clip">
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:inputText id="commentsBitacora" value="#{dashboardManager.commentsBitacora}" autocomplete="off" style="width: 100%;">
+                            </p:inputText>
+                            <label>Comentarios</label>
+                            <p:message for="commentsBitacora" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <div class="ui-g-12">
+                            <p:commandButton id="addButtonBitacora" value="#{i18n['button.save']}"  actionListener="#{dashboardManager.deleteLoan}" oncomplete="validNewObjectGeneric7(xhr, status, args)" update=":dashboardResumen:dtLoan,msgsDialogBitacora,loanDialogBitacora"/>
+                        </div>
+                    </p:dialog>
+                </h:form>
+
+                <h:form id="bitacoraForm1">
+                    <p:growl id="msgsDialogBitacora1" showDetail="true"/>
+                    <p:dialog  widgetVar="dlg9" width="30%" id="loanDialogBitacora1" header="Eliminar abono del día" modal="true" responsive="true" showEffect="clip" hideEffect="clip">
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:inputText id="commentsBitacora1" value="#{dashboardManager.commentsBitacora}" autocomplete="off" style="width: 100%;">
+                            </p:inputText>
+                            <label>Comentarios</label>
+                            <p:message for="commentsBitacora1" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <div class="ui-g-12">
+                            <p:commandButton id="addButtonBitacora1" value="#{i18n['button.save']}"  actionListener="#{dashboardManager.deletePaymentLoan}" oncomplete="validNewObjectGeneric8(xhr, status, args)" update=":dashboardResumen:dtLoan,msgsDialogBitacora1,loanDialogBitacora1"/>
+                        </div>
+                    </p:dialog>
+                </h:form>
+
+                <h:form id="bitacoraForm2">
+                    <p:growl id="msgsDialogBitacora2" showDetail="true"/>
+                    <p:dialog  widgetVar="dlg10" width="30%" id="loanDialogBitacora2" header="Eliminar multa del día" modal="true" responsive="true" showEffect="clip" hideEffect="clip">
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:inputText id="commentsBitacora2" value="#{dashboardManager.commentsBitacora}" autocomplete="off" style="width: 100%;">
+                            </p:inputText>
+                            <label>Comentarios</label>
+                            <p:message for="commentsBitacora2" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <div class="ui-g-12">
+                            <p:commandButton id="addButtonBitacora2" value="#{i18n['button.save']}"  actionListener="#{dashboardManager.deleteFeeLoan}" oncomplete="validNewObjectGeneric9(xhr, status, args)" update=":dashboardResumen:dtLoan,msgsDialogBitacora2,loanDialogBitacora2"/>
+                        </div>
+                    </p:dialog>
+                </h:form>
+
+                <h:form id="bitacoraForm3">
+                    <p:growl id="msgsDialogBitacora3" showDetail="true"/>
+                    <p:dialog  widgetVar="dlg11" width="30%" id="loanDialogBitacora3" header="Cambiar a aprobado" modal="true" responsive="true" showEffect="clip" hideEffect="clip">
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:inputText id="commentsBitacora3" value="#{dashboardManager.commentsBitacora}" autocomplete="off" style="width: 100%;">
+                            </p:inputText>
+                            <label>Comentarios</label>
+                            <p:message for="commentsBitacora3" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <div class="ui-g-12">
+                            <p:commandButton id="addButtonBitacora3" value="#{i18n['button.save']}"  actionListener="#{dashboardManager.changeApprovedStatus}" oncomplete="validNewObjectGeneric10(xhr, status, args)" update=":dashboardResumen:dtLoan,msgsDialogBitacora3,loanDialogBitacora3"/>
+                        </div>
+                    </p:dialog>
+                </h:form>
+
+                <h:form id="bitacoraForm4">
+                    <p:growl id="msgsDialogBitacora4" showDetail="true"/>
+                    <p:dialog  widgetVar="dlg12" width="30%" id="loanDialogBitacora4" header="Cambiar a finalizado" modal="true" responsive="true" showEffect="clip" hideEffect="clip">
+                        <br></br>
+                        <h:panelGroup styleClass="md-inputfield" >
+                            <p:inputText id="commentsBitacora4" value="#{dashboardManager.commentsBitacora}" autocomplete="off" style="width: 100%;">
+                            </p:inputText>
+                            <label>Comentarios</label>
+                            <p:message for="commentsBitacora4" display="text"/>
+                        </h:panelGroup>
+                        <br></br>
+                        <div class="ui-g-12">
+                            <p:commandButton id="addButtonBitacora4" value="#{i18n['button.save']}"  actionListener="#{dashboardManager.changeFinishStatus}" oncomplete="validNewObjectGeneric11(xhr, status, args)" update=":dashboardResumen:dtLoan,msgsDialogBitacora4,loanDialogBitacora4"/>
+                        </div>
+                    </p:dialog>
+                </h:form>
+
             </div>
         </div>
     </ui:define>