Merge branch 'Verze_1.0'

Conflicts:
	src/main/java/info/bukova/isspst/Constants.java

src/main/webapp/WEB-INF/locales/zk-label.properties

@@ -349,6 +349,7 @@ InvoicingInvoiceNumber=Číslo faktury
 InvoicingAmount=Částka
 InvoicingDescription=Popis
 InvoicingInvoiced=Fakturováno
+InvoicingApplicant=Žadatel
 
 HandleComboKeyFilter=#del
 HandleComboKey=$#del

src/main/webapp/main/invoicing/invoicingGrid.zul

@@ -29,6 +29,9 @@
 					label="${labels.RequirementsGridWorkgroup}"
 					width="180px"/>
 				<listheader
+          label="${labels.InvoicingApplicant}"
+          width="180px"/>
+				<listheader
 					label="${labels.InvoicingDescription}" 
 					width=""/>
 				<listheader
@@ -161,6 +164,7 @@
 					<listcell label="@load(each.requirement.reqDate)  @converter('formatedDate', format=labels.DateFormat)" />
 					<listcell label="@load(each.requirement.centre)" />
 					<listcell label="@load(each.requirement.workgroup)" />
+					<listcell label="@load(each.requirement.ownedBy)" />
 					<listcell label="@load(each.requirement.description)" />
 					<listcell label="@load(each.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)" />
 					<listcell label="@load(each.totalInvoiced) @converter(vm.standardBigDecimalConverter)"