diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/xxxxworklist_search_custom.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/xxxxworklist_search_custom.xhtml
deleted file mode 100644
index 2fb3918..0000000
--- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/xxxxworklist_search_custom.xhtml
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestOPListen.java b/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestOPListen.java
new file mode 100644
index 0000000..734d85d
--- /dev/null
+++ b/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestOPListen.java
@@ -0,0 +1,65 @@
+package com.alexanderlogistics;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.IsoFields;
+import java.util.Date;
+import java.util.logging.Logger;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Testen der KW Berechnung
+ *
+ * @author rsoika
+ *
+ */
+public class TestOPListen {
+
+ public static DateFormat dateFormat = new SimpleDateFormat("ddMMyyyy");
+
+ private final static Logger logger = Logger.getLogger(TestOPListen.class.getName());
+
+ @Before
+ public void setUp() throws Exception {
+
+ }
+
+ /**
+ * Teste 31.12.2024
+ */
+ @Test
+ public void testDatum() {
+ SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyyMMdd");
+ String testDate = "20241231";
+ try {
+ Date dateResult = dateFormatter.parse(testDate);
+ System.out.println("Test Date=" + dateResult);
+
+ LocalDate date = LocalDate.parse("20241231", DateTimeFormatter.BASIC_ISO_DATE);
+ int weekNumber = date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR);
+ int weekBasedYear = date.get(IsoFields.WEEK_BASED_YEAR);
+ String weekCategory = weekBasedYear + "/" + String.format("%02d", weekNumber);
+
+ if ("2024/01".equals(weekCategory)) {
+ logger.warning("--> Invoice found with 2024/01: ");
+ }
+
+ assertEquals("2025/01", weekCategory);
+
+ } catch (ParseException e) {
+
+ e.printStackTrace();
+ fail();
+ }
+
+ }
+
+}
diff --git a/pom.xml b/pom.xml
index 4b7ac54..2d72a65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,8 +25,8 @@
10.0.0
- 5.0.3-SNAPSHOT
- 6.0.8
+ 5.0.4-SNAPSHOT
+ 6.0.9-SNAPSHOT
5.0.0
3.0.2
3.0.2
diff --git a/workflow/dwc/rechnungseingang-sachrechnung-dwc-1.0.1.bpmn b/workflow/dwc/rechnungseingang-sachrechnung-dwc-1.0.1.bpmn
new file mode 100644
index 0000000..e3824ea
--- /dev/null
+++ b/workflow/dwc/rechnungseingang-sachrechnung-dwc-1.0.1.bpmn
@@ -0,0 +1,5371 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Task_2
+ ExclusiveGateway_1
+ StartEvent_1
+ IntermediateCatchEvent_3
+ IntermediateCatchEvent_13
+ IntermediateCatchEvent_6
+ IntermediateCatchEvent_24
+ IntermediateCatchEvent_7
+ EndEvent_3
+ Task_8
+ IntermediateCatchEvent_19
+ IntermediateThrowEvent_3
+ IntermediateCatchEvent_5000-20
+ EventBasedGateway_1
+ IntermediateCatchEvent_36
+ IntermediateThrowEvent_6
+ IntermediateCatchEvent_40
+ IntermediateThrowEvent_7
+
+ DataObject_2
+
+
+
+ Task_5005
+ Task_4
+ Task_3
+ IntermediateCatchEvent_5005-20
+ IntermediateCatchEvent_5005-10
+ EndEvent_1
+ IntermediateCatchEvent_21
+ IntermediateCatchEvent_25
+ IntermediateCatchEvent_2
+ IntermediateCatchEvent_4
+ IntermediateCatchEvent_8
+ IntermediateThrowEvent_2
+ IntermediateThrowEvent_4
+ IntermediateCatchEvent_27
+ IntermediateCatchEvent_32
+ IntermediateCatchEvent_33
+ EventBasedGateway_2
+ ExclusiveGateway_3
+ EventBasedGateway_3
+ DataObject_1
+
+
+
+ Task_9
+ Task_14
+ Task_15
+ Task_5
+ Task_6
+ IntermediateCatchEvent_1
+ IntermediateCatchEvent_11
+ IntermediateCatchEvent_28
+ IntermediateCatchEvent_29
+ IntermediateCatchEvent_31
+ IntermediateCatchEvent_5
+ IntermediateCatchEvent_9
+ IntermediateCatchEvent_14
+ IntermediateThrowEvent_1
+ IntermediateCatchEvent_18
+ EndEvent_4
+ IntermediateCatchEvent_20
+ IntermediateCatchEvent_22
+ IntermediateCatchEvent_38
+ IntermediateCatchEvent_39
+ event_AQYumg
+ Task_1
+ Task_7
+ Task_10
+ Task_11
+ Task_12
+ IntermediateCatchEvent_10
+ IntermediateCatchEvent_12
+ IntermediateCatchEvent_15
+ IntermediateCatchEvent_16
+ IntermediateCatchEvent_17
+ EndEvent_2
+ IntermediateCatchEvent_23
+ IntermediateThrowEvent_5
+ IntermediateCatchEvent_26
+ IntermediateCatchEvent_34
+ IntermediateCatchEvent_35
+ IntermediateCatchEvent_37
+ IntermediateCatchEvent_41
+ IntermediateCatchEvent_42
+ EventBasedGateway_4
+ ExclusiveGateway_2
+ ExclusiveGateway_4
+ DataObject_3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home
+
+ stop
+ false
+
+- space.name
+]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_8
+ SequenceFlow_55
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SequenceFlow_38
+
+
+
+
+
+ SequenceFlow_37
+ SequenceFlow_8
+ SequenceFlow_54
+
+
+
+
+
+
+
+
+
+
+
+ txtlastcomment]]>
+
+
+
+
+
+
+
+
+ _imgcdtr.name invoice.number (invoice.currency invoice.total) space.name]]>
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $workflowgroup - $workflowstatus]]>
+ SequenceFlow_33
+ SequenceFlow_20
+ SequenceFlow_22
+
+
+
+
+
+ - space.name
+false]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_39
+ SequenceFlow_41
+
+
+
+
+
+ SequenceFlow_1
+ SequenceFlow_41
+ SequenceFlow_42
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SequenceFlow_43
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home
+false
+Wollen Sie den Vorgang wirklich löschen?]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_26
+ SequenceFlow_25
+
+
+ SequenceFlow_25
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home
+false]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SequenceFlow_44
+
+
+
+
+
+
+
+ txtlastcomment
+numsequencenumber_sub]]>
+
+
+
+
+
+
+
+
+ numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]>
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $workflowgroup - $workflowstatus]]>
+ SequenceFlow_44
+ SequenceFlow_58
+ SequenceFlow_45
+
+
+ SequenceFlow_45
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home
+false]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_57
+ SequenceFlow_58
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home
+false]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_61
+ SequenceFlow_62
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ _subject]]>
+
+
+
+
+
+
+
+
+ _amount (Brutto € _amount_brutto)
+_description]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_47
+ SequenceFlow_63
+
+
+
+
+
+
+
+
+ SequenceFlow_70
+
+
+
+
+ SequenceFlow_67
+
+
+
+
+ SequenceFlow_65
+
+
+
+
+
+
+
+
+
+
+
+
+ _subject]]>
+
+
+
+
+
+
+
+
+ _amount (Brutto € _amount_brutto)
+_description]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_64
+ SequenceFlow_65
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ _subject]]>
+
+
+
+
+
+
+
+
+ _amount (Brutto € _amount_brutto)
+_description]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home
+
+ start
+ false
+]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_66
+ SequenceFlow_67
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ _subject]]>
+
+
+
+
+
+
+
+
+ _amount (Brutto € _amount_brutto)
+_description]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_69
+ SequenceFlow_70
+
+
+ SequenceFlow_2
+ SequenceFlow_68
+ SequenceFlow_69
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home
+false
+]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_71
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SequenceFlow_72
+
+
+
+
+
+
+
+ txtlastcomment]]>
+
+
+
+
+
+
+
+
+ _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]>
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $workflowgroup - $workflowstatus]]>
+ SequenceFlow_72
+ SequenceFlow_85
+ SequenceFlow_73
+
+
+
+
+
+
+
+
+
+
+ _subject]]>
+
+
+
+
+
+
+
+
+ _amount (Brutto € _amount_brutto)
+_description]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+ SequenceFlow_73
+ SequenceFlow_74
+
+
+
+
+
+
+
+
+
+
+
+
+ SequenceFlow_55
+ SequenceFlow_75
+ SequenceFlow_76
+
+
+
+
+
+
+ workitem['payment.type'][0]=="credit"
+
+
+
+ SequenceFlow_77
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home
+false
+Wollen Sie den Vorgang wirklich archivieren?
+
+ stop
+ false
+
+cancel]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_78
+ SequenceFlow_77
+
+
+
+
+
+
+
+
+ SequenceFlow_79
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SequenceFlow_80
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SequenceFlow_81
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+ stop
+ false
+
+
+ rechnungseingang-dwc-1.0
+ 5000
+ 990
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_83
+ SequenceFlow_82
+
+
+ SequenceFlow_82
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ txtlastcomment]]>
+
+
+
+
+
+
+
+
+ _imgnumsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]>
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $workflowgroup - $workflowstatus]]>
+ SequenceFlow_76
+ SequenceFlow_86
+ SequenceFlow_84
+
+
+
+
+
+
+
+
+
+
+ _subject]]>
+
+
+
+
+
+
+
+
+ _amount (Brutto € _amount_brutto)
+_description]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_84
+ SequenceFlow_85
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SequenceFlow_86
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ payment.type ]]>
+
+
+
+
+
+ sequenceFlow_z0r1uQ
+ sequenceFlow_00jhXg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+