update aus e-mail
This commit is contained in:
gaby
parent
c5d54fffc9
commit
26eeb83147
3 changed files with 3200 additions and 76 deletions
|
|
@ -6,21 +6,36 @@
|
||||||
xmlns:a="http://xmlns.jcp.org/jsf/passthrough">
|
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"
|
<h:panelGroup layout="block" styleClass="imixs-form-section"
|
||||||
id="oderlist" binding="#{orderlistContainer}">
|
id="oderlist" binding="#{orderlistContainer}">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<f:ajax render="oderlist" onevent="updateOrderItems">
|
<f:ajax render="oderlist" onevent="updateOrderItems">
|
||||||
<table class="imixsdatatable imixs-orderitems">
|
<table class="imixsdatatable imixs-orderitems">
|
||||||
<tr>
|
<tr>
|
||||||
<th style="">#</th>
|
<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="">
|
<th style="">
|
||||||
<!-- delete -->
|
<!-- delete -->
|
||||||
</th>
|
</th>
|
||||||
|
|
@ -32,59 +47,64 @@
|
||||||
<td><h:outputText value="#{orderitem.item['numpos']}" /></td>
|
<td><h:outputText value="#{orderitem.item['numpos']}" /></td>
|
||||||
|
|
||||||
<!-- Name -->
|
<!-- Name -->
|
||||||
<td><h:inputText value="#{orderitem.item['name']}" style="width:100%;"/></td>
|
<td><h:inputText value="#{orderitem.item['name']}"
|
||||||
|
style="width:100%;" /></td>
|
||||||
|
|
||||||
|
|
||||||
<!-- Steuer -->
|
<!-- Steuer -->
|
||||||
<td><h:selectOneMenu value="#{orderitem.item['tax']}" a:data-id="orderitem_tax" >
|
<td><h:selectOneMenu value="#{orderitem.item['tax']}"
|
||||||
<f:selectItem itemLabel="" itemValue="" />
|
a:data-id="orderitem_tax">
|
||||||
<f:selectItem itemLabel="Steuerfrei Ausfuhr" itemValue="0"></f:selectItem>
|
<f:selectItem itemLabel="" itemValue="" />
|
||||||
<f:selectItem itemLabel="Steuerfrei EU" itemValue="0EU"></f:selectItem>
|
<f:selectItem itemLabel="Steuerfrei Ausfuhr" itemValue="0"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Steuerfrei Inland" itemValue="0IN"></f:selectItem>
|
<f:selectItem itemLabel="Steuerfrei EU" itemValue="0EU"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Steuerpflichtig 16%" itemValue="16"></f:selectItem>
|
<f:selectItem itemLabel="Steuerfrei Inland" itemValue="0IN"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Steuerpflichtig 19%" itemValue="19"></f:selectItem>
|
<f:selectItem itemLabel="Steuerpflichtig 16%" itemValue="16"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Reverse-Charge" itemValue="RC"></f:selectItem>
|
<f:selectItem itemLabel="Steuerpflichtig 19%" itemValue="19"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Reverse-Charge-EU" itemValue="RCE"></f:selectItem>
|
<f:selectItem itemLabel="Reverse-Charge" itemValue="RC"></f:selectItem>
|
||||||
</h:selectOneMenu></td>
|
<f:selectItem itemLabel="Reverse-Charge-EU" itemValue="RCE"></f:selectItem>
|
||||||
|
</h:selectOneMenu></td>
|
||||||
|
|
||||||
<!-- Leistungsart -->
|
<!-- Leistungsart -->
|
||||||
<td><h:selectOneMenu value="#{orderitem.item['category']}" a:data-id="orderitem_category" >
|
<td><h:selectOneMenu value="#{orderitem.item['category']}"
|
||||||
<f:selectItem itemLabel="" itemValue="" />
|
a:data-id="orderitem_category">
|
||||||
<f:selectItem itemLabel="Dieselzuschlag" itemValue="DIESEL"></f:selectItem>
|
<f:selectItem itemLabel="" itemValue="" />
|
||||||
<f:selectItem itemLabel="EUSt" itemValue="EUST"></f:selectItem>
|
<f:selectItem itemLabel="Dieselzuschlag" itemValue="DIESEL"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Transportkosten - Nachlauf" itemValue="FRACHT"></f:selectItem>
|
<f:selectItem itemLabel="EUSt" itemValue="EUST"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Umschlagkosten" itemValue="HANDL"></f:selectItem>
|
<f:selectItem itemLabel="Transportkosten - Nachlauf"
|
||||||
<f:selectItem itemLabel="Joloda" itemValue="JOLODA"></f:selectItem>
|
itemValue="FRACHT"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Lagerkosten" itemValue="LAGER"></f:selectItem>
|
<f:selectItem itemLabel="Umschlagkosten" itemValue="HANDL"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Luftfracht" itemValue="LUFT"></f:selectItem>
|
<f:selectItem itemLabel="Joloda" itemValue="JOLODA"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Mautgebühren" itemValue="MAUT"></f:selectItem>
|
<f:selectItem itemLabel="Lagerkosten" itemValue="LAGER"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Seefracht" itemValue="SEE"></f:selectItem>
|
<f:selectItem itemLabel="Luftfracht" itemValue="LUFT"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Shipping Agency" itemValue="SHA"></f:selectItem>
|
<f:selectItem itemLabel="Mautgebühren" itemValue="MAUT"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Sonstige" itemValue="SONST"></f:selectItem>
|
<f:selectItem itemLabel="Seefracht" itemValue="SEE"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Lagerkosten" itemValue="STORAGE"></f:selectItem>
|
<f:selectItem itemLabel="Shipping Agency" itemValue="SHA"></f:selectItem>
|
||||||
<f:selectItem itemLabel="THC-Kosten" itemValue="THC"></f:selectItem>
|
<f:selectItem itemLabel="Sonstige" itemValue="SONST"></f:selectItem>
|
||||||
<f:selectItem itemLabel="Zoll" itemValue="Zoll"></f:selectItem>
|
<f:selectItem itemLabel="Lagerkosten" itemValue="STORAGE"></f:selectItem>
|
||||||
</h:selectOneMenu></td>
|
<f:selectItem itemLabel="THC-Kosten" itemValue="THC"></f:selectItem>
|
||||||
|
<f:selectItem itemLabel="Zoll" itemValue="Zoll"></f:selectItem>
|
||||||
|
</h:selectOneMenu></td>
|
||||||
|
|
||||||
<!-- Netto Betrag -->
|
<!-- 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" />
|
<f:convertNumber minFractionDigits="2" locale="de" />
|
||||||
</h:inputText>
|
</h:inputText></td>
|
||||||
</td>
|
|
||||||
|
|
||||||
<!-- Brutto -->
|
<!-- 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>
|
<span class="typcn typcn-trash imixs-state-info"></span>
|
||||||
<f:ajax render="#{orderlistContainer.clientId}"
|
<f:ajax render="#{orderlistContainer.clientId}"
|
||||||
onevent="updateOrderItems" />
|
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" />
|
<f:convertNumber minFractionDigits="2" locale="de" />
|
||||||
</h:inputHidden>
|
</h:inputHidden></td>
|
||||||
</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
</ui:repeat>
|
</ui:repeat>
|
||||||
|
|
||||||
|
|
@ -95,12 +115,14 @@
|
||||||
<td />
|
<td />
|
||||||
<td />
|
<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 />
|
<td />
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<!-- total summary -->
|
<!-- 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" />
|
<f:convertNumber minFractionDigits="2" locale="de" />
|
||||||
</h:inputHidden>
|
</h:inputHidden>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,16 @@
|
||||||
xmlns:h="http://xmlns.jcp.org/jsf/html">
|
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"
|
<h:panelGroup layout="block" styleClass="imixs-form-section"
|
||||||
id="oderlist" binding="#{orderlistContainer}">
|
id="oderlist" binding="#{orderlistContainer}">
|
||||||
|
|
||||||
|
|
@ -13,11 +23,12 @@
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<th style="">#</th>
|
<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;">Steuer</th>
|
||||||
<th style="width: 100px;">Leistungsart</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>
|
</tr>
|
||||||
|
|
||||||
<ui:repeat var="orderitem" value="#{childItemController.childItems}">
|
<ui:repeat var="orderitem" value="#{childItemController.childItems}">
|
||||||
|
|
@ -34,11 +45,11 @@
|
||||||
|
|
||||||
<td><h:outputText value="#{orderitem.item['category']}" /></td>
|
<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 />
|
<td />
|
||||||
<td style="text-align: right;">Summe:</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>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
@ -72,10 +82,6 @@
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
/*<![CDATA[*/
|
/*<![CDATA[*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*]]>*/
|
/*]]>*/
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
||||||
3096
workflow/rechnungseingang-de-1.0.3.bpmn
Normal file
3096
workflow/rechnungseingang-de-1.0.3.bpmn
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue