diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungseingangSaldoAdapter.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungseingangSaldoAdapter.java
index 7ab9887..dc92e92 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungseingangSaldoAdapter.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungseingangSaldoAdapter.java
@@ -111,7 +111,9 @@ public class ZahlungseingangSaldoAdapter implements SignalAdapter {
float invoiceRate = invoice.getItemValueFloat("invoice.rate");
String mainCurrency = invoiceService.getCurrenciesOutMain();
- if (!invoiceCurrency.equals(mainCurrency) && !paymentCurrency.equals(mainCurrency)) {
+ if ((!invoiceCurrency.equals(paymentCurrency))
+ && (!invoiceCurrency.equals(mainCurrency) &&
+ !paymentCurrency.equals(mainCurrency))) {
String message = resourceBundleHandler.findMessage("ERROR_PAYMENT4");
message = message.replace("{1}", mainCurrency);
throw new PluginException(PluginException.class.getName(),
diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_payments.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_payments.xhtml
index be17410..7422986 100644
--- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_payments.xhtml
+++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_payments.xhtml
@@ -9,14 +9,12 @@
-
-
| Zahlungseingang |
Referenz |
- Betrag |
- Zahlung |
- Währungsumsatz |
+ Betrag |
+ Zahlung |
+ Währungsumsatz |
OP-Liste Template
op-liste_template.xlsx
op-liste_dbtr.number_$lasteventdate.xlsx
+ true
diff --git a/workflow/rechnungseingang-de-1.2.39.bpmn b/workflow/rechnungseingang-de-1.2.39.bpmn
index 67d2ddb..fde92c1 100644
--- a/workflow/rechnungseingang-de-1.2.39.bpmn
+++ b/workflow/rechnungseingang-de-1.2.39.bpmn
@@ -209,6 +209,7 @@
TextAnnotation_5
TextAnnotation_2
event_e0gqXQ
+ gateway_ApXfeg
@@ -1174,12 +1175,11 @@ if (paymentType!="direct_debit" && paymentType!="no_sepa" ) {
$workflowgroup - $workflowstatus]]>
- SequenceFlow_25
SequenceFlow_44
- SequenceFlow_58
SequenceFlow_90
SequenceFlow_47
sequenceFlow_ucyuIw
+ sequenceFlow_SvEjiw
SequenceFlow_47
@@ -1416,7 +1416,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com
-
+
@@ -2889,8 +2889,8 @@ result.isValid=true;
-
- workitem['payment.type'][0]=="credit"
+
@@ -3830,7 +3830,7 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
@@ -6737,6 +6737,15 @@ if ( ( workitem.get(refField) == null || ''==workitem.get(refField)[0]) ) {
+
+
+ SequenceFlow_25
+ sequenceFlow_SvEjiw
+ SequenceFlow_58
+
+
+
+
@@ -6818,13 +6827,13 @@ Betrag: invoice.total invoice.currency
-
+
-
+
@@ -6860,7 +6869,7 @@ Betrag: invoice.total invoice.currency
-
+
@@ -6899,7 +6908,7 @@ Betrag: invoice.total invoice.currency
-
+
@@ -6914,7 +6923,7 @@ Betrag: invoice.total invoice.currency
-
+
@@ -7040,7 +7049,7 @@ Betrag: invoice.total invoice.currency
-
+
@@ -7059,9 +7068,9 @@ Betrag: invoice.total invoice.currency
-
+
-
+
@@ -7161,18 +7170,18 @@ Betrag: invoice.total invoice.currency
-
+
-
+
-
+
-
+
-
+
@@ -7235,7 +7244,7 @@ Betrag: invoice.total invoice.currency
-
+
@@ -7271,7 +7280,7 @@ Betrag: invoice.total invoice.currency
-
+
@@ -7316,7 +7325,7 @@ Betrag: invoice.total invoice.currency
-
+
@@ -7340,7 +7349,7 @@ Betrag: invoice.total invoice.currency
-
+
@@ -7350,9 +7359,9 @@ Betrag: invoice.total invoice.currency
-
+
-
+
@@ -7398,33 +7407,33 @@ Betrag: invoice.total invoice.currency
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -7437,9 +7446,9 @@ Betrag: invoice.total invoice.currency
-
+
-
+
@@ -7455,30 +7464,30 @@ Betrag: invoice.total invoice.currency
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -7494,9 +7503,9 @@ Betrag: invoice.total invoice.currency
-
+
-
+
@@ -7598,9 +7607,8 @@ Betrag: invoice.total invoice.currency
-
-
-
+
+
@@ -7628,16 +7636,12 @@ Betrag: invoice.total invoice.currency
-
+
-
-
-
-
-
+
@@ -7673,18 +7677,12 @@ Betrag: invoice.total invoice.currency
-
-
-
-
-
-
-
+
@@ -7730,15 +7728,13 @@ Betrag: invoice.total invoice.currency
-
-
+
+
-
-
-
+
@@ -7792,9 +7788,7 @@ Betrag: invoice.total invoice.currency
-
-
-
+
@@ -7832,10 +7826,8 @@ Betrag: invoice.total invoice.currency
-
-
-
-
+
+
@@ -7870,8 +7862,8 @@ Betrag: invoice.total invoice.currency
-
-
+
+
@@ -7902,11 +7894,9 @@ Betrag: invoice.total invoice.currency
-
-
-
-
-
+
+
+
@@ -7985,25 +7975,19 @@ Betrag: invoice.total invoice.currency
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
+
+
+
-
-
+
+
@@ -8012,11 +7996,9 @@ Betrag: invoice.total invoice.currency
-
-
-
-
-
+
+
+
@@ -8063,17 +8045,13 @@ Betrag: invoice.total invoice.currency
-
-
-
-
-
-
+
+
@@ -8151,18 +8129,14 @@ Betrag: invoice.total invoice.currency
-
-
-
-
+
+
+
+
-
-
-
-
@@ -8173,10 +8147,6 @@ Betrag: invoice.total invoice.currency
-
-
-
-
@@ -8252,12 +8222,10 @@ Betrag: invoice.total invoice.currency
-
-
-
-
-
-
+
+
+
+
@@ -8305,25 +8273,20 @@ Betrag: invoice.total invoice.currency
-
-
+
+
-
-
-
+
-
-
-
-
-
-
-
+
+
+
+
@@ -8365,12 +8328,8 @@ Betrag: invoice.total invoice.currency
-
-
-
-
-
-
+
+
@@ -8391,24 +8350,18 @@ Betrag: invoice.total invoice.currency
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
@@ -8449,12 +8402,8 @@ Betrag: invoice.total invoice.currency
-
-
-
-
-
-
+
+
@@ -8527,6 +8476,16 @@ Betrag: invoice.total invoice.currency
+
+
+
+
+
+
+
+
+
+