Imixs/office-alexander-logistics
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git@git.imixs.com/git/office-alexander-logistics

Browse source
This commit is contained in:
gaby 2020-11-23 13:42:56 +01:00
commit 54d05da44b
9 changed files with 70 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile-wildfly-debug Normal file
View file

@ -0,0 +1,8 @@
FROM imixs/imixs-office-workflow:4.4.0
# Deploy artefact
RUN rm -r /opt/jboss/wildfly/standalone/deployments/*
COPY ./*-app/target/*.war /opt/jboss/wildfly/standalone/deployments/
# Run in Debug Mode
CMD ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0", "--debug", "*:8787"]

68
office-alexander-logistics-app/pom.xml
View file

@ -45,41 +45,7 @@
</profile> </profile>
<profile> <profile>
<id>docker-build</id> <id>docker-wildfly-debug</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>install</phase>
<configuration>
<target>
<exec executable="docker">
<arg value="build" />
<arg value="-t" />
<arg value="imixs/${imixs-office.applicationname}:${project.version}" />
<arg value="../." />
</exec>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>docker-push</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -93,18 +59,11 @@
<target> <target>
<exec executable="docker"> <exec executable="docker">
<arg value="build" /> <arg value="build" />
<arg value="-f" />
<arg value="./Dockerfile-wildfly-debug" />
<arg value="-t" /> <arg value="-t" />
<arg value="imixs/${imixs-office.applicationname}:${project.version}" /> <arg value="imixs/imixs-documents" />
<arg value="../." /> <arg value="./." />
</exec>
<exec executable="docker">
<arg value="tag" />
<arg value="imixs/${imixs-office.applicationname}:${project.version}" />
<arg value="${org.imixs.docker.registry}/imixs/${imixs-office.applicationname}:${project.version}" />
</exec>
<exec executable="docker">
<arg value="push" />
<arg value="${org.imixs.docker.registry}/imixs/${imixs-office.applicationname}:${project.version}" />
</exec> </exec>
</target> </target>
</configuration> </configuration>
@ -118,7 +77,7 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile> <profile>
<id>kubernetes</id> <id>kubernetes</id>
<build> <build>
@ -296,5 +255,20 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- xsl 2.0 support -->
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>9.9.1-4</version>
</dependency>
<!-- Apache Commons FTP Client -->
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.6</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

4
office-alexander-logistics-app/src/main/webapp/layout/commandbox_admin_custom.xhtml
View file

@ -5,10 +5,8 @@
<ul> <ul>
<li><h:link outcome="/pages/admin/document_import">Dokument Import</h:link></li> <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/sepa_config">SEPA</h:link></li>
-->
</ul> </ul>
</f:subview> </f:subview>

2
office-alexander-logistics-app/src/main/webapp/pages/admin/sepa_config.xhtml
View file

@ -53,7 +53,7 @@
</dt> </dt>
<dd> <dd>
<h:inputText required="true" <h:inputText required="true"
value="#{sepaController.configuration.item['_dbtr_name']}"> value="#{sepaController.configuration.item['dbtr.name']}">
</h:inputText> </h:inputText>
</dd> </dd>
</dl> </dl>

8
office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml
View file

@ -31,10 +31,10 @@
<table class=""> <table class="">
<tr> <tr>
<th style="">#{custom.creditor_name}</th> <th style="">#{message['form.company']}</th>
<th style="">#{custom.invoicenumber}</th> <th style="">#{message['form.invoicenumber']}</th>
<th style="">#{custom.invoicedate}</th> <th style="">#{message['form.date']}</th>
<th style="">#{custom.amount}</th> <th style="">#{message['form.amount']}</th>
<th style=""></th> <th style=""></th>
<th style="">IBAN</th> <th style="">IBAN</th>
<th style="">BIC</th> <th style="">BIC</th>

10
pom.xml
View file

@ -28,7 +28,7 @@
<org.imixs.workflow.version>5.2.5</org.imixs.workflow.version> <org.imixs.workflow.version>5.2.5</org.imixs.workflow.version>
<org.imixs.marty.version>4.1.8</org.imixs.marty.version> <org.imixs.marty.version>4.1.8</org.imixs.marty.version>
<org.imixs.office.version>4.4.0</org.imixs.office.version> <org.imixs.office.version>4.4.0</org.imixs.office.version>
<org.imixs.adapters.version>2.2.3</org.imixs.adapters.version> <org.imixs.adapters.version>2.2.4-SNAPSHOT</org.imixs.adapters.version>
<org.imixs.archive.version>2.2.7</org.imixs.archive.version> <org.imixs.archive.version>2.2.7</org.imixs.archive.version>
<org.imixs.melman.version>1.0.19</org.imixs.melman.version> <org.imixs.melman.version>1.0.19</org.imixs.melman.version>
<org.imixs.ml.version>1.0.1</org.imixs.ml.version> <org.imixs.ml.version>1.0.1</org.imixs.ml.version>
@ -78,14 +78,6 @@
<id>docker</id> <id>docker</id>
<!-- build latest - see ear module for details --> <!-- build latest - see ear module for details -->
</profile> </profile>
<profile>
<id>docker-build</id>
<!-- build current version local - see ear module for details -->
</profile>
<profile>
<id>docker-push</id>
<!-- build and push to repp - see ear module for details -->
</profile>
<profile> <profile>
<id>kubernetes</id> <id>kubernetes</id>
<!-- build and push to rep - see ear module for details --> <!-- build and push to rep - see ear module for details -->

2
reports/sepa/sepa-2.0.1.imixs-report
View file

File diff suppressed because one or more lines are too long

15
reports/sepa/sepa-2.0.1.xsl
View file

@ -20,10 +20,10 @@
<!-- generate header info --> <!-- generate header info -->
<!-- compute count of invoices --> <!-- compute count of invoices -->
<xsl:variable name="count" <xsl:variable name="count"
select="count(/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'Rechnungseingang']/item[@name='$uniqueid']/value)" /> select="count(/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Request']/item[@name='$uniqueid']/value)" />
<!-- compute total amount --> <!-- compute total amount -->
<xsl:variable name="totalsum" <xsl:variable name="totalsum"
select="xs:decimal(sum(/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'Rechnungseingang']/item[@name='invoice.total']/value))" /> select="xs:decimal(sum(/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Request']/item[@name='invoice.total']/value))" />
<!-- round to 2 digits --> <!-- round to 2 digits -->
<xsl:variable name="total" <xsl:variable name="total"
select="xs:decimal(round-half-to-even($totalsum, 2))" /> select="xs:decimal(round-half-to-even($totalsum, 2))" />
@ -43,6 +43,7 @@
<xsl:value-of select="$count" /> <xsl:value-of select="$count" />
</NbOfTxs> </NbOfTxs>
<CtrlSum> <CtrlSum>
<!-- round to 2 digits -->
<xsl:value-of select="$total" /> <xsl:value-of select="$total" />
</CtrlSum> </CtrlSum>
<InitgPty> <InitgPty>
@ -63,6 +64,7 @@
<xsl:value-of select="$count" /> <xsl:value-of select="$count" />
</NbOfTxs> </NbOfTxs>
<CtrlSum> <CtrlSum>
<!-- round to 2 digits -->
<xsl:value-of select="$total" /> <xsl:value-of select="$total" />
</CtrlSum> </CtrlSum>
<PmtTpInf> <PmtTpInf>
@ -100,7 +102,7 @@
<!-- generate CdtTrfTxInf for each invoice --> <!-- generate CdtTrfTxInf for each invoice -->
<xsl:apply-templates <xsl:apply-templates
select="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'Rechnungseingang']" /> select="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Request']" />
@ -123,7 +125,7 @@
<!-- This template builds sepa payment info for each invoice --> <!-- This template builds sepa payment info for each invoice -->
<xsl:template <xsl:template
match="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'Rechnungseingang']"> match="/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'SEPA-Request']">
<CdtTrfTxInf xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.003.03"> <CdtTrfTxInf xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.003.03">
@ -164,11 +166,6 @@
</RmtInf> </RmtInf>
</CdtTrfTxInf> </CdtTrfTxInf>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

36
workflow/sepa-export-3.0.1.bpmn
View file

@ -86,6 +86,7 @@ Please check the process:
<bpmn2:flowNodeRef>IntermediateCatchEvent_4</bpmn2:flowNodeRef> <bpmn2:flowNodeRef>IntermediateCatchEvent_4</bpmn2:flowNodeRef>
<bpmn2:flowNodeRef>IntermediateCatchEvent_1</bpmn2:flowNodeRef> <bpmn2:flowNodeRef>IntermediateCatchEvent_1</bpmn2:flowNodeRef>
<bpmn2:flowNodeRef>IntermediateCatchEvent_18</bpmn2:flowNodeRef> <bpmn2:flowNodeRef>IntermediateCatchEvent_18</bpmn2:flowNodeRef>
<bpmn2:flowNodeRef>IntermediateCatchEvent_9</bpmn2:flowNodeRef>
</bpmn2:lane> </bpmn2:lane>
</bpmn2:laneSet> </bpmn2:laneSet>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_5" imixs:activityid="20" name="Fehlerhaft"> <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_5" imixs:activityid="20" name="Fehlerhaft">
@ -175,7 +176,7 @@ Please check the process:
<imixs:value><![CDATA[typcn-cloud-storage||||typcn-tick,imixs-success]]></imixs:value> <imixs:value><![CDATA[typcn-cloud-storage||||typcn-tick,imixs-success]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="txteditorid" type="xs:string"> <imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[]]></imixs:value> <imixs:value><![CDATA[form_panel#sepa_export]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="txttype" type="xs:string"> <imixs:item name="txttype" type="xs:string">
<imixs:value><![CDATA[workitemarchive]]></imixs:value> <imixs:value><![CDATA[workitemarchive]]></imixs:value>
@ -265,7 +266,7 @@ Please check the process:
<imixs:value><![CDATA[SEPA-Lauf <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue> (<itemvalue>_dbtr_name</itemvalue>)]]></imixs:value> <imixs:value><![CDATA[SEPA-Lauf <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue> (<itemvalue>_dbtr_name</itemvalue>)]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="txteditorid" type="xs:string"> <imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[form_panel#krieger/sepa_export]]></imixs:value> <imixs:value><![CDATA[form_panel#sepa_export]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="txtimageurl" type="xs:string"> <imixs:item name="txtimageurl" type="xs:string">
<imixs:value><![CDATA[typcn-cloud-storage||||typcn-arrow-forward]]></imixs:value> <imixs:value><![CDATA[typcn-cloud-storage||||typcn-arrow-forward]]></imixs:value>
@ -320,7 +321,7 @@ Please check the process:
<imixs:value><![CDATA[typcn-cloud-storage||||typcn-tick,imixs-error]]></imixs:value> <imixs:value><![CDATA[typcn-cloud-storage||||typcn-tick,imixs-error]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="txteditorid" type="xs:string"> <imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[]]></imixs:value> <imixs:value><![CDATA[form_panel#sepa_export]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="txttype" type="xs:string"> <imixs:item name="txttype" type="xs:string">
<imixs:value><![CDATA[workitemarchive]]></imixs:value> <imixs:value><![CDATA[workitemarchive]]></imixs:value>
@ -366,7 +367,7 @@ Please check the process:
<imixs:value><![CDATA[typcn-cloud-storage||||typcn-tick,imixs-success]]></imixs:value> <imixs:value><![CDATA[typcn-cloud-storage||||typcn-tick,imixs-success]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="txteditorid" type="xs:string"> <imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[]]></imixs:value> <imixs:value><![CDATA[form_panel#sepa_export]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="txttype" type="xs:string"> <imixs:item name="txttype" type="xs:string">
<imixs:value><![CDATA[workitem]]></imixs:value> <imixs:value><![CDATA[workitem]]></imixs:value>
@ -383,6 +384,7 @@ Please check the process:
</bpmn2:extensionElements> </bpmn2:extensionElements>
<bpmn2:documentation id="Documentation_32"><![CDATA[<textblock>SEPA_Export_success</textblock>]]></bpmn2:documentation> <bpmn2:documentation id="Documentation_32"><![CDATA[<textblock>SEPA_Export_success</textblock>]]></bpmn2:documentation>
<bpmn2:incoming>SequenceFlow_11</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>
<bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing>
<bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
</bpmn2:task> </bpmn2:task>
@ -426,11 +428,11 @@ Please check the process:
</imixs:item> </imixs:item>
<imixs:item name="txtactivityresult" type="CDATA"> <imixs:item name="txtactivityresult" type="CDATA">
<imixs:value><![CDATA[<item name="process">Rechnungscontrolling</item> <imixs:value><![CDATA[<item name="process">Rechnungscontrolling</item>
<item name="invoice_update"> <sepa name="invoice_update">
<modelversion>(^sepa-export)</modelversion> <modelversion>(^sepa-export)</modelversion>
<task>210</task> <task>210</task>
<event>300</event> <event>300</event>
</item>]]></imixs:value> </sepa>]]></imixs:value>
</imixs:item> </imixs:item>
</bpmn2:extensionElements> </bpmn2:extensionElements>
<bpmn2:incoming>SequenceFlow_5</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
@ -502,6 +504,10 @@ Please check the process:
<bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
</bpmn2:intermediateCatchEvent> </bpmn2:intermediateCatchEvent>
<bpmn2:sequenceFlow id="SequenceFlow_2" sourceRef="IntermediateCatchEvent_18" targetRef="Task_2"/> <bpmn2:sequenceFlow id="SequenceFlow_2" sourceRef="IntermediateCatchEvent_18" targetRef="Task_2"/>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_9" imixs:activityid="30" name="Intermediate Catch Event 9">
<bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing>
</bpmn2:intermediateCatchEvent>
<bpmn2:sequenceFlow id="SequenceFlow_19" sourceRef="IntermediateCatchEvent_9" targetRef="Task_7"/>
</bpmn2:process> </bpmn2:process>
<bpmn2:process id="Process_2" name="SEPA-Request" definitionalCollaborationRef="Collaboration_1" isExecutable="false"> <bpmn2:process id="Process_2" name="SEPA-Request" definitionalCollaborationRef="Collaboration_1" isExecutable="false">
<bpmn2:laneSet id="LaneSet_2" name="Lane Set 2"> <bpmn2:laneSet id="LaneSet_2" name="Lane Set 2">
@ -542,7 +548,7 @@ Please check the process:
<bpmn2:task id="Task_3" imixs:processid="200" name="Open"> <bpmn2:task id="Task_3" imixs:processid="200" name="Open">
<bpmn2:extensionElements> <bpmn2:extensionElements>
<imixs:item name="txtworkflowsummary" type="xs:string"> <imixs:item name="txtworkflowsummary" type="xs:string">
<imixs:value><![CDATA[<itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue>]]></imixs:value> <imixs:value><![CDATA[<itemvalue>cdtr.iban</itemvalue> <itemvalue>invoice.number</itemvalue>]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="txteditorid" type="xs:string"> <imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[form_basic_read]]></imixs:value> <imixs:value><![CDATA[form_basic_read]]></imixs:value>
@ -586,7 +592,7 @@ Please check the process:
<bpmn2:task id="Task_5" imixs:processid="290" name="Closed"> <bpmn2:task id="Task_5" imixs:processid="290" name="Closed">
<bpmn2:extensionElements> <bpmn2:extensionElements>
<imixs:item name="txtworkflowsummary" type="xs:string"> <imixs:item name="txtworkflowsummary" type="xs:string">
<imixs:value><![CDATA[<itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue>]]></imixs:value> <imixs:value><![CDATA[<itemvalue>cdtr.iban</itemvalue> <itemvalue>invoice.number</itemvalue>]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="keyupdateacl" type="xs:boolean"> <imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>true</imixs:value> <imixs:value>true</imixs:value>
@ -622,7 +628,7 @@ Please check the process:
<bpmn2:task id="Task_4" imixs:processid="210" name="Processing"> <bpmn2:task id="Task_4" imixs:processid="210" name="Processing">
<bpmn2:extensionElements> <bpmn2:extensionElements>
<imixs:item name="txtworkflowsummary" type="xs:string"> <imixs:item name="txtworkflowsummary" type="xs:string">
<imixs:value><![CDATA[<itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue>]]></imixs:value> <imixs:value><![CDATA[<itemvalue>cdtr.iban</itemvalue> <itemvalue>invoice.number</itemvalue>]]></imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="keyupdateacl" type="xs:boolean"> <imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>true</imixs:value> <imixs:value>true</imixs:value>
@ -977,6 +983,12 @@ Please check the process:
<dc:Bounds height="28.0" width="77.0" x="720.0" y="196.0"/> <dc:Bounds height="28.0" width="77.0" x="720.0" y="196.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_9" bpmnElement="IntermediateCatchEvent_9">
<dc:Bounds height="36.0" width="36.0" x="712.0" y="522.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_53">
<dc:Bounds height="28.0" width="79.0" x="691.0" y="558.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="BPMNShape_EventBasedGateway_1" targetElement="BPMNShape_IntermediateCatchEvent_2"> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="BPMNShape_EventBasedGateway_1" targetElement="BPMNShape_IntermediateCatchEvent_2">
<di:waypoint xsi:type="dc:Point" x="682.0" y="668.0"/> <di:waypoint xsi:type="dc:Point" x="682.0" y="668.0"/>
<di:waypoint xsi:type="dc:Point" x="682.0" y="605.0"/> <di:waypoint xsi:type="dc:Point" x="682.0" y="605.0"/>
@ -1135,6 +1147,12 @@ Please check the process:
<di:waypoint xsi:type="dc:Point" x="885.0" y="223.0"/> <di:waypoint xsi:type="dc:Point" x="885.0" y="223.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_52"/> <bpmndi:BPMNLabel id="BPMNLabel_52"/>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="BPMNShape_IntermediateCatchEvent_9" targetElement="BPMNShape_Task_7">
<di:waypoint xsi:type="dc:Point" x="748.0" y="540.0"/>
<di:waypoint xsi:type="dc:Point" x="885.0" y="540.0"/>
<di:waypoint xsi:type="dc:Point" x="885.0" y="580.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_56"/>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane> </bpmndi:BPMNPlane>
<bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1"> <bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
<dc:Font name="arial" size="9.0"/> <dc:Font name="arial" size="9.0"/>