update gutschriften Workflow, Update Zahlugnsart Read Mode, Update pom

versions
This commit is contained in:
Ralph Soika 2022-04-20 14:03:33 +02:00
parent 3075e0532e
commit c814bd46e5
16 changed files with 12937 additions and 9 deletions

View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>office-alexander-logistics</artifactId> <artifactId>office-alexander-logistics</artifactId>
<groupId>com.alexander-logistics</groupId> <groupId>com.alexander-logistics</groupId>
<version>1.2.4</version> <version>1.2.5</version>
</parent> </parent>
<artifactId>office-alexander-logistics-app</artifactId> <artifactId>office-alexander-logistics-app</artifactId>
<packaging>war</packaging> <packaging>war</packaging>

View file

@ -4,7 +4,7 @@
lucence.indexDir=${imixs-office.IndexDir} 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 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.analyze=txtUsername
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.noanalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,$participants,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.store=process.name,txtProcessName,txtWorkflowImageURL
index.fields.category=space.name,space.ref,taxonomy.verteilung.stop.by,taxonomy.sachpruefung.stop.by,taxonomy.buchhaltung.stop.by 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 office.search.noanalyze=invoice.number,invoice.number.stripped

View file

@ -12,7 +12,8 @@
<c:if <c:if
test="#{fn:startsWith(workflowController.workitem.item['$modelversion'],'rechnungseingang')}"> test="#{fn:startsWith(workflowController.workitem.item['$modelversion'],'rechnungseingang')}">
<c:forEach items="#{sepaController.dbtrList}" var="dbtr"> <c:forEach items="#{sepaController.dbtrList}" var="dbtr">
<f:selectItem itemLabel="#{dbtr.item['name']}" itemValue="#{dbtr.item['name']}" /> <f:selectItem itemLabel="#{dbtr.item['name']}"
itemValue="#{dbtr.item['name']}" />
</c:forEach> </c:forEach>
<f:selectItem itemLabel="Manuelle Auslandszahlung" <f:selectItem itemLabel="Manuelle Auslandszahlung"
itemValue="no_sepa" /> itemValue="no_sepa" />
@ -23,8 +24,22 @@
</h:selectOneMenu> </h:selectOneMenu>
</ui:fragment> </ui:fragment>
<ui:fragment rendered="#{readonly}"> <ui:fragment rendered="#{readonly}">
<h:outputText required="true" value="#{workitem.item['payment.type']}">
</h:outputText> <c:choose>
<c:when test="#{workitem.item['payment.type'] eq 'no_sepa'}">
<h:outputText value="Manuelle Auslandszahlung" />
</c:when>
<c:when test="#{workitem.item['payment.type'] eq 'direct_debit'}">
<h:outputText value="Lastschrift" />
</c:when>
<c:when test="#{workitem.item['payment.type'] eq 'credit'}">
<h:outputText value="Gutschrift" />
</c:when>
<c:otherwise>
<h:outputText value="#{workitem.item['payment.type']}" />
</c:otherwise>
</c:choose>
</ui:fragment> </ui:fragment>
</ui:composition> </ui:composition>

View file

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.alexander-logistics</groupId> <groupId>com.alexander-logistics</groupId>
<artifactId>office-alexander-logistics</artifactId> <artifactId>office-alexander-logistics</artifactId>
<version>1.2.4</version> <version>1.2.5</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Imixs Office Workflow - Custom Build</name> <name>Imixs Office Workflow - Custom Build</name>
@ -25,9 +25,9 @@
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format> <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
<!-- Versions --> <!-- Versions -->
<org.imixs.workflow.version>5.2.15-SNAPSHOT</org.imixs.workflow.version> <org.imixs.workflow.version>5.2.15</org.imixs.workflow.version>
<org.imixs.marty.version>4.2.1-SNAPSHOT</org.imixs.marty.version> <org.imixs.marty.version>4.2.2</org.imixs.marty.version>
<org.imixs.office.version>4.5.1-SNAPSHOT</org.imixs.office.version> <org.imixs.office.version>4.5.2</org.imixs.office.version>
<org.imixs.adapters.version>2.3.1-SNAPSHOT</org.imixs.adapters.version> <org.imixs.adapters.version>2.3.1-SNAPSHOT</org.imixs.adapters.version>
<org.imixs.archive.version>2.2.14-SNAPSHOT</org.imixs.archive.version> <org.imixs.archive.version>2.2.14-SNAPSHOT</org.imixs.archive.version>
<org.imixs.melman.version>1.0.20</org.imixs.melman.version> <org.imixs.melman.version>1.0.20</org.imixs.melman.version>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff