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

fix suche

Browse source
This commit is contained in:
Ralph Soika 2024-03-12 11:49:31 +01:00
parent 9599dbfe55
commit 8921a096a2
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -96,16 +96,25 @@ public class CustomSearchController implements Serializable {
// invoice.closingdate // invoice.closingdate
if (closingDate != null) { if (closingDate != null) {
query += " ($lasteventdate:" + CustomSearchController.getRangeMonth(closingDate) + ")"; query += " ($lasteventdate:" + CustomSearchController.getRangeMonth(closingDate) + ")";
} }
// dbtr.number // dbtr.number
if (cdtrNumber != null && !cdtrNumber.isEmpty()) { if (cdtrNumber != null && !cdtrNumber.isEmpty()) {
cdtrNumber = cdtrNumber.trim(); cdtrNumber = cdtrNumber.trim().toUpperCase();
if (!cdtrNumber.startsWith("K")) { if (!cdtrNumber.startsWith("K") && !cdtrNumber.startsWith("D")) {
cdtrNumber = "K" + cdtrNumber; query += " (cdtr.number:K" + cdtrNumber + " OR dbtr.number:" + cdtrNumber + ")";
} } else {
if (cdtrNumber.startsWith("K")) {
// suche nach Kreditor (Eingangsrechnung)
query += " (cdtr.number:" + cdtrNumber + ")"; query += " (cdtr.number:" + cdtrNumber + ")";
} else {
// suche nach Debitor (Ausgangsrechnung)
if (cdtrNumber.startsWith("D")) {
cdtrNumber = cdtrNumber.substring(1);
}
query += " (dbtr.number:" + cdtrNumber + ")";
}
}
} }
// Udpate query // Udpate query

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

@ -27,7 +27,7 @@ pos.net=Netto
pos.gross=Brutto pos.gross=Brutto
creditor_name=Kreditor creditor_name=Kreditor
creditor_number=Kreditornummer creditor_number=Kreditor- / Debitornummer
invoicenumber=Rechnungsnummer invoicenumber=Rechnungsnummer
invoicedate=Rechnungsdatum invoicedate=Rechnungsdatum
invoiceduedate=Fälligkeit invoiceduedate=Fälligkeit

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

@ -27,7 +27,7 @@ pos.net=Net
pos.gross=Gross pos.gross=Gross
creditor_name=Creditor creditor_name=Creditor
creditor_number=Creditor No. creditor_number=Creditor/Debitor No.
invoicenumber=Invoice No. invoicenumber=Invoice No.
invoicedate=Invoice Date invoicedate=Invoice Date
invoiceduedate=Due Date invoiceduedate=Due Date