diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerService.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerService.java index a56fe1a..2446ffd 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerService.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerService.java @@ -262,6 +262,7 @@ public class BusinessPartnerService { * @return */ public List findOutgoingInvoices(String _dbtrNumber) { + logger.info("search outgoing invoices...."); // Aus der dbtrNummer muss das führendde D entfernt werden String query = "(type:workitem) AND ($modelversion:rechnungsausgang-*)"; diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceService.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceService.java index 7b07f82..f311c9c 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceService.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceService.java @@ -118,7 +118,7 @@ public class InvoiceService { * @throws PluginException */ public String getCurrenciesOutMain() throws PluginException { - + logger.info("Load currency Configuration...."); // ermittle die Hauptwährungen ItemCollection configItemCollection = configService.loadConfiguration("AGL_CONFIGURATION"); List currencyList = configItemCollection.getItemValue("currency.out"); diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java index 7f9eec0..0a92fd9 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java @@ -51,6 +51,8 @@ public class OPListController implements Serializable { private String lastCurrencyFilter = null; private List invoiceList = null; + private String currenciesOutMain = null; + private List currenciesOut = null; @Inject protected WorkflowController workflowController; @@ -183,7 +185,7 @@ public class OPListController implements Serializable { /* * Mahnlauf ? * - * Bei einem Mahnlauf selektieren wir alle Rechnungne immer vor. Das ist eine + * Bei einem Mahnlauf selektieren wir alle Rechnungen immer vor. Das ist eine * Anforderung von AGL Der Benutzer kann dann einzelne Rechnungen wieder * abwählen. * @@ -289,6 +291,7 @@ public class OPListController implements Serializable { */ @SuppressWarnings("rawtypes") public void updateChildList(ItemCollection workitem) { + long l = System.currentTimeMillis(); double paymentTotal = 0; List mapInvoiceItems = new ArrayList(); logger.fine("Convert child items into Map..."); @@ -313,6 +316,9 @@ public class OPListController implements Serializable { workitem.replaceItemValue(ZahlungseingangService.ITEM_PAYMENT_DETAILS, mapInvoiceItems); // Update $workitemref workitem.setItemValue("$workitemref", selectionList); + + // logger.info("update child list completed in " + (System.currentTimeMillis() - + // l) + "ms"); } /** @@ -438,19 +444,26 @@ public class OPListController implements Serializable { } public List getCurrenciesOut() { - try { - return invoiceService.getCurrenciesOut(); - } catch (PluginException e) { - return new ArrayList(); + if (currenciesOut == null) { + try { + currenciesOut = invoiceService.getCurrenciesOut(); + } catch (PluginException e) { + currenciesOut = new ArrayList(); + } } + return currenciesOut; } public String getCurrenciesOutMain() { - try { - return invoiceService.getCurrenciesOutMain(); - } catch (PluginException e) { - return "undefined currency"; + if (currenciesOutMain == null) { + try { + currenciesOutMain = invoiceService.getCurrenciesOutMain(); + } catch (PluginException e) { + currenciesOutMain = "undefined currency"; + } } + + return currenciesOutMain; } } diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml index 790df6c..c470919 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml @@ -20,7 +20,6 @@ -
#{custom['oplist.invoicenumber']}