Permalink
Browse files

Merge branch 'master' into tim-connector

  • Loading branch information...
2 parents 111b780 + 82f2591 commit 28e56f8ae19f717a048e90e26fa4479ad1909425 @mrego mrego committed Mar 27, 2013
Showing with 15,823 additions and 3,956 deletions.
  1. +1 −0 AUTHORS.rst
  2. +1 −0 doc/src/user/en/20-acerca-de.rst
  3. +1 −0 doc/src/user/es/20-acerca-de.rst
  4. +1 −0 doc/src/user/gl/20-acerca-de.rst
  5. +9 −21 ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
  6. +249 −0 ganttzk/src/main/resources/i18n/zh.po
  7. +4 −0 libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java
  8. +8 −0 libreplan-business/src/main/java/org/libreplan/business/orders/daos/IOrderDAO.java
  9. +256 −0 libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java
  10. +4 −0 libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
  11. +8 −0 libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java
  12. +10 −0 libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java
  13. +44 −15 libreplan-business/src/main/java/org/libreplan/business/planner/daos/DayAssignmentDAO.java
  14. +6 −1 libreplan-business/src/main/java/org/libreplan/business/planner/daos/IDayAssignmentDAO.java
  15. +80 −0 ...n-business/src/main/java/org/libreplan/business/resources/daos/IResourceLoadRatiosCalculator.java
  16. +218 −0 ...an-business/src/main/java/org/libreplan/business/resources/daos/ResourceLoadRatiosCalculator.java
  17. +4 −0 libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java
  18. +27 −9 libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java
  19. +2 −1 libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java
  20. +89 −10 libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java
  21. +65 −0 libreplan-business/src/main/resources/db.changelog-1.3.xml
  22. +14 −0 libreplan-business/src/main/resources/org/libreplan/business/users/entities/Users.hbm.xml
  23. +3 −0 libreplan-webapp/pom.xml
  24. +14 −0 ...eplan-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_zh.properties
  25. +11 −0 ...pp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_zh.properties
  26. +18 −0 libreplan-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_zh.properties
  27. +28 −0 libreplan-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_zh.properties
  28. +20 −0 libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_zh.properties
  29. +24 −0 ...webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder_zh.properties
  30. +17 −0 ...lan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_zh.properties
  31. +28 −0 ...bapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_zh.properties
  32. +24 −0 libreplan-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_zh.properties
  33. +270 −0 libreplan-webapp/src/main/java/org/libreplan/web/common/FilterUtils.java
  34. +11 −7 libreplan-webapp/src/main/java/org/libreplan/web/common/ViewSwitcher.java
  35. +13 −0 libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java
  36. +12 −0 ...webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java
  37. +2 −2 ...src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java
  38. +2 −2 ...webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java
  39. +2 −2 .../src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java
  40. +2 −2 ...pp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java
  41. +8 −0 libreplan-webapp/src/main/java/org/libreplan/web/orders/IOrderModel.java
  42. +195 −18 libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
  43. +8 −0 libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java
  44. +102 −5 libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
  45. +34 −0 libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
  46. +24 −0 libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskGroupPredicate.java
  47. +16 −8 ...eplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java
  48. +4 −1 libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/IResourceAllocationModel.java
  49. +25 −4 ...eplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java
  50. +15 −1 libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationModel.java
  51. +72 −13 libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
  52. +163 −43 libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java
  53. +10 −7 libreplan-webapp/src/main/java/org/libreplan/web/planner/company/ICompanyPlanningModel.java
  54. +65 −23 libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java
  55. +33 −10 libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java
  56. +3 −1 libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java
  57. +1 −1 libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
  58. +3 −2 libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java
  59. +17 −1 libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java
  60. +18 −1 libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java
  61. +2 −2 ...-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java
  62. +3 −0 libreplan-webapp/src/main/java/org/libreplan/web/resourceload/IResourceLoadModel.java
  63. +120 −9 libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java
  64. +17 −0 libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java
  65. +8 −0 libreplan-webapp/src/main/java/org/libreplan/web/resources/search/AllocationSelectorController.java
  66. +244 −30 ...plan-webapp/src/main/java/org/libreplan/web/resources/search/NewAllocationSelectorController.java
  67. +8 −1 libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
  68. +34 −0 libreplan-webapp/src/main/java/org/libreplan/web/users/settings/ISettingsModel.java
  69. +109 −0 libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java
  70. +109 −0 libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
  71. +2,326 −1,963 libreplan-webapp/src/main/resources/i18n/es.po
  72. +1,793 −1,727 libreplan-webapp/src/main/resources/i18n/keys.pot
  73. +8,552 −0 libreplan-webapp/src/main/resources/i18n/zh.po
  74. +35 −0 libreplan-webapp/src/main/webapp/myaccount/settings.zul
  75. +5 −5 libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
  76. +5 −3 libreplan-webapp/src/main/webapp/orders/_orderFilter.zul
  77. +35 −5 libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul
