diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerController.java index bfed114..2adeb1b 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerController.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerController.java @@ -345,7 +345,9 @@ public class BusinessPartnerController implements Serializable { ItemCollection businessPartner = businessPartnerService.getBusinessPartnerByID(bpid); searchResult = null; if (businessPartner != null) { + workitem.setItemValue("partner.id", bpid); workitem.setItemValue("partner.ref", businessPartner.getUniqueID()); + workitem.setItemValue("partner.name", businessPartner.getItemValueString("partner.name")); // Eingangsrechnung if (InvoiceUtil.isCreditorInvoice(workitem)) { workitem.setItemValue("cdtr.number", diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/businesspartner_search.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/businesspartner_search.xhtml index 6bddacb..223e0c7 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/businesspartner_search.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/businesspartner_search.xhtml @@ -19,7 +19,6 @@ diff --git a/workflow/ams/rechnungseingang-ams-1.0.0.bpmn b/workflow/ams/rechnungseingang-ams-1.0.0.bpmn index c7534f3..c5c83c7 100644 --- a/workflow/ams/rechnungseingang-ams-1.0.0.bpmn +++ b/workflow/ams/rechnungseingang-ams-1.0.0.bpmn @@ -3232,7 +3232,7 @@ result.isValid=true; - + @@ -3874,6 +3874,9 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export']] + + + @@ -4291,392 +4294,395 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export']] + + + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + + + - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/workflow/analyse-debitor-de-1.0.0.bpmn b/workflow/deprecated/analyse-debitor-de-1.0.0.bpmn similarity index 100% rename from workflow/analyse-debitor-de-1.0.0.bpmn rename to workflow/deprecated/analyse-debitor-de-1.0.0.bpmn diff --git a/workflow/businesspartner-de-1.0.1.bpmn b/workflow/deprecated/businesspartner-de-1.0.1.bpmn similarity index 100% rename from workflow/businesspartner-de-1.0.1.bpmn rename to workflow/deprecated/businesspartner-de-1.0.1.bpmn diff --git a/workflow/businesspartner-en-1.0.0.bpmn b/workflow/deprecated/businesspartner-en-1.0.0.bpmn similarity index 100% rename from workflow/businesspartner-en-1.0.0.bpmn rename to workflow/deprecated/businesspartner-en-1.0.0.bpmn diff --git a/workflow/mahnlauf-de-1.0.4-mailplugin.bpmn b/workflow/deprecated/mahnlauf-de-1.0.4-mailplugin.bpmn similarity index 100% rename from workflow/mahnlauf-de-1.0.4-mailplugin.bpmn rename to workflow/deprecated/mahnlauf-de-1.0.4-mailplugin.bpmn diff --git a/workflow/mahnlauf-de-1.0.4.bpmn b/workflow/deprecated/mahnlauf-de-1.0.4.bpmn similarity index 100% rename from workflow/mahnlauf-de-1.0.4.bpmn rename to workflow/deprecated/mahnlauf-de-1.0.4.bpmn diff --git a/workflow/dwc/rechnungseingang-dwc-1.0.8.bpmn b/workflow/dwc/rechnungseingang-dwc-1.0.8.bpmn index 4b4b325..a013a38 100644 --- a/workflow/dwc/rechnungseingang-dwc-1.0.8.bpmn +++ b/workflow/dwc/rechnungseingang-dwc-1.0.8.bpmn @@ -3152,7 +3152,7 @@ if (workitem.getItemValueString('txtcomment')==='') { - + @@ -4528,6 +4528,9 @@ if (b>0 && (a!=b) ) { + + + @@ -4941,385 +4944,388 @@ if (b>0 && (a!=b) ) { + + + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + + + - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/workflow/pl/rechnungseingang-pl-1.0.9.bpmn b/workflow/pl/rechnungseingang-pl-1.0.9.bpmn index e865b91..a3c5484 100644 --- a/workflow/pl/rechnungseingang-pl-1.0.9.bpmn +++ b/workflow/pl/rechnungseingang-pl-1.0.9.bpmn @@ -3857,7 +3857,7 @@ result.isValid=true; - + @@ -4674,6 +4674,9 @@ result.isValid=true; + + + @@ -5202,550 +5205,552 @@ result.isValid=true; + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + + + - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/workflow/rechnungseingang-de-1.2.42.bpmn b/workflow/rechnungseingang-de-1.2.42.bpmn index a96f497..dcea89f 100644 --- a/workflow/rechnungseingang-de-1.2.42.bpmn +++ b/workflow/rechnungseingang-de-1.2.42.bpmn @@ -5540,7 +5540,10 @@ result.isValid=true; - + @@ -6826,6 +6829,9 @@ if ( ( workitem.get(refField) == null || ''==workitem.get(refField)[0]) ) { + + + invoice.total invoice.currency + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + + + - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/workflow/usa/rechnungseingang-usa-1.0.1.bpmn b/workflow/usa/rechnungseingang-usa-1.0.1.bpmn index 17771fe..6d43e0d 100644 --- a/workflow/usa/rechnungseingang-usa-1.0.1.bpmn +++ b/workflow/usa/rechnungseingang-usa-1.0.1.bpmn @@ -4101,7 +4101,7 @@ result.isValid=true; - + @@ -5234,6 +5234,9 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'invoice-export']]>< + + + @@ -5781,583 +5784,586 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'invoice-export']]>< + + + - + - + - + - + - + - + - + - + - + - + - + - + - + + + - - - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +