Merge branch 'Verze_1.0'

This commit is contained in:
2015-03-08 20:16:34 +01:00
@@ -46,8 +46,8 @@ public class TripRequirementServiceImpl extends RequirementBaseServiceImpl<TripR
super.update(entity);
if (entity.getState() == RequirementState.APPROVED) {
TripBill newBill = tripBillService.createTripBill(entity);
for (TripBill bill : getBills(entity)) {
TripBill newBill = tripBillService.createTripBill(entity);
bill.getBillItems().clear();
bill.getBillItems().addAll(newBill.getBillItems());
tripBillService.calculate(bill);