diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/EntityNameEnum.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/EntityNameEnum.java index 0610d4aa4..890dd1c50 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/EntityNameEnum.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/EntityNameEnum.java @@ -47,13 +47,13 @@ import org.libreplan.business.workreports.entities.WorkReportType; */ public enum EntityNameEnum { - ORDER("Order", false), CRITERION("Criterion", true), LABEL("Label", true), MACHINE( - "Machine", true), WORKER("Worker", true), UNIT_TYPE("Unit type", + ORDER("Project", false), CRITERION("Criterion", true), LABEL("Label", true), MACHINE( + "Machine", true), WORKER("Worker", true), UNIT_TYPE( + "Material unit", true), CALENDAR("Calendar", true), WORK_HOURS_TYPE( - "Type of work hours", true), MATERIAL_CATEGORY("Material category", - true), WORK_REPORT("Work report", true), WORKREPORTTYPE( - "Work report type", false), CALENDAR_EXCEPTION_TYPE( - "Calendar exception type", true), COST_CATEGORY("Cost category", + "Hours type", true), MATERIAL_CATEGORY("Material category", true), WORK_REPORT( + "Timesheet", true), WORKREPORTTYPE("Timesheet template", false), CALENDAR_EXCEPTION_TYPE( + "Calendar exception day", true), COST_CATEGORY("Cost category", true), RESOURCE_CALENDAR("Resource calendar", true), CRITERION_SATISFACTION( "Criterion satisfaction", true), RESOURCE_COST_CATEGORY_ASSIGNMENT( "Resource cost category assignment", true), EXPENSE_SHEET("Expense sheet", true); diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/TypeOfWorkHoursDAO.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/TypeOfWorkHoursDAO.java index 4ed9ede03..bfa585272 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/TypeOfWorkHoursDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/TypeOfWorkHoursDAO.java @@ -158,7 +158,7 @@ public class TypeOfWorkHoursDAO extends IntegrationEntityDAO if (!workReportLines.isEmpty()) { throw ValidationException .invalidValue( - "Cannot delete type of work hours. It is being used at this moment in some work report line.", + "Cannot delete type of work hours. It is being used at this moment in some timesheet line.", type); } } diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/bootstrap/PredefinedProfiles.java b/libreplan-business/src/main/java/org/libreplan/business/users/bootstrap/PredefinedProfiles.java index 9e948186b..709601e53 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/users/bootstrap/PredefinedProfiles.java +++ b/libreplan-business/src/main/java/org/libreplan/business/users/bootstrap/PredefinedProfiles.java @@ -55,7 +55,7 @@ import static org.libreplan.business.users.entities.UserRole.ROLE_VIRTUAL_WORKER import static org.libreplan.business.users.entities.UserRole.ROLE_WORKERS; import static org.libreplan.business.users.entities.UserRole.ROLE_WORK_AND_PROGRESS_PER_PROJECT_REPORT; import static org.libreplan.business.users.entities.UserRole.ROLE_WORK_AND_PROGRESS_PER_TASK_REPORT; -import static org.libreplan.business.users.entities.UserRole.ROLE_WORK_REPORT_LINES_REPORT; +import static org.libreplan.business.users.entities.UserRole.ROLE_TIMESHEET_LINES_LIST_REPORT; import java.util.Arrays; import java.util.HashSet; @@ -97,7 +97,7 @@ public enum PredefinedProfiles { TIME_TRACKING_AND_EXPENSES_RESPONSIBLE( "Time Tracking & Expenses Responsible", ROLE_TIMESHEETS, ROLE_TIMESHEETS_TEMPLATES, ROLE_EXPENSES, ROLE_HOURS_TYPES, - ROLE_WORK_REPORT_LINES_REPORT, + ROLE_TIMESHEET_LINES_LIST_REPORT, ROLE_HOURS_WORKED_PER_RESOURCE_REPORT, ROLE_TOTAL_WORKED_HOURS_BY_RESOURCE_IN_A_MONTH_REPORT), @@ -105,7 +105,7 @@ public enum PredefinedProfiles { ROLE_SEND_TO_SUBCONTRACTORS, ROLE_RECEIVED_FROM_SUBCONTRACTORS, ROLE_SEND_TO_CUSTOMERS, ROLE_RECEIVED_FROM_CUSTOMERS), - REPORTS_RESPONSIBLE("Reports Responsible", ROLE_WORK_REPORT_LINES_REPORT, + REPORTS_RESPONSIBLE("Reports Responsible", ROLE_TIMESHEET_LINES_LIST_REPORT, ROLE_HOURS_WORKED_PER_RESOURCE_REPORT, ROLE_TOTAL_WORKED_HOURS_BY_RESOURCE_IN_A_MONTH_REPORT, ROLE_WORK_AND_PROGRESS_PER_PROJECT_REPORT, diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java b/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java index 7ec8b99cd..bbbbcfccc 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java +++ b/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java @@ -70,7 +70,7 @@ public enum UserRole { ROLE_RECEIVED_FROM_SUBCONTRACTORS(_("Received From Subcontractors")), ROLE_SEND_TO_CUSTOMERS(_("Send To Customers")), ROLE_RECEIVED_FROM_CUSTOMERS(_("Received From Customers")), - ROLE_WORK_REPORT_LINES_REPORT(_("Work Report Lines Report")), + ROLE_TIMESHEET_LINES_LIST_REPORT(_("Timesheet Lines List Report")), ROLE_HOURS_WORKED_PER_RESOURCE_REPORT(_("Hours Worked Per Resource Report")), ROLE_TOTAL_WORKED_HOURS_BY_RESOURCE_IN_A_MONTH_REPORT(_("Total Worked Hours By Resource In A Month Report")), ROLE_WORK_AND_PROGRESS_PER_PROJECT_REPORT(_("Work And Progress Per Project Report")), diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java index 5594ea902..8781f6b5e 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java @@ -130,7 +130,7 @@ public class WorkReport extends IntegrationEntity implements } } - @NotNull(message = "work report type not specified") + @NotNull(message = "timesheet template not specified") public WorkReportType getWorkReportType() { return workReportType; } @@ -259,7 +259,7 @@ public class WorkReport extends IntegrationEntity implements } @SuppressWarnings("unused") - @AssertTrue(message = "label type:the work report have not assigned this label type") + @AssertTrue(message = "label type:the timesheet have not assigned this label type") public boolean checkConstraintAssignedLabelTypes() { if (this.workReportType == null) { return true; @@ -281,7 +281,7 @@ public class WorkReport extends IntegrationEntity implements } @SuppressWarnings("unused") - @AssertTrue(message = "description value:the work report have not assigned the description field") + @AssertTrue(message = "description value:the timesheet have not assigned the description field") public boolean checkConstraintAssignedDescriptionValues() { if (this.workReportType == null) { return true; @@ -304,7 +304,7 @@ public class WorkReport extends IntegrationEntity implements } @SuppressWarnings("unused") - @AssertTrue(message = "There are repeated description values in the work report ") + @AssertTrue(message = "There are repeated description values in the timesheet ") public boolean checkConstraintAssignedRepeatedDescriptionValues() { Set textFields = new HashSet(); @@ -359,7 +359,7 @@ public class WorkReport extends IntegrationEntity implements assignItsDescriptionValues(workReportType); assignItsLabels(workReportType); - // it updates the fields and labels of its work report lines + // it updates the fields and labels of its timesheet lines for (WorkReportLine line : getWorkReportLines()) { line.updateItsFieldsAndLabels(); } @@ -432,7 +432,7 @@ public class WorkReport extends IntegrationEntity implements } - @AssertTrue(message = "The work report line codes must be unique.") + @AssertTrue(message = "The timesheet line codes must be unique.") public boolean checkConstraintNonRepeatedWorkReportLinesCodes() { return getFirstRepeatedCode(this.workReportLines) == null; } @@ -470,7 +470,7 @@ public class WorkReport extends IntegrationEntity implements return result; } - @AssertTrue(message = "only one work report line per day and task is allowed in monthly timesheets") + @AssertTrue(message = "only one timesheet line per day and task is allowed in monthly timesheets") public boolean checkConstraintOnlyOneWorkReportLinePerDayAndOrderElementInMonthlyTimesheet() { if (!getWorkReportType().isMonthlyTimesheetsType()) { return true; @@ -492,7 +492,7 @@ public class WorkReport extends IntegrationEntity implements return true; } - @AssertTrue(message = "all work report lines have to be in the same month in monthly timesheets") + @AssertTrue(message = "all timesheet lines have to be in the same month in monthly timesheets") public boolean checkConstraintAllWorkReportLinesInTheSameMonthInMonthlyTimesheet() { if (!getWorkReportType().isMonthlyTimesheetsType()) { return true; diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java index ef5652b2e..7c3e9c03c 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java @@ -164,7 +164,7 @@ public class WorkReportType extends IntegrationEntity implements IHumanIdentifia } @SuppressWarnings("unused") - @AssertTrue(message = "work report type name is already being used") + @AssertTrue(message = "timeshet template name is already being used") public boolean checkConstraintUniqueWorkReportTypeName() { IWorkReportTypeDAO workReportTypeDAO = Registry.getWorkReportTypeDAO(); if (isNewObject()) { @@ -195,7 +195,7 @@ public class WorkReportType extends IntegrationEntity implements IHumanIdentifia } @SuppressWarnings("unused") - @AssertTrue(message = "the assigned label type can not repeat in the work report type.") + @AssertTrue(message = "the assigned label type can not repeat in the timeshet template.") public boolean checkConstraintNotExistRepeatedLabelTypes() { for (WorkReportLabelTypeAssigment assignedLabelType : this.workReportLabelTypeAssigments) { if (existRepeatedLabelType(assignedLabelType)) { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java index 4eac07ea2..02dcbe5bd 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java @@ -440,8 +440,8 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { List reportsItems = new ArrayList(); if (SecurityUtils - .isSuperuserOrUserInRoles(UserRole.ROLE_WORK_REPORT_LINES_REPORT)) { - reportsItems.add(subItem(_("Work Report Lines"), + .isSuperuserOrUserInRoles(UserRole.ROLE_TIMESHEET_LINES_LIST_REPORT)) { + reportsItems.add(subItem(_("Timesheet Lines List"), "/workreports/workReportQuery.zul", "09-partes.html#id4")); } if (SecurityUtils diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java index 814fce5ad..1bcd5d01a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java @@ -109,12 +109,12 @@ public class TypeOfWorkHoursCRUDController extends BaseCRUDController { @Override protected String getEntityType() { - return _("Unit Measure"); + return _("Material Unit"); } @Override protected String getPluralEntityType() { - return _("Unit Measures"); + return _("Material Units"); } @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java index 89cef0659..4580ab651 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java @@ -918,7 +918,7 @@ public class OrderCRUDController extends GenericForwardComposer { .showMessage( Level.ERROR, _( - "You can not remove the project \"{0}\" because of any of its tasks are already in use in some work reports and the project just exists in the current scenario", + "You can not remove the project \"{0}\" because of any of its tasks are already in use in some timesheets and the project just exists in the current scenario", order.getName())); } else { if (!StringUtils.isBlank(order.getExternalCode())) { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java index e7ebdae94..25e43b3b6 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java @@ -713,7 +713,7 @@ public class OrderElementTreeController extends TreeController { messagesForUser .showMessage( Level.ERROR, - _("You can not remove the task \"{0}\" because of this or any of its children are already in use in some work reports", + _("You can not remove the task \"{0}\" because of this or any of its children are already in use in some timesheets", element.getName())); } else { super.remove(element); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java index 27e3a2d11..4603a3e19 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java @@ -251,7 +251,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements if (Messagebox.OK == status) { workReportModel.remove(workReport); messagesForUser.showMessage(Level.INFO, - _("Work report removed successfully")); + _("Timesheet removed successfully")); loadComponentslist(listWindow); Util.reloadBindings(listWindow); } @@ -293,8 +293,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements workReportModel.generateWorkReportLinesIfIsNecessary(); try { workReportModel.confirmSave(); - messagesForUser.showMessage(Level.INFO, - _("Work report saved")); + messagesForUser.showMessage(Level.INFO, _("Timesheet saved")); return true; } catch (ValidationException e) { showInvalidValues(e); @@ -660,7 +659,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements cameBackList = false; workReportModel.initCreate(workReportType); prepareWorkReportList(); - createWindow.setTitle(_("Create Work Report")); + createWindow.setTitle(_("Create Timesheet")); getVisibility().showOnly(createWindow); loadComponents(createWindow); Util.reloadBindings(createWindow); @@ -679,7 +678,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements goToEditMonthlyTimeSheet(workReport); } else { workReportModel.initEdit(workReport); - createWindow.setTitle(_("Edit Work Report")); + createWindow.setTitle(_("Edit Timesheet")); loadComponents(createWindow); prepareWorkReportList(); getVisibility().showOnly(createWindow); @@ -1533,7 +1532,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements private final String SHOW_ALL = _("Show all"); - private final String FILTER = _("Filter work reports"); + private final String FILTER = _("Filter timesheets"); public List getFilterWorkReportTypes() { List result = workReportModel.getWorkReportTypes(); @@ -1863,13 +1862,13 @@ public class WorkReportCRUDController extends GenericForwardComposer implements Listitem selectedItem = listTypeToAssign.getSelectedItem(); if (selectedItem == null) { throw new WrongValueException(listTypeToAssign, - _("please, select a work report type")); + _("please, select a timesheet template type")); } WorkReportType type = (WorkReportType) selectedItem.getValue(); if (type == null) { throw new WrongValueException(listTypeToAssign, - _("please, select a work report type")); + _("please, select a timesheet template type")); } goToCreateForm(type); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java index 94490149c..d54d4cd4d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java @@ -654,7 +654,7 @@ public class WorkReportTypeCRUDController extends BaseCRUDController + access="ROLE_SUPERUSER,ROLE_TIMESHEET_LINES_LIST_REPORT" /> . --> - + diff --git a/libreplan-webapp/src/main/webapp/common/configuration.zul b/libreplan-webapp/src/main/webapp/common/configuration.zul index 75790f38a..9df2b1865 100644 --- a/libreplan-webapp/src/main/webapp/common/configuration.zul +++ b/libreplan-webapp/src/main/webapp/common/configuration.zul @@ -20,7 +20,7 @@ . --> - + @@ -33,7 +33,7 @@ + title="${i18n:_('Main Settings')}"> @@ -131,17 +131,17 @@ diff --git a/libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul b/libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul index 5cfc4d361..3c12eebc0 100644 --- a/libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul +++ b/libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul @@ -19,7 +19,7 @@ along with this program. If not, see . --> - + diff --git a/libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul b/libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul index dd3faad3d..95e6aaf4f 100644 --- a/libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul +++ b/libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul @@ -18,7 +18,7 @@ --> - + diff --git a/libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul b/libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul index 8505f3340..0f52353bd 100644 --- a/libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul +++ b/libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul @@ -33,7 +33,7 @@
-
diff --git a/libreplan-webapp/src/main/webapp/planner/index.zul b/libreplan-webapp/src/main/webapp/planner/index.zul index 817026d99..c93c7cdd7 100644 --- a/libreplan-webapp/src/main/webapp/planner/index.zul +++ b/libreplan-webapp/src/main/webapp/planner/index.zul @@ -19,7 +19,7 @@ along with this program. If not, see . --> - + diff --git a/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul b/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul index 5182715be..741363bc7 100644 --- a/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul +++ b/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul @@ -18,7 +18,7 @@ along with this program. If not, see . --> - + diff --git a/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul b/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul index b304b3e69..cf1a9c9eb 100644 --- a/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul +++ b/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul @@ -111,7 +111,7 @@ diff --git a/libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul b/libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul index e00356c09..9c43e898a 100644 --- a/libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul +++ b/libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul @@ -18,7 +18,7 @@ along with this program. If not, see . --> - + @@ -36,7 +36,7 @@ + title="${i18n:_('Project Costs')}"> diff --git a/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul b/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul index f3c7d91f5..fcc37f89a 100644 --- a/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul +++ b/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul @@ -17,7 +17,7 @@ along with this program. If not, see . --> - + @@ -30,7 +30,7 @@ + title="${i18n:_('Communications From Customers')}">
diff --git a/libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul b/libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul index 0f440aa69..a73c2cb10 100644 --- a/libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul +++ b/libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul @@ -19,7 +19,7 @@ along with this program. If not, see . --> - + @@ -32,7 +32,7 @@
+ title="${i18n:_('Communications To Customers')}"> diff --git a/libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul b/libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul index dd2037c31..f3c882500 100644 --- a/libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul +++ b/libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul @@ -19,7 +19,7 @@ along with this program. If not, see . --> - + @@ -32,7 +32,7 @@
+ title="${i18n:_('Communications To Subcontractors')}"> diff --git a/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul b/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul index b046646f8..31eb4f235 100644 --- a/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul +++ b/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul @@ -17,7 +17,7 @@ along with this program. If not, see . --> - + @@ -30,7 +30,7 @@ + title="${i18n:_('Communications From Subcontractors')}">
diff --git a/libreplan-webapp/src/main/webapp/templates/templates.zul b/libreplan-webapp/src/main/webapp/templates/templates.zul index 2b76e1c9a..24df153fd 100644 --- a/libreplan-webapp/src/main/webapp/templates/templates.zul +++ b/libreplan-webapp/src/main/webapp/templates/templates.zul @@ -19,7 +19,7 @@ along with this program. If not, see . --> - + diff --git a/libreplan-webapp/src/main/webapp/typeofworkhours/typeOfWorkHours.zul b/libreplan-webapp/src/main/webapp/typeofworkhours/typeOfWorkHours.zul index 04b7b43a8..35cb118be 100644 --- a/libreplan-webapp/src/main/webapp/typeofworkhours/typeOfWorkHours.zul +++ b/libreplan-webapp/src/main/webapp/typeofworkhours/typeOfWorkHours.zul @@ -20,7 +20,7 @@ --> - + diff --git a/libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul b/libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul index 9f153e73b..293a25eae 100644 --- a/libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul +++ b/libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> - + diff --git a/libreplan-webapp/src/main/webapp/users/users.zul b/libreplan-webapp/src/main/webapp/users/users.zul index 740e0fdd5..fcaec9072 100644 --- a/libreplan-webapp/src/main/webapp/users/users.zul +++ b/libreplan-webapp/src/main/webapp/users/users.zul @@ -20,7 +20,7 @@ --> - + diff --git a/libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul b/libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul index a7880e57b..0f1923bf6 100644 --- a/libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul +++ b/libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul @@ -19,7 +19,7 @@ along with this program. If not, see . --> - + @@ -44,7 +44,7 @@ onClick="controller.confirmDelete(self.parent.parent.value);"> - diff --git a/libreplan-webapp/src/main/webapp/workreports/workReport.zul b/libreplan-webapp/src/main/webapp/workreports/workReport.zul index 4b4a4a7d5..506821b7f 100644 --- a/libreplan-webapp/src/main/webapp/workreports/workReport.zul +++ b/libreplan-webapp/src/main/webapp/workreports/workReport.zul @@ -20,7 +20,7 @@ --> - + @@ -35,12 +35,12 @@ apply="org.libreplan.web.workreports.WorkReportCRUDController"> - + -