update aus e-mail

office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml

@@ -6,21 +6,36 @@
 	xmlns:a="http://xmlns.jcp.org/jsf/passthrough">
 
 
+	<div class="imixs-form-section-2">
+		<dl>
+			<dt>
+				Exchange Rate:<span class="imixs-required">*</span>
+			</dt>
+			<dd>
+				<h:inputText required="true"
+					value="#{workitem.item['invoice.exchangerate']}">
+					<f:convertNumber />
+				</h:inputText>
+			</dd>
+		</dl>
+	</div>
+
+
 	<h:panelGroup layout="block" styleClass="imixs-form-section"
 		id="oderlist" binding="#{orderlistContainer}">
 
-		
-		
-
 		<f:ajax render="oderlist" onevent="updateOrderItems">
 			<table class="imixsdatatable imixs-orderitems">
 				<tr>
 					<th style="">#</th>
-					<th style="">Positionsnummer<span class="imixs-required"> *</span></th>
+					<th style="">Positionsnummer<span class="imixs-required">
-					<th style="width: 100px;">Steuer<span class="imixs-required"> *</span></th>
+							*</span></th>
-					<th style="width: 100px;">Leistungsart<span class="imixs-required"> *</span></th>
+					<th style="width: 100px;">Steuer<span class="imixs-required">
-					<th style="width: 150px;text-align:right;">Netto</th>
+							*</span></th>
-					<th style="width: 150px;text-align:right;">Brutto</th>
+					<th style="width: 100px;">Leistungsart<span
+						class="imixs-required"> *</span></th>
+					<th style="width: 150px; text-align: right;">Netto</th>
+					<th style="width: 150px; text-align: right;">Brutto</th>
 					<th style="">
 						<!-- delete -->
 					</th>
@@ -32,11 +47,13 @@
 						<td><h:outputText value="#{orderitem.item['numpos']}" /></td>
 
 						<!-- Name -->
-						<td><h:inputText value="#{orderitem.item['name']}" style="width:100%;"/></td>
+						<td><h:inputText value="#{orderitem.item['name']}"
+								style="width:100%;" /></td>
 
 
 						<!-- Steuer -->
-						<td><h:selectOneMenu value="#{orderitem.item['tax']}" a:data-id="orderitem_tax" >
+						<td><h:selectOneMenu value="#{orderitem.item['tax']}"
+								a:data-id="orderitem_tax">
 								<f:selectItem itemLabel="" itemValue="" />
 								<f:selectItem itemLabel="Steuerfrei Ausfuhr" itemValue="0"></f:selectItem>
 								<f:selectItem itemLabel="Steuerfrei EU" itemValue="0EU"></f:selectItem>
@@ -48,11 +65,13 @@
 							</h:selectOneMenu></td>
 
 						<!-- Leistungsart -->
-						<td><h:selectOneMenu value="#{orderitem.item['category']}" a:data-id="orderitem_category" >
+						<td><h:selectOneMenu value="#{orderitem.item['category']}"
+								a:data-id="orderitem_category">
 								<f:selectItem itemLabel="" itemValue="" />
 								<f:selectItem itemLabel="Dieselzuschlag" itemValue="DIESEL"></f:selectItem>
 								<f:selectItem itemLabel="EUSt" itemValue="EUST"></f:selectItem>
-							<f:selectItem itemLabel="Transportkosten - Nachlauf" itemValue="FRACHT"></f:selectItem>
+								<f:selectItem itemLabel="Transportkosten - Nachlauf"
+									itemValue="FRACHT"></f:selectItem>
 								<f:selectItem itemLabel="Umschlagkosten" itemValue="HANDL"></f:selectItem>
 								<f:selectItem itemLabel="Joloda" itemValue="JOLODA"></f:selectItem>
 								<f:selectItem itemLabel="Lagerkosten" itemValue="LAGER"></f:selectItem>
@@ -67,24 +86,25 @@
 							</h:selectOneMenu></td>
 
 						<!-- Netto Betrag -->
-						<td style="text-align:right;"><h:inputText value="#{orderitem.item['amount']}"
+						<td style="text-align: right;"><h:inputText
-								a:data-id="orderitem_amount" style="text-align: right;width:100%;">
+								value="#{orderitem.item['amount']}" a:data-id="orderitem_amount"
+								style="text-align: right;width:100%;">
 								<f:convertNumber minFractionDigits="2" locale="de" />
-							</h:inputText>
+							</h:inputText></td>
-						</td>
 
 						<!-- Brutto -->
-						<td data-id="orderitem_summary" style="text-align: right;padding-right:10px;"></td>
+						<td data-id="orderitem_summary"
+							style="text-align: right; padding-right: 10px;"></td>
 
-						<td><h:commandLink actionListener="#{childItemController.remove(orderitem.item['numpos'])}">
+						<td><h:commandLink
+								actionListener="#{childItemController.remove(orderitem.item['numpos'])}">
 								<span class="typcn typcn-trash imixs-state-info"></span>
 								<f:ajax render="#{orderlistContainer.clientId}"
 									onevent="updateOrderItems" />
-							</h:commandLink>
+							</h:commandLink> <h:inputHidden value="#{orderitem.item['total']}"
-							 <h:inputHidden value="#{orderitem.item['total']}" a:data-id="orderitem_total">
+								a:data-id="orderitem_total">
 								<f:convertNumber minFractionDigits="2" locale="de" />
-							</h:inputHidden>	
+							</h:inputHidden></td>
-						</td>
 					</tr>
 				</ui:repeat>
 
@@ -95,12 +115,14 @@
 					<td />
 					<td />
 					<td />
-					<td data-id="orderlist_summary" style="text-align: right;padding-right:10px;font-wight:bold;"></td>
+					<td data-id="orderlist_summary"
+						style="text-align: right; padding-right: 10px; font-wight: bold;"></td>
 					<td />
 				</tr>
 			</table>
 			<!-- total summary -->
-			<h:inputHidden value="#{workitem.item['order.total']}" a:data-id="orderitems_capacity">
+			<h:inputHidden value="#{workitem.item['order.total']}"
+				a:data-id="orderitems_capacity">
 				<f:convertNumber minFractionDigits="2" locale="de" />
 			</h:inputHidden>
 

office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen_read.xhtml

@@ -5,6 +5,16 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html">
 
 
+	<dl>
+		<dt>
+			Exchange Rate:<span class="imixs-required">*</span>
+		</dt>
+		<dd>
+			<h:outputText required="true"
+				value="#{workitem.item['invoice.exchangerate']}">
+			</h:outputText>
+		</dd>
+	</dl>
 	<h:panelGroup layout="block" styleClass="imixs-form-section"
 		id="oderlist" binding="#{orderlistContainer}">
 
@@ -13,11 +23,12 @@
 
 				<tr>
 					<th style="">#</th>
-					<th style="">Positionsnummer<span class="imixs-required"> *</span></th>
+					<th style="">Positionsnummer<span class="imixs-required">
+							*</span></th>
 					<th style="width: 100px;">Steuer</th>
 					<th style="width: 100px;">Leistungsart</th>
-					<th style="width: 150px;text-align:right;">Netto</th>
+					<th style="width: 150px; text-align: right;">Netto</th>
-					<th style="width: 150px;text-align:right;">Brutto</th>
+					<th style="width: 150px; text-align: right;">Brutto</th>
 				</tr>
 
 				<ui:repeat var="orderitem" value="#{childItemController.childItems}">
@@ -34,11 +45,11 @@
 
 						<td><h:outputText value="#{orderitem.item['category']}" /></td>
 
-						<td style="text-align: right;"><h:outputText value="#{orderitem.item['amount']}"
+						<td style="text-align: right;"><h:outputText
-								 /></td>
+								value="#{orderitem.item['amount']}" /></td>
 
-						<td style="text-align: right;"><h:outputText value="#{orderitem.item['total']}"
+						<td style="text-align: right;"><h:outputText
-								 /></td>
+								value="#{orderitem.item['total']}" /></td>
 
 
 
@@ -54,10 +65,9 @@
 					<td />
 					<td />
 					<td style="text-align: right;">Summe:</td>
-					<td class="orderlist_summary" style="text-align: right;">
+					<td class="orderlist_summary" style="text-align: right;"><h:outputText
-					<h:outputText value="#{workitem.item['order.total']}">
+							value="#{workitem.item['order.total']}">
-					</h:outputText>
+						</h:outputText></td>
-					</td>
 
 				</tr>
 			</table>
@@ -72,10 +82,6 @@
 	<script type="text/javascript">
 		/*<![CDATA[*/
 
-		
-		
-
-
 		/*]]>*/
 	</script>