diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java
index 3684651..12e3fda 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java
@@ -11,6 +11,7 @@ import org.imixs.workflow.ItemCollection;
import org.imixs.workflow.WorkflowKernel;
import org.imixs.workflow.engine.DocumentService;
import org.imixs.workflow.engine.WorkflowService;
+import org.imixs.workflow.exceptions.PluginException;
import org.imixs.workflow.exceptions.QueryException;
import org.imixs.workflow.faces.data.WorkflowController;
import org.imixs.workflow.faces.data.WorkflowEvent;
@@ -65,6 +66,9 @@ public class OPListController implements Serializable {
@Inject
protected DocumentService documentService;
+ @Inject
+ protected InvoiceService invoiceService;
+
/**
* Diese Methode wird für Zahlungseingänge und Mahnläufe verwendet.
*
@@ -444,4 +448,13 @@ public class OPListController implements Serializable {
public void setCurrencyFilter(String currencyFilter) {
this.currencyFilter = currencyFilter;
}
+
+ public List getCurrenciesOut() {
+ try {
+ return invoiceService.getCurrenciesOut();
+ } catch (PluginException e) {
+ return new ArrayList();
+ }
+ }
+
}
diff --git a/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties b/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties
index 653d61a..d7a1287 100644
--- a/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties
+++ b/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties
@@ -42,6 +42,16 @@ form.open_saldo=Offener Saldo
form.dunning=Mahnen
form.all=Alle
+oplist.remaining=Restbetrag
+oplist.invoicenumber=Rg-Nr.
+oplist.total=Betrag
+oplist.rate=Kurs
+oplist.total.base=Basisumsatz
+oplist.saldo=Saldo
+oplist.saldo.base=Saldo
+oplist.payment=Zahlbetrag
+
+
ERROR_CDTR_INVALID=Die Kreditorennummer ist nicht gültig
ERROR_BOOKING_PERIOD=Eingabefehler - Bitte geben Sie eine gültige Buchungsperiode ein! Prüfen Sie auch die Spalte BP in der Positionstabelle.
diff --git a/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties b/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties
index 3c6a66f..060b177 100644
--- a/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties
+++ b/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties
@@ -42,6 +42,15 @@ form.open_saldo=Open Balance
form.dunning=Dunning
form.all=All
+oplist.remaining=Remaining Amount
+oplist.invoicenumber=No.
+oplist.total=Total
+oplist.rate=Rate
+oplist.total.base=Total Base
+oplist.saldo=Saldo
+oplist.saldo.base=Saldo
+oplist.payment=Payment
+
ERROR_CDTR_INVALID=The creditor number is not valid
ERROR_BOOKING_PERIOD=Input error - Please enter a valid booking period! Also check the BP column in the position table.
ERROR_MAIN_BOOKING_PERIOD=Input errors - Please check the main booking period with the booking periods of each item.
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 180ca43..9dfe373 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
@@ -12,7 +12,7 @@
- - Restbetrag:
+ - #{custom['oplist.remaining']}:
-
@@ -23,23 +23,23 @@
- | Rg-Nr. |
+ #{custom['oplist.invoicenumber']} |
#{message['form.date']} |
#{message['form.deadline']} |
Status |
- S/H |
+ #{custom['oplist.total']} |
|
- Kurs |
- Basisumsatz |
+ #{custom['oplist.rate']} |
+ #{custom['oplist.total.base']} |
|
- Saldo |
+ #{custom['oplist.saldo']} |
|
- Saldo in EUR |
+ #{custom['oplist.saldo.base']} #{workitem.item['payment.currency']} |
|
- Zahlbetrag |
+ #{custom['oplist.payment']} |
|
@@ -163,20 +163,22 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
- |
-
-
- EUR USD |
+
+
+
+
+
+ #{currency}
+
+
+ |
|
@@ -196,7 +198,7 @@
-
+
EUR
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 8c8b4ff..be17410 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
@@ -20,7 +20,7 @@
+ value="#{workitemLinkController.getExternalReferences('$modelversion:zahlungseingang-.*')}">
diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_readonly.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/xxxxsection_opliste_readonly.xhtml
similarity index 89%
rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_readonly.xhtml
rename to office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/xxxxsection_opliste_readonly.xhtml
index d0613e3..921cb6d 100644
--- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_readonly.xhtml
+++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/xxxxsection_opliste_readonly.xhtml
@@ -14,21 +14,24 @@
- | Rg-Nr. |
+ #{custom['oplist.invoicenumber']} |
#{message['form.date']} |
#{message['form.deadline']} |
Status |
- S/H |
+ #{custom['oplist.total']} |
|
- Kurs |
- Basisumsatz |
+ #{custom['oplist.rate']} |
+ #{custom['oplist.total.base']} |
|
- Saldo |
+ #{custom['oplist.saldo']} |
|
-
+ #{custom['oplist.saldo.base']} #{workitem.item['payment.currency']} |
+ |
+ #{custom['oplist.payment']} |
+ |