diff --git a/src/main/webapp/WEB-INF/reports/tripRequirement.jasper b/src/main/webapp/WEB-INF/reports/tripRequirement.jasper
index 4e5a43a6..b1300a2f 100644
Binary files a/src/main/webapp/WEB-INF/reports/tripRequirement.jasper and b/src/main/webapp/WEB-INF/reports/tripRequirement.jasper differ
diff --git a/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml b/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml
index f8a88eba..d78c0c74 100644
--- a/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml
+++ b/src/main/webapp/WEB-INF/reports/tripRequirement.jrxml
@@ -2,7 +2,7 @@
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="tripRequirement" pageWidth="612" pageHeight="792" columnWidth="572" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="0b7fa2d2-d452-4a1f-b1c0-2d8e16a22525">
 	<property name="ireport.zoom" value="1.5"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.y" value="80"/>
 	<style name="table">
 		<box>
 			<pen lineWidth="1.0" lineColor="#000000"/>
@@ -35,10 +35,9 @@
 	<parameter name="P_USER_SIGNATURE" class="java.lang.String"/>
 	<parameter name="P_APPROVE_DATE" class="java.util.Date"/>
 	<parameter name="P_APPROVER_SIGNATURE" class="java.lang.String"/>
-	<parameter name="P_LOGO" class="java.lang.String"/>
-	<parameter name="P_MAIN_ADDRESS" class="java.lang.String"/>
-	<parameter name="P_PREV_APPROVE_DATE" class="java.util.Date"/>
-	<parameter name="P_PREV_APPROVER_SIGNATURE" class="java.lang.String"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
+		<defaultValueExpression><![CDATA["/home/pepa/Dokumenty/dev/java/isspst/"]]></defaultValueExpression>
+	</parameter>
 	<field name="requirement" class="info.bukova.isspst.data.TripRequirement"/>
 	<field name="ownedBy" class="info.bukova.isspst.data.User"/>
 	<field name="requirement.reqDate" class="java.util.Date"/>
@@ -49,6 +48,7 @@
 	<field name="requirement.end" class="java.lang.String"/>
 	<field name="requirement.endDate" class="java.util.Date"/>
 	<field name="requirement.passengers" class="java.util.Collection"/>
+	<field name="requirement.foreignPersons" class="java.lang.String"/>
 	<field name="requirement.vehicle" class="info.bukova.isspst.data.Vehicle"/>
 	<field name="requirement.vehicle.code" class="java.lang.String"/>
 	<field name="requirement.requireDownPayment" class="java.lang.Boolean"/>
@@ -63,26 +63,19 @@
 	</background>
 	<title>
 		<band height="79" splitType="Stretch">
-			<image onErrorType="Blank">
-				<reportElement uuid="ef1dc796-f5c6-4036-99eb-26e7b6b7abbc" x="0" y="0" width="100" height="79" isRemoveLineWhenBlank="true">
-					<printWhenExpression><![CDATA[$P{P_LOGO} != null]]></printWhenExpression>
-				</reportElement>
-				<imageExpression><![CDATA[$P{P_LOGO}]]></imageExpression>
-			</image>
-			<textField>
-				<reportElement uuid="3e2074cd-220c-4c9a-b94c-a0a254cc24a6" x="100" y="0" width="471" height="34"/>
+			<staticText>
+				<reportElement uuid="50f96189-2183-4afd-915d-b5342375e988" x="0" y="30" width="572" height="20"/>
 				<textElement textAlignment="Center">
-					<font isBold="true" pdfEncoding="Cp1250"/>
+					<font size="16" isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{P_MAIN_ADDRESS}]]></textFieldExpression>
-			</textField>
+				<text><![CDATA[Cestovní příkaz]]></text>
+			</staticText>
 			<staticText>
-				<reportElement uuid="a7a82c52-e8b8-41cf-b13a-ebc54d30d04f" x="101" y="34" width="470" height="45"/>
-				<textElement textAlignment="Center" verticalAlignment="Bottom">
-					<font size="14" isBold="true" pdfEncoding="Cp1250"/>
+				<reportElement uuid="5b2dc2ca-188e-4636-b617-dd5c1132246b" x="0" y="50" width="572" height="20"/>
+				<textElement textAlignment="Center">
+					<font size="16" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<text><![CDATA[CESTOVNÍ PŘÍKAZ
-k tuzemské pracovní cestě]]></text>
+				<text><![CDATA[k tuzemské pracovní cestě]]></text>
 			</staticText>
 		</band>
 	</title>
@@ -204,33 +197,18 @@ k tuzemské pracovní cestě]]></text>
 				<textElement/>
 				<text><![CDATA[Spolucestující:]]></text>
 			</staticText>
-			<componentElement>
-				<reportElement uuid="a282ba81-891b-4c97-a47f-1836222a1bf3" x="143" y="265" width="400" height="20"/>
-				<jr:list xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd" printOrder="Horizontal">
-					<datasetRun subDataset="Passengers" uuid="999b96b4-faa2-4c2c-b2d7-dd40e7ff68ee">
-						<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{requirement.passengers})]]></dataSourceExpression>
-					</datasetRun>
-					<jr:listContents height="20" width="400">
-						<textField>
-							<reportElement uuid="83a5b316-eae3-443e-8fe5-0a6f2e03e47f" x="6" y="0" width="100" height="20"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$F{fullName}]]></textFieldExpression>
-						</textField>
-					</jr:listContents>
-				</jr:list>
-			</componentElement>
 			<staticText>
-				<reportElement uuid="ab2fbb7c-28d3-4e6b-beb9-93c6fc8745c8" x="0" y="302" width="348" height="20"/>
+				<reportElement uuid="ab2fbb7c-28d3-4e6b-beb9-93c6fc8745c8" x="0" y="307" width="348" height="20"/>
 				<textElement/>
 				<text><![CDATA[Určený dopravní prostředek (u vlastního vozidla druh a reg. značka):]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="1a52f009-c560-443a-9b84-cd9502b6b0c5" x="348" y="302" width="60" height="20"/>
+				<reportElement uuid="1a52f009-c560-443a-9b84-cd9502b6b0c5" x="348" y="307" width="60" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{requirement.vehicle.code}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="8355e20a-124b-4c63-ab9c-4d64be5b912e" x="0" y="322" width="572" height="40"/>
+				<reportElement uuid="8355e20a-124b-4c63-ab9c-4d64be5b912e" x="0" y="327" width="572" height="40"/>
 				<textElement textAlignment="Center"/>
 				<text><![CDATA[A - autobus, V - vlak
 AUV - auto vlastní, AUS - auto služební, AUC - auto cizí
@@ -326,7 +304,7 @@ L - letadlo, P - pěšky, T - taxi]]></text>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{requirement.downPayment}]]></textFieldExpression>
 			</textField>
-			<image onErrorType="Blank">
+			<image>
 				<reportElement uuid="954e517f-5d23-4166-b776-7c31b4409ddd" x="378" y="69" width="183" height="50">
 					<printWhenExpression><![CDATA[$P{P_USER_SIGNATURE} != null]]></printWhenExpression>
 				</reportElement>
@@ -335,20 +313,30 @@ L - letadlo, P - pěšky, T - taxi]]></text>
 			<textField pattern="dd. MM. yyyy" isBlankWhenNull="true">
 				<reportElement uuid="97daa8a7-dab0-4104-babb-c3889faac21a" x="301" y="399" width="77" height="20"/>
 				<textElement/>
-				<textFieldExpression><![CDATA[$P{P_PREV_APPROVE_DATE}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{P_APPROVE_DATE}]]></textFieldExpression>
 			</textField>
-			<image onErrorType="Blank">
+			<image>
 				<reportElement uuid="baf922bc-b6fb-4dbf-abc9-250f448baef3" x="378" y="368" width="183" height="50">
-					<printWhenExpression><![CDATA[$P{P_PREV_APPROVER_SIGNATURE} != null]]></printWhenExpression>
+					<printWhenExpression><![CDATA[$P{P_APPROVER_SIGNATURE} != null]]></printWhenExpression>
 				</reportElement>
-				<imageExpression><![CDATA[$P{P_PREV_APPROVER_SIGNATURE}]]></imageExpression>
+				<imageExpression><![CDATA[$P{P_APPROVER_SIGNATURE}]]></imageExpression>
 			</image>
 			<textField>
 				<reportElement uuid="16e5c4e2-a366-4eca-ad27-7db7fef6771c" x="186" y="27" width="375" height="20">
 					<printWhenExpression><![CDATA[$F{ownedBy.address} != null]]></printWhenExpression>
 				</reportElement>
 				<textElement/>
-				<textFieldExpression><![CDATA[$F{ownedBy.address}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{ownedBy.address.street} + " " + $F{ownedBy.address.houseNumber} + ", " + $F{ownedBy.address.zipCode} + " " + $F{ownedBy.address.city}]]></textFieldExpression>
+			</textField>
+			<subreport>
+				<reportElement uuid="c98e1094-2d6b-4a11-9030-67d3f3d0eafd" x="144" y="265" width="417" height="20"/>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{requirement.passengers})]]></dataSourceExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "tripRequirementPassengers.jasper"]]></subreportExpression>
+			</subreport>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="34904d3e-d889-4396-abd9-bd08036d0fa2" x="144" y="285" width="417" height="20"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$F{requirement.foreignPersons}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
diff --git a/src/main/webapp/WEB-INF/reports/tripRequirementPassengers.jasper b/src/main/webapp/WEB-INF/reports/tripRequirementPassengers.jasper
new file mode 100644
index 00000000..d230c901
Binary files /dev/null and b/src/main/webapp/WEB-INF/reports/tripRequirementPassengers.jasper differ
diff --git a/src/main/webapp/WEB-INF/reports/tripRequirementPassengers.jrxml b/src/main/webapp/WEB-INF/reports/tripRequirementPassengers.jrxml
new file mode 100644
index 00000000..5d725bdf
--- /dev/null
+++ b/src/main/webapp/WEB-INF/reports/tripRequirementPassengers.jrxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="tripRequirementPassengers" columnCount="6" printOrder="Horizontal" pageWidth="572" pageHeight="752" columnWidth="93" columnSpacing="2" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="1ebe05ce-8ff3-4a97-9a07-697cf7e14072">
+	<property name="ireport.zoom" value="2.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<field name="fullName" class="java.lang.String"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<detail>
+		<band height="22" splitType="Stretch">
+			<textField>
+				<reportElement uuid="91fea9e9-df44-465a-96e0-ea1dffa7fdda" x="0" y="0" width="90" height="20"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$F{fullName}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+</jasperReport>