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

mahnlauf

Browse source
This commit is contained in:
Ralph Soika 2023-03-06 14:54:46 +01:00
parent 5918074f86
commit 630f85a362
5 changed files with 74 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/InkassoExportAdapter.java
View file

@ -154,8 +154,10 @@ public class InkassoExportAdapter extends POIFindReplaceAdapter {
row.getCell(0).setCellValue(invoice.getItemValueString("invoice.number"));
row.getCell(1).setCellValue(invoice.getItemValueDate("invoice.date"));
row.getCell(2).setCellValue(invoice.getItemValueDate("invoice.duedate"));
// Rechnung
row.getCell(4).setCellValue(invoice.getItemValueDouble("invoice.total"));
// total
row.getCell(3).setCellValue(invoice.getItemValueDouble("invoice.total"));
// saldo
row.getCell(4).setCellValue(invoice.getItemValueDouble("invoice.saldo"));
rowPos++;
}

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

@ -26,8 +26,6 @@
<th style="text-align: left;">Status</th>
<th style="text-align: right;">S/H</th>
<th style="width: 40px;"></th>
<th style="width: 100px;">Offener Saldo</th>
<th style="">Mahnen</th>
</tr>

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

@ -35,7 +35,8 @@
<th style="text-align: left;">#{message['form.date']}</th>
<th style="text-align: left;">#{message['form.deadline']}</th>
<th style="text-align: right;">#{message['form.amount']}</th>
<th style=""></th>
<th style=""><!-- currency --></th>
<th style="width: 100px;">Offener Saldo</th>
<th style="width:40px;"></th>
</tr>
<ui:repeat value="#{workitem.itemList['$workitemref']}" var="id">
@ -68,7 +69,11 @@
</h:outputText></td>
<td />
<!-- Saldo / offene Betrag -->
<td style="text-align: right; color: red;"><h:outputText
value="#{invoice.item['invoice.saldo']}">
<f:convertNumber minFractionDigits="2" locale="de" />
</h:outputText></td>
<td><h:commandLink
actionListener="#{inkassoController.removeInvoice(id)}">
<span class="typcn typcn-trash imixs-state-info"></span>
@ -89,7 +94,10 @@
<f:convertNumber minFractionDigits="2" locale="de" />
</h:outputText></strong></td>
<td><strong>#{invoice.item['invoice.currency']}</strong></td>
<td />
<td style="text-align: right;"><strong><h:outputText
value="#{inkassoController.calculateSum(workitem.itemList['$workitemref'], 'invoice.saldo')}">
<f:convertNumber minFractionDigits="2" locale="de" />
</h:outputText></strong></td>
</tr>
</table>

BIN
templates/inkasso_template.xlsx
View file

Binary file not shown.

70
workflow/rechnungsausgang-de-1.0.2-test.bpmn
View file

@ -502,7 +502,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com
<bpmn2:task id="Task_5" imixs:processid="5900" name="Bezahlt">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic]]></imixs:value>
<imixs:value><![CDATA[alexander/form_basic_read]]></imixs:value>
</imixs:item>
<imixs:item name="txtworkflowabstract" type="xs:string">
<imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>]]></imixs:value>
@ -2178,7 +2178,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com
<bpmn2:task id="Task_8" imixs:processid="5910" name="Inkasso Bezahlt">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic]]></imixs:value>
<imixs:value><![CDATA[alexander/form_basic_read]]></imixs:value>
</imixs:item>
<imixs:item name="txtworkflowabstract" type="xs:string">
<imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>]]></imixs:value>
@ -2385,6 +2385,12 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com
Wiedervorlage wird um 7 bzw. 5 Tage erhöht</bpmn2:text>
</bpmn2:textAnnotation>
<bpmn2:association id="Association_6" sourceRef="DataObject_2" targetRef="Task_1"/>
<bpmn2:association id="Association_12" sourceRef="DataObject_2" targetRef="Task_5005"/>
<bpmn2:association id="Association_13" sourceRef="DataObject_2" targetRef="Task_3"/>
<bpmn2:association id="Association_14" sourceRef="DataObject_2" targetRef="Task_4"/>
<bpmn2:association id="Association_15" sourceRef="DataObject_2" targetRef="Task_5"/>
<bpmn2:association id="Association_16" sourceRef="DataObject_2" targetRef="Task_8"/>
<bpmn2:association id="Association_17" sourceRef="DataObject_2" targetRef="Task_7"/>
</bpmn2:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="Collaboration_1">
@ -2447,9 +2453,9 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht</bpmn2:text>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_DataObject_1" bpmnElement="DataObject_2">
<dc:Bounds height="50.0" width="36.0" x="164.0" y="433.0"/>
<dc:Bounds height="50.0" width="36.0" x="870.0" y="549.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_85">
<dc:Bounds height="14.0" width="70.0" x="147.0" y="483.0"/>
<dc:Bounds height="14.0" width="70.0" x="853.0" y="599.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_13" bpmnElement="IntermediateCatchEvent_13">
@ -2798,9 +2804,11 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht</bpmn2:text>
<bpmndi:BPMNLabel id="BPMNLabel_67"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_2" bpmnElement="Association_2" sourceElement="BPMNShape_DataObject_1" targetElement="BPMNShape_Task_5">
<di:waypoint xsi:type="dc:Point" x="200.0" y="458.0"/>
<di:waypoint xsi:type="dc:Point" x="335.0" y="458.0"/>
<di:waypoint xsi:type="dc:Point" x="335.0" y="330.0"/>
<di:waypoint xsi:type="dc:Point" x="888.0" y="549.0"/>
<di:waypoint xsi:type="dc:Point" x="888.0" y="333.0"/>
<di:waypoint xsi:type="dc:Point" x="477.0" y="333.0"/>
<di:waypoint xsi:type="dc:Point" x="477.0" y="313.0"/>
<di:waypoint xsi:type="dc:Point" x="418.0" y="313.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_86"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_20" sourceElement="BPMNShape_IntermediateCatchEvent_13" targetElement="BPMNShape_ExclusiveGateway_1">
@ -3030,10 +3038,10 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht</bpmn2:text>
<bpmndi:BPMNLabel id="BPMNLabel_17"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_6" bpmnElement="Association_6" sourceElement="BPMNShape_DataObject_1" targetElement="BPMNShape_Task_3">
<di:waypoint xsi:type="dc:Point" x="200.0" y="466.0"/>
<di:waypoint xsi:type="dc:Point" x="252.0" y="466.0"/>
<di:waypoint xsi:type="dc:Point" x="252.0" y="621.0"/>
<di:waypoint xsi:type="dc:Point" x="304.0" y="621.0"/>
<di:waypoint xsi:type="dc:Point" x="882.0" y="549.0"/>
<di:waypoint xsi:type="dc:Point" x="882.0" y="539.0"/>
<di:waypoint xsi:type="dc:Point" x="377.0" y="539.0"/>
<di:waypoint xsi:type="dc:Point" x="377.0" y="605.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_74"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="BPMNShape_IntermediateCatchEvent_20" targetElement="BPMNShape_Task_2">
@ -3164,6 +3172,46 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht</bpmn2:text>
<di:waypoint xsi:type="dc:Point" x="1481.0" y="928.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_158"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_12" bpmnElement="Association_12" sourceElement="BPMNShape_DataObject_1" targetElement="BPMNShape_Task_2">
<di:waypoint xsi:type="dc:Point" x="888.0" y="599.0"/>
<di:waypoint xsi:type="dc:Point" x="888.0" y="684.0"/>
<di:waypoint xsi:type="dc:Point" x="601.0" y="684.0"/>
<di:waypoint xsi:type="dc:Point" x="601.0" y="751.0"/>
<di:waypoint xsi:type="dc:Point" x="377.0" y="751.0"/>
<di:waypoint xsi:type="dc:Point" x="377.0" y="904.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_159"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_13" bpmnElement="Association_13" sourceElement="BPMNShape_DataObject_1" targetElement="BPMNShape_Task_6">
<di:waypoint xsi:type="dc:Point" x="870.0" y="574.0"/>
<di:waypoint xsi:type="dc:Point" x="794.0" y="574.0"/>
<di:waypoint xsi:type="dc:Point" x="794.0" y="903.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_160"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_14" bpmnElement="Association_14" sourceElement="BPMNShape_DataObject_1" targetElement="BPMNShape_Task_4">
<di:waypoint xsi:type="dc:Point" x="906.0" y="574.0"/>
<di:waypoint xsi:type="dc:Point" x="1240.0" y="574.0"/>
<di:waypoint xsi:type="dc:Point" x="1240.0" y="903.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_161"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_15" bpmnElement="Association_15" sourceElement="BPMNShape_DataObject_1" targetElement="BPMNShape_Task_11">
<di:waypoint xsi:type="dc:Point" x="906.0" y="565.0"/>
<di:waypoint xsi:type="dc:Point" x="1471.0" y="565.0"/>
<di:waypoint xsi:type="dc:Point" x="1471.0" y="403.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_162"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_16" bpmnElement="Association_16" sourceElement="BPMNShape_DataObject_1" targetElement="BPMNShape_Task_8">
<di:waypoint xsi:type="dc:Point" x="906.0" y="561.0"/>
<di:waypoint xsi:type="dc:Point" x="1779.0" y="561.0"/>
<di:waypoint xsi:type="dc:Point" x="1779.0" y="403.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_163"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_17" bpmnElement="Association_17" sourceElement="BPMNShape_DataObject_1" targetElement="BPMNShape_Task_7">
<di:waypoint xsi:type="dc:Point" x="894.0" y="599.0"/>
<di:waypoint xsi:type="dc:Point" x="894.0" y="634.0"/>
<di:waypoint xsi:type="dc:Point" x="1650.0" y="634.0"/>
<di:waypoint xsi:type="dc:Point" x="1650.0" y="670.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_164"/>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
<bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
<dc:Font name="arial" size="9.0"/>