kreditor search
This commit is contained in:
parent
c91e14de0d
commit
64fe94c261
5 changed files with 14652 additions and 91 deletions
|
|
@ -1,6 +1,10 @@
|
|||
# Versionen
|
||||
|
||||
### 1.2.16 (Development)
|
||||
### 1.2.17 (Development)
|
||||
|
||||
- neue Archive suche
|
||||
|
||||
### 1.2.16
|
||||
|
||||
- Upgrade Imixs-Archive auf 2.4.2 - verbesserter IMAP Import
|
||||
- Upgarde Imixs-Adapters 2.3.3-SNAPSHOT
|
||||
|
|
@ -16,8 +20,7 @@
|
|||
|
||||
**Achtung**: Kubernetes Deploymets müssen angepasst werden (siehe AGL Polen)
|
||||
|
||||
### 1.2.15 (Development)
|
||||
|
||||
### 1.2.15
|
||||
- kleinere Layout Anpassungen in den Formualren und input Feldern (Positionstabelle, Sachbearbeiter Auswahl...)
|
||||
- invoice.exchangerate Input ersetzt nun , durch . damit der Wert richtig gespeichert wird.
|
||||
- Fix Cargosoft DATEV Import - Korektur des Rechnungsdatums / Jahr
|
||||
|
|
|
|||
|
|
@ -1,11 +1,7 @@
|
|||
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:f="http://xmlns.jcp.org/jsf/core"
|
||||
xmlns:h="http://xmlns.jcp.org/jsf/html"
|
||||
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
|
||||
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
|
||||
xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
|
||||
xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty"
|
||||
xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs">
|
||||
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
|
||||
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
|
||||
xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
|
||||
xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty" xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs">
|
||||
|
||||
<!-- Cargosoft Search integration
|
||||
|
||||
|
|
@ -21,82 +17,85 @@
|
|||
https://dzone.com/articles/execute-a-jsf-ajax-request-by-just-a-function-call
|
||||
https://www.w3schools.com/howto/howto_js_autocomplete.asp
|
||||
-->
|
||||
<h:commandScript name="cargosoftCdtrSearch" action="#{cargosoftController.searchCreditor(searchmode)}"
|
||||
render="autocomplete-resultlist-cargosoft" onevent="autocompleteShowResult" />
|
||||
<h:commandScript name="cargosoftCdtrSearch" action="#{cargosoftController.searchCreditor(searchmode)}"
|
||||
render="autocomplete-resultlist-cargosoft" onevent="autocompleteShowResult" />
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
/*<![CDATA[*/
|
||||
|
||||
// init ml input fields...
|
||||
$(document).ready(function() {
|
||||
// init ml input fields...
|
||||
$(document).ready(function () {
|
||||
|
||||
// add autocomplete feature to cdtr.number...
|
||||
var creditorField= $("input[data-item='cdtr.number']");
|
||||
$(creditorField).each(function() {
|
||||
$(this).addClass("imixs-ml");
|
||||
autocompleteInitInput(this,cargosoftCdtrSearch,'autocomplete-resultlist-cargosoft',selectCdtrCallback);
|
||||
});
|
||||
// add cargsoft label if available
|
||||
var cdtrName="#{workflowController.workitem.item['cdtr.name.cargosoft']}";
|
||||
var inputElement=$("input[data-item='cdtr.number']");
|
||||
//inputElement.after( "<span id='cdtr-name-id' class='small'>" + cdtrName + "</p>" );
|
||||
// add autocomplete feature to cdtr.number...
|
||||
var creditorField = $("input[data-item='cdtr.number']");
|
||||
$(creditorField).each(function () {
|
||||
$(this).addClass("imixs-ml");
|
||||
autocompleteInitInput(this, cargosoftCdtrSearch, 'autocomplete-resultlist-cargosoft', selectCdtrCallback);
|
||||
});
|
||||
|
||||
// Hier bekommen wir die JSON Struktur mit allen daten.
|
||||
// diese Daten werden auf die einzelnen Felder verteilt.
|
||||
function selectCdtrCallback(selection) {
|
||||
// add cargsoft label if available
|
||||
// see cdtreingabe.xhtml !!
|
||||
// var cdtrName = "#{workflowController.workitem.item['cdtr.name.cargosoft']}";
|
||||
// var inputElement = $("input[data-item='cdtr.number']");
|
||||
// inputElement.after("<span id='cdtr-name-id' class='small'>" + cdtrName + "</p>");
|
||||
|
||||
const cdtrData = JSON.parse(selection);
|
||||
});
|
||||
|
||||
// fill data into the fields....
|
||||
var inputElement=$("input[data-item='cdtr.number']");
|
||||
inputElement.val(cdtrData.no);
|
||||
// remove old cdtr.name
|
||||
$('#cdtr-name-id').remove();
|
||||
// append span with cdtr.name....
|
||||
inputElement.after( "<span id='cdtr-name-id' class='small'>" + cdtrData.name + "</p>" );
|
||||
// Hier bekommen wir die JSON Struktur mit allen daten.
|
||||
// diese Daten werden auf die einzelnen Felder verteilt.
|
||||
function selectCdtrCallback(selection) {
|
||||
|
||||
var inputElementZahlungsziel=$("input[data-item='cdtr.creditperiod']");
|
||||
var inputElementZahlungszielCdtr=$("input[id$='cdtr_creditperiod']");
|
||||
var inputElementInvoiceDate=$("input[id$='date_invoice']");
|
||||
var inputElementMail=$("input[data-item='cdtr.mail'],textarea[data-item='cdtr.mail']");
|
||||
var inputElementIban=$("input[data-item='cdtr.iban']");
|
||||
var inputElementBic=$("input[data-item='cdtr.bic']");
|
||||
if (inputElementZahlungszielCdtr) {
|
||||
inputElementZahlungszielCdtr.val(cdtrData.creditperiod);
|
||||
}
|
||||
// nur wenn ein Rechnugnsdatum eingegeben wurde
|
||||
if (inputElementInvoiceDate && inputElementInvoiceDate.val()!='' && inputElementZahlungsziel && cdtrData.creditperiod!='') {
|
||||
inputElementZahlungsziel.val(cdtrData.creditperiod);
|
||||
inputElementZahlungsziel.change();
|
||||
//$('.alexander-logistic-date').focus().select();
|
||||
$("input[data-item='invoice.number']").focus().select();
|
||||
const cdtrData = JSON.parse(selection);
|
||||
|
||||
}
|
||||
// update iban/bic
|
||||
if (inputElementIban) {
|
||||
inputElementIban.val(cdtrData.iban);
|
||||
}
|
||||
if (inputElementBic) {
|
||||
inputElementBic.val(cdtrData.bic);
|
||||
}
|
||||
if (inputElementMail) {
|
||||
inputElementMail.val(cdtrData.mail);
|
||||
}
|
||||
// fill data into the fields....
|
||||
var inputElement = $("input[data-item='cdtr.number']");
|
||||
inputElement.val(cdtrData.no);
|
||||
// remove old cdtr.name
|
||||
$('#cdtr-name-id').remove();
|
||||
// append span with cdtr.name....
|
||||
inputElement.after("<span id='cdtr-name-id' class='small'>" + cdtrData.name + "</p>");
|
||||
|
||||
// update all possible data fields von kredorenverwaltung
|
||||
if ($("input[data-item='cdtr.iban']")) {
|
||||
$("input[data-item='cdtr.iban2']").val(cdtrData.iban2);
|
||||
$("input[data-item='cdtr.bic2']").val(cdtrData.bic2);
|
||||
$("input[data-item='cdtr.iban3']").val(cdtrData.iban3);
|
||||
$("input[data-item='cdtr.bic3']").val(cdtrData.bic3);
|
||||
$("input[data-item='cdtr.iban4']").val(cdtrData.iban4);
|
||||
$("input[data-item='cdtr.bic4']").val(cdtrData.bic4);
|
||||
}
|
||||
var inputElementZahlungsziel = $("input[data-item='cdtr.creditperiod']");
|
||||
var inputElementZahlungszielCdtr = $("input[id$='cdtr_creditperiod']");
|
||||
var inputElementInvoiceDate = $("input[id$='date_invoice']");
|
||||
var inputElementMail = $("input[data-item='cdtr.mail'],textarea[data-item='cdtr.mail']");
|
||||
var inputElementIban = $("input[data-item='cdtr.iban']");
|
||||
var inputElementBic = $("input[data-item='cdtr.bic']");
|
||||
if (inputElementZahlungszielCdtr) {
|
||||
inputElementZahlungszielCdtr.val(cdtrData.creditperiod);
|
||||
}
|
||||
// nur wenn ein Rechnugnsdatum eingegeben wurde
|
||||
if (inputElementInvoiceDate && inputElementInvoiceDate.val() != '' && inputElementZahlungsziel && cdtrData.creditperiod != '') {
|
||||
inputElementZahlungsziel.val(cdtrData.creditperiod);
|
||||
inputElementZahlungsziel.change();
|
||||
//$('.alexander-logistic-date').focus().select();
|
||||
$("input[data-item='invoice.number']").focus().select();
|
||||
|
||||
}
|
||||
// update iban/bic
|
||||
if (inputElementIban) {
|
||||
inputElementIban.val(cdtrData.iban);
|
||||
}
|
||||
if (inputElementBic) {
|
||||
inputElementBic.val(cdtrData.bic);
|
||||
}
|
||||
if (inputElementMail) {
|
||||
inputElementMail.val(cdtrData.mail);
|
||||
}
|
||||
|
||||
// update all possible data fields von kredorenverwaltung
|
||||
if ($("input[data-item='cdtr.iban']")) {
|
||||
$("input[data-item='cdtr.iban2']").val(cdtrData.iban2);
|
||||
$("input[data-item='cdtr.bic2']").val(cdtrData.bic2);
|
||||
$("input[data-item='cdtr.iban3']").val(cdtrData.iban3);
|
||||
$("input[data-item='cdtr.bic3']").val(cdtrData.bic3);
|
||||
$("input[data-item='cdtr.iban4']").val(cdtrData.iban4);
|
||||
$("input[data-item='cdtr.bic4']").val(cdtrData.bic4);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/*]]>*/
|
||||
</script>
|
||||
|
|
@ -110,12 +109,10 @@
|
|||
<ui:repeat var="suggest" value="#{cargosoftController.searchResult}">
|
||||
<div class="autocomplete-resultlist-element" onclick="autocompleteSelectElement('#{suggest.data}')">
|
||||
<a href="#">
|
||||
<h:outputText value="#{suggest.display}" escape="false"/>
|
||||
<h:outputText value="#{suggest.display}" escape="false" />
|
||||
</a>
|
||||
</div>
|
||||
</ui:repeat>
|
||||
</h:panelGroup>
|
||||
|
||||
</ui:composition>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
|
||||
xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
|
||||
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
|
||||
xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty">
|
||||
|
||||
|
||||
<!-- Dieses Part zeigt unter dem Eingabefeld einfach nur den cdtr.name.cargosoft an -->
|
||||
|
||||
<h:inputText value="#{workitem.item[item.name]}" pt:data-item="#{item.name}"
|
||||
required="#{item.required?validationController.required:false}" rendered="#{!item.readonly}"
|
||||
disabled="#{item.disabled}" />
|
||||
<h:outputText value="#{workitem.item[item.name]}" rendered="#{item.readonly}" />
|
||||
|
||||
<!-- anzeige cargosoft name -->
|
||||
<h:outputText styleClass="small" value="#{workflowController.workitem.item['cdtr.name.cargosoft']}"
|
||||
style="#{item.readonly?'margin-left:0.9em':''}">
|
||||
</h:outputText>
|
||||
|
||||
</ui:composition>
|
||||
8284
workflow/rechnungseingang-de-1.2.36.bpmn
Normal file
8284
workflow/rechnungseingang-de-1.2.36.bpmn
Normal file
File diff suppressed because it is too large
Load diff
6258
workflow/rechnungseingang-pl-1.0.2.bpmn
Normal file
6258
workflow/rechnungseingang-pl-1.0.2.bpmn
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue