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

update modelle

Browse source
This commit is contained in:
Ralph Soika 2021-03-18 15:54:40 +01:00
parent 9dfa89b92d
commit ce59adaa03
4 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoicePlugin.java
View file

@ -53,8 +53,19 @@ public class InvoicePlugin extends AbstractPlugin {
*
**/
@Override
public ItemCollection run(ItemCollection workitem, ItemCollection documentActivity) throws PluginException {
public ItemCollection run(ItemCollection workitem, ItemCollection event) throws PluginException {
// skip if validaten tag is required=false
ItemCollection evalItemCollection = this.getWorkflowService().evalWorkflowResult(event, "validation", workitem);
if (evalItemCollection != null) {
// evaluate the validation rules...
if ("false".equalsIgnoreCase(evalItemCollection.getItemValueString("required"))) {
return workitem;
}
}
// Payment.type muss immer eingetragne werden!
if (workitem.getTaskID() >= TASK_ERFASSUNG && workitem.getEventID()<900) {
if (workitem.getItemValueString("payment.type").trim().isEmpty()) {

2
workflow/gutschriftabgleich-de-1.0.2.bpmn
View file

@ -594,7 +594,7 @@ result.isValid=true;
<imixs:value>true</imixs:value>
</imixs:item>
<imixs:item name="keyownershipfields" type="xs:string">
<imixs:value><![CDATA[process.team]]></imixs:value>
<imixs:value><![CDATA[$editor]]></imixs:value>
</imixs:item>
<imixs:item name="keyaddwritefields" type="xs:string">
<imixs:value><![CDATA[process.manager]]></imixs:value>

8
workflow/rechnungseingang-de-1.1.0.bpmn
View file

@ -2700,7 +2700,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<imixs:value><![CDATA[0]]></imixs:value>
</imixs:item>
<imixs:item name="rtfresultlog" type="xs:string">
<imixs:value><![CDATA[Gutschrift - Abgleich für Ausgangsrechnung.]]></imixs:value>
<imixs:value><![CDATA[Zur Bearbeitung übernommen - Gutschrift - Abgleich für Ausgangsrechnung.]]></imixs:value>
</imixs:item>
<imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>false</imixs:value>
@ -2709,7 +2709,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<imixs:value><![CDATA[]]></imixs:value>
</imixs:item>
</bpmn2:extensionElements>
<bpmn2:documentation id="Documentation_44"><![CDATA[Gutschrift für Ausgangsrechnung]]></bpmn2:documentation>
<bpmn2:documentation id="Documentation_44"><![CDATA[Zur Bearbeitung als Gutschriftsabgleich übernehmen]]></bpmn2:documentation>
<bpmn2:incoming>SequenceFlow_65</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_69</bpmn2:outgoing>
<bpmn2:linkEventDefinition id="LinkEventDefinition_2" name="Link Event Definition 2"/>
@ -3156,7 +3156,7 @@ Betrag: <itemvalue>invoice.total</itemvalue> <itemvalue>invoice.currency</itemva
<imixs:value><![CDATA[0]]></imixs:value>
</imixs:item>
<imixs:item name="rtfresultlog" type="xs:string">
<imixs:value><![CDATA[Sachrechnung - Freigabe für Verwaltung.]]></imixs:value>
<imixs:value><![CDATA[Zur Bearbeitung übernommen - Sachrechnung .]]></imixs:value>
</imixs:item>
<imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>false</imixs:value>
@ -3165,7 +3165,7 @@ Betrag: <itemvalue>invoice.total</itemvalue> <itemvalue>invoice.currency</itemva
<imixs:value><![CDATA[]]></imixs:value>
</imixs:item>
</bpmn2:extensionElements>
<bpmn2:documentation id="Documentation_56"><![CDATA[Sachrechnung für Verwaltung]]></bpmn2:documentation>
<bpmn2:documentation id="Documentation_56"><![CDATA[Zur Bearbeitung als Sachrechnung übernehmen]]></bpmn2:documentation>
<bpmn2:incoming>SequenceFlow_71</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_64</bpmn2:outgoing>
<bpmn2:linkEventDefinition id="LinkEventDefinition_6" name="Link Event Definition 2"/>

2
workflow/rechnungseingang-sachrechnung-de-1.0.0.bpmn
View file

@ -397,7 +397,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<imixs:value>true</imixs:value>
</imixs:item>
<imixs:item name="keyownershipfields" type="xs:string">
<imixs:value><![CDATA[process.team]]></imixs:value>
<imixs:value><![CDATA[$editor]]></imixs:value>
</imixs:item>
<imixs:item name="keyaddwritefields" type="xs:string">
<imixs:value><![CDATA[process.manager]]></imixs:value>