Opravena chyba při vytváření vyúčtování služební cesty a požadavku na schválení cesťáku- na záznamech se nenastavovalo období.
Opraveno filtrování nabízených středisek.
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
Reference in New Issue
Block a user