update rechnungsformulare und auslandszahlung
This commit is contained in:
parent
ba1419ab62
commit
3e455d8b0f
7 changed files with 3787 additions and 32 deletions
|
|
@ -22,22 +22,6 @@
|
||||||
</ui:include>
|
</ui:include>
|
||||||
</f:subview>
|
</f:subview>
|
||||||
|
|
||||||
<dl>
|
|
||||||
<dt>Zahlungsart</dt>
|
|
||||||
<dd>
|
|
||||||
<h:selectOneMenu style="width:20em;" required="true"
|
|
||||||
value="#{workflowController.workitem.item['payment.type']}">
|
|
||||||
<c:if test="#{workflowController.workitem.item['$workflowgroup'] eq 'Rechnungseingang'}" >
|
|
||||||
<c:forEach items="#{sepaController.dbtrList}" var="dbtr">
|
|
||||||
<f:selectItem itemLabel="#{dbtr.item['name']}"
|
|
||||||
itemValue="#{dbtr.item['name']}" />
|
|
||||||
</c:forEach>
|
|
||||||
<f:selectItem itemLabel="Lastschrift" itemValue="direct_debit" />
|
|
||||||
</c:if>
|
|
||||||
<f:selectItem itemLabel="Gutschrift" itemValue="credit" />
|
|
||||||
</h:selectOneMenu>
|
|
||||||
</dd>
|
|
||||||
</dl>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- sub forms (optional) -->
|
<!-- sub forms (optional) -->
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,6 @@
|
||||||
</f:subview>
|
</f:subview>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- sub forms (optional) -->
|
<!-- sub forms (optional) -->
|
||||||
<c:forEach items="#{formController.formDefinition.sections}"
|
<c:forEach items="#{formController.formDefinition.sections}"
|
||||||
var="section">
|
var="section">
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,31 @@
|
||||||
|
<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">
|
||||||
|
|
||||||
|
|
||||||
|
<div class="imixs-form-section-2">
|
||||||
|
<dl>
|
||||||
|
<dt>Zahlungsart:</dt>
|
||||||
|
<dd>
|
||||||
|
<h:selectOneMenu style="width:20em;" required="true"
|
||||||
|
value="#{workflowController.workitem.item['payment.type']}">
|
||||||
|
<c:if test="#{workflowController.workitem.item['$workflowgroup'] eq 'Rechnungseingang'}" >
|
||||||
|
<c:forEach items="#{sepaController.dbtrList}" var="dbtr">
|
||||||
|
<f:selectItem itemLabel="#{dbtr.item['name']}"
|
||||||
|
itemValue="#{dbtr.item['name']}" />
|
||||||
|
</c:forEach>
|
||||||
|
<f:selectItem itemLabel="Manuelle Auslandszahlung" itemValue="no_sepa" />
|
||||||
|
<f:selectItem itemLabel="Lastschrift" itemValue="direct_debit" />
|
||||||
|
</c:if>
|
||||||
|
<f:selectItem itemLabel="Gutschrift" itemValue="credit" />
|
||||||
|
|
||||||
|
</h:selectOneMenu>
|
||||||
|
</dd>
|
||||||
|
</dl>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</ui:composition>
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
<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">
|
||||||
|
|
||||||
|
|
||||||
|
<div class="imixs-form-section-2">
|
||||||
|
<dl>
|
||||||
|
<dt>Zahlungsart:</dt>
|
||||||
|
<dd>
|
||||||
|
<h:outputText
|
||||||
|
value="#{workflowController.workitem.item['payment.type']}" />
|
||||||
|
</dd>
|
||||||
|
</dl>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</ui:composition>
|
||||||
2
pom.xml
2
pom.xml
|
|
@ -25,7 +25,7 @@
|
||||||
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
|
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
|
||||||
|
|
||||||
<!-- Versions -->
|
<!-- Versions -->
|
||||||
<org.imixs.workflow.version>5.2.8</org.imixs.workflow.version>
|
<org.imixs.workflow.version>5.2.9-SNAPSHOT</org.imixs.workflow.version>
|
||||||
<org.imixs.marty.version>4.1.11</org.imixs.marty.version>
|
<org.imixs.marty.version>4.1.11</org.imixs.marty.version>
|
||||||
<org.imixs.office.version>4.4.4-SNAPSHOT</org.imixs.office.version>
|
<org.imixs.office.version>4.4.4-SNAPSHOT</org.imixs.office.version>
|
||||||
<org.imixs.adapters.version>2.2.4-SNAPSHOT</org.imixs.adapters.version>
|
<org.imixs.adapters.version>2.2.4-SNAPSHOT</org.imixs.adapters.version>
|
||||||
|
|
|
||||||
3731
workflow/rechnungseingang-de-1.0.8.bpmn
Normal file
3731
workflow/rechnungseingang-de-1.0.8.bpmn
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -270,9 +270,7 @@ result.isValid=true;
|
||||||
<imixs:item name="keyupdateacl" type="xs:boolean">
|
<imixs:item name="keyupdateacl" type="xs:boolean">
|
||||||
<imixs:value>true</imixs:value>
|
<imixs:value>true</imixs:value>
|
||||||
</imixs:item>
|
</imixs:item>
|
||||||
<imixs:item name="keyownershipfields" type="xs:string">
|
<imixs:item name="keyownershipfields" type="xs:string"/>
|
||||||
<imixs:value><![CDATA[namprocessteam]]></imixs:value>
|
|
||||||
</imixs:item>
|
|
||||||
<imixs:item name="keyaddwritefields" type="xs:string"/>
|
<imixs:item name="keyaddwritefields" type="xs:string"/>
|
||||||
<imixs:item name="keyaddreadfields" type="xs:string"/>
|
<imixs:item name="keyaddreadfields" type="xs:string"/>
|
||||||
<imixs:item name="txtimageurl" type="xs:string">
|
<imixs:item name="txtimageurl" type="xs:string">
|
||||||
|
|
@ -312,6 +310,7 @@ result.isValid=true;
|
||||||
</imixs:item>
|
</imixs:item>
|
||||||
<imixs:item name="keyownershipfields" type="xs:string">
|
<imixs:item name="keyownershipfields" type="xs:string">
|
||||||
<imixs:value><![CDATA[namprocessteam]]></imixs:value>
|
<imixs:value><![CDATA[namprocessteam]]></imixs:value>
|
||||||
|
<imixs:value><![CDATA[namprocessmanager]]></imixs:value>
|
||||||
</imixs:item>
|
</imixs:item>
|
||||||
<imixs:item name="keyaddwritefields" type="xs:string"/>
|
<imixs:item name="keyaddwritefields" type="xs:string"/>
|
||||||
<imixs:item name="keyaddreadfields" type="xs:string"/>
|
<imixs:item name="keyaddreadfields" type="xs:string"/>
|
||||||
|
|
@ -480,12 +479,7 @@ result.isValid=true;
|
||||||
<imixs:item name="keyversion" type="xs:string">
|
<imixs:item name="keyversion" type="xs:string">
|
||||||
<imixs:value><![CDATA[0]]></imixs:value>
|
<imixs:value><![CDATA[0]]></imixs:value>
|
||||||
</imixs:item>
|
</imixs:item>
|
||||||
<imixs:item name="keyaddwritefields" type="xs:string">
|
<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:value><![CDATA[process.team]]></imixs:value>
|
|
||||||
</imixs:item>
|
|
||||||
<imixs:item name="numnextactivityid" type="xs:int">
|
<imixs:item name="numnextactivityid" type="xs:int">
|
||||||
<imixs:value><![CDATA[0]]></imixs:value>
|
<imixs:value><![CDATA[0]]></imixs:value>
|
||||||
</imixs:item>
|
</imixs:item>
|
||||||
|
|
@ -498,10 +492,7 @@ result.isValid=true;
|
||||||
<imixs:item name="keylogdateformat" type="xs:string">
|
<imixs:item name="keylogdateformat" type="xs:string">
|
||||||
<imixs:value><![CDATA[2]]></imixs:value>
|
<imixs:value><![CDATA[2]]></imixs:value>
|
||||||
</imixs:item>
|
</imixs:item>
|
||||||
<imixs:item name="keyownershipfields" type="xs:string">
|
<imixs:item name="keyownershipfields" type="xs:string"/>
|
||||||
<imixs:value><![CDATA[$editor]]></imixs:value>
|
|
||||||
<imixs:value><![CDATA[$creator]]></imixs:value>
|
|
||||||
</imixs:item>
|
|
||||||
<imixs:item name="numnextid" type="xs:int">
|
<imixs:item name="numnextid" type="xs:int">
|
||||||
<imixs:value><![CDATA[5000]]></imixs:value>
|
<imixs:value><![CDATA[5000]]></imixs:value>
|
||||||
</imixs:item>
|
</imixs:item>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue