update
This commit is contained in:
parent
676f082bc3
commit
d8dce27b1b
9 changed files with 12210 additions and 217 deletions
|
|
@ -0,0 +1,50 @@
|
|||
/*******************************************************************************
|
||||
* Imixs Workflow Technology
|
||||
* Copyright (C) 2003, 2008 Imixs Software Solutions GmbH,
|
||||
* http://www.imixs.com
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You can receive a copy of the GNU General Public
|
||||
* License at http://www.gnu.org/licenses/gpl.html
|
||||
*
|
||||
* Contributors:
|
||||
* Imixs Software Solutions GmbH - initial API and implementation
|
||||
* Ralph Soika
|
||||
*
|
||||
*******************************************************************************/
|
||||
package com.alexanderlogistics;
|
||||
|
||||
import javax.enterprise.context.RequestScoped;
|
||||
import javax.inject.Named;
|
||||
|
||||
import org.imixs.workflow.office.config.ConfigController;
|
||||
|
||||
/**
|
||||
* The Custom Config Controller for TAXES and Invoice typs
|
||||
*
|
||||
*
|
||||
* @author rsoika
|
||||
* @version 1.0
|
||||
*/
|
||||
|
||||
@Named("aglConfigController")
|
||||
@RequestScoped
|
||||
public class AGLConfigController extends ConfigController {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public AGLConfigController() {
|
||||
super();
|
||||
setName("AGL_CONFIGURATION");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,16 +1,28 @@
|
|||
<f:subview xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:f="http://java.sun.com/jsf/core"
|
||||
xmlns:h="http://java.sun.com/jsf/html"
|
||||
xmlns:ui="http://java.sun.com/jsf/facelets">
|
||||
<f:subview xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
|
||||
xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets">
|
||||
|
||||
<ul>
|
||||
<li><h:link outcome="/pages/admin/document_import">Dokument Import</h:link></li>
|
||||
<li><h:link outcome="/pages/admin/sepa_config">SEPA</h:link></li>
|
||||
<li><h:link outcome="/pages/admin/cargosoft_export">Cargosoft Export</h:link></li>
|
||||
<li><h:link outcome="/pages/admin/analyse_invoicing">Analyse Rechnungseingang</h:link></li>
|
||||
<li><h:link outcome="/pages/admin/kreditor">Kreditoren/Debitoren</h:link></li>
|
||||
<li><h:link outcome="/pages/admin/oplist_export">OP Listen Export</h:link></li>
|
||||
<li>
|
||||
<h:link outcome="/pages/admin/document_import">Document Import</h:link>
|
||||
</li>
|
||||
<li>
|
||||
<h:link outcome="/pages/admin/sepa_config">SEPA</h:link>
|
||||
</li>
|
||||
<li>
|
||||
<h:link outcome="/pages/admin/cargosoft_export">Cargosoft Export</h:link>
|
||||
</li>
|
||||
<li>
|
||||
<h:link outcome="/pages/admin/analyse_invoicing">Analyse Rechnungseingang</h:link>
|
||||
</li>
|
||||
<li>
|
||||
<h:link outcome="/pages/admin/kreditor">Creditor/Debitor Management</h:link>
|
||||
</li>
|
||||
<li>
|
||||
<h:link outcome="/pages/admin/oplist_export">OP List Export</h:link>
|
||||
</li>
|
||||
<li>
|
||||
<h:link outcome="/pages/admin/agl_params">Parameter</h:link>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</f:subview>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,90 @@
|
|||
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
|
||||
xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets"
|
||||
xmlns:i="http://java.sun.com/jsf/composite/imixs" xmlns:c="http://java.sun.com/jsp/jstl/core"
|
||||
xmlns:marty="http://java.sun.com/jsf/composite/marty" template="/layout/template.xhtml">
|
||||
|
||||
<ui:define name="content">
|
||||
<f:view>
|
||||
<script type="text/javascript">
|
||||
/*<![CDATA[*/
|
||||
|
||||
/*]]>*/
|
||||
</script>
|
||||
|
||||
<h:form id="import_form_id">
|
||||
<!-- ########## Error ########## -->
|
||||
<ui:include src="/pages/error_message.xhtml" />
|
||||
<div class="imixs-form">
|
||||
<div class="imixs-header">
|
||||
<h1>Parameter</h1>
|
||||
<h2>#{global.edit}</h2>
|
||||
</div>
|
||||
<div class="imixs-body">
|
||||
<!-- **** General info ***** -->
|
||||
|
||||
<div class="imixs-form-panel">
|
||||
<div class="imixs-form-section-2">
|
||||
<dl>
|
||||
<dt>#{custom['pos.tax']}:</dt>
|
||||
<dd>
|
||||
|
||||
<h:inputTextarea required="false" converter="org.imixs.VectorConverter"
|
||||
style="height: 8em; width: 100%;"
|
||||
value="#{aglConfigController.workitem.itemList['invoice.tax']}">
|
||||
</h:inputTextarea>
|
||||
|
||||
</dd>
|
||||
|
||||
</dl>
|
||||
|
||||
|
||||
<dl>
|
||||
<dt>#{custom['pos.type']}:</dt>
|
||||
<dd>
|
||||
|
||||
<h:inputTextarea required="false" converter="org.imixs.VectorConverter"
|
||||
style="height: 8em; width: 100%;"
|
||||
value="#{aglConfigController.workitem.itemList['invoice.type']}">
|
||||
</h:inputTextarea>
|
||||
|
||||
</dd>
|
||||
|
||||
</dl>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="imixs-footer">
|
||||
|
||||
|
||||
<h:outputLabel value="#{message.modified}: " />
|
||||
<h:outputText value="#{aglConfigController.workitem.item['$modified']}">
|
||||
<f:convertDateTime timeZone="#{message.timeZone}" type="both"
|
||||
pattern="#{message.dateTimePattern}" />
|
||||
</h:outputText>
|
||||
<br />
|
||||
<h:commandButton actionListener="#{aglConfigController.save}" value="#{message.save}">
|
||||
</h:commandButton>
|
||||
<h:commandButton value="#{message.close}" action="notes" />
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</h:form>
|
||||
</f:view>
|
||||
</ui:define>
|
||||
|
||||
|
||||
|
||||
</ui:composition>
|
||||
|
|
@ -1,15 +1,10 @@
|
|||
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
|
||||
xmlns:f="http://xmlns.jcp.org/jsf/core"
|
||||
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
|
||||
xmlns:h="http://xmlns.jcp.org/jsf/html"
|
||||
xmlns:a="http://xmlns.jcp.org/jsf/passthrough">
|
||||
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
|
||||
xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
|
||||
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:a="http://xmlns.jcp.org/jsf/passthrough">
|
||||
|
||||
|
||||
|
||||
<h:panelGroup layout="block" styleClass="imixs-form-section"
|
||||
id="oderlist" binding="#{orderlistContainer}">
|
||||
|
||||
<h:panelGroup layout="block" styleClass="imixs-form-section" id="oderlist" binding="#{orderlistContainer}">
|
||||
<f:ajax render="oderlist" onevent="updateOrderItems">
|
||||
<table class="imixsdatatable imixs-orderitems">
|
||||
<tr>
|
||||
|
|
@ -18,8 +13,7 @@
|
|||
*</span></th>
|
||||
<th style="width: 100px;">#{custom['pos.tax']}<span class="imixs-required">
|
||||
*</span></th>
|
||||
<th style="width: 100px;">#{custom['pos.type']}<span
|
||||
class="imixs-required"> *</span></th>
|
||||
<th style="width: 100px;">#{custom['pos.type']}<span class="imixs-required"> *</span></th>
|
||||
<th style="width: 80px;">BP</th>
|
||||
<th style="width: 150px; text-align: right;">#{custom['pos.net']}</th>
|
||||
<th style="width: 150px; text-align: right;">#{custom['pos.gross']}</th>
|
||||
|
|
@ -31,17 +25,24 @@
|
|||
<ui:repeat var="orderitem" value="#{childItemController.childItems}">
|
||||
<tr>
|
||||
<!-- pos -->
|
||||
<td><h:outputText value="#{orderitem.item['numpos']}" /></td>
|
||||
<td>
|
||||
<h:outputText value="#{orderitem.item['numpos']}" />
|
||||
</td>
|
||||
|
||||
<!-- Name -->
|
||||
<td><h:inputText value="#{orderitem.item['name']}" styleClass="pos_nameinput"
|
||||
style="width:100%;text-transform: uppercase" /></td>
|
||||
<td>
|
||||
<h:inputText value="#{orderitem.item['name']}" styleClass="pos_nameinput"
|
||||
style="width:100%;text-transform: uppercase" />
|
||||
</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:selectItems value="#{aglConfigController.getSelectItems('invoice.tax')}" />
|
||||
|
||||
<!--
|
||||
<f:selectItem itemLabel="Steuerfrei Ausfuhr" itemValue="0"></f:selectItem>
|
||||
<f:selectItem itemLabel="Steuerfrei EU" itemValue="0EU"></f:selectItem>
|
||||
<f:selectItem itemLabel="Steuerfrei Inland" itemValue="0IN"></f:selectItem>
|
||||
|
|
@ -49,16 +50,19 @@
|
|||
<f:selectItem itemLabel="Steuerpflichtig 19%" itemValue="19"></f:selectItem>
|
||||
<f:selectItem itemLabel="Reverse-Charge" itemValue="RC"></f:selectItem>
|
||||
<f:selectItem itemLabel="Reverse-Charge-EU" itemValue="RCE"></f:selectItem>
|
||||
</h:selectOneMenu></td>
|
||||
-->
|
||||
</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:selectItems value="#{aglConfigController.getSelectItems('invoice.type')}" />
|
||||
<!--
|
||||
<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>
|
||||
|
|
@ -70,35 +74,37 @@
|
|||
<f:selectItem itemLabel="Lagerkosten" itemValue="STORAGE"></f:selectItem>
|
||||
<f:selectItem itemLabel="THC-Kosten" itemValue="THC"></f:selectItem>
|
||||
<f:selectItem itemLabel="Zoll" itemValue="Zoll"></f:selectItem>
|
||||
</h:selectOneMenu></td>
|
||||
-->
|
||||
</h:selectOneMenu>
|
||||
</td>
|
||||
|
||||
|
||||
<!-- Buchungsperiode -->
|
||||
<td><h:inputText
|
||||
value="#{orderitem.item['invoice.period']}"
|
||||
style="width:100%;">
|
||||
</h:inputText></td>
|
||||
<td>
|
||||
<h:inputText value="#{orderitem.item['invoice.period']}" style="width:100%;">
|
||||
</h:inputText>
|
||||
</td>
|
||||
|
||||
<!-- Netto Betrag -->
|
||||
<td style="text-align: right;"><h:inputText
|
||||
value="#{orderitem.item['amount']}" a:data-id="orderitem_amount"
|
||||
<td style="text-align: right;">
|
||||
<h:inputText value="#{orderitem.item['amount']}" a:data-id="orderitem_amount"
|
||||
style="text-align: right;width:100%;">
|
||||
<f:convertNumber minFractionDigits="2" locale="de" />
|
||||
</h:inputText></td>
|
||||
</h:inputText>
|
||||
</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:inputHidden value="#{orderitem.item['total']}"
|
||||
a:data-id="orderitem_total">
|
||||
<f:ajax render="#{orderlistContainer.clientId}" onevent="updateOrderItems" />
|
||||
</h:commandLink>
|
||||
<h:inputHidden value="#{orderitem.item['total']}" a:data-id="orderitem_total">
|
||||
<f:convertNumber minFractionDigits="2" locale="de" />
|
||||
</h:inputHidden></td>
|
||||
</h:inputHidden>
|
||||
</td>
|
||||
</tr>
|
||||
</ui:repeat>
|
||||
|
||||
|
|
@ -111,22 +117,19 @@
|
|||
<td />
|
||||
<td data-id="orderlist_summary_net"
|
||||
style="text-align: right; padding-right: 10px; font-wight: normal;"></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_total">
|
||||
<h:inputHidden value="#{workitem.item['order.total']}" a:data-id="orderitems_total">
|
||||
<f:convertNumber minFractionDigits="2" locale="de" />
|
||||
</h:inputHidden>
|
||||
<h:inputHidden value="#{workitem.item['order.total.netto']}"
|
||||
a:data-id="orderitems_total_netto">
|
||||
<h:inputHidden value="#{workitem.item['order.total.netto']}" a:data-id="orderitems_total_netto">
|
||||
<f:convertNumber minFractionDigits="2" locale="de" />
|
||||
</h:inputHidden>
|
||||
<h:inputHidden value="#{workitem.item['order.total.tax']}"
|
||||
a:data-id="orderitems_total_tax">
|
||||
<h:inputHidden value="#{workitem.item['order.total.tax']}" a:data-id="orderitems_total_tax">
|
||||
<f:convertNumber minFractionDigits="2" locale="de" />
|
||||
</h:inputHidden>
|
||||
|
||||
|
|
@ -145,12 +148,12 @@
|
|||
/*<![CDATA[*/
|
||||
|
||||
// display summary
|
||||
$(document).ready(function() {
|
||||
$(document).ready(function () {
|
||||
// erste Zeile hinzufügen, falls tabelle noch leer ist
|
||||
var posTableEmpty=#{empty childItemController.childItems};
|
||||
var posTableEmpty =#{ empty childItemController.childItems };
|
||||
if (posTableEmpty) {
|
||||
// click on add button
|
||||
posButton=$("[data-id='addposbutton_id']");
|
||||
posButton = $("[data-id='addposbutton_id']");
|
||||
if (posButton) {
|
||||
$(posButton).click();
|
||||
}
|
||||
|
|
@ -165,8 +168,8 @@
|
|||
$('[id$=oderlist]').imixsLayout();
|
||||
|
||||
// mit diesem trick machen wir alle pos-nummern eingaben in uppercase
|
||||
$(".pos_nameinput" ).each(function( index ) {
|
||||
$(this).val($(this).val().toUpperCase());
|
||||
$(".pos_nameinput").each(function (index) {
|
||||
$(this).val($(this).val().toUpperCase());
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -175,33 +178,33 @@
|
|||
function calculateSummary() {
|
||||
var price = 0, amount = 0, sum = 0, total = 0, brutto = 0, netto = 0;
|
||||
var summaryItems = $("[data-id='orderitem_amount']");
|
||||
$(summaryItems).each(function(index, value) {
|
||||
$(summaryItems).each(function (index, value) {
|
||||
var tableRow = $(this).closest('tr');
|
||||
var inputamount = $("[data-id='orderitem_amount']", tableRow);
|
||||
var inputtax = $("[data-id='orderitem_tax']", tableRow);
|
||||
if (inputamount ) {
|
||||
if (inputamount) {
|
||||
|
||||
amount = convertToNumber(inputamount.val());
|
||||
//console.log('amount=' + amount);
|
||||
if (!isNaN(amount) ) {
|
||||
if (!isNaN(amount)) {
|
||||
|
||||
// round
|
||||
amount=runden(amount)
|
||||
amount = runden(amount)
|
||||
|
||||
// is tax a number?
|
||||
if (!isNaN(inputtax.val())) {
|
||||
tax=convertToNumber(inputtax.val());
|
||||
tax = convertToNumber(inputtax.val());
|
||||
//console.log('tax=' +tax);
|
||||
brutto=amount + amount*(tax/100);
|
||||
brutto = amount + amount * (tax / 100);
|
||||
//console.log('brutto=' +brutto);
|
||||
} else {
|
||||
brutto=amount;
|
||||
brutto = amount;
|
||||
}
|
||||
// round brutto
|
||||
brutto=runden(brutto);
|
||||
brutto = runden(brutto);
|
||||
total = total + brutto;
|
||||
// round total
|
||||
total=runden(total);
|
||||
total = runden(total);
|
||||
|
||||
netto = netto + amount;
|
||||
// round net
|
||||
|
|
@ -209,11 +212,11 @@
|
|||
|
||||
|
||||
// update netto column
|
||||
$("[data-id='orderitem_amount']",tableRow).val(convertToCurrency(amount));
|
||||
$("[data-id='orderitem_amount']", tableRow).val(convertToCurrency(amount));
|
||||
|
||||
// update brutto column
|
||||
brutto=convertToCurrency(brutto);
|
||||
$("[data-id='orderitem_total']",tableRow).val(brutto); // hidden field
|
||||
brutto = convertToCurrency(brutto);
|
||||
$("[data-id='orderitem_total']", tableRow).val(brutto); // hidden field
|
||||
|
||||
// update display column
|
||||
$("[data-id='orderitem_summary']", tableRow).empty();
|
||||
|
|
@ -226,11 +229,11 @@
|
|||
});
|
||||
|
||||
// compute total tax
|
||||
var total_tax=total-netto;
|
||||
var total_tax = total - netto;
|
||||
total_tax = runden(total_tax);
|
||||
|
||||
// update total netto and tax
|
||||
netto=convertToCurrency(netto);
|
||||
netto = convertToCurrency(netto);
|
||||
total = convertToCurrency(total);
|
||||
total_tax = convertToCurrency(total_tax);
|
||||
$("[data-id='orderitems_total']").val(total);
|
||||
|
|
@ -245,13 +248,13 @@
|
|||
}
|
||||
|
||||
function runden(x) {
|
||||
return Math.round((x*100).toFixed(2))/100;
|
||||
return Math.round((x * 100).toFixed(2)) / 100;
|
||||
}
|
||||
|
||||
function convertToNumber(currency) {
|
||||
// has ,?
|
||||
if (currency && currency.indexOf(',')>-1) {
|
||||
currency=currency.trim();
|
||||
if (currency && currency.indexOf(',') > -1) {
|
||||
currency = currency.trim();
|
||||
//remove .
|
||||
currency = currency.replace('.', '');
|
||||
// replace ,
|
||||
|
|
|
|||
|
|
@ -1,13 +1,9 @@
|
|||
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
|
||||
xmlns:f="http://xmlns.jcp.org/jsf/core"
|
||||
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
|
||||
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
|
||||
xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
|
||||
xmlns:h="http://xmlns.jcp.org/jsf/html">
|
||||
|
||||
|
||||
<h:panelGroup layout="block" styleClass="imixs-form-section"
|
||||
id="oderlist" binding="#{orderlistContainer}">
|
||||
|
||||
<h:panelGroup layout="block" styleClass="imixs-form-section" id="oderlist" binding="#{orderlistContainer}">
|
||||
<f:ajax render="oderlist" onevent="updateOrderItems">
|
||||
<table class="imixsdatatable imixs-orderitems">
|
||||
|
||||
|
|
@ -28,22 +24,34 @@
|
|||
|
||||
<tr>
|
||||
<!-- pos -->
|
||||
<td><h:outputText value="#{orderitem.item['numpos']}" /></td>
|
||||
<td>
|
||||
<h:outputText value="#{orderitem.item['numpos']}" />
|
||||
</td>
|
||||
|
||||
<!-- Name -->
|
||||
<td><h:outputText value="#{orderitem.item['name']}" /></td>
|
||||
<td>
|
||||
<h:outputText value="#{orderitem.item['name']}" />
|
||||
</td>
|
||||
|
||||
<td><h:outputText value="#{orderitem.item['tax']}" /></td>
|
||||
<td>
|
||||
<h:outputText value="#{orderitem.item['tax']}" />
|
||||
</td>
|
||||
|
||||
<td><h:outputText value="#{orderitem.item['category']}" /></td>
|
||||
<td>
|
||||
<h:outputText value="#{orderitem.item['category']}" />
|
||||
</td>
|
||||
|
||||
<td><h:outputText value="#{orderitem.item['invoice.period']}" /></td>
|
||||
<td>
|
||||
<h:outputText value="#{orderitem.item['invoice.period']}" />
|
||||
</td>
|
||||
|
||||
<td style="text-align: right;"><h:outputText
|
||||
value="#{orderitem.item['amount']}" /></td>
|
||||
<td style="text-align: right;">
|
||||
<h:outputText value="#{orderitem.item['amount']}" />
|
||||
</td>
|
||||
|
||||
<td style="text-align: right;"><h:outputText
|
||||
value="#{orderitem.item['total']}" /></td>
|
||||
<td style="text-align: right;">
|
||||
<h:outputText value="#{orderitem.item['total']}" />
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</ui:repeat>
|
||||
|
|
@ -55,12 +63,14 @@
|
|||
<td />
|
||||
<td />
|
||||
<td style="text-align: right;">Summe:</td>
|
||||
<td class="orderlist_summary" style="text-align: right;"><h:outputText
|
||||
value="#{workitem.item['order.total.net']}">
|
||||
</h:outputText></td>
|
||||
<td class="orderlist_summary" style="text-align: right;"><h:outputText
|
||||
value="#{workitem.item['order.total']}">
|
||||
</h:outputText></td>
|
||||
<td class="orderlist_summary" style="text-align: right;">
|
||||
<h:outputText value="#{workitem.item['order.total.net']}">
|
||||
</h:outputText>
|
||||
</td>
|
||||
<td class="orderlist_summary" style="text-align: right;">
|
||||
<h:outputText value="#{workitem.item['order.total']}">
|
||||
</h:outputText>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
|||
11755
reports/cargosoft/examples/Vendors.csv
Normal file
11755
reports/cargosoft/examples/Vendors.csv
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -46,6 +46,7 @@
|
|||
<bpmn2:participant id="Participant_1" name="Gutschrift Abgleich" processRef="Process_1">
|
||||
<bpmn2:documentation id="documentation_0NBmKg"/>
|
||||
</bpmn2:participant>
|
||||
<bpmn2:participant id="participant_eGGHwQ" name="Default Process" processRef="process_2"/>
|
||||
</bpmn2:collaboration>
|
||||
<bpmn2:process definitionalCollaborationRef="Collaboration_1" id="Process_1" isExecutable="false" name="Gutschrift Abgleich">
|
||||
<bpmn2:laneSet id="LaneSet_1" name="Lane Set 1">
|
||||
|
|
@ -533,7 +534,7 @@ result.isValid=true;
|
|||
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.total" type="currency" required="true" label="Rechnungsbetrag:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="PLN;EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
|
||||
|
|
@ -1273,7 +1274,7 @@ result.isValid=true;
|
|||
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.total" type="currency" readonly="true" required="true" label="Rechnungsbetrag:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="PLN;EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
|
||||
|
|
@ -2051,7 +2052,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
|
|||
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.total" type="currency" readonly="true" label="Rechnungsbetrag:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" readonly="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" readonly="true" options="PLN;EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
<item name="cdtr.iban" type="text" readonly="true" label="IBAN:" />
|
||||
|
|
|
|||
|
|
@ -79,7 +79,6 @@
|
|||
<bpmn2:flowNodeRef>IntermediateThrowEvent_9</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>IntermediateCatchEvent_60</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>IntermediateCatchEvent_3</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>ExclusiveGateway_9</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>IntermediateCatchEvent_5000-20</bpmn2:flowNodeRef>
|
||||
<bpmn2:documentation id="documentation_HmRhqw"/>
|
||||
<bpmn2:flowNodeRef>DataObject_2</bpmn2:flowNodeRef>
|
||||
|
|
@ -94,7 +93,6 @@
|
|||
<bpmn2:flowNodeRef>Task_5005</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>IntermediateCatchEvent_5005-10</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>IntermediateCatchEvent_55</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>ExclusiveGateway_7</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>IntermediateCatchEvent_36</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>IntermediateCatchEvent_32</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>IntermediateCatchEvent_21</bpmn2:flowNodeRef>
|
||||
|
|
@ -112,6 +110,9 @@
|
|||
<bpmn2:flowNodeRef>DataObject_1</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>TextAnnotation_1</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>TextAnnotation_3</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>textAnnotation_81NDHg</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>event_pAR6FQ</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>event_FPc1AA</bpmn2:flowNodeRef>
|
||||
</bpmn2:lane>
|
||||
<bpmn2:lane id="Lane_5" name="Buchhaltung">
|
||||
<bpmn2:flowNodeRef>EndEvent_3</bpmn2:flowNodeRef>
|
||||
|
|
@ -341,7 +342,8 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com
|
|||
<taxonomy name="verteilung">
|
||||
<type>start</type>
|
||||
<anonymised>false</anonymised>
|
||||
</taxonomy>]]></imixs:value>
|
||||
</taxonomy>
|
||||
]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="txtname" type="xs:string">
|
||||
<imixs:value><![CDATA[Akzeptieren]]></imixs:value>
|
||||
|
|
@ -375,7 +377,7 @@ if (workitem['payment.type'][0]!="direct_debit" && workitem['payment.type'][0]!
|
|||
</bpmn2:extensionElements>
|
||||
<bpmn2:documentation id="Documentation_105"><![CDATA[Invoice entered, forward to review]]></bpmn2:documentation>
|
||||
<bpmn2:incoming>SequenceFlow_46</bpmn2:incoming>
|
||||
<bpmn2:outgoing>SequenceFlow_122</bpmn2:outgoing>
|
||||
<bpmn2:outgoing>sequenceFlow_acNhxg</bpmn2:outgoing>
|
||||
</bpmn2:intermediateCatchEvent>
|
||||
<bpmn2:exclusiveGateway gatewayDirection="Converging" id="ExclusiveGateway_1">
|
||||
<bpmn2:incoming>SequenceFlow_0</bpmn2:incoming>
|
||||
|
|
@ -438,10 +440,10 @@ function oeffnefenster (url) {
|
|||
</script>]]></bpmn2:documentation>
|
||||
<bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
|
||||
<bpmn2:incoming>SequenceFlow_83</bpmn2:incoming>
|
||||
<bpmn2:incoming>SequenceFlow_106</bpmn2:incoming>
|
||||
<bpmn2:incoming>SequenceFlow_104</bpmn2:incoming>
|
||||
<bpmn2:incoming>SequenceFlow_134</bpmn2:incoming>
|
||||
<bpmn2:outgoing>SequenceFlow_37</bpmn2:outgoing>
|
||||
<bpmn2:outgoing>sequenceFlow_ZFDfeA</bpmn2:outgoing>
|
||||
</bpmn2:task>
|
||||
<bpmn2:sequenceFlow id="SequenceFlow_37" sourceRef="Task_5005" targetRef="EventBasedGateway_2">
|
||||
<bpmn2:documentation id="documentation_jEZaiQ"/>
|
||||
|
|
@ -546,7 +548,7 @@ var b= workitem.get("order.total")[0];
|
|||
<bpmn2:outputSet id="OutputSet_2" name="Output Set 2">
|
||||
<bpmn2:dataOutputRefs>DataOutput_1</bpmn2:dataOutputRefs>
|
||||
</bpmn2:outputSet>
|
||||
<bpmn2:signalEventDefinition id="SignalEventDefinition_3" signalRef="Signal_4"/>
|
||||
<bpmn2:signalEventDefinition id="SignalEventDefinition_3" signalRef=""/>
|
||||
</bpmn2:intermediateCatchEvent>
|
||||
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_5005-10" imixs:activityid="10" name="Save">
|
||||
<bpmn2:extensionElements>
|
||||
|
|
@ -751,6 +753,7 @@ var b= workitem.get("order.total")[0];
|
|||
</imixs:item>
|
||||
<imixs:item name="txtactivityresult" type="xs:string">
|
||||
<imixs:value><![CDATA[<item name="comment" ignore="true"/>
|
||||
<item name="space">Controlling</item>
|
||||
<ml-config name="status">suggest</ml-config>
|
||||
<validation name="required">false</validation>
|
||||
<taxonomy name="buchhaltung">
|
||||
|
|
@ -1809,14 +1812,14 @@ Betrag: <itemvalue>invoice.total</itemvalue> <itemvalue>invoice.currency</itemva
|
|||
<imixs:item name="keyupdateacl" type="xs:boolean">
|
||||
<imixs:value>false</imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="txtbusinessrule" type="CDATA">
|
||||
<imixs:item name="txtbusinessrule" type="xs:string">
|
||||
<imixs:value><![CDATA[var result={};
|
||||
var refField="txtcomment";
|
||||
result.isValid=true;
|
||||
|
||||
if ( ( workitem.get(refField) == null || ''==workitem.get(refField)[0]) ) {
|
||||
result.isValid=false;
|
||||
result.errorMessage='Bitte geben Sie einen Kommentar ein.';
|
||||
result.errorMessage='Please enter a comment.';
|
||||
}]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="keymailreceiverfields" type="xs:string">
|
||||
|
|
@ -1843,15 +1846,16 @@ result.isValid=true;
|
|||
<item name="cdtr.name" type="text" readonly="true" label="Vendor:"/>
|
||||
<item name="cdtr.number" type="text" required="true" label="Vendor number:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="3">
|
||||
<imixs-form-section columns="2">
|
||||
<item name="invoice.number" type="text" readonly="true" label="Invoice number:" />
|
||||
<item name="invoice.date" type="date" readonly="false" label="Invoice date:" />
|
||||
<item name="invoice.duedate" type="date" readonly="true" required="true" label="Due date:" />
|
||||
<item name="invoice.servicedate" type="date" required="false" label="Service date:" />
|
||||
</imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="3">
|
||||
<imixs-form-section columns="2">
|
||||
<item name="invoice.total" type="currency" readonly="true" required="true" label="Invoice amount:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="PLN;EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
|
||||
|
|
@ -2567,15 +2571,16 @@ result.isValid=true;
|
|||
<item name="cdtr.name" type="text" readonly="true" label="Vendor:"/>
|
||||
<item name="cdtr.number" type="text" readonly="true" label="Kreditorennummer:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="3">
|
||||
<imixs-form-section columns="2">
|
||||
<item name="invoice.number" type="text" readonly="true" label="Invoice number:" />
|
||||
<item name="invoice.date" type="date" readonly="true" label="Invoice date:" />
|
||||
<item name="invoice.duedate" type="date" readonly="false" required="true" label="Due date:" />
|
||||
<item name="invoice.servicedate" type="date" required="false" label="Service date:" />
|
||||
</imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="3">
|
||||
<imixs-form-section columns="2">
|
||||
<item name="invoice.total" type="currency" readonly="true" required="true" label="Invoice amount:" />
|
||||
<item name="invoice.currency" readonly="false" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
<item name="invoice.currency" readonly="false" type="selectOneMenu" required="true" options="PLN;EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
|
||||
|
|
@ -4051,14 +4056,6 @@ result.isValid=true;
|
|||
<bpmn2:sequenceFlow id="SequenceFlow_90" sourceRef="IntermediateCatchEvent_41" targetRef="Task_5">
|
||||
<bpmn2:documentation id="documentation_SwnaPg"/>
|
||||
</bpmn2:sequenceFlow>
|
||||
<bpmn2:exclusiveGateway default="SequenceFlow_106" gatewayDirection="Diverging" id="ExclusiveGateway_7" name="Delegation">
|
||||
<bpmn2:outgoing>SequenceFlow_106</bpmn2:outgoing>
|
||||
<bpmn2:documentation id="documentation_aiFqpg"/>
|
||||
<bpmn2:incoming>sequenceFlow_cdb6kw</bpmn2:incoming>
|
||||
</bpmn2:exclusiveGateway>
|
||||
<bpmn2:sequenceFlow id="SequenceFlow_106" sourceRef="ExclusiveGateway_7" targetRef="Task_5005">
|
||||
<bpmn2:documentation id="documentation_0xcV0w"/>
|
||||
</bpmn2:sequenceFlow>
|
||||
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_46" imixs:activityid="10" name="Save">
|
||||
<bpmn2:extensionElements>
|
||||
<imixs:item name="keylogtimeformat" type="xs:string">
|
||||
|
|
@ -4282,16 +4279,15 @@ result.isValid=true;
|
|||
<item name="cdtr.name" type="text" label="Vendor:"/>
|
||||
<item name="cdtr.number" type="text" required="true" label="Vendor number:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="3">
|
||||
<imixs-form-section columns="2">
|
||||
<item name="invoice.number" type="text" label="Invoice number:" />
|
||||
<item name="invoice.date" type="custom" path="alexander/datumseingabe" label="Invoice date:" />
|
||||
<item name="invoice.date" type="custom" path="alexander/datumseingabe" label="Invoice date:" />
|
||||
<item name="invoice.duedate" type="custom" path="alexander/datumseingabe_tage" required="true" label="Due date:" />
|
||||
<item name="invoice.servicedate" type="custom" path="alexander/datumseingabe" required="false" label="Service date:" />
|
||||
<item name="invoice.total" type="currency" required="true" label="Invoice amount:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="PLN;EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
</imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.total" type="currency" required="true" label="Invoice amount:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
|
||||
<item name="cdtr.iban" type="text" label="IBAN:" />
|
||||
|
|
@ -4762,18 +4758,11 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
|
|||
<bpmn2:sequenceFlow id="SequenceFlow_129" sourceRef="IntermediateCatchEvent_63" targetRef="Task_19">
|
||||
<bpmn2:documentation id="documentation_m09PIg"/>
|
||||
</bpmn2:sequenceFlow>
|
||||
<bpmn2:exclusiveGateway default="SequenceFlow_132" gatewayDirection="Diverging" id="ExclusiveGateway_9">
|
||||
<bpmn2:incoming>SequenceFlow_122</bpmn2:incoming>
|
||||
<bpmn2:documentation id="documentation_DC0xJg"/>
|
||||
<bpmn2:outgoing>sequenceFlow_cdb6kw</bpmn2:outgoing>
|
||||
</bpmn2:exclusiveGateway>
|
||||
<bpmn2:sequenceFlow id="SequenceFlow_122" sourceRef="IntermediateCatchEvent_5000-20" targetRef="ExclusiveGateway_9">
|
||||
<bpmn2:documentation id="documentation_OnlwqA"/>
|
||||
</bpmn2:sequenceFlow>
|
||||
<bpmn2:exclusiveGateway gatewayDirection="Converging" id="ExclusiveGateway_10">
|
||||
<bpmn2:incoming>SequenceFlow_75</bpmn2:incoming>
|
||||
<bpmn2:outgoing>SequenceFlow_134</bpmn2:outgoing>
|
||||
<bpmn2:documentation id="documentation_bOpuxw"/>
|
||||
<bpmn2:incoming>sequenceFlow_acNhxg</bpmn2:incoming>
|
||||
</bpmn2:exclusiveGateway>
|
||||
<bpmn2:sequenceFlow id="SequenceFlow_134" sourceRef="ExclusiveGateway_10" targetRef="Task_5005">
|
||||
<bpmn2:documentation id="documentation_rzTVKQ"/>
|
||||
|
|
@ -4872,15 +4861,100 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
<bpmn2:association id="Association_10" sourceRef="TextAnnotation_5" targetRef="ExclusiveGateway_5">
|
||||
<bpmn2:documentation id="documentation_Qwftgg"/>
|
||||
</bpmn2:association>
|
||||
<bpmn2:sequenceFlow id="sequenceFlow_cdb6kw" sourceRef="ExclusiveGateway_9" targetRef="ExclusiveGateway_7">
|
||||
<bpmn2:documentation id="documentation_Xa83DQ"/>
|
||||
</bpmn2:sequenceFlow>
|
||||
<bpmn2:sequenceFlow id="sequenceFlow_MxzvVQ" sourceRef="Task_19" targetRef="IntermediateCatchEvent_62">
|
||||
<bpmn2:documentation id="documentation_LBmVrQ"/>
|
||||
</bpmn2:sequenceFlow>
|
||||
<bpmn2:sequenceFlow id="sequenceFlow_MV1o2Q" sourceRef="IntermediateCatchEvent_62" targetRef="Task_15">
|
||||
<bpmn2:documentation id="documentation_Anf50Q"/>
|
||||
</bpmn2:sequenceFlow>
|
||||
<bpmn2:textAnnotation id="textAnnotation_81NDHg" textFormat="">
|
||||
<bpmn2:text id="text_1yc3yQ"><![CDATA[D E A K T I V ]]></bpmn2:text>
|
||||
<bpmn2:documentation id="documentation_ufdRDg"/>
|
||||
</bpmn2:textAnnotation>
|
||||
<bpmn2:intermediateThrowEvent id="event_pAR6FQ" name="ABLEHNEN">
|
||||
<bpmn2:linkEventDefinition id="linkEventDefinition_WxwMVg" name="Link Event Definition 5"/>
|
||||
<bpmn2:documentation id="documentation_rnGZjg"/>
|
||||
<bpmn2:incoming>sequenceFlow_l7lJjQ</bpmn2:incoming>
|
||||
</bpmn2:intermediateThrowEvent>
|
||||
<bpmn2:intermediateCatchEvent id="event_FPc1AA" imixs:activityid="11" name="Reject">
|
||||
<bpmn2:extensionElements>
|
||||
<imixs:item name="keylogtimeformat" type="xs:string">
|
||||
<imixs:value><![CDATA[2]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="keyarchive" type="xs:string">
|
||||
<imixs:value><![CDATA[0]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="txtmailsubject" type="xs:string">
|
||||
<imixs:value/>
|
||||
</imixs:item>
|
||||
<imixs:item name="keyaccessmode" type="xs:string">
|
||||
<imixs:value><![CDATA[0]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="keyscheduledactivity" type="xs:string">
|
||||
<imixs:value><![CDATA[0]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="rtfmailbody" type="xs:string">
|
||||
<imixs:value/>
|
||||
</imixs:item>
|
||||
<imixs:item name="keyversion" type="xs:string">
|
||||
<imixs:value><![CDATA[0]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="keyaddwritefields" type="xs:string">
|
||||
<imixs:value><![CDATA[$creator]]></imixs:value>
|
||||
<imixs:value><![CDATA[$editor]]></imixs:value>
|
||||
<imixs:value><![CDATA[process.manager]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="numnextactivityid" type="xs:int">
|
||||
<imixs:value><![CDATA[0]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="keyfollowup" type="xs:string">
|
||||
<imixs:value><![CDATA[2]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="keypublicresult" type="xs:string">
|
||||
<imixs:value><![CDATA[1]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="keylogdateformat" type="xs:string">
|
||||
<imixs:value><![CDATA[2]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="keyownershipfields" type="xs:string">
|
||||
<imixs:value><![CDATA[$editor]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="txtnextprocesstree" type="xs:string">
|
||||
<imixs:value/>
|
||||
</imixs:item>
|
||||
<imixs:item name="numnextid" type="xs:int">
|
||||
<imixs:value><![CDATA[5005]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="txtactivityresult" type="xs:string">
|
||||
<imixs:value><![CDATA[<item name="comment" ignore="true"/>
|
||||
<validation name="required">false</validation>]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="txtname" type="xs:string">
|
||||
<imixs:value><![CDATA[Save]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="keyownershipmode" type="xs:string">
|
||||
<imixs:value><![CDATA[0]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="rtfresultlog" type="xs:string">
|
||||
<imixs:value><![CDATA[Rejected]]></imixs:value>
|
||||
</imixs:item>
|
||||
<imixs:item name="keyupdateacl" type="xs:boolean">
|
||||
<imixs:value>false</imixs:value>
|
||||
</imixs:item>
|
||||
</bpmn2:extensionElements>
|
||||
<bpmn2:documentation id="documentation_c35gxA"><![CDATA[Caching]]></bpmn2:documentation>
|
||||
<bpmn2:incoming>sequenceFlow_ZFDfeA</bpmn2:incoming>
|
||||
<bpmn2:outgoing>sequenceFlow_l7lJjQ</bpmn2:outgoing>
|
||||
</bpmn2:intermediateCatchEvent>
|
||||
<bpmn2:sequenceFlow id="sequenceFlow_ZFDfeA" sourceRef="Task_5005" targetRef="event_FPc1AA">
|
||||
<bpmn2:documentation id="documentation_RaPhVQ"/>
|
||||
</bpmn2:sequenceFlow>
|
||||
<bpmn2:sequenceFlow id="sequenceFlow_l7lJjQ" sourceRef="event_FPc1AA" targetRef="event_pAR6FQ">
|
||||
<bpmn2:documentation id="documentation_xaIviw"/>
|
||||
</bpmn2:sequenceFlow>
|
||||
<bpmn2:sequenceFlow id="sequenceFlow_acNhxg" sourceRef="IntermediateCatchEvent_5000-20" targetRef="ExclusiveGateway_10">
|
||||
<bpmn2:documentation id="documentation_QlVvFg"/>
|
||||
</bpmn2:sequenceFlow>
|
||||
</bpmn2:process>
|
||||
<bpmn2:process id="process_2" name="Default Process" processType="Public">
|
||||
<bpmn2:documentation id="documentation_yUm3kA"/>
|
||||
|
|
@ -5104,9 +5178,9 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="IntermediateThrowEvent_2" id="BPMNShape_IntermediateThrowEvent_2">
|
||||
<dc:Bounds height="36.0" width="36.0" x="1182.0" y="917.0"/>
|
||||
<dc:Bounds height="36.0" width="36.0" x="1180.0" y="917.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_122" labelStyle="BPMNLabelStyle_1">
|
||||
<dc:Bounds height="20.0" width="100.0" x="1150.5" y="953.0"/>
|
||||
<dc:Bounds height="20.0" width="100.0" x="1148.5" y="953.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="DataObject_1" id="BPMNShape_DataObject_2">
|
||||
|
|
@ -5346,12 +5420,6 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
<bpmndi:BPMNShape bpmnElement="TextAnnotation_3" id="BPMNShape_TextAnnotation_3">
|
||||
<dc:Bounds height="50.0" width="141.0" x="311.0" y="1200.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="ExclusiveGateway_7" id="BPMNShape_ExclusiveGateway_7" isMarkerVisible="true">
|
||||
<dc:Bounds height="50.0" width="50.0" x="400.0" y="810.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_231" labelStyle="BPMNLabelStyle_1">
|
||||
<dc:Bounds height="20.0" width="100.0" x="375.0" y="860.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_46" id="BPMNShape_IntermediateCatchEvent_51">
|
||||
<dc:Bounds height="36.0" width="36.0" x="2216.0" y="2111.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_78" labelStyle="BPMNLabelStyle_1">
|
||||
|
|
@ -5442,16 +5510,10 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
<dc:Bounds height="20.0" width="100.0" x="1835.0" y="1792.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="ExclusiveGateway_9" id="BPMNShape_ExclusiveGateway_9" isMarkerVisible="true">
|
||||
<dc:Bounds height="50.0" width="50.0" x="695.0" y="480.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_265">
|
||||
<dc:Bounds height="20.0" width="100.0" x="663.0" y="519.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="ExclusiveGateway_10" id="BPMNShape_ExclusiveGateway_10" isMarkerVisible="true">
|
||||
<dc:Bounds height="50.0" width="50.0" x="510.0" y="910.0"/>
|
||||
<dc:Bounds height="50.0" width="50.0" x="377.0" y="836.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_284">
|
||||
<dc:Bounds height="20.0" width="100.0" x="478.0" y="949.0"/>
|
||||
<dc:Bounds height="20.0" width="100.0" x="345.0" y="875.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_65" id="BPMNShape_IntermediateCatchEvent_70">
|
||||
|
|
@ -5828,7 +5890,7 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
<bpmndi:BPMNLabel id="BPMNLabel_146"/>
|
||||
<di:waypoint x="1126.0" y="935.0"/>
|
||||
<di:waypoint x="1157.0" y="935.0"/>
|
||||
<di:waypoint x="1182.0" y="935.0"/>
|
||||
<di:waypoint x="1180.0" y="935.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_56" id="BPMNEdge_SequenceFlow_57" sourceElement="BPMNShape_IntermediateCatchEvent_34" targetElement="BPMNShape_Task_9">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_147"/>
|
||||
|
|
@ -5894,9 +5956,7 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_75" id="BPMNEdge_SequenceFlow_76" sourceElement="BPMNShape_IntermediateCatchEvent_37" targetElement="BPMNShape_ExclusiveGateway_10">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_167"/>
|
||||
<di:waypoint x="702.0" y="861.0"/>
|
||||
<di:waypoint x="631.0" y="861.0"/>
|
||||
<di:waypoint x="631.0" y="935.0"/>
|
||||
<di:waypoint x="560.0" y="935.0"/>
|
||||
<di:waypoint x="427.0" y="861.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_72" id="BPMNEdge_SequenceFlow_73" sourceElement="BPMNShape_Task_10" targetElement="BPMNShape_IntermediateCatchEvent_26">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_162"/>
|
||||
|
|
@ -6007,13 +6067,6 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
<di:waypoint x="2470.0" y="1711.0"/>
|
||||
<di:waypoint x="2470.0" y="1791.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_106" id="BPMNEdge_SequenceFlow_107" sourceElement="BPMNShape_ExclusiveGateway_7" targetElement="BPMNShape_Task_2">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_233"/>
|
||||
<di:waypoint x="425.0" y="860.0"/>
|
||||
<di:waypoint x="425.0" y="937.5"/>
|
||||
<di:waypoint x="402.0" y="937.5"/>
|
||||
<di:waypoint x="402.0" y="1015.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_34" id="BPMNEdge_SequenceFlow_35" sourceElement="BPMNShape_IntermediateCatchEvent_51" targetElement="BPMNShape_Task_13">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_96"/>
|
||||
<di:waypoint x="2234.0" y="2111.0"/>
|
||||
|
|
@ -6107,16 +6160,10 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
<di:waypoint x="1885.0" y="1746.0"/>
|
||||
<di:waypoint x="1885.0" y="1736.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_122" id="BPMNEdge_SequenceFlow_123" sourceElement="BPMNShape_IntermediateCatchEvent_2" targetElement="BPMNShape_ExclusiveGateway_9">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_266"/>
|
||||
<di:waypoint x="720.0" y="436.0"/>
|
||||
<di:waypoint x="720.0" y="480.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_134" id="BPMNEdge_SequenceFlow_135" sourceElement="BPMNShape_ExclusiveGateway_10" targetElement="BPMNShape_Task_2">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_285"/>
|
||||
<di:waypoint x="535.0" y="960.0"/>
|
||||
<di:waypoint x="535.0" y="1027.0"/>
|
||||
<di:waypoint x="457.0" y="1027.0"/>
|
||||
<di:waypoint x="402.0" y="886.0"/>
|
||||
<di:waypoint x="402.0" y="1015.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_24" id="BPMNEdge_SequenceFlow_25" sourceElement="BPMNShape_IntermediateCatchEvent_70" targetElement="BPMNShape_Task_9">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_283"/>
|
||||
|
|
@ -6130,12 +6177,6 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
<di:waypoint x="1798.0" y="1711.0"/>
|
||||
<di:waypoint x="1830.0" y="1711.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sequenceFlow_cdb6kw" id="BPMNEdge_4BxEyQ" sourceElement="BPMNShape_ExclusiveGateway_9" targetElement="BPMNShape_ExclusiveGateway_7">
|
||||
<di:waypoint x="695.0" y="505.0"/>
|
||||
<di:waypoint x="572.5" y="505.0"/>
|
||||
<di:waypoint x="572.5" y="835.0"/>
|
||||
<di:waypoint x="450.0" y="835.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sequenceFlow_MxzvVQ" id="BPMNEdge_PFCzDQ" sourceElement="BPMNShape_Task_21" targetElement="BPMNShape_IntermediateCatchEvent_67">
|
||||
<di:waypoint x="1940.0" y="1711.0"/>
|
||||
<di:waypoint x="2020.0" y="1711.0"/>
|
||||
|
|
@ -6144,6 +6185,36 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
|
|||
<di:waypoint x="2056.0" y="1711.0"/>
|
||||
<di:waypoint x="2142.0" y="1711.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNShape bpmnElement="textAnnotation_81NDHg" id="BPMNShape_dOeYpg">
|
||||
<dc:Bounds height="50.0" width="110.0" x="730.0" y="1099.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="event_pAR6FQ" id="BPMNShape_jZi2gA">
|
||||
<dc:Bounds height="36.0" width="36.0" x="190.0" y="843.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_ApxusA">
|
||||
<dc:Bounds height="20.0" width="100.0" x="158.5" y="879.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="event_FPc1AA" id="BPMNShape_pqLMdw">
|
||||
<dc:Bounds height="36.0" width="36.0" x="190.0" y="937.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_8Oz0ug">
|
||||
<dc:Bounds height="20.0" width="100.0" x="158.0" y="973.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNEdge bpmnElement="sequenceFlow_ZFDfeA" id="BPMNEdge_s3vscQ" sourceElement="BPMNShape_Task_2" targetElement="BPMNShape_pqLMdw">
|
||||
<di:waypoint x="347.0" y="1040.0"/>
|
||||
<di:waypoint x="286.5" y="1040.0"/>
|
||||
<di:waypoint x="286.5" y="955.0"/>
|
||||
<di:waypoint x="226.0" y="955.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sequenceFlow_l7lJjQ" id="BPMNEdge_G9LJIQ" sourceElement="BPMNShape_pqLMdw" targetElement="BPMNShape_jZi2gA">
|
||||
<di:waypoint x="208.0" y="937.0"/>
|
||||
<di:waypoint x="208.0" y="879.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sequenceFlow_acNhxg" id="BPMNEdge_kpAm0w" sourceElement="BPMNShape_IntermediateCatchEvent_2" targetElement="BPMNShape_ExclusiveGateway_10">
|
||||
<di:waypoint x="702.0" y="418.0"/>
|
||||
<di:waypoint x="400.0" y="418.0"/>
|
||||
<di:waypoint x="400.0" y="838.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
</bpmndi:BPMNPlane>
|
||||
<bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
|
||||
<dc:Font name="arial" size="9.0"/>
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@
|
|||
<bpmn2:flowNodeRef>IntermediateCatchEvent_40</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>IntermediateThrowEvent_7</bpmn2:flowNodeRef>
|
||||
<bpmn2:documentation id="documentation_iMb60w"/>
|
||||
<bpmn2:flowNodeRef>DataObject_1</bpmn2:flowNodeRef>
|
||||
</bpmn2:lane>
|
||||
<bpmn2:lane id="Lane_2" name="Verantwortlicher / Bereich Team">
|
||||
<bpmn2:flowNodeRef>Task_6</bpmn2:flowNodeRef>
|
||||
|
|
@ -140,6 +139,7 @@
|
|||
<bpmn2:flowNodeRef>EventBasedGateway_3</bpmn2:flowNodeRef>
|
||||
<bpmn2:flowNodeRef>IntermediateCatchEvent_33</bpmn2:flowNodeRef>
|
||||
<bpmn2:documentation id="documentation_0hbndQ"/>
|
||||
<bpmn2:flowNodeRef>DataObject_1</bpmn2:flowNodeRef>
|
||||
</bpmn2:lane>
|
||||
</bpmn2:laneSet>
|
||||
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_5000-20" imixs:activityid="50" name="Foward">
|
||||
|
|
@ -491,13 +491,14 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
|
|||
</imixs-form-section>
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.number" type="text" label="Invoice number:" />
|
||||
<item name="invoice.date" type="custom" path="alexander/datumseingabe" label="Invoice date:" />
|
||||
<item name="invoice.date" type="date" label="Invoice date:" />
|
||||
<item name="invoice.duedate" type="custom" path="alexander/datumseingabe_tage" required="true" label="Due date:" />
|
||||
<item name="invoice.servicedate" type="date" required="false" label="Service date:" />
|
||||
</imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.total" type="currency" required="true" label="Invoice amount:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="PLN;EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
|
||||
|
|
@ -815,11 +816,12 @@ result.isValid=true;
|
|||
<item name="invoice.number" type="text" readonly="true" label="Invoice number:" />
|
||||
<item name="invoice.date" type="date" readonly="true" label="Invoice date:" />
|
||||
<item name="invoice.duedate" type="date" required="true" label="Due date:" />
|
||||
<item name="invoice.servicedate" type="date" required="false" label="Service date:" />
|
||||
</imixs-form-section>
|
||||
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.total" type="currency" readonly="true" required="true" label="Invoice amount:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
<item name="invoice.currency" type="selectOneMenu" required="true" options="PLN;EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
|
||||
|
|
@ -2526,7 +2528,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
|
|||
|
||||
<imixs-form-section columns="3">
|
||||
<item name="invoice.total" type="currency" readonly="true" required="true" label="Invoice amount:" />
|
||||
<item name="invoice.currency" readonly="true" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
<item name="invoice.currency" readonly="true" type="selectOneMenu" required="true" options="PLN;EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Currency:" />
|
||||
</imixs-form-section>
|
||||
<imixs-form-section columns="2">
|
||||
|
||||
|
|
@ -4435,9 +4437,9 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
|
|||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="DataObject_1" id="BPMNShape_DataObject_2">
|
||||
<dc:Bounds height="50.0" width="35.0" x="300.0" y="330.0"/>
|
||||
<dc:Bounds height="50.0" width="35.0" x="260.0" y="360.0"/>
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_52">
|
||||
<dc:Bounds height="20.0" width="100.0" x="268.0" y="380.0"/>
|
||||
<dc:Bounds height="20.0" width="100.0" x="228.0" y="410.0"/>
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape bpmnElement="Task_8" id="BPMNShape_Task_8">
|
||||
|
|
@ -4900,11 +4902,10 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
|
|||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="Association_5" id="BPMNEdge_Association_5" sourceElement="BPMNShape_DataObject_2" targetElement="BPMNShape_Task_2">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_70"/>
|
||||
<di:waypoint x="335.0" y="355.0"/>
|
||||
<di:waypoint x="336.0" y="355.0"/>
|
||||
<di:waypoint x="336.0" y="385.0"/>
|
||||
<di:waypoint x="346.0" y="385.0"/>
|
||||
<di:waypoint x="346.0" y="448.0"/>
|
||||
<di:waypoint x="277.5" y="410.0"/>
|
||||
<di:waypoint x="277.5" y="429.0"/>
|
||||
<di:waypoint x="365.0" y="429.0"/>
|
||||
<di:waypoint x="365.0" y="448.0"/>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_9" id="BPMNEdge_SequenceFlow_11" sourceElement="BPMNShape_Task_8" targetElement="BPMNShape_EndEvent_3">
|
||||
<bpmndi:BPMNLabel id="BPMNLabel_73"/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue