From 5d913b10e043f42f220bed3a8d8c55d47f3b36b9 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Wed, 28 Jun 2023 12:51:55 +0200 Subject: [PATCH] markierung reklamiert anzeigen --- .../java/com/alexanderlogistics/OPListExportAdapter.java | 6 +++++- .../pages/workitems/forms/alexander/section_opliste.xhtml | 4 +++- .../pages/workitems/forms/alexander/section_payments.xhtml | 6 +----- 3 files changed, 9 insertions(+), 7 deletions(-) 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 b81d531..92e74c7 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 @@ -213,7 +213,11 @@ public class OPListExportAdapter extends POIFindReplaceAdapter { XSSFRow row = sheet.createRow(rowPos); row.copyRowFrom(referenceRowInvoice, new CellCopyPolicy()); // insert values - row.getCell(2).setCellValue(invoice.getItemValueString("invoice.number")); + if (invoice.getItemValueBoolean("invoice.protest")) { + row.getCell(2).setCellValue(invoice.getItemValueString("invoice.number") + " (R)"); + } else { + row.getCell(2).setCellValue(invoice.getItemValueString("invoice.number")); + } row.getCell(3).setCellValue(invoice.getItemValueString("invoice.text")); row.getCell(4).setCellValue(invoice.getItemValueDate("invoice.date")); row.getCell(5).setCellValue(invoice.getItemValueDate("invoice.duedate")); 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 7eff773..d94892f 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 @@ -52,7 +52,9 @@ #{invoice.item['invoice.number']} - + + + diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_payments.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_payments.xhtml index dc8d88e..1c5c448 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_payments.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_payments.xhtml @@ -9,11 +9,7 @@ - - - - - +