OO-1591: update to vitero 6.0

pom.xml

@@ -1712,7 +1712,7 @@
 		<dependency>
 			<groupId>org.openolat</groupId>
 			<artifactId>viterows</artifactId>
-			<version>4.4</version>
+			<version>6.0</version>
 		</dependency>
 		<!-- docx4j need poi scratchpad version 3.8 -->
 		<dependency>

src/main/java/org/olat/modules/vitero/manager/ViteroManager.java

@@ -94,7 +94,7 @@ import de.vitero.schema.booking.CreateBookingResponse;
 import de.vitero.schema.booking.DeleteBookingRequest;
 import de.vitero.schema.booking.DeleteBookingResponse;
 import de.vitero.schema.booking.GetBookingListByDateRequest;
-import de.vitero.schema.booking.GetBookingListByUserInFutureRequest;
+import de.vitero.schema.booking.GetBookingListByUserAndCustomerInFutureRequest;
 import de.vitero.schema.booking.Newbookingtype;
 import de.vitero.schema.group.ChangeGroupRoleRequest;
 import de.vitero.schema.group.Completegrouptype;
@@ -1226,11 +1226,12 @@ public class ViteroManager extends BasicManager implements UserDataDeletable {
 	protected List<Booking_Type> getBookingInFutureByUserId(int userId)
 	throws VmsNotAvailableException {
 		try {
-			GetBookingListByUserInFutureRequest request = new GetBookingListByUserInFutureRequest();
+			GetBookingListByUserAndCustomerInFutureRequest request = new GetBookingListByUserAndCustomerInFutureRequest();
 			request.setUserid(userId);
+			request.setCustomerid(viteroModule.getCustomerId());
 			request.setTimezone(viteroModule.getTimeZoneId());
 			
-			Bookinglist bookingList = getBookingWebService().getBookingListByUserInFuture(request);
+			Bookinglist bookingList = getBookingWebService().getBookingListByUserAndCustomerInFuture(request);
 			
 			return bookingList.getBooking();
 		} catch(SOAPFaultException f) {

src/main/java/org/olat/modules/vitero/ui/_content/adminconfig.html

 <fieldset>
-	<legend>$r.translate("vitero.title")</legend>
-	$r.contextHelpWithWrapper("org.olat.modules.vitero.ui","module.html","help.hover.vitero")
-	<p>$r.translate("vitero.intro")</p>
-
+	<legend>$r.translate("vitero.title")
+		$r.contextHelpWithWrapper("org.olat.modules.vitero.ui","module.html","help.hover.vitero")
+	</legend>
+	<p class="o_info">$r.translate("vitero.intro")</p>
 	$r.render("flc_module")
 </fieldset>
\ No newline at end of file