From 630f85a3621d77573c4e5580ebeeb02d5a881f62 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Mon, 6 Mar 2023 14:54:46 +0100 Subject: [PATCH] mahnlauf --- .../mahnlauf/InkassoExportAdapter.java | 6 +- .../alexander/section_opliste_mahnlauf.xhtml | 2 - .../pages/workitems/forms/inkasso.xhtml | 14 +++- templates/inkasso_template.xlsx | Bin 41572 -> 41567 bytes workflow/rechnungsausgang-de-1.0.2-test.bpmn | 70 +++++++++++++++--- 5 files changed, 74 insertions(+), 18 deletions(-) diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/InkassoExportAdapter.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/InkassoExportAdapter.java index 8f7d867..4fe6d4a 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/InkassoExportAdapter.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/InkassoExportAdapter.java @@ -154,8 +154,10 @@ public class InkassoExportAdapter extends POIFindReplaceAdapter { row.getCell(0).setCellValue(invoice.getItemValueString("invoice.number")); row.getCell(1).setCellValue(invoice.getItemValueDate("invoice.date")); row.getCell(2).setCellValue(invoice.getItemValueDate("invoice.duedate")); - // Rechnung - row.getCell(4).setCellValue(invoice.getItemValueDouble("invoice.total")); + // total + row.getCell(3).setCellValue(invoice.getItemValueDouble("invoice.total")); + // saldo + row.getCell(4).setCellValue(invoice.getItemValueDouble("invoice.saldo")); rowPos++; } diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_mahnlauf.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_mahnlauf.xhtml index 09c7a6b..7517651 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_mahnlauf.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_mahnlauf.xhtml @@ -26,8 +26,6 @@ Status S/H - - Offener Saldo Mahnen diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/inkasso.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/inkasso.xhtml index 4907a8e..8f80b4c 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/inkasso.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/inkasso.xhtml @@ -35,7 +35,8 @@ #{message['form.date']} #{message['form.deadline']} #{message['form.amount']} - + + Offener Saldo @@ -68,7 +69,11 @@ - + + + + @@ -89,7 +94,10 @@ #{invoice.item['invoice.currency']} - + + + diff --git a/templates/inkasso_template.xlsx b/templates/inkasso_template.xlsx index 3e41a73d05d6031b4498e6656d7b175577785148..f1e2d62d7285bc325f5a09ecd4984befb39f0c75 100644 GIT binary patch delta 5315 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 delta 5195 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 - + txtlastcomment]]> @@ -2178,7 +2178,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + txtlastcomment]]> @@ -2385,6 +2385,12 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com Wiedervorlage wird um 7 bzw. 5 Tage erhöht + + + + + + @@ -2447,9 +2453,9 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - + - + @@ -2798,9 +2804,11 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - - - + + + + + @@ -3030,10 +3038,10 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - - - - + + + + @@ -3164,6 +3172,46 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +