From 3eecb7e90d55aff0e9cf072c28847e2c73e450ca Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Thu, 21 Nov 2024 14:36:24 +0100 Subject: [PATCH] multi currency - minor fixes --- .../AGLAnalyticExcelAdapterDebitor.java | 2 +- .../OPListExportAdapter.java | 43 +++--------------- templates/op-liste_template.xlsx | Bin 40200 -> 40202 bytes 3 files changed, 8 insertions(+), 37 deletions(-) diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapterDebitor.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapterDebitor.java index 9772745..2cd4b18 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapterDebitor.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticExcelAdapterDebitor.java @@ -194,7 +194,7 @@ public class AGLAnalyticExcelAdapterDebitor extends POIFindReplaceAdapter { col++; cell = labelRow.getCell(col); - cell.setCellValue("Saldo " + currency); + cell.setCellValue("Balance " + currency); col++; } } diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java index 6f187a6..3e23090 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java @@ -163,37 +163,6 @@ public class OPListExportAdapter extends POIFindReplaceAdapter { } logger.info("... completed!"); - // appendExcelTemplate(document, textblock, template, targetName); - - // logger.info("... loading poi configuration.."); - // // Process POI instructions - // // read the config - // ItemCollection poiConfig = workflowService.evalWorkflowResult(event, - // "poi-update", document, false); - // if (poiConfig == null || !poiConfig.hasItem("findreplace")) { - // throw new PluginException(POIFindReplaceAdapter.class.getSimpleName(), - // CONFIG_ERROR, - // "missing poi configuration"); - // } - // List replaceDevList = poiConfig.getItemValue("findreplace"); - // String eval = poiConfig.getItemValueString("eval"); - // try { - // logger.info("... update template with normal poi information.."); - // this.updateFileData(document.getFileData(targetName), document, - // replaceDevList, eval); - - // // now we add separate lines for each invoice.... - // logger.info("... insert invoices - filter=" + filter); - // document.setItemValue("space.currency1", currency1); - // document.setItemValue("space.currency2", currency2); - - // insertInvoiceRows(document, targetName, filter, currency1, currency2); - // } catch (PluginException | IOException | QueryException e) { - // throw new PluginException(OPListExportAdapter.class.getSimpleName(), - // InvoiceService.ERROR_CONFIG, - // "failed to update op-liste: " + e.getMessage()); - // } - // logger.info("... completed!"); return document; } @@ -319,7 +288,7 @@ public class OPListExportAdapter extends POIFindReplaceAdapter { // jetzt füge alle Rechnungen an. for (ItemCollection invoice : invoices) { - logger.fine("......add invoice " + invoice.getUniqueID()); + logger.info("......add invoice " + invoice.getUniqueID() + " -> Row=" + rowPos); // now create a new line.. XSSFRow row = sheet.createRow(rowPos); @@ -360,12 +329,14 @@ public class OPListExportAdapter extends POIFindReplaceAdapter { rowPos++; } // delete reference row 11 - // sheet.shiftRows(referenceRowPos, lastRow + totalRowCount, -3, true, true); - // sheet.shiftRows(rowPos, lastRow, -3, true, true); - + sheet.shiftRows(referenceRowPos, rowPos + 4, -1, true, true); + // delete last empty lines + sheet.shiftRows(rowPos + 0, rowPos + 1, -2, true, true); + // fix current row pos for totals + rowPos = rowPos - 2; // finally update the totals... int i = 0; - XSSFRow totalRow = sheet.getRow(rowPos + 1); + XSSFRow totalRow = sheet.getRow(rowPos); for (String cur : currencyList) { i++; Double totalSum = currencyTotalSum.get(cur); diff --git a/templates/op-liste_template.xlsx b/templates/op-liste_template.xlsx index 8f3b32917e9979bd2c51c628cd9fe15e520a5c61..573123aed824e754a18780ba2aa97873cb7e07d4 100644 GIT binary patch delta 4041 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 D?q^;6 delta 3993 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