This commit is contained in:
Ralph Soika 2024-06-06 22:15:43 +02:00
parent 8285b6ee70
commit 86077361be
4 changed files with 15 additions and 11 deletions

View file

@ -1,7 +1,11 @@
# Versionen # Versionen
### 1.2.19 (Development) ### 1.2.20 (Development)
- Optimierung OP-Liste nach KW
### 1.2.19
- Neue XML Invoice Schnittstelle - Neue XML Invoice Schnittstelle
- Mahnwesen englisch - Mahnwesen englisch

View file

@ -340,7 +340,7 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter {
for (String week : sortedWeekList) { for (String week : sortedWeekList) {
// now create a new line.. // now create a new line..
rowPos++; rowPos++;
logger.info("--> Zeile " + rowPos + " Week=" + week); logger.fine("--> Zeile " + rowPos + " Week=" + week);
XSSFRow row = sheet.createRow(rowPos); XSSFRow row = sheet.createRow(rowPos);
if (week.equals(currentWeekCategory)) { if (week.equals(currentWeekCategory)) {
@ -361,11 +361,11 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter {
for (String name : spaceNames) { for (String name : spaceNames) {
String key = name + "/" + week; String key = name + "/" + week;
logger.info("search WeekInvoiceData for " + key); logger.fine("search WeekInvoiceData for " + key);
// list of invoices // list of invoices
WeekInvoiceData weekData = weekDataMap.get(key); WeekInvoiceData weekData = weekDataMap.get(key);
if (weekData != null) { if (weekData != null) {
logger.info(" EUR=" + weekData.totalEUR + " USD=" + weekData.totalUSD); logger.fine(" EUR=" + weekData.totalEUR + " USD=" + weekData.totalUSD);
row.getCell(column).setCellValue(weekData.totalEUR); row.getCell(column).setCellValue(weekData.totalEUR);
column++; column++;
row.getCell(column).setCellValue(weekData.totalUSD); row.getCell(column).setCellValue(weekData.totalUSD);
@ -392,7 +392,7 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter {
kwTotalUSD = kwTotalUSD + weekData.totalUSD; kwTotalUSD = kwTotalUSD + weekData.totalUSD;
column++; column++;
} else { } else {
logger.info("...... NOT FOUND"); logger.fine("...... NOT FOUND");
// skip columns // skip columns
column = column + 2; column = column + 2;
} }
@ -441,7 +441,7 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter {
} }
// delete reference rows // delete reference rows
logger.info("..shift 12 to " + rowPos); logger.finest("..shift 12 to " + rowPos);
sheet.shiftRows(12, rowPos, -1, true, true); sheet.shiftRows(12, rowPos, -1, true, true);
sheet.shiftRows(rowPos + 2, rowPos + 6, -3, true, true); sheet.shiftRows(rowPos + 2, rowPos + 6, -3, true, true);
@ -595,7 +595,7 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter {
"$modelversion:rechnungsausgang-* AND type:workitem AND $uniqueidref:" + spaceID, 9999, 0, "$modelversion:rechnungsausgang-* AND type:workitem AND $uniqueidref:" + spaceID, 9999, 0,
"invoice.number", false); "invoice.number", false);
logger.info(" found " + invoices.size() + " for space " + spaceName); logger.fine(" found " + invoices.size() + " for space " + spaceName);
for (ItemCollection invoice : invoices) { for (ItemCollection invoice : invoices) {
// compute Week // compute Week
Date dueDate = invoice.getItemValueDate("invoice.duedate"); Date dueDate = invoice.getItemValueDate("invoice.duedate");

View file

@ -6,7 +6,7 @@
<CstmrCdtTrfInitn> <CstmrCdtTrfInitn>
<GrpHdr> <GrpHdr>
<MsgId>bf073e72asdf512c4d60af7740872036</MsgId> <MsgId>bf073e72asdf512c4d60af7740872036</MsgId>
<CreDtTm>2024-06-05T15:50:07</CreDtTm> <CreDtTm>2024-06-06T22:12:54</CreDtTm>
<NbOfTxs>3</NbOfTxs> <NbOfTxs>3</NbOfTxs>
<CtrlSum>655.90</CtrlSum> <CtrlSum>655.90</CtrlSum>
<InitgPty> <InitgPty>
@ -23,7 +23,7 @@
<Cd>SEPA</Cd> <Cd>SEPA</Cd>
</SvcLvl> </SvcLvl>
</PmtTpInf> </PmtTpInf>
<ReqdExctnDt>2024-06-05</ReqdExctnDt> <ReqdExctnDt>2024-06-06</ReqdExctnDt>
<Dbtr> <Dbtr>
<Nm>Targo Bank</Nm> <Nm>Targo Bank</Nm>
</Dbtr> </Dbtr>

View file

@ -6,7 +6,7 @@
<CstmrCdtTrfInitn> <CstmrCdtTrfInitn>
<GrpHdr> <GrpHdr>
<MsgId>bf073e72asdf512c4d60af7740872036</MsgId> <MsgId>bf073e72asdf512c4d60af7740872036</MsgId>
<CreDtTm>2024-06-05T15:50:07</CreDtTm> <CreDtTm>2024-06-06T22:12:54</CreDtTm>
<NbOfTxs>3</NbOfTxs> <NbOfTxs>3</NbOfTxs>
<CtrlSum>655.90</CtrlSum> <CtrlSum>655.90</CtrlSum>
<InitgPty> <InitgPty>
@ -23,7 +23,7 @@
<Cd>SEPA</Cd> <Cd>SEPA</Cd>
</SvcLvl> </SvcLvl>
</PmtTpInf> </PmtTpInf>
<ReqdExctnDt>2024-06-05</ReqdExctnDt> <ReqdExctnDt>2024-06-06</ReqdExctnDt>
<Dbtr> <Dbtr>
<Nm>Targo Bank</Nm> <Nm>Targo Bank</Nm>
</Dbtr> </Dbtr>