View
@@ -51,6 +51,7 @@ Translators
Helena Grosso <lenagrosso@gmail.com>,
Joaquim Rocha <jrocha@igalia.com>
* [ru] Pavel Rudensky <prudensky@gmail.com>
+* [zh] Swanson Chan <lacidophilin@yahoo.com>
Contributors
@@ -86,6 +86,7 @@ Translators
Helena Grosso <lenagrosso@gmail.com>,
Joaquim Rocha <jrocha@igalia.com>
* [ru] Pavel Rudensky <prudensky@gmail.com>
+* [zh] Swanson Chan <lacidophilin@yahoo.com>
Contributors
------------
@@ -86,6 +86,7 @@ Traductores
Helena Grosso <lenagrosso@gmail.com>,
Joaquim Rocha <jrocha@igalia.com>
* [ru] Pavel Rudensky <prudensky@gmail.com>
+* [zh] Swanson Chan <lacidophilin@yahoo.com>
Contribuidores
--------------
@@ -86,6 +86,7 @@ Traductores
Helena Grosso <lenagrosso@gmail.com>,
Joaquim Rocha <jrocha@igalia.com>
* [ru] Pavel Rudensky <prudensky@gmail.com>
+* [zh] Swanson Chan <lacidophilin@yahoo.com>
Contribuidores
--------------
@@ -144,8 +144,6 @@ public static boolean guessShowMoneyCostBarByDefault(
private GanttPanel ganttPanel;
- private boolean fixedZoomByUser = false;
-
private List<? extends CommandContextualized<?>> contextualizedGlobalCommands;
private CommandContextualized<?> goingDownInLastArrowCommand;
@@ -174,7 +172,7 @@ public static boolean guessShowMoneyCostBarByDefault(
private boolean isFlattenTree = false;
- private ZoomLevel initialZoomLevel = null;
+ private ZoomLevel zoomLevel = null;
private Listbox listZoomLevels = null;
@@ -276,8 +274,7 @@ public void setZoomLevel(final ZoomLevel zoomLevel, int scrollLeft) {
if (ganttPanel == null) {
return;
}
- this.fixedZoomByUser = true;
- initialZoomLevel = zoomLevel;
+ this.zoomLevel = zoomLevel;
ganttPanel.setZoomLevel(zoomLevel, scrollLeft);
}
@@ -732,22 +729,14 @@ public void print() {
public ZoomLevel getZoomLevel() {
if (ganttPanel == null) {
- return initialZoomLevel != null ? initialZoomLevel
+ return zoomLevel != null ? zoomLevel
: ZoomLevel.DETAIL_ONE;
}
return ganttPanel.getTimeTracker().getDetailLevel();
}
- public boolean isFixedZoomByUser() {
- return this.fixedZoomByUser;
- }
-
public void setInitialZoomLevel(final ZoomLevel zoomLevel) {
- if (this.initialZoomLevel != null) {
- // already initialized
- return;
- }
- this.initialZoomLevel = zoomLevel;
+ this.zoomLevel = zoomLevel;
}
public boolean areContainersExpandedByDefault() {
@@ -821,12 +810,11 @@ public void expandAllAlways() {
}
public void updateSelectedZoomLevel() {
- if (!isFixedZoomByUser()) {
- Listitem selectedItem = (Listitem) listZoomLevels.getItems().get(
- initialZoomLevel.ordinal());
- listZoomLevels.setSelectedItem(selectedItem);
- listZoomLevels.invalidate();
- }
+ ganttPanel.getTimeTracker().setZoomLevel(zoomLevel);
+ Listitem selectedItem = (Listitem) listZoomLevels.getItems().get(
+ zoomLevel.ordinal());
+ listZoomLevels.setSelectedItem(selectedItem);
+ listZoomLevels.invalidate();
}
public IContext<?> getContext() {
@@ -0,0 +1,249 @@
+# LibrePlan - GanttZK module.
+# Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
+# Desenvolvemento Tecnolóxico de Galicia
+# Copyright (C) 2010-2012 Igalia, S.L.
+# This file is distributed under the same license as the LibrePlan package.
+#
+# Translators:
+# Swanson Chan <lacidophilin@yahoo.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: libreplan-1.3.3\n"
+"Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n"
+"POT-Creation-Date: 2012-12-07 13:59+0100\n"
+"PO-Revision-Date: 2013-03-09 07:49+0000\n"
+"Last-Translator: Swanson Chan <lacidophilin@yahoo.com>\n"
+"Language-Team: 中文\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:216
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:235
+msgid "Erase"
+msgstr "抹去"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:299
+msgid "Add Dependency"
+msgstr "添加依赖关系"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Worker"
+msgstr "工人"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:689
+msgid "Show money cost bar"
+msgstr "显示资金成本栏"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29
+msgid "Start"
+msgstr "开始"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:668
+msgid "Show reported hours"
+msgstr "节目报道小时"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:85
+msgid "Show/Hide reported hours"
+msgstr "报告显示/隐藏小时"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:49
+msgid "Zoom"
+msgstr "放大"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:67
+msgid "The specified dependency is not allowed"
+msgstr "不允许指定的依赖"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:255
+msgid "Set End-End"
+msgstr "设置端到端"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:78
+msgid "Show/Hide progress"
+msgstr "显示/隐藏进度"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Task"
+msgstr "任务"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199
+msgid "available effort: {0}, assigned effort: {1}"
+msgstr "可用的努力:{0},分配的努力:{1}"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:64
+msgid "Criterion"
+msgstr "标准"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:695
+msgid "Hide money cost bar"
+msgstr "隐藏资金成本吧"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:44
+msgid "Print"
+msgstr "打印"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:71
+msgid "Week"
+msgstr "周"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:501
+msgid "filtering by name"
+msgstr "过滤名称"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:111
+msgid "See scheduling"
+msgstr "见调度"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:30
+msgid "End"
+msgstr "结束"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:89
+msgid "Resources"
+msgstr "资源"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243
+msgid "changing zoom"
+msgstr "改变变焦"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:91
+msgid "Show/Hide money cost bar"
+msgstr "显示/隐藏资金成本吧"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:47
+msgid "Group by"
+msgstr "集团通过"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:90
+msgid "Generic allocation criteria"
+msgstr "通用的分配标准"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45
+msgid "Quarter"
+msgstr "季"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43
+msgid "Page"
+msgstr "页"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "None"
+msgstr "无"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71
+msgid "Flatten/Unflatten tree"
+msgstr "拼合/ Unflatten树的"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Project"
+msgstr "项目"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:67
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28
+msgid "Name"
+msgstr "名称"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:645
+msgid "Show progress"
+msgstr "显示进度"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67
+msgid "Expand/Collapse all"
+msgstr "展开/收起所有"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:58
+msgid "Show/Hide critical path"
+msgstr "显示/隐藏关键路径"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32
+msgid "Year"
+msgstr "年"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:150
+msgid "showing criteria"
+msgstr "显示标准"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:58
+msgid "Month"
+msgstr "月"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:64
+msgid "Show/Hide resources"
+msgstr "显示/隐藏资源"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:247
+msgid "Set End-Start"
+msgstr "设置结束开始"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:309
+msgid "decreasing zoom"
+msgstr "减少变焦"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:625
+msgid "Hide critical path"
+msgstr "隐藏关键路径"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:84
+msgid "Day"
+msgstr "日"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:675
+msgid "Hide reported hours"
+msgstr "隐藏报道小时"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:193
+msgid "Load: {0}%"
+msgstr "负载:{0}%"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:147
+msgid "showing resources"
+msgstr "显示资源"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:61
+msgid "Show/Hide labels"
+msgstr "显示/隐藏标签"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:97
+msgid "Hour"
+msgstr "小时"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:90
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:120
+msgid "Graphics"
+msgstr "图像"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:251
+msgid "Set Start-Start"
+msgstr "设置开始启动"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:152
+msgid "See resource allocation"
+msgstr "资源分配"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:292
+msgid "increasing zoom"
+msgstr "增加变焦"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:467
+msgid "Show all elements"
+msgstr "显示所有元素"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:466
+msgid "All"
+msgstr "所有"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:38
+msgid "Refresh"
+msgstr "刷新"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:620
+msgid "Show critical path"
+msgstr "显示关键路径"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:653
+msgid "Hide progress"
+msgstr "隐藏进度"
@@ -132,4 +132,8 @@ public int compareTo(Label o) {
return getTypeAndName().compareToIgnoreCase(o.getTypeAndName());
}
+ public String getFinderPattern() {
+ return String.format("%s ( %s )", name, type.getName());
+ }
+
}
@@ -26,8 +26,11 @@
import org.libreplan.business.common.daos.IIntegrationEntityDAO;
import org.libreplan.business.common.exceptions.InstanceNotFoundException;
+import org.libreplan.business.externalcompanies.entities.ExternalCompany;
+import org.libreplan.business.labels.entities.Label;
import org.libreplan.business.orders.entities.Order;
import org.libreplan.business.orders.entities.OrderElement;
+import org.libreplan.business.orders.entities.OrderStatusEnum;
import org.libreplan.business.planner.entities.Task;
import org.libreplan.business.reports.dtos.CostExpenseSheetDTO;
import org.libreplan.business.reports.dtos.OrderCostsPerResourceDTO;
@@ -79,6 +82,11 @@
List<Order> getOrdersByReadAuthorizationByScenario(String username,
Scenario scenario);
+ List<Order> getOrdersByReadAuthorizationBetweenDatesByLabelsCriteriaCustomerAndState(
+ String username, Scenario scenario, Date startDate, Date endDate,
+ List<Label> labels, List<Criterion> criteria,
+ ExternalCompany customer, OrderStatusEnum state);
+
/**
* Returns the order filtered by the name. If name is blank (whitespace,
* empty ("") or null, it throws <code>InstanceNotFoundException</code>.
Oops, something went wrong.

0 comments on commit 28e56f8

Please sign in to comment.