From b0fb32825b87a1f87e2ef66975dd61f886b05d2d Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Mon, 29 Feb 2016 15:08:05 +0100
Subject: [PATCH] =?UTF-8?q?Opravena=20chyba=20p=C5=99i=20vytv=C3=A1=C5=99e?=
 =?UTF-8?q?n=C3=AD=20vy=C3=BA=C4=8Dtov=C3=A1n=C3=AD=20slu=C5=BEebn=C3=AD?=
 =?UTF-8?q?=20cesty=20a=20po=C5=BEadavku=20na=20schv=C3=A1len=C3=AD=20ces?=
 =?UTF-8?q?=C5=A5=C3=A1ku-=20na=20z=C3=A1znamech=20se=20nenastavovalo=20ob?=
 =?UTF-8?q?dob=C3=AD.=20Opraveno=20filtrov=C3=A1n=C3=AD=20nab=C3=ADzen?=
 =?UTF-8?q?=C3=BDch=20st=C5=99edisek.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/tripbill/TripBillApprovalServiceImpl.java |  1 +
 .../isspst/services/tripbill/TripBillServiceImpl.java  |  1 +
 .../services/workgroups/WorkgroupServiceImpl.java      | 10 +++++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java b/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java
index 0406a0db..b05a9730 100644
--- a/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java
@@ -40,6 +40,7 @@ public class TripBillApprovalServiceImpl extends RequirementBaseServiceImpl<Trip
 		TripBillApproval approval = new TripBillApproval();
 		approval.setCentre(bill.getRequirement().getCentre());
 		approval.setWorkgroup(bill.getRequirement().getWorkgroup());
+		approval.setSeason(bill.getSeason());
 		approval.setReqDate(new Date());
 		approval.setType(reqTypeService.getTypeById(Constants.REQTYPE_BUSINESSTRIP));
 		approval.setState(RequirementState.NEW);
diff --git a/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java b/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java
index de09e16a..c3b07e02 100644
--- a/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java
@@ -47,6 +47,7 @@ public class TripBillServiceImpl extends AbstractOwnedService<TripBill> implemen
 		TripBill bill = new TripBill();
 
 		bill.setRequirement(requirement);
+		bill.setSeason(requirement.getSeason());
 
 		if (!passengers) {
 			bill.setDownPayment(requirement.getDownPayment());
diff --git a/src/main/java/info/bukova/isspst/services/workgroups/WorkgroupServiceImpl.java b/src/main/java/info/bukova/isspst/services/workgroups/WorkgroupServiceImpl.java
index 8a68e6ab..2ae68987 100644
--- a/src/main/java/info/bukova/isspst/services/workgroups/WorkgroupServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/workgroups/WorkgroupServiceImpl.java
@@ -183,7 +183,15 @@ public class WorkgroupServiceImpl extends AbstractOwnedService<Workgroup> implem
 			}
 		}
 
-		for (Workgroup w : getUserWorkgroups(user)) {
+		List<Workgroup> workGroups;
+
+		if (userOnly) {
+			workGroups = filterUserOnly(user, getUserWorkgroups(user));
+		} else {
+			workGroups = getUserWorkgroups(user);
+		}
+
+		for (Workgroup w : workGroups) {
 			loadParents(w);
 			for (Workgroup centre : w.getParents()) {
 				if (!centres.contains(centre)) {