diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java index bc9bd84..fe10332 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java @@ -32,7 +32,7 @@ import java.util.Calendar; import java.util.Date; import java.util.logging.Logger; -import javax.enterprise.context.ConversationScoped; +import javax.enterprise.context.SessionScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.inject.Named; @@ -51,7 +51,7 @@ import org.imixs.workflow.office.views.SearchEvent; */ @Named -@ConversationScoped +@SessionScoped public class CustomSearchController implements Serializable { private static final long serialVersionUID = 1L; @@ -182,7 +182,7 @@ public class CustomSearchController implements Serializable { } } - logger.info(query); + logger.fine("Custom Query=" + query); // Udpate query searchEvent.setQuery(query); 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 795cb81..09a3dbb 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 @@ -32,6 +32,7 @@ invoicenumber=Rechnungsnummer invoicedate=Rechnungsdatum invoiceduedate=Fälligkeit invoiceamount=Rechnungsbetrag +invoicecurrency=Währung payment_type=Zahlungsart sequencenumber=Belegnummer amount=Betrag 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 9af74c6..c8140a9 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 @@ -32,6 +32,7 @@ invoicenumber=Invoice No. invoicedate=Invoice Date invoiceduedate=Due Date invoiceamount=Invoice amount +invoicecurrency=Currency payment_type=Payment Type sequencenumber=Request No. amount=Amount diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive.xhtml index 2f1b5a9..c8b0ddb 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive.xhtml @@ -2,7 +2,6 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets" template="/layout/template.xhtml"> - @@ -11,7 +10,6 @@ - @@ -19,9 +17,8 @@ src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.worklist.custom.js?build=#{app.application_build_timestamp}"> - - + @@ -35,8 +32,6 @@ - -
@@ -46,14 +41,10 @@
-
- - - @@ -70,11 +61,10 @@
- @@ -85,7 +75,6 @@ -
#{message.total_result} #{searchresultCount} #{message.serach_hits}
@@ -96,7 +85,6 @@
- diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive_filter.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive_filter.xhtml index 9f49785..e6b7ab4 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive_filter.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive_filter.xhtml @@ -36,11 +36,10 @@
- -
Währung:
+
#{custom.invoicecurrency}:
@@ -57,8 +56,6 @@
- -
#{custom.invoicedate}:
@@ -77,7 +74,6 @@
-
#{custom.closingdate}:
@@ -105,14 +101,13 @@
-
#{custom.payment_type}:
- + diff --git a/reports/sepa/result_sepa01.xml b/reports/sepa/result_sepa01.xml index 6844cfe..f47b826 100644 --- a/reports/sepa/result_sepa01.xml +++ b/reports/sepa/result_sepa01.xml @@ -6,7 +6,7 @@ bf073e72asdf512c4d60af7740872036 - 2024-03-21T12:16:05 + 2024-04-03T15:17:47 3 655.90 @@ -23,7 +23,7 @@ SEPA - 2024-03-21 + 2024-04-03 Targo Bank diff --git a/reports/sepa/result_sepa02.xml b/reports/sepa/result_sepa02.xml index 15d6cab..74cdf78 100644 --- a/reports/sepa/result_sepa02.xml +++ b/reports/sepa/result_sepa02.xml @@ -6,7 +6,7 @@ bf073e72asdf512c4d60af7740872036 - 2024-03-21T12:16:05 + 2024-04-03T15:17:47 3 655.90 @@ -23,7 +23,7 @@ SEPA - 2024-03-21 + 2024-04-03 Targo Bank