From 5c92f8098e706c788fb2fdaf492951a1a0f7faa4 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 6 Jun 2012 16:04:23 +0200
Subject: [PATCH] Fix issues in ExpenseSheetCRUDController regarding to
 BaseCRUDController

FEA: ItEr76S28UserDashboard
---
 .../expensesheet/ExpenseSheetCRUDController.java  | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java
index 26aaf8d08..6b6277b90 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java
@@ -129,16 +129,7 @@ public class ExpenseSheetCRUDController extends BaseCRUDController<ExpenseSheet>
         expenseSheetModel.generateExpenseSheetLineCodesIfIsNecessary();
     }
 
-    public void cancel() {
-        goToList();
-    }
-
-    private void goToEditWindow() {
-        showEditWindow();
-        loadComponentsEditWindow();
-    }
-
-     private void loadComponentsEditWindow() {
+    private void loadComponentsEditWindow() {
         tbConcept = (Textbox) editWindow.getFellowIfAny("tbConcept");
         dateboxExpenseDate = (Datebox) editWindow.getFellowIfAny("dateboxExpenseDate");
         dboxValue = (Decimalbox) editWindow.getFellowIfAny("dboxValue");
@@ -592,13 +583,13 @@ public class ExpenseSheetCRUDController extends BaseCRUDController<ExpenseSheet>
     @Override
     protected void initCreate() {
         expenseSheetModel.initCreate();
-        goToEditWindow();
+        loadComponentsEditWindow();
     }
 
     @Override
     protected void initEdit(ExpenseSheet expenseSheet) {
         expenseSheetModel.prepareToEdit(expenseSheet);
-        goToEditWindow();
+        loadComponentsEditWindow();
     }
 
     @Override