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

übersetzung Mahnstatus

Browse source
This commit is contained in:
Ralph Soika 2022-10-31 08:45:24 +01:00
parent d493ec2fbd
commit da9f4c7c0e
3 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufExecuteAdapter.java
View file

@ -104,6 +104,13 @@ public class MahnlaufExecuteAdapter implements SignalAdapter {
invoiceStub.setItemValue("invoice.date", invoice.getItemValue("invoice.date"));
invoiceStub.setItemValue("invoice.duedate", invoice.getItemValue("invoice.duedate"));
invoiceStub.setItemValue("$workflowstatus", invoice.getItemValue("$workflowstatus"));
// test if we have a international status translation..
if (!invoice.getItemValueString("workflowstatus_en").isEmpty()) {
invoiceStub.setItemValue("workflowstatus_en", invoice.getItemValue("workflowstatus_en"));
} else {
// default
invoiceStub.setItemValue("workflowstatus_en", invoice.getItemValue("$workflowstatus"));
}
invoiceList.add(invoiceStub.getAllItems());
// store currency in mahnlauf

2
workflow/mahnlauf-de-1.0.0.bpmn
View file

@ -489,7 +489,7 @@ Debitor: <itemvalue>dbtr.name</itemvalue> (<itemvalue>dbtr.number</itemvalue>)
<td style="text-align:center;"><itemvalue format="dd.MM.yyyy">invoice.duedate</itemvalue></td>
<td style="text-align:right;"><itemvalue format="#,###,##0.00" locale="de_DE">invoice.total</itemvalue> <itemvalue>invoice.currency</itemvalue></td>
<td style="text-align:right;"><itemvalue format="#,###,##0.00" locale="de_DE">invoice.saldo</itemvalue> <itemvalue>invoice.currency</itemvalue></td>
<td style="text-align:center;"><itemvalue>$workflowstatus</itemvalue></td>
<td style="text-align:center;"><itemvalue>workflowstatus_en</itemvalue></td>
</tr>
</for-each>
<tr>

24
workflow/rechnungsausgang-de-1.0.0.bpmn
View file

@ -1402,6 +1402,7 @@ Betrag: <itemvalue>invoice.total</itemvalue> <itemvalue>invoice.currency</itemva
</imixs:item>
<imixs:item name="txtactivityresult" type="xs:string">
<imixs:value><![CDATA[<dunning name="period">5</dunning>
<item name="workflowstatus_en">1. Dunning</item>
]]></imixs:value>
</imixs:item>
<imixs:item name="txtname" type="xs:string">
@ -1479,7 +1480,8 @@ Betrag: <itemvalue>invoice.total</itemvalue> <itemvalue>invoice.currency</itemva
<imixs:value><![CDATA[]]></imixs:value>
</imixs:item>
<imixs:item name="txtactivityresult" type="xs:string">
<imixs:value><![CDATA[<dunning name="period">5</dunning>]]></imixs:value>
<imixs:value><![CDATA[<dunning name="period">5</dunning>
<item name="workflowstatus_en">2. Dunning</item>]]></imixs:value>
</imixs:item>
<imixs:item name="txtname" type="xs:string">
<imixs:value><![CDATA[Akzeptieren]]></imixs:value>
@ -1796,7 +1798,9 @@ Betrag: <itemvalue>invoice.total</itemvalue> <itemvalue>invoice.currency</itemva
<imixs:value><![CDATA[]]></imixs:value>
</imixs:item>
<imixs:item name="txtactivityresult" type="xs:string">
<imixs:value><![CDATA[<dunning name="period">7</dunning>]]></imixs:value>
<imixs:value><![CDATA[<dunning name="period">7</dunning>
<item name="workflowstatus_en">Reminder</item>
]]></imixs:value>
</imixs:item>
<imixs:item name="txtname" type="xs:string">
<imixs:value><![CDATA[Akzeptieren]]></imixs:value>
@ -2617,9 +2621,9 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht</bpmn2:text>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_TextAnnotation_2" bpmnElement="TextAnnotation_1">
<dc:Bounds height="53.0" width="201.0" x="1153.0" y="170.0"/>
<dc:Bounds height="53.0" width="201.0" x="1122.0" y="201.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_36">
<dc:Bounds height="47.0" width="189.0" x="1159.0" y="170.0"/>
<dc:Bounds height="47.0" width="189.0" x="1128.0" y="201.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_IntermediateThrowEvent_7" bpmnElement="IntermediateThrowEvent_7">
@ -2959,15 +2963,15 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht</bpmn2:text>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_14" sourceElement="BPMNShape_IntermediateCatchEvent_5" targetElement="BPMNShape_Task_5">
<di:waypoint xsi:type="dc:Point" x="1468.0" y="277.0"/>
<di:waypoint xsi:type="dc:Point" x="1468.0" y="267.0"/>
<di:waypoint xsi:type="dc:Point" x="381.0" y="267.0"/>
<di:waypoint xsi:type="dc:Point" x="381.0" y="280.0"/>
<di:waypoint xsi:type="dc:Point" x="1468.0" y="168.0"/>
<di:waypoint xsi:type="dc:Point" x="363.0" y="168.0"/>
<di:waypoint xsi:type="dc:Point" x="363.0" y="280.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_29"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_1" bpmnElement="Association_1" sourceElement="BPMNShape_TextAnnotation_2" targetElement="BPMNShape_IntermediateCatchEvent_21">
<di:waypoint xsi:type="dc:Point" x="1253.0" y="223.0"/>
<di:waypoint xsi:type="dc:Point" x="1253.0" y="250.0"/>
<di:waypoint xsi:type="dc:Point" x="1288.0" y="250.0"/>
<di:waypoint xsi:type="dc:Point" x="1222.0" y="254.0"/>
<di:waypoint xsi:type="dc:Point" x="1222.0" y="265.0"/>
<di:waypoint xsi:type="dc:Point" x="1288.0" y="265.0"/>
<di:waypoint xsi:type="dc:Point" x="1288.0" y="277.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_37"/>
</bpmndi:BPMNEdge>