Merge branch 'Verze_1.0'

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

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

@@ -40,6 +40,8 @@ RequirementItemUnitPrice=Jedn. cena
 RequirementItemTotal=Celkem
 RequirementItemDescription=Poznámka
 
+RequirementInvoicedAmount=Fakturovaná částka:
+
 
 AgendaMyOrders=Aktuální
 AgendaOrdersHistory=Ukončené

src/main/webapp/main/orders/approved/grid.zul

@@ -32,6 +32,10 @@
 			<listhead menupopup="auto">
 				<listheader width="27" />
 				<listheader
+          hflex="6"
+          sort="czech(requirement.numser)"
+          label="${labels.InvoicingRequirementNumber}" />
+				<listheader
 					hflex="7"
 					sort="czech(code)"
 					label="${labels.RequirementItemCode}" />
@@ -82,6 +86,21 @@
 			<auxhead visible="@load(vm.filter)">
 				<auxheader />
 				<auxheader>
+          <div sclass="find-grid-cell">
+            <div sclass="find-grid-divtextbox">
+              <textbox
+                value="@bind(vm.filterTemplate.requirement.numser)"
+                instant="true"
+                onChange="@command('doFilter')"
+                maxlength="@load(vm.lengthText)"
+                sclass="find-grid-textbox" />
+            </div>
+            <div sclass="find-grid-img">
+              <image src="/img/funnel.png" />
+            </div>
+          </div>
+        </auxheader>
+				<auxheader>
 					<div sclass="find-grid-cell">
 						<div sclass="find-grid-divtextbox">
 							<textbox
@@ -268,6 +287,7 @@
 			<template name="model">
 				<listitem context="popupMenu">
 					<listcell />
+					<listcell label="@load(each.requirement.numser)"/>
 					<listcell label="@load(each.code)" />
 					<listcell label="@load(each.name)" />
 					<listcell label="@load(each.textItem)" />

src/main/webapp/main/orders/requirements/reqListMyAll.zul

@@ -188,6 +188,14 @@
 		</template>
 	</listbox>
 	<div hflex="3">
-		<include src="/main/approveStatus.zul" />
+	   <vbox>
+	     <include src="/main/approveStatus.zul" />
+	     
+	     <hbox visible="@load(not empty vm.invoicedAmount)">
+	       <label value="${labels.RequirementInvoicedAmount}"/>
+	       <label value="@load(vm.invoicedAmount) @converter(vm.bigDecimalConverter)"/>
+	     </hbox>
+	     
+	   </vbox>
 	</div>
 </hbox>

src/main/webapp/main/orders/requirements/reqListMyCenters.zul

@@ -188,6 +188,14 @@
 		</template>
 	</listbox>
 	<div hflex="3">
-		<include src="/main/approveStatus.zul" />
+		<vbox>
+       <include src="/main/approveStatus.zul" />
+       
+       <hbox visible="@load(not empty vm.invoicedAmount)">
+         <label value="${labels.RequirementInvoicedAmount}"/>
+         <label value="@load(vm.invoicedAmount) @converter(vm.bigDecimalConverter)"/>
+       </hbox>
+       
+     </vbox>
 	</div>
 </hbox>

src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul

@@ -188,6 +188,14 @@
 		</template>
 	</listbox>
 	<div hflex="3">
-		<include src="/main/approveStatus.zul" />
+		<vbox>
+       <include src="/main/approveStatus.zul" />
+       
+       <hbox visible="@load(not empty vm.invoicedAmount)">
+         <label value="${labels.RequirementInvoicedAmount}"/>
+         <label value="@load(vm.invoicedAmount) @converter(vm.bigDecimalConverter)"/>
+       </hbox>
+       
+     </vbox>
 	</div>
 </hbox>