Imixs/office-alexander-logistics
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

erweiterte Archive Suche

Browse source
This commit is contained in:
Ralph Soika 2024-03-19 16:44:41 +01:00
parent de15f32f69
commit 303ef23928
5 changed files with 56 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASENOTES.md
View file

@ -3,7 +3,7 @@
### 1.2.17 (Development)
- neue Archive suche
- invoice.exchangerate Input ersetzt nun . durch , damit der Wert richtig gespeichert wird!!
- invoice.exchangerate Input ersetzt nun . durch , und locale='de' damit der Wert richtig gespeichert wird!!
### 1.2.16

23
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java
View file

@ -72,6 +72,9 @@ public class CustomSearchController implements Serializable {
Date closingDate = searchEvent.getSearchFilter().getItemValueDate("invoice.closingdate");
String cdtrNumber = searchEvent.getSearchFilter().getItemValueString("cdtr.number");
String invoiceType = searchEvent.getSearchFilter().getItemValueString("invoice.type");
String invoiceNumber = searchEvent.getSearchFilter().getItemValueString("invoice.number");
// invoice.total
if (invoiceTotal != 0) {
@ -98,6 +101,26 @@ public class CustomSearchController implements Serializable {
query += " ($lasteventdate:" + CustomSearchController.getRangeMonth(closingDate) + ")";
}
if (invoiceNumber != null && !invoiceNumber.isEmpty()) {
query += " (invoice.number:" + invoiceNumber + ")";
}
// Rechnungsart
if (invoiceType != null && !"0".equals(invoiceType)) {
if ("1".equals(invoiceType)) {
query += " ($workflowgroup:\"Rechnungseingang\" AND NOT payment.type:credit)";
}
if ("2".equals(invoiceType)) {
query += " ($workflowgroup:Sachrechnung)";
}
if ("3".equals(invoiceType)) {
query += " (($workflowgroup:Rechnungseingang) AND (payment.type:credit))";
}
if ("4".equals(invoiceType)) {
query += " ($workflowgroup:\"Gutschrift Abgleich\")";
}
}
// dbtr.number
if (cdtrNumber != null && !cdtrNumber.isEmpty()) {
cdtrNumber = cdtrNumber.trim().toUpperCase();

2
office-alexander-logistics-app/src/main/resources/imixs.properties
View file

@ -4,7 +4,7 @@
lucence.indexDir=${imixs-office.IndexDir}
index.fields=txtsearchstring,txtSubject,txtname,txtEmail,txtUserName,namCreator,txtworkflowgroup,txtworkflowstatus,txtWorkflowAbstract,txtWorkflowSummary,txtworkflowhistory,txtspacename,txtprocessname,_subject,_description,_name,_projectnumber,_projectname,_ordernumber,_contractnumber,datDueDate,txtcommentlog,htmldescription,htmldocumentation,dms,dms_names,invoice.number.stripped,_childitems,$file.names,_VENDOR_NAME,dbtr.number,cdtr.number
index.fields.analyze=txtUsername
index.fields.noanalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,$participants,namCreator,$ProcessID,datDate,txtWorkflowGroup,txtemail, datdate, datfrom, datto, numsequencenumber,dms_count,invoice.number,invoice.number.stripped,invoice.date,invoice.duedate,taxonomy.verteilung.stop,taxonomy.sachpruefung.stop,taxonomy.verteilung.start,taxonomy.sachpruefung.start,taxonomy.buchhaltung.start,taxonomy.buchhaltung.stop,dbtr.number,cdtr.number,payment.date,invoice.total,$lasteventdate
index.fields.noanalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,$participants,namCreator,$ProcessID,datDate,txtWorkflowGroup,txtemail, datdate, datfrom, datto, numsequencenumber,dms_count,invoice.number,invoice.number.stripped,invoice.date,invoice.duedate,taxonomy.verteilung.stop,taxonomy.sachpruefung.stop,taxonomy.verteilung.start,taxonomy.sachpruefung.start,taxonomy.buchhaltung.start,taxonomy.buchhaltung.stop,dbtr.number,cdtr.number,payment.date,invoice.total,$lasteventdate,payment.type
index.fields.store=process.name,txtProcessName,txtWorkflowImageURL,payment.date,invoice.number,invoice.date,invoice.duedate
index.fields.category=space.name,space.ref,taxonomy.verteilung.stop.by,taxonomy.sachpruefung.stop.by,taxonomy.buchhaltung.stop.by
office.search.noanalyze=invoice.number,invoice.number.stripped

2
office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/exchangerate.xhtml
View file

@ -3,7 +3,7 @@
xmlns:h="http://xmlns.jcp.org/jsf/html">
<ui:fragment rendered="#{!readonly}">
abd<h:inputText required="#{validationController.required}" value="#{workitem.item['invoice.exchangerate']}"
<h:inputText required="#{validationController.required}" value="#{workitem.item['invoice.exchangerate']}"
onchange="this.value=this.value.replace('.', ',');">
<f:convertNumber pattern="#0.00000" locale="de" />
</h:inputText>

30
office-alexander-logistics-app/src/main/webapp/pages/workitems/worklist_search_custom.xhtml
View file

@ -4,6 +4,7 @@
xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty" xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs">
<!-- *** Krieger Custom Search form *** -->
<hr style="border-width:5px" />
<div class="imixs-form-section-3">
<dl>
<dt>#{custom.invoiceamount}:</dt>
@ -51,7 +52,36 @@
</dd>
</dl>
<dl>
<dt>#{custom.invoicenumber}:</dt>
<dd>
<h:inputText value="#{searchController.searchFilter.item['invoice.number']}">
</h:inputText>
</dd>
</dl>
</div>
<div class="imixs-form-section">
<dl>
<dt>Rechnungsart:</dt>
<dd>
<h:selectOneRadio value="#{searchController.searchFilter.item['invoice.type']}">
<f:selectItem itemLabel="Alle" itemValue="0" />
<f:selectItem itemLabel="Cargo Rechnung" itemValue="1" />
<f:selectItem itemLabel="Sachrechnung" itemValue="2" />
<f:selectItem itemLabel="Gutschrift" itemValue="3" />
<f:selectItem itemLabel="Gutschrift Abgleich" itemValue="4" />
</h:selectOneRadio>
</dd>
</dl>
</div>
<hr style="border-width:5px" />
</ui:composition>