From 0f648abf5a26ce21e3be192394bb7ac0e0fae553 Mon Sep 17 00:00:00 2001
From: Ralph Soika <ralph.soika@imixs.com>
Date: Mon, 11 Apr 2022 17:04:00 +0200
Subject: [PATCH] =?UTF-8?q?pr=C3=BCfung=20doppelete=20Rechnugnsnummer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 office-alexander-logistics-app/pom.xml                    | 2 +-
 .../main/java/com/alexanderlogistics/InvoicePlugin.java   | 8 ++++++--
 .../src/main/resources/imixs.properties                   | 6 +++---
 pom.xml                                                   | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/office-alexander-logistics-app/pom.xml b/office-alexander-logistics-app/pom.xml
index 2b02130..120affc 100644
--- a/office-alexander-logistics-app/pom.xml
+++ b/office-alexander-logistics-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>office-alexander-logistics</artifactId>
 		<groupId>com.alexander-logistics</groupId>
-		<version>1.2.3</version>
+		<version>1.2.4</version>
 	</parent>
 	<artifactId>office-alexander-logistics-app</artifactId>
 	<packaging>war</packaging>
diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoicePlugin.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoicePlugin.java
index b41ce2f..921c280 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoicePlugin.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoicePlugin.java
@@ -281,6 +281,9 @@ public class InvoicePlugin extends AbstractPlugin {
     private void validateInvoiceNumber(ItemCollection workitem) throws PluginException {
 
         String invoiceNumber = workitem.getItemValueString("invoice.number");
+        // strip
+        String invoiceNumberStripped=invoiceNumber.replace(" ","");
+        workitem.setItemValue("invoice.number.stripped", invoiceNumberStripped);
         String invoiceNumberDuplicate = workitem.getItemValueString("invoice.number.duplicate");
 
         // wenn keine Rechnungsnummer eingegeben wurde gehts weiter!
@@ -289,8 +292,9 @@ public class InvoicePlugin extends AbstractPlugin {
         }
 
         // rechnungseingang only workitems...
-        String query = "(type:workitem OR type:workitemarchive) AND ($modelversion:rechnungseingang*) AND NOT ($uniqueid:\""
-                + workitem.getUniqueID() + "\") AND (invoice.number:\"" + invoiceNumber + "\")";
+        // Change 11.4.22 - we have now an additional field: invoice.number.stripped
+        String query  = "(type:workitem OR type:workitemarchive) AND ($modelversion:rechnungseingang*) AND NOT ($uniqueid:\""
+                    + workitem.getUniqueID() + "\") AND ((invoice.number:\"" + invoiceNumberStripped + "\") OR (invoice.number.stripped:\"" + invoiceNumberStripped + "\"))";
         try {
             int result = this.getWorkflowService().getDocumentService().count(query, 1);
             if (result > 0) {
diff --git a/office-alexander-logistics-app/src/main/resources/imixs.properties b/office-alexander-logistics-app/src/main/resources/imixs.properties
index b6ba1ca..3022e46 100644
--- a/office-alexander-logistics-app/src/main/resources/imixs.properties
+++ b/office-alexander-logistics-app/src/main/resources/imixs.properties
@@ -2,12 +2,12 @@
 # Imixs Lucene Plugin 
 ##############################
 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,_childitems,$file.names,_VENDOR_NAME
+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
 index.fields.analyze=txtUsername
-index.fields.noanalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,namCreator,$ProcessID,datDate,txtWorkflowGroup,txtemail, datdate, datfrom, datto, numsequencenumber,dms_count,invoice.number,invoice.duedate,taxonomy.verteilung.stop,taxonomy.sachpruefung.stop,taxonomy.verteilung.start,taxonomy.sachpruefung.start,taxonomy.buchhaltung.start,taxonomy.buchhaltung.stop
+index.fields.noanalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,namCreator,$ProcessID,datDate,txtWorkflowGroup,txtemail, datdate, datfrom, datto, numsequencenumber,dms_count,invoice.number,invoice.number.stripped,invoice.duedate,taxonomy.verteilung.stop,taxonomy.sachpruefung.stop,taxonomy.verteilung.start,taxonomy.sachpruefung.start,taxonomy.buchhaltung.start,taxonomy.buchhaltung.stop
 index.fields.store=process.name,txtProcessName,txtWorkflowImageURL
 index.fields.category=space.name,space.ref,taxonomy.verteilung.stop.by,taxonomy.sachpruefung.stop.by,taxonomy.buchhaltung.stop.by
-office.search.noanalyze=invoice.number
+office.search.noanalyze=invoice.number,invoice.number.stripped
 
 ##############################
 # Marty Setup
diff --git a/pom.xml b/pom.xml
index 5366739..e00c39a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.alexander-logistics</groupId>
 	<artifactId>office-alexander-logistics</artifactId>
-	<version>1.2.3</version>
+	<version>1.2.4</version>
 	<packaging>pom</packaging>
 	<name>Imixs Office Workflow - Custom Build</name>