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 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 implem } } - for (Workgroup w : getUserWorkgroups(user)) { + List 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)) {