From 1df90a41c4245d6d6adb83cb99b5c02cf9fec333 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Sun, 15 Feb 2015 19:14:03 +0100
Subject: [PATCH] =?UTF-8?q?Do=20agendy=20po=C5=BEadavk=C5=AF=20na=20slu?=
 =?UTF-8?q?=C5=BEebn=C3=AD=20cesty=20byla=20p=C5=99id=C3=A1na=20mo=C5=BEno?=
 =?UTF-8?q?st=20prohl=C3=AD=C5=BEen=C3=AD=20vy=C3=BA=C4=8Dtov=C3=A1n=C3=AD?=
 =?UTF-8?q?=20slu=C5=BEebn=C3=AD=20cesty.=20closes=20#200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../requirement/TripRequirementService.java   |   2 +
 .../TripRequirementServiceImpl.java           |  16 +
 .../requirement/TripRequirementListAll.java   |  30 +-
 .../TripRequirementListCentre.java            |  31 +-
 .../TripRequirementListWorkgroup.java         |  31 +-
 .../WEB-INF/locales/zk-label.properties       |   1 +
 src/main/webapp/img/bill-016.png              | Bin 0 -> 651 bytes
 .../webapp/main/trips/bill/tripBillForm.zul   | 335 +--------------
 .../main/trips/requirements/reqListMyAll.zul  |  14 +-
 .../trips/requirements/reqListMyCenters.zul   |  10 +-
 .../requirements/reqListMyWorkgroups.zul      |  10 +-
 .../main/trips/requirements/tripBill.zul      |  39 ++
 .../webapp/main/trips/tripBillInterior.zul    | 385 ++++++++++++++++++
 13 files changed, 557 insertions(+), 347 deletions(-)
 create mode 100644 src/main/webapp/img/bill-016.png
 create mode 100644 src/main/webapp/main/trips/requirements/tripBill.zul
 create mode 100644 src/main/webapp/main/trips/tripBillInterior.zul

diff --git a/src/main/java/info/bukova/isspst/services/requirement/TripRequirementService.java b/src/main/java/info/bukova/isspst/services/requirement/TripRequirementService.java
index 373fee93..5e6805b7 100644
--- a/src/main/java/info/bukova/isspst/services/requirement/TripRequirementService.java
+++ b/src/main/java/info/bukova/isspst/services/requirement/TripRequirementService.java
@@ -1,10 +1,12 @@
 package info.bukova.isspst.services.requirement;
 
+import info.bukova.isspst.data.TripBill;
 import info.bukova.isspst.data.TripRequirement;
 
 public interface TripRequirementService extends RequirementBaseService<TripRequirement>
 {
 	
 	public void loadPassangers(TripRequirement entity);
+	public TripBill getTripBill(TripRequirement requirement);
 	
 }
diff --git a/src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java b/src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java
index 53411223..180626fd 100644
--- a/src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java
@@ -7,10 +7,12 @@ import info.bukova.isspst.services.tripbill.TripBillService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
 import org.hibernate.Hibernate;
 import org.hibernate.LazyInitializationException;
+import org.hibernate.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.List;
 
 public class TripRequirementServiceImpl extends RequirementBaseServiceImpl<TripRequirement>
 		implements TripRequirementService, RequirementBaseService<TripRequirement> {
@@ -49,6 +51,20 @@ public class TripRequirementServiceImpl extends RequirementBaseServiceImpl<TripR
 		}
 	}
 
+	@Override
+	@Transactional
+	public TripBill getTripBill(TripRequirement requirement) {
+		Query q = dao.getQuery("from TripBill tb where tb.requirement = :req");
+		q.setParameter("req", requirement);
+		List<TripBill> result = q.list();
+
+		if (result.size() > 0) {
+			return result.get(0);
+		}
+
+		return null;
+	}
+
 	@Transactional
 	@LazyLoader("form")
 	public void loadAttachments(TripRequirement entity) {
diff --git a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListAll.java b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListAll.java
index 4d46242c..4709b651 100644
--- a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListAll.java
+++ b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListAll.java
@@ -1,20 +1,26 @@
 package info.bukova.isspst.ui.requirement;
 
+import info.bukova.isspst.data.TripBill;
 import info.bukova.isspst.data.TripRequirement;
 import info.bukova.isspst.data.Workgroup;
 import info.bukova.isspst.filters.TripRequirementFilter;
 import info.bukova.isspst.services.requirement.TripRequirementService;
+import info.bukova.isspst.services.tripbill.TripBillService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import org.springframework.security.access.AccessDeniedException;
 import org.zkoss.bind.BindUtils;
+import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.GlobalCommand;
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.bind.annotation.NotifyChange;
+import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
+import org.zkoss.zul.Window;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class TripRequirementListAll extends RequirementSubpage<TripRequirement> {
 	
@@ -22,6 +28,8 @@ public class TripRequirementListAll extends RequirementSubpage<TripRequirement>
 	private TripRequirementService tripRequirementService;
 	@WireVariable
 	private WorkgroupService workgroupService;
+	@WireVariable
+	private TripBillService tripBillService;
 	private List<Workgroup> allCentres;
 	private List<Workgroup> allWorkgroups;
 
@@ -65,4 +73,18 @@ public class TripRequirementListAll extends RequirementSubpage<TripRequirement>
 		BindUtils.postGlobalCommand(null, null, "selectAll", null);
 	}
 
+	@Command
+	public void showTripBill() {
+		if (getDataBean() == null) {
+			return;
+		}
+
+		TripBill tb = tripRequirementService.getTripBill(getDataBean());
+		tripBillService.loadLazyData(tb);
+		Map<String, Object> params = new HashMap<String, Object>();
+		params.put("selected", tb);
+		Window win = (Window) Executions.createComponents("tripBill.zul", null, params);
+		win.doModal();
+	}
+
 }
diff --git a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListCentre.java b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListCentre.java
index cccf1a00..f0857290 100644
--- a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListCentre.java
+++ b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListCentre.java
@@ -1,20 +1,26 @@
 package info.bukova.isspst.ui.requirement;
 
+import info.bukova.isspst.data.TripBill;
 import info.bukova.isspst.data.TripRequirement;
 import info.bukova.isspst.data.Workgroup;
 import info.bukova.isspst.filters.TripRequirementFilter;
 import info.bukova.isspst.services.requirement.TripRequirementService;
+import info.bukova.isspst.services.tripbill.TripBillService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import org.springframework.security.access.AccessDeniedException;
 import org.zkoss.bind.BindUtils;
+import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.GlobalCommand;
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.bind.annotation.NotifyChange;
+import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
+import org.zkoss.zul.Window;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class TripRequirementListCentre extends RequirementSubpage<TripRequirement> {
 	
@@ -24,6 +30,9 @@ public class TripRequirementListCentre extends RequirementSubpage<TripRequiremen
 	@WireVariable
 	private WorkgroupService workgroupService;
 
+	@WireVariable
+	private TripBillService tripBillService;
+
 	private List<Workgroup> myCentres;
 
 	@Init
@@ -61,4 +70,18 @@ public class TripRequirementListCentre extends RequirementSubpage<TripRequiremen
 		BindUtils.postGlobalCommand(null, null, "selectCentre", null);
 	}
 
+	@Command
+	public void showTripBill() {
+		if (getDataBean() == null) {
+			return;
+		}
+
+		TripBill tb = tripRequirementService.getTripBill(getDataBean());
+		tripBillService.loadLazyData(tb);
+		Map<String, Object> params = new HashMap<String, Object>();
+		params.put("selected", tb);
+		Window win = (Window) Executions.createComponents("tripBill.zul", null, params);
+		win.doModal();
+	}
+
 }
diff --git a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListWorkgroup.java b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListWorkgroup.java
index 3aff0cfb..4a883718 100644
--- a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListWorkgroup.java
+++ b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListWorkgroup.java
@@ -1,20 +1,26 @@
 package info.bukova.isspst.ui.requirement;
 
+import info.bukova.isspst.data.TripBill;
 import info.bukova.isspst.data.TripRequirement;
 import info.bukova.isspst.data.Workgroup;
 import info.bukova.isspst.filters.TripRequirementFilter;
 import info.bukova.isspst.services.requirement.TripRequirementService;
+import info.bukova.isspst.services.tripbill.TripBillService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import org.springframework.security.access.AccessDeniedException;
 import org.zkoss.bind.BindUtils;
+import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.GlobalCommand;
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.bind.annotation.NotifyChange;
+import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
+import org.zkoss.zul.Window;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class TripRequirementListWorkgroup extends RequirementSubpage<TripRequirement> {
 	
@@ -24,6 +30,9 @@ public class TripRequirementListWorkgroup extends RequirementSubpage<TripRequire
 	@WireVariable
 	private WorkgroupService workgroupService;
 
+	@WireVariable
+	private TripBillService tripBillService;
+
 	private List<Workgroup> myCentres;
 
 	private List<Workgroup> myWorkgroups;
@@ -68,4 +77,18 @@ public class TripRequirementListWorkgroup extends RequirementSubpage<TripRequire
 		BindUtils.postGlobalCommand(null, null, "selectWorkgroup", null);
 	}
 
+	@Command
+	public void showTripBill() {
+		if (getDataBean() == null) {
+			return;
+		}
+
+		TripBill tb = tripRequirementService.getTripBill(getDataBean());
+		tripBillService.loadLazyData(tb);
+		Map<String, Object> params = new HashMap<String, Object>();
+		params.put("selected", tb);
+		Window win = (Window) Executions.createComponents("tripBill.zul", null, params);
+		win.doModal();
+	}
+
 }
diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties
index d6f65f62..d8dea6f6 100644
--- a/src/main/webapp/WEB-INF/locales/zk-label.properties
+++ b/src/main/webapp/WEB-INF/locales/zk-label.properties
@@ -224,6 +224,7 @@ TripBillBack=Zpět
 TripBillTotal=Celkem
 
 TripRequirement=Požadavek na služební cestu
+ShowTripBill=Zobrazit vyúčtování
 
 CentresForRequirements=Střediska, pro která lze vkládat požadavky
 WorkgroupMembership=Členství v komisích
diff --git a/src/main/webapp/img/bill-016.png b/src/main/webapp/img/bill-016.png
new file mode 100644
index 0000000000000000000000000000000000000000..39f09967046b32c8563a44af9da1b0b454175626
GIT binary patch
literal 651
zcmV;60(AX}P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006~Nkl<Zc$|%r
z+e?#i7{@>FVe>ug)pt&<ZJsiOsR)vEAPNT|cx6F1UPbs9dDpG<2UJ#27lqvhl`Bj<
zOq)~N$+_RuoqTub!bn2Xp3CRq`NHSJSK@;C{&ZplcyPw)#n7X-5$S^Gd9B$BdpiSI
ztrn^RxLg#A7UIVSA`$(do)_TpnBm~9dnjhhUwgv>qqU8XGoQof21v4uoQYD?CsA}0
zssidqY_F|yu=I*@xyHEx^+UmKw1T|<5?3X`*77&zKgDqxZY=8(t+sU>aF!@Vk&Q+n
zOOsb4wHhJ1U8baV;|mQ^Lt&ubCcdzMdXcEC*uv}@AYj$l%jCH`HAOPE@drWLeD<&r
zyghzO6abFH^O+|MUu`B8PqMm_Ang=!8~O>t|A;C(Rk9Tg;r63>Tkv&to*)2XFPXMo
z)pw9vKPAexJgmiw^o@*S1@n09X8fVh3Bu3UQ#O#(bT<j15Zfw|KXfP*igdIY^w=qu
zR*vYlDy*&~Slrpi-(_Okek{{OnV#r;qpE7J%jLow?4i3wpcj^it}U{g-exzaqH9e!
zb(Q6vDuyqJ+1|&Eu~81wDOA%m!-4B#IHfX`y%alngQct=UuclRK@s+o+`MxQQ3NZP
zNB0<bd|s5?m*XPIij0!mMCzVI?=i851w-Q}5+h$FoXk3h@g%X|2)=fMj>`cIO&1qR
zG&EgMt40!e+0IDqBX!M+h^j8!rKUMaW>!^I<w~R8cwA0z-rw9Q^~SRP-jd4`6Z@4|
lO_k;(nc4p7_u^l5{{>jUEn<+O^G*N&002ovPDHLkV1jd4IY$5h

literal 0
HcmV?d00001

diff --git a/src/main/webapp/main/trips/bill/tripBillForm.zul b/src/main/webapp/main/trips/bill/tripBillForm.zul
index 8485dd36..bbf9249b 100644
--- a/src/main/webapp/main/trips/bill/tripBillForm.zul
+++ b/src/main/webapp/main/trips/bill/tripBillForm.zul
@@ -10,342 +10,15 @@
 		position="center"
 		apply="org.zkoss.bind.BindComposer"
 		viewModel="@id('vm') @init('info.bukova.isspst.ui.tripbill.TripBillForm')">
+		<zscript>
+			boolean disabled = false;
+		</zscript>
 		<caption
 			src="/img/pickup-032.png"
 			zclass="form-caption"
 			label="${labels.TravelOrdersFormTitle}" />
 		<vlayout vflex="1">
-			<grid>
-				<columns visible="false">
-					<column hflex="min"/>
-					<column hflex="min"/>
-					<column hflex="2"/>
-					<column hflex="2"/>
-					<column hflex="2"/>
-				</columns>
-				<auxhead>
-					<auxheader label="${labels.TripBillTravelBegin}" colspan="2"/>
-					<auxheader label="${labels.TripBillTravelTarget}"/>
-					<auxheader label="${labels.TripBillPurpose}"/>
-					<auxheader label="${labels.TripBillTravelEnd}"/>
-				</auxhead>
-				<rows>
-					<row>
-						<cell colspan="2">
-							<label value="@load(vm.dataBean.requirement.from)"/>
-						</cell>
-						<cell>
-							<label value="@load(vm.dataBean.requirement.to)"/>
-						</cell>
-						<cell>
-							<label value="@load(vm.dataBean.requirement.description)"/>
-						</cell>
-						<cell>
-							<label value="@load(vm.dataBean.requirement.end)"/>
-						</cell>
-					</row>
-					<row>
-						<label value="@load(vm.dataBean.requirement.tripDate) @converter('formatedDate', format=labels.DateFormat)"/>
-						<label value="@load(vm.dataBean.requirement.tripDate) @converter('formatedDate', format='hh:mm')"/>
-						<cell/>
-						<cell/>
-						<label value="@load(vm.dataBean.requirement.endDate) @converter('formatedDate', format=labels.DateFormat)"/>
-					</row>
-				</rows>
-			</grid>
-			<grid>
-				<columns>
-					<column/>
-					<column/>
-				</columns>
-				<rows>
-					<row>
-						<label value="${labels.TripBillResultMessage}"/>
-						<datebox value="@bind(vm.dataBean.resultMessageDate)"/>
-					</row>
-					<row>
-						<cell colspan="2">
-							<checkbox label="${labels.TripBillFreeMeals}" checked="@bind(vm.dataBean.freeMeals)" onCheck="@command('calculate')"/>
-						</cell>
-					</row>
-					<row>
-						<cell colspan="2">
-							<checkbox label="${labels.TripBillFreeHousing}" checked="@bind(vm.dataBean.freeHousing)"/>
-						</cell>
-					</row>
-					<row>
-						<cell colspan="2">
-							<checkbox label="${labels.TripBillFreeCarfare}" checked="@bind(vm.dataBean.freeCarfare)"/>
-						</cell>
-					</row>
-				</rows>
-			</grid>
-			<grid 
-				model="@load(vm.dataBean.billItems)"
-				vflex="1">
-				<auxhead>
-					<auxheader rowspan="2">
-						<div sclass="vertikaal" height="50px">
-							<label value="${labels.TripBillDate}" sclass="bold"/>
-						</div>
-					</auxheader>
-					<auxheader colspan="2">
-						<label value=""/>
-					</auxheader>
-					<!-- <auxheader >
-						<label value=""/>
-					</auxheader> -->
-					<auxheader colspan="2" align="center">
-						<label value="${labels.TripBillDepartureArrival}" sclass="bold"/>
-					</auxheader>
-					<!-- <auxheader>
-						<label value=""/>
-					</auxheader> -->
-					<auxheader rowspan="2"  valign="bottom" height="110px">
-						<div sclass="vertikaal" height="88px" width="88px">
-							<vbox>
-								<label value="${labels.TripBillUsed}" sclass="bold"/>
-								<label value="${labels.TripBillVehicle}" sclass="bold"/>
-							</vbox>
-						</div>
-						 
-					</auxheader>
-					<auxheader rowspan="2" valign="bottom" height="112px">
-						<div sclass="vertikaal" height="101px" width="90px">
-							<vbox>
-								<label value="${labels.TripBillBeginEnd}" sclass="bold"/>
-								<label value="${labels.TripBillWork}" sclass="bold"/>
-							</vbox>
-						</div>
-					</auxheader>
-					<auxheader>
-						<html>
-							<![CDATA[${labels.TripBillTraveled}  <br /> ${labels.TripBillKm} ]]>
-						</html>
-					</auxheader>
-					<auxheader>
-						<html>
-							<![CDATA[${labels.TripBillConsumption}  <br /> ${labels.TripBillPHM} ]]>
-						</html>
-					</auxheader>
-					<auxheader rowspan="2">
-						<html>
-							<![CDATA[${labels.TripBillCarfare}  <br /> ${labels.TripBillLocal} <br /> ${labels.TripBillTransportation} ]]>
-						</html>
-					</auxheader>
-					<auxheader rowspan="2">
-						<label value="${labels.TripBillHousing}" sclass="bold"/>
-					</auxheader>
-					<auxheader rowspan="2">
-						<html>
-							<![CDATA[${labels.TripBillNumber}  <br /> ${labels.TripBillMeals} <br /> ${labels.TripBillFree} ]]>
-						</html>
-					</auxheader>
-					<auxheader rowspan="2">
-						<label value="${labels.TripBillMealExpenses}" sclass="bold"/>
-					</auxheader>
-					<auxheader rowspan="2">
-						<html>
-							<![CDATA[${labels.TripBillNecessary}  <br /> ${labels.TripBillOther} <br /> ${labels.TripBillExpenses} ]]>
-						</html>
-					</auxheader>
-					<auxheader rowspan="2">
-						<label value="${labels.TripBillTotal}" sclass="bold"/>
-					</auxheader>
-					<auxheader rowspan="2">
-						<label value="${labels.TripBillAdjusted}" sclass="bold"/>
-					</auxheader>
-				</auxhead>
-				<auxhead>
-					<!-- <auxheader>
-						<label value=""/>
-					</auxheader>  -->
-					<auxheader colspan="2" align="center">
-						<label value="${labels.TripBillTravelTarget}" sclass="bold"/>
-					</auxheader>
-					<!-- <auxheader >
-						<label value=""/>
-					</auxheader>  -->
-					<auxheader>
-						<label value="${labels.TripBillHourMin}" sclass="bold"/>
-					</auxheader>
-					<auxheader>
-						<label value="${labels.TripBillHourMin}" sclass="bold"/>
-					</auxheader>
-					<!--  <auxheader>
-						<label value=""/>
-					</auxheader>-->
-					<!-- <auxheader>
-						<label value=""/>
-					</auxheader> -->
-					<auxheader>
-						<html>
-							<![CDATA[<div> ${labels.TripBillTraveled}  <br /> ${labels.TripBillKm} <br /> ${labels.TripBillInKc}</div> ]]>
-						</html>
-					</auxheader>
-					<auxheader>
-						<html>
-							<![CDATA[${labels.TripBillConsumption}  <br /> ${labels.TripBillPHM} <br /> ${labels.TripBillInKc}]]>
-						</html>
-					</auxheader>
-					<!-- <auxheader>
-						<label value=""/>
-					</auxheader> 
-					<auxheader>
-						<label value=""/>
-					</auxheader>
-					<auxheader>
-						<label value=""/>
-					</auxheader>
-					<auxheader>
-						<label value=""/>
-					</auxheader>
-					<auxheader>
-						<label value=""/>
-					</auxheader>
-					<auxheader>
-						<label value=""/>
-					</auxheader>-->
-				</auxhead>
-				<columns visible="false">
-					<column width="60px"/>
-					<column width="60px"/>
-					<column hflex="max"/>
-					<column width="70px"/>
-					<column width="70px"/>
-					<column width="70px"/>
-					<column width="70px"/>
-					<column width="70px"/>
-					<column width="70px"/>
-					<column width="70px"/>
-					<column width="70px"/>
-					<column width="70px"/>
-					<column width="70px"/>
-					<column width="70px"/>
-					<column width="70px"/>
-					<column width="70px"/>
-				</columns>
-				<rows>
-					<template name="model">
-					<row>
-						<label value="@load(each.date) @converter('formatedDate', format='dd.MM')"/>
-						<vbox>
-							<label value="${labels.TripBillTo}"/>
-							<label value="${labels.TripBillBack}"/>
-						</vbox>
-						<vbox hflex="max">
-							<textbox inplace="true" 
-								value="@load(each.to)"
-								maxlength="@load(vm.lengthText)"
-								sclass="grid-textbox-max-left"/>
-							<textbox inplace="true" 
-								value="@load(each.back)"
-								maxlength="@load(vm.lengthText)"
-								sclass="grid-textbox-max-left"/>
-						</vbox>
-						<vbox>
-							<timebox inplace="true" width="68px" value="@bind(each.toArrival)" onChange="@command('calculate')" format="short"/>
-							<timebox inplace="true" width="68px" value="@bind(each.backArrival)" onChange="@command('calculate')" format="short"/>
-						</vbox>
-						<vbox>
-							<timebox inplace="true" width="68px" value="@bind(each.toDeparture)" onChange="@command('calculate')" format="short"/>
-							<timebox inplace="true" width="68px" value="@bind(each.backDeparture)" onChange="@command('calculate')" format="short"/>
-						</vbox>
-						<vbox>
-							<combobox inplace="true" 
-								model="@load(vm.vehicles)" 
-								selectedItem="@bind(each.toVehicle)" 
-								width="67px"
-								readonly="true">
-								<template name="model">
-									<comboitem label="@load(each.code)"/>
-								</template>
-							</combobox>
-							
-							<combobox inplace="true" 
-								model="@load(vm.vehicles)" 
-								selectedItem="@bind(each.backVehicle)" 
-								width="67px"
-								readonly="true">
-								<template name="model">
-									<comboitem label="@load(each.code)"/>
-								</template>
-							</combobox>
-						</vbox>
-						<vbox>
-							<timebox inplace="true" width="68px" value="@bind(each.beginWork)" format="short"/>
-							<timebox inplace="true" width="68px" value="@bind(each.endWork)" format="short"/>
-						</vbox>
-						<vbox>
-							<textbox
-								inplace="true"
-								width="68px"
-								maxlength="@load(vm.lengthText)"
-								value="@bind(each.distance) @converter(vm.standardBigDecimalConverter)" />
-							<textbox
-								inplace="true"
-								width="68px"
-								value="@bind(each.distanceAmount) @converter(vm.standardBigDecimalConverter)"
-								maxlength="@load(vm.lengthText)"
-								onChange="@command('calculate')" />
-						</vbox>
-						<vbox>
-							<textbox
-								inplace="true"
-								width="68px"
-								maxlength="@load(vm.lengthText)"
-								value="@bind(each.fuelConsumption) @converter(vm.standardBigDecimalConverter)" />
-							<textbox
-								inplace="true"
-								width="68px"
-								value="@bind(each.fuelAmount) @converter(vm.standardBigDecimalConverter)"
-								maxlength="@load(vm.lengthText)"
-								onChange="@command('calculate')" />
-						</vbox>
-						<textbox
-							inplace="true"
-							value="@bind(each.carefare) @converter(vm.standardBigDecimalConverter)"
-							maxlength="@load(vm.lengthText)"
-							onChange="@command('calculate')" />
-						<textbox
-							inplace="true"
-							value="@bind(each.housing) @converter(vm.standardBigDecimalConverter)"
-							maxlength="@load(vm.lengthText)"
-							onChange="@command('calculate')" />
-						<combobox inplace="true" selectedIndex="@bind(each.freeMealsCount)" 
-							readonly="true" 
-							width="60px" 
-							disabled="@load(not vm.dataBean.freeMeals)"
-							onBlur="@command('calculate')">
-							<comboitem value="0" label="0"/>
-							<comboitem value="1" label="1"/>
-							<comboitem value="2" label="2"/>
-							<comboitem value="3" label="3"/>
-						</combobox>
-						<label value="@load(each.meals) @converter(vm.standardBigDecimalConverter)"/>
-						<textbox
-							inplace="true"
-							value="@bind(each.otherExpenses) @converter(vm.standardBigDecimalConverter)"
-							maxlength="@load(vm.lengthText)"
-							onChange="@command('calculate')" />
-						<label value="@load(each.total) @converter(vm.standardBigDecimalConverter)"/>
-						<label value="@load(each.adjustedTotal) @converter(vm.standardBigDecimalConverter)"/>
-					</row>
-					</template>
-				</rows>
-			</grid>
-			<div hflex="1" align="end" >
-				<vbox>
-					<hbox>
-						<label value="Záloha: " style="font-size: 14px;"/>
-						<label value="@load(vm.dataBean.requirement.downPayment) @converter(vm.standardBigDecimalConverter)" style="font-size: 14px;"/>
-					</hbox>
-					<hbox>
-						<label value="${labels.TripBillTotal}: " style="font-size: 14px; font-weight: bold;"/> 
-						<label value="@load(vm.dataBean.total) @converter(vm.standardBigDecimalConverter)" style="font-size: 14px; font-weight: bold;"/>
-					</hbox>
-				</vbox>		
-			</div>
+			<include src="../tripBillInterior.zul"/>
 			<include src="/app/formButtons.zul" />
 		</vlayout>
 	</window>
diff --git a/src/main/webapp/main/trips/requirements/reqListMyAll.zul b/src/main/webapp/main/trips/requirements/reqListMyAll.zul
index 10b4824b..89ef85f3 100644
--- a/src/main/webapp/main/trips/requirements/reqListMyAll.zul
+++ b/src/main/webapp/main/trips/requirements/reqListMyAll.zul
@@ -1,4 +1,6 @@
-<zk>
+<zk xmlns="http://www.zkoss.org/2005/zul"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.zkoss.org/2005/zul http://www.zkoss.org/2005/zul/zul.xsd">
 	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 	<window
 		vflex="1"
@@ -182,7 +184,15 @@
 				</template>
 			</listbox>
 			<div hflex="3">
-				<include src="/main/approveStatus.zul" />
+				<vbox>
+					<include src="/main/approveStatus.zul" />
+					<button label="${labels.ShowTripBill}"
+							image="/img/bill-016.png"
+							onClick="@command('showTripBill')"
+							visible="@load(not empty vm.dataBean)"
+							disabled="@load(not(vm.dataBean.state eq 'APPROVED'))"
+							sclass="nicebutton"/>
+				</vbox>
 			</div>
 		</hbox>
 	</window>
diff --git a/src/main/webapp/main/trips/requirements/reqListMyCenters.zul b/src/main/webapp/main/trips/requirements/reqListMyCenters.zul
index 9ee3531d..3c40bb3e 100644
--- a/src/main/webapp/main/trips/requirements/reqListMyCenters.zul
+++ b/src/main/webapp/main/trips/requirements/reqListMyCenters.zul
@@ -158,7 +158,15 @@
 				</template>
 			</listbox>
 			<div hflex="3">
-				<include src="/main/approveStatus.zul" />
+				<vbox>
+					<include src="/main/approveStatus.zul" />
+					<button label="${labels.ShowTripBill}"
+							image="/img/bill-016.png"
+							onClick="@command('showTripBill')"
+							visible="@load(not empty vm.dataBean)"
+							disabled="@load(not(vm.dataBean.state eq 'APPROVED'))"
+							sclass="nicebutton"/>
+				</vbox>
 			</div>
 		</hbox>
 	</window>
diff --git a/src/main/webapp/main/trips/requirements/reqListMyWorkgroups.zul b/src/main/webapp/main/trips/requirements/reqListMyWorkgroups.zul
index 6c4db24b..6abd5043 100644
--- a/src/main/webapp/main/trips/requirements/reqListMyWorkgroups.zul
+++ b/src/main/webapp/main/trips/requirements/reqListMyWorkgroups.zul
@@ -182,7 +182,15 @@
 				</template>
 			</listbox>
 			<div hflex="3">
-				<include src="/main/approveStatus.zul" />
+				<vbox>
+					<include src="/main/approveStatus.zul" />
+					<button label="${labels.ShowTripBill}"
+							image="/img/bill-016.png"
+							onClick="@command('showTripBill')"
+							visible="@load(not empty vm.dataBean)"
+							disabled="@load(not(vm.dataBean.state eq 'APPROVED'))"
+							sclass="nicebutton"/>
+				</vbox>
 			</div>
 		</hbox>
 	</window>
diff --git a/src/main/webapp/main/trips/requirements/tripBill.zul b/src/main/webapp/main/trips/requirements/tripBill.zul
new file mode 100644
index 00000000..7fdaa8fd
--- /dev/null
+++ b/src/main/webapp/main/trips/requirements/tripBill.zul
@@ -0,0 +1,39 @@
+<?page title="${labels.TravelOrdersFormTitle}" contentType="text/html;charset=UTF-8"?>
+
+<zk xmlns="http://www.zkoss.org/2005/zul"
+	xmlns:w="http://www.zkoss.org/2005/zk/client"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.zkoss.org/2005/zul http://www.zkoss.org/2005/zul/zul.xsd">
+	<zscript>
+		boolean disabled = true;
+	</zscript>
+	<window
+		id="editWin"
+		closable="true"
+		width="95%"
+		height="95%"
+		border="normal"
+		position="center"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.tripbill.TripBillForm')">
+		<caption
+			src="/img/pickup-032.png"
+			zclass="form-caption"
+			label="${labels.TravelOrdersFormTitle}" />
+		<vlayout vflex="1">
+			<include src="../tripBillInterior.zul"/>
+			<vlayout
+				vflex="min"
+				hflex="max">
+				<div
+					hflex="max"
+					align="right">
+					<button image="~./zul/img/misc/drag-disallow.png"
+						label="${labels.ButtonStorno}"
+						onClick="editWin.detach()"
+						sclass="nicebutton" />
+				</div>
+			</vlayout>
+		</vlayout>
+	</window>
+</zk>
\ No newline at end of file
diff --git a/src/main/webapp/main/trips/tripBillInterior.zul b/src/main/webapp/main/trips/tripBillInterior.zul
new file mode 100644
index 00000000..c7cbb394
--- /dev/null
+++ b/src/main/webapp/main/trips/tripBillInterior.zul
@@ -0,0 +1,385 @@
+<zk xmlns="http://www.zkoss.org/2005/zul"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.zkoss.org/2005/zul http://www.zkoss.org/2005/zul/zul.xsd">
+	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+
+	<grid>
+		<columns visible="false">
+			<column hflex="min"/>
+			<column hflex="min"/>
+			<column hflex="2"/>
+			<column hflex="2"/>
+			<column hflex="2"/>
+		</columns>
+		<auxhead>
+			<auxheader label="${labels.TripBillTravelBegin}" colspan="2"/>
+			<auxheader label="${labels.TripBillTravelTarget}"/>
+			<auxheader label="${labels.TripBillPurpose}"/>
+			<auxheader label="${labels.TripBillTravelEnd}"/>
+		</auxhead>
+		<rows>
+			<row>
+				<cell colspan="2">
+					<label value="@load(vm.dataBean.requirement.from)"/>
+				</cell>
+				<cell>
+					<label value="@load(vm.dataBean.requirement.to)"/>
+				</cell>
+				<cell>
+					<label value="@load(vm.dataBean.requirement.description)"/>
+				</cell>
+				<cell>
+					<label value="@load(vm.dataBean.requirement.end)"/>
+				</cell>
+			</row>
+			<row>
+				<label value="@load(vm.dataBean.requirement.tripDate) @converter('formatedDate', format=labels.DateFormat)"/>
+				<label value="@load(vm.dataBean.requirement.tripDate) @converter('formatedDate', format='hh:mm')"/>
+				<cell/>
+				<cell/>
+				<label value="@load(vm.dataBean.requirement.endDate) @converter('formatedDate', format=labels.DateFormat)"/>
+			</row>
+		</rows>
+	</grid>
+	<grid>
+		<columns>
+			<column/>
+			<column/>
+		</columns>
+		<rows>
+			<row>
+				<label value="${labels.TripBillResultMessage}"/>
+				<datebox value="@bind(vm.dataBean.resultMessageDate)" disabled="${disabled}"/>
+			</row>
+			<row>
+				<cell colspan="2">
+					<checkbox label="${labels.TripBillFreeMeals}"
+							  checked="@bind(vm.dataBean.freeMeals)"
+							  onCheck="@command('calculate')"
+							  disabled="${disabled}"/>
+				</cell>
+			</row>
+			<row>
+				<cell colspan="2">
+					<checkbox label="${labels.TripBillFreeHousing}"
+							  checked="@bind(vm.dataBean.freeHousing)"
+							  disabled="${disabled}" />
+				</cell>
+			</row>
+			<row>
+				<cell colspan="2">
+					<checkbox label="${labels.TripBillFreeCarfare}"
+							  checked="@bind(vm.dataBean.freeCarfare)"
+							  disabled="${disabled}" />
+				</cell>
+			</row>
+		</rows>
+	</grid>
+	<grid
+			model="@load(vm.dataBean.billItems)"
+			vflex="1">
+		<auxhead>
+			<auxheader rowspan="2">
+				<div sclass="vertikaal" height="50px">
+					<label value="${labels.TripBillDate}" sclass="bold"/>
+				</div>
+			</auxheader>
+			<auxheader colspan="2">
+				<label value=""/>
+			</auxheader>
+			<!-- <auxheader >
+				<label value=""/>
+			</auxheader> -->
+			<auxheader colspan="2" align="center">
+				<label value="${labels.TripBillDepartureArrival}" sclass="bold"/>
+			</auxheader>
+			<!-- <auxheader>
+				<label value=""/>
+			</auxheader> -->
+			<auxheader rowspan="2"  valign="bottom" height="110px">
+				<div sclass="vertikaal" height="88px" width="88px">
+					<vbox>
+						<label value="${labels.TripBillUsed}" sclass="bold"/>
+						<label value="${labels.TripBillVehicle}" sclass="bold"/>
+					</vbox>
+				</div>
+
+			</auxheader>
+			<auxheader rowspan="2" valign="bottom" height="112px">
+				<div sclass="vertikaal" height="101px" width="90px">
+					<vbox>
+						<label value="${labels.TripBillBeginEnd}" sclass="bold"/>
+						<label value="${labels.TripBillWork}" sclass="bold"/>
+					</vbox>
+				</div>
+			</auxheader>
+			<auxheader>
+				<html>
+				<![CDATA[${labels.TripBillTraveled}  <br /> ${labels.TripBillKm} ]]>
+				</html>
+			</auxheader>
+			<auxheader>
+				<html>
+				<![CDATA[${labels.TripBillConsumption}  <br /> ${labels.TripBillPHM} ]]>
+				</html>
+			</auxheader>
+			<auxheader rowspan="2">
+				<html>
+				<![CDATA[${labels.TripBillCarfare}  <br /> ${labels.TripBillLocal} <br /> ${labels.TripBillTransportation} ]]>
+				</html>
+			</auxheader>
+			<auxheader rowspan="2">
+				<label value="${labels.TripBillHousing}" sclass="bold"/>
+			</auxheader>
+			<auxheader rowspan="2">
+				<html>
+				<![CDATA[${labels.TripBillNumber}  <br /> ${labels.TripBillMeals} <br /> ${labels.TripBillFree} ]]>
+				</html>
+			</auxheader>
+			<auxheader rowspan="2">
+				<label value="${labels.TripBillMealExpenses}" sclass="bold"/>
+			</auxheader>
+			<auxheader rowspan="2">
+				<html>
+				<![CDATA[${labels.TripBillNecessary}  <br /> ${labels.TripBillOther} <br /> ${labels.TripBillExpenses} ]]>
+				</html>
+			</auxheader>
+			<auxheader rowspan="2">
+				<label value="${labels.TripBillTotal}" sclass="bold"/>
+			</auxheader>
+			<auxheader rowspan="2">
+				<label value="${labels.TripBillAdjusted}" sclass="bold"/>
+			</auxheader>
+		</auxhead>
+		<auxhead>
+			<!-- <auxheader>
+				<label value=""/>
+			</auxheader>  -->
+			<auxheader colspan="2" align="center">
+				<label value="${labels.TripBillTravelTarget}" sclass="bold"/>
+			</auxheader>
+			<!-- <auxheader >
+				<label value=""/>
+			</auxheader>  -->
+			<auxheader>
+				<label value="${labels.TripBillHourMin}" sclass="bold"/>
+			</auxheader>
+			<auxheader>
+				<label value="${labels.TripBillHourMin}" sclass="bold"/>
+			</auxheader>
+			<!--  <auxheader>
+				<label value=""/>
+			</auxheader>-->
+			<!-- <auxheader>
+				<label value=""/>
+			</auxheader> -->
+			<auxheader>
+				<html>
+				<![CDATA[<div> ${labels.TripBillTraveled}  <br /> ${labels.TripBillKm} <br /> ${labels.TripBillInKc}</div> ]]>
+				</html>
+			</auxheader>
+			<auxheader>
+				<html>
+				<![CDATA[${labels.TripBillConsumption}  <br /> ${labels.TripBillPHM} <br /> ${labels.TripBillInKc}]]>
+				</html>
+			</auxheader>
+			<!-- <auxheader>
+				<label value=""/>
+			</auxheader>
+			<auxheader>
+				<label value=""/>
+			</auxheader>
+			<auxheader>
+				<label value=""/>
+			</auxheader>
+			<auxheader>
+				<label value=""/>
+			</auxheader>
+			<auxheader>
+				<label value=""/>
+			</auxheader>
+			<auxheader>
+				<label value=""/>
+			</auxheader>-->
+		</auxhead>
+		<columns visible="false">
+			<column width="60px"/>
+			<column width="60px"/>
+			<column hflex="max"/>
+			<column width="70px"/>
+			<column width="70px"/>
+			<column width="70px"/>
+			<column width="70px"/>
+			<column width="70px"/>
+			<column width="70px"/>
+			<column width="70px"/>
+			<column width="70px"/>
+			<column width="70px"/>
+			<column width="70px"/>
+			<column width="70px"/>
+			<column width="70px"/>
+			<column width="70px"/>
+		</columns>
+		<rows>
+			<template name="model">
+				<row>
+					<label value="@load(each.date) @converter('formatedDate', format='dd.MM')"/>
+					<vbox>
+						<label value="${labels.TripBillTo}"/>
+						<label value="${labels.TripBillBack}"/>
+					</vbox>
+					<vbox hflex="max">
+						<textbox inplace="true"
+								 value="@load(each.to)"
+								 maxlength="@load(vm.lengthText)"
+								 sclass="grid-textbox-max-left"
+								 readonly="${disabled}"/>
+						<textbox inplace="true"
+								 value="@load(each.back)"
+								 maxlength="@load(vm.lengthText)"
+								 sclass="grid-textbox-max-left"
+								 readonly="${disabled}"/>
+					</vbox>
+					<vbox>
+						<timebox inplace="true"
+								 width="68px"
+								 value="@bind(each.toArrival)"
+								 onChange="@command('calculate')"
+								 format="short"
+								 disabled="${disabled}"/>
+						<timebox inplace="true"
+								 width="68px"
+								 value="@bind(each.backArrival)"
+								 onChange="@command('calculate')"
+								 format="short"
+								 disabled="${disabled}"/>
+					</vbox>
+					<vbox>
+						<timebox inplace="true"
+								 width="68px"
+								 value="@bind(each.toDeparture)"
+								 onChange="@command('calculate')"
+								 format="short"
+								 disabled="${disabled}"/>
+						<timebox inplace="true"
+								 width="68px"
+								 value="@bind(each.backDeparture)"
+								 onChange="@command('calculate')"
+								 format="short"
+								 disabled="${disabled}"/>
+					</vbox>
+					<vbox>
+						<combobox inplace="true"
+								  model="@load(vm.vehicles)"
+								  selectedItem="@bind(each.toVehicle)"
+								  width="67px"
+								  readonly="true"
+								  disabled="${disabled}">
+							<template name="model">
+								<comboitem label="@load(each.code)"/>
+							</template>
+						</combobox>
+
+						<combobox inplace="true"
+								  model="@load(vm.vehicles)"
+								  selectedItem="@bind(each.backVehicle)"
+								  width="67px"
+								  readonly="true"
+								  disabled="${disabled}">
+							<template name="model">
+								<comboitem label="@load(each.code)"/>
+							</template>
+						</combobox>
+					</vbox>
+					<vbox>
+						<timebox inplace="true"
+								 width="68px"
+								 value="@bind(each.beginWork)"
+								 format="short"
+								 disabled="${disabled}"/>
+						<timebox inplace="true"
+								 width="68px"
+								 value="@bind(each.endWork)"
+								 format="short"
+								 disabled="${disabled}"/>
+					</vbox>
+					<vbox>
+						<textbox
+								inplace="true"
+								width="68px"
+								maxlength="@load(vm.lengthText)"
+								value="@bind(each.distance) @converter(vm.standardBigDecimalConverter)"
+								readonly="${disabled}"/>
+						<textbox
+								inplace="true"
+								width="68px"
+								value="@bind(each.distanceAmount) @converter(vm.standardBigDecimalConverter)"
+								maxlength="@load(vm.lengthText)"
+								onChange="@command('calculate')"
+								readonly="${disabled}"/>
+					</vbox>
+					<vbox>
+						<textbox
+								inplace="true"
+								width="68px"
+								maxlength="@load(vm.lengthText)"
+								value="@bind(each.fuelConsumption) @converter(vm.standardBigDecimalConverter)"
+								readonly="${disabled}"/>
+						<textbox
+								inplace="true"
+								width="68px"
+								value="@bind(each.fuelAmount) @converter(vm.standardBigDecimalConverter)"
+								maxlength="@load(vm.lengthText)"
+								onChange="@command('calculate')"
+								readonly="${disabled}"/>
+					</vbox>
+					<textbox
+							inplace="true"
+							value="@bind(each.carefare) @converter(vm.standardBigDecimalConverter)"
+							maxlength="@load(vm.lengthText)"
+							onChange="@command('calculate')"
+							readonly="${disabled}"/>
+					<textbox
+							inplace="true"
+							value="@bind(each.housing) @converter(vm.standardBigDecimalConverter)"
+							maxlength="@load(vm.lengthText)"
+							onChange="@command('calculate')"
+							readonly="${disabled}"/>
+					<combobox inplace="true" selectedIndex="@bind(each.freeMealsCount)"
+							  readonly="true"
+							  disabled="${disabled}"
+							  width="60px"
+
+							  onBlur="@command('calculate')">
+						<comboitem value="0" label="0"/>
+						<comboitem value="1" label="1"/>
+						<comboitem value="2" label="2"/>
+						<comboitem value="3" label="3"/>
+					</combobox>
+					<label value="@load(each.meals) @converter(vm.standardBigDecimalConverter)"/>
+					<textbox
+							inplace="true"
+							value="@bind(each.otherExpenses) @converter(vm.standardBigDecimalConverter)"
+							maxlength="@load(vm.lengthText)"
+							onChange="@command('calculate')"
+							readonly="${disabled}"/>
+					<label value="@load(each.total) @converter(vm.standardBigDecimalConverter)"/>
+					<label value="@load(each.adjustedTotal) @converter(vm.standardBigDecimalConverter)"/>
+				</row>
+			</template>
+		</rows>
+	</grid>
+	<div hflex="1" align="end" >
+		<vbox>
+			<hbox>
+				<label value="Záloha: " style="font-size: 14px;"/>
+				<label value="@load(vm.dataBean.requirement.downPayment) @converter(vm.standardBigDecimalConverter)" style="font-size: 14px;"/>
+			</hbox>
+			<hbox>
+				<label value="${labels.TripBillTotal}: " style="font-size: 14px; font-weight: bold;"/>
+				<label value="@load(vm.dataBean.total) @converter(vm.standardBigDecimalConverter)" style="font-size: 14px; font-weight: bold;"/>
+			</hbox>
+		</vbox>
+	</div>
+
+</zk>
\ No newline at end of file