diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml index 4b97a7f..edce9a8 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml @@ -20,7 +20,9 @@ #{message['form.invoicenumber']} #{message['form.date']} + #{message['form.deadline']} + Status S/H Saldo @@ -46,6 +48,9 @@ timeZone="#{message.timeZone}" /> + + + @@ -99,7 +104,7 @@ - + Summary diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestFormat.java b/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestFormat.java new file mode 100644 index 0000000..3e38069 --- /dev/null +++ b/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestFormat.java @@ -0,0 +1,56 @@ +package com.alexanderlogistics; + +import java.text.DateFormat; +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; +import java.util.Optional; +import java.util.logging.Logger; + +import org.imixs.workflow.FileData; +import org.imixs.workflow.exceptions.PluginException; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +import junit.framework.Assert; + +/** + * This test generates random test data + * + * @author rsoika + * + */ +public class TestFormat { + + public static DateFormat dateFormat = new SimpleDateFormat("ddMMyyyy"); + public static DecimalFormat decimalFormat = new DecimalFormat("0.00"); + public static DecimalFormat rateFormat = new DecimalFormat("0.000000"); + + private final static Logger logger = Logger.getLogger(TestFormat.class.getName()); + + @Before + public void setUp() throws Exception { + + } + + @Test + public void testBetrag() { + double total = 87547.09; + logger.info(decimalFormat.format(total)); + total = 42.0; + logger.info(decimalFormat.format(total)); + total = 0.5; + logger.info(decimalFormat.format(total)); + } + + @Test + public void testKurs() { + double kurs = 1.002118; + logger.info(rateFormat.format(kurs)); + kurs = 777.0; + logger.info(rateFormat.format(kurs)); + kurs = 0; + logger.info(rateFormat.format(kurs)); + } + +} diff --git a/pom.xml b/pom.xml index c43cac1..d68e7e1 100644 --- a/pom.xml +++ b/pom.xml @@ -106,6 +106,7 @@ 1.8 + office-alexander-logistics diff --git a/workflow/datev-import-1.0.0.bpmn b/workflow/datev-import-1.0.0.bpmn index 3f54169..7a54593 100644 --- a/workflow/datev-import-1.0.0.bpmn +++ b/workflow/datev-import-1.0.0.bpmn @@ -6,15 +6,12 @@ - - - - - - - - + + + + + @@ -98,7 +95,7 @@ - + @@ -201,7 +198,7 @@ result.isValid=true; SEPA-Body]]> - + true - - - + @@ -309,8 +304,8 @@ if (workitem['$file.count'][0]!=1) { true - - + + @@ -365,7 +360,7 @@ if (workitem['$file.count'][0]!=1) { - + @@ -491,7 +486,7 @@ if (workitem['$file.count'][0]!=1) { SEPA-Body]]> - + @@ -527,7 +522,7 @@ if (workitem['$file.count'][0]!=1) { SEPA-Body]]> - + diff --git a/workflow/rechnungsausgang-de-1.0.0.bpmn b/workflow/rechnungsausgang-de-1.0.0.bpmn index 1a86ddb..372683e 100644 --- a/workflow/rechnungsausgang-de-1.0.0.bpmn +++ b/workflow/rechnungsausgang-de-1.0.0.bpmn @@ -64,6 +64,7 @@ IntermediateCatchEvent_18 ExclusiveGateway_5 EventBasedGateway_1 + IntermediateThrowEvent_8 Task_3 @@ -82,10 +83,12 @@ Task_8 IntermediateCatchEvent_7 IntermediateCatchEvent_11 - IntermediateThrowEvent_5 IntermediateThrowEvent_1 IntermediateThrowEvent_2 ExclusiveGateway_3 + IntermediateThrowEvent_5 + IntermediateCatchEvent_1 + IntermediateThrowEvent_10 @@ -100,7 +103,7 @@ - + - + @@ -154,6 +157,15 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com + + + + + + + + + SequenceFlow_46 @@ -182,10 +194,10 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + invoice.number dbtr.number dbtr.name (invoice.currency invoice.total) ]]> true @@ -289,7 +301,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + invoice.number dbtr.number dbtr.name (invoice.currency invoice.total) ]]> @@ -297,9 +309,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com true - - - + @@ -316,6 +326,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com SequenceFlow_33 SequenceFlow_20 SequenceFlow_14 + SequenceFlow_15 SequenceFlow_39 SequenceFlow_46 SequenceFlow_2 @@ -329,7 +340,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + @@ -432,10 +443,10 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + invoice.number dbtr.number dbtr.name (invoice.currency invoice.total) ]]> true @@ -515,7 +526,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - Rechnungscontrolling]]> + Mahnwesen]]> @@ -548,21 +559,20 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + invoice.number dbtr.number dbtr.name (invoice.currency invoice.total) ]]> true - + - @@ -573,6 +583,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com SequenceFlow_27 SequenceFlow_1 SequenceFlow_18 + SequenceFlow_25 @@ -670,10 +681,10 @@ result.isValid=true; - + - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + invoice.number dbtr.number dbtr.name (invoice.currency invoice.total) ]]> true @@ -684,7 +695,7 @@ result.isValid=true; - + @@ -696,6 +707,7 @@ result.isValid=true; SequenceFlow_31 SequenceFlow_40 SequenceFlow_16 + SequenceFlow_26 SequenceFlow_40 @@ -713,10 +725,10 @@ result.isValid=true; - + - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + invoice.number dbtr.number dbtr.name (invoice.currency invoice.total) ]]> true @@ -983,10 +995,10 @@ result.isValid=true; - + - numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + invoice.number dbtr.number dbtr.name (invoice.currency invoice.total) ]]> true @@ -1007,6 +1019,7 @@ result.isValid=true; SequenceFlow_29 SequenceFlow_30 SequenceFlow_7 + SequenceFlow_28 @@ -1253,6 +1266,7 @@ Betrag: _amount (Brutto € _amount_bruttoSequenceFlow_18 SequenceFlow_5 SequenceFlow_56 + SequenceFlow_6 @@ -1447,7 +1461,7 @@ Betrag: invoice.total invoice.currency - + @@ -1478,6 +1492,9 @@ Betrag: invoice.total invoice.currencyfalse + + + SequenceFlow_42 SequenceFlow_8 @@ -1517,20 +1534,20 @@ Betrag: invoice.total invoice.currency - invoice.saldo]]> + invoice.saldo]]> SequenceFlow_10 SequenceFlow_11 - (parseFloat(workitem['invoice.saldo']) == parseFloat('0.0')) + (parseFloat(workitem['invoice.saldo'][0]) == parseFloat('0.0')) - invoice.saldo]]> + invoice.saldo]]> SequenceFlow_12 @@ -1548,6 +1565,95 @@ Betrag: invoice.total invoice.currency + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + + SequenceFlow_6 + SequenceFlow_15 + + + + + SequenceFlow_25 + + + + + SequenceFlow_26 + + + + + SequenceFlow_28 + + + Trigger über ZahlungseingangsSaldoAdapter @@ -1657,9 +1763,9 @@ Betrag: invoice.total invoice.currency - + - + @@ -1823,9 +1929,33 @@ Betrag: invoice.total invoice.currency - + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2021,9 +2151,9 @@ Betrag: invoice.total invoice.currency - - - + + + @@ -2099,11 +2229,40 @@ Betrag: invoice.total invoice.currency - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workflow/zahlungseingang-de-1.0.0.bpmn b/workflow/zahlungseingang-de-1.0.0.bpmn index c2e893c..8bad352 100644 --- a/workflow/zahlungseingang-de-1.0.0.bpmn +++ b/workflow/zahlungseingang-de-1.0.0.bpmn @@ -153,7 +153,7 @@ result.isValid=true; - + @@ -233,7 +233,7 @@ result.isValid=true; - + @@ -298,7 +298,7 @@ result.isValid=true; - ]]> + @@ -441,7 +441,7 @@ result.isValid=true; - ]]> + home]]>