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

update

Browse source
This commit is contained in:
Ralph Soika 2020-11-25 16:00:12 +01:00
parent 6f73b67a6f
commit 4330652eba
2 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_responsible.xhtml
View file

@ -36,9 +36,9 @@
<dd>
<ui:param name="space"
value="#{teamController.getSpaceById(workitem.item['space.ref'])}"></ui:param>
<h:selectOneMenu required="true" style="width:20em;"
<h:selectOneMenu required="false" style="width:20em;"
value="#{workflowController.workitem.item['team']}">
<f:selectItem itemLabel=""></f:selectItem>
<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<c:forEach var="teammember" items="#{space.itemList['space.team']}">

45
workflow/rechnungseingang-de-1.0.1.bpmn
View file

@ -401,6 +401,18 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>false</imixs:value>
</imixs:item>
<imixs:item name="txtbusinessrule" type="CDATA">
<imixs:value><![CDATA[var result={};
result.isValid=true;
var a=workitem.get("invoice.total")[0];
var b= workitem.get("order.total")[0];
if ( b>0 && (parseFloat(a)!=parseFloat(b)) ) {
result.isValid=false;
result.errorMessage="Der Rechnungsbetrag " + a+ " stimmt nicht mit dem Positionsbetrag " + b + " überein.";
}]]></imixs:value>
</imixs:item>
</bpmn2:extensionElements>
<bpmn2:documentation id="Documentation_23"><![CDATA[Rechnung geprüft, weiterleiten an Buchhaltung.]]></bpmn2:documentation>
<bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
@ -564,7 +576,7 @@ result.isValid=true;
<bpmn2:task id="Task_2" imixs:processid="5000" name="Erfassung">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic#alexander/sub_responsible]]></imixs:value>
<imixs:value><![CDATA[alexander/form_basic#sub_dispatch]]></imixs:value>
</imixs:item>
<imixs:item name="txtworkflowabstract" type="xs:string">
<imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>]]></imixs:value>
@ -608,21 +620,22 @@ result.isValid=true;
<imixs-form-section columns="1" label="Rechnungsdaten">
<item name="cdtr.name" type="text" label="Kreditor:" />
</imixs-form-section>
<imixs-form-section columns="2">
<imixs-form-section columns="3">
<item name="invoice.number" type="text" label="Rechnungsnummer:" />
<item name="invoice.date" type="date" label="Rechnungsdatum:" />
<item name="invoice.total" type="currency" label="Rechnungsbetrag:" />
<item name="invoice.duedate" type="date" required="true" label="Fälligkeitsdatum:" />
</imixs-form-section>
<imixs-form-section columns="2">
<item name="invoice.total" type="currency" required="true" label="Rechnungsbetrag:" />
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;USD" label="Währung:" />
<item name="cdtr.iban" type="text" label="IBAN:" />
<item name="cdtr.bic" type="text" label="BIC:" />
<item name="payment.type" type="selectOneMenu" required="true" options="SEPA|sepa_transfer;Bankeinzug / Kreditkarte|direct_debit" label="Zahlungsart:" />
</imixs-form-section>
<imixs-form-section columns="3" label="Sonstige Daten">
<item name="positionsnummer" type="textarea" label="Positionsnummer:" />
<item name="invoice.duedate" type="date" label="Fälligkeitsdatum:" />
<item name="invoice.postingdate" type="date" label="Bezahldatum:" />
</imixs-form-section>
</imixs-form>]]></bpmn2:documentation>
<bpmn2:dataState id="DataState_1"/>
</bpmn2:dataObject>
@ -1399,7 +1412,7 @@ result.isValid=true;
<bpmn2:task id="Task_1" imixs:processid="5100" name="Verteilung zur Prüfung">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic#alexander/sub_responsible]]></imixs:value>
<imixs:value><![CDATA[alexander/form_basic_read#alexander/sub_responsible]]></imixs:value>
</imixs:item>
<imixs:item name="txtworkflowabstract" type="xs:string">
<imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>]]></imixs:value>
@ -1506,7 +1519,7 @@ result.isValid=true;
<bpmn2:outgoing>SequenceFlow_26</bpmn2:outgoing>
</bpmn2:intermediateCatchEvent>
<bpmn2:sequenceFlow id="SequenceFlow_26" sourceRef="IntermediateCatchEvent_9" targetRef="Task_1"/>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_10" imixs:activityid="110" name="Verteilen">
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_10" imixs:activityid="20" name="Verteilen">
<bpmn2:extensionElements>
<imixs:item name="keylogtimeformat" type="xs:string">
<imixs:value><![CDATA[2]]></imixs:value>
@ -1573,6 +1586,16 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>false</imixs:value>
</imixs:item>
<imixs:item name="txtbusinessrule" type="CDATA">
<imixs:value><![CDATA[var result={};
var refField="team";
result.isValid=true;
if ( ( workitem.get(refField) == null || '-'==workitem.get(refField)[0]) ) {
result.isValid=false;
result.errorMessage='Bitte wählen Sie eine(n) Verantwortliche(n) aus.';
}]]></imixs:value>
</imixs:item>
</bpmn2:extensionElements>
<bpmn2:documentation id="Documentation_40"><![CDATA[Rechnung weiterleiten an Sachbearbeiter.]]></bpmn2:documentation>
<bpmn2:incoming>SequenceFlow_28</bpmn2:incoming>
@ -1580,7 +1603,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
</bpmn2:intermediateCatchEvent>
<bpmn2:sequenceFlow id="SequenceFlow_28" sourceRef="Task_1" targetRef="IntermediateCatchEvent_10"/>
<bpmn2:sequenceFlow id="SequenceFlow_34" sourceRef="IntermediateCatchEvent_10" targetRef="Task_5005"/>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_11" imixs:activityid="30" name="Ablehnen">
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_11" imixs:activityid="90" name="Ablehnen">
<bpmn2:extensionElements>
<imixs:item name="keylogtimeformat" type="xs:string">
<imixs:value><![CDATA[2]]></imixs:value>