comment in dossier and skip peppol for invoice

Author: nbittich

artcoded/src/main/java/tech/artcoded/websitev2/pages/dossier/Dossier.java

@@ -53,6 +53,10 @@ public class Dossier implements Serializable {
     private boolean bookmarked = false;
     private Date bookmarkedDate;
 
+    // 20260405 comments
+    @Builder.Default
+    private String comment = "";
+
     private String dossierUploadId;
 
     // if it was imported from an old system

artcoded/src/main/java/tech/artcoded/websitev2/pages/dossier/DossierService.java

@@ -73,7 +73,8 @@ public Optional<Dossier> toggleBookmarked(String id) {
     public Dossier newDossier(Dossier dossier) {
         if (this.getActiveDossier().isEmpty()) {
             Dossier build = Dossier.builder().name(dossier.getName()).tvaDue(dossier.getTvaDue())
-                    .advancePayments(dossier.getAdvancePayments()).description(dossier.getDescription()).build();
+                    .advancePayments(dossier.getAdvancePayments()).description(dossier.getDescription())
+                    .comment("").build();
             Dossier savedDossier = dossierRepository.save(build);
             eventService.sendEvent(
                     DossierCreated.builder().dossierId(savedDossier.getId()).description(savedDossier.getDescription())
@@ -99,6 +100,7 @@ public Dossier updateActiveDossier(Dossier dossier) {
         Dossier toSave = getActiveDossier()
                 .map(d -> d.toBuilder().name(dossier.getName()).description(dossier.getDescription())
                         .tvaDue(dossier.getTvaDue())
+                        .comment(dossier.getComment())
                         .advancePayments(ofNullable(dossier.getAdvancePayments()).orElseGet(List::of))
                         .updatedDate(new Date()).build())
                 .orElseThrow(() -> new RuntimeException("No active dossier found"));
@@ -132,7 +134,7 @@ public Dossier recallForModification(Dossier dossier) {
     }
 
     public Dossier fromPreviousDossier() {
-        var copy = Dossier.builder().id(null).creationDate(null).updatedDate(null);
+        var copy = Dossier.builder().id(null).creationDate(null).updatedDate(null).comment("");
         return dossierRepository.findFirstByClosedIsTrueOrderByCreationDateDesc()
                 .map(d -> copy.name(d.getName() + "(copy)").description(d.getDescription())
                         .advancePayments(d.getAdvancePayments()).bookmarked(false).bookmarkedDate(null).build())

artcoded/src/main/java/tech/artcoded/websitev2/pages/dossier/ImportOldDossierService.java

@@ -181,6 +181,7 @@ public void create(MultipartFile zip) {
                                     .projectName(client.projectName).build()))
                             .dateCreation(invoiceRow.dateOfInvoice).taxRate(invoiceRow.taxRate)
                             .maxDaysToPay(client.maxDaysToPay).uploadedManually(true)
+                            .skipPeppol(true)
                             .billTo(BillTo.builder().address(client.address).vatNumber(client.vat).city(client.city)
                                     .emailAddress(client.email).clientName(client.name).build())
                             .build();
@@ -207,6 +208,7 @@ public void create(MultipartFile zip) {
 
                 for (var dossierRow : dossierRows) {
                     Dossier dossier = dossierService.save(Dossier.builder().description(dossierRow.description)
+                            .comment("dossier imported from csv")
                             .name(dossierRow.name).tvaDue(dossierRow.totalVat).build());
 
                     var invoices = invoiceGroupedByDossier.get(dossierRow.name);

artcoded/src/main/java/tech/artcoded/websitev2/pages/invoice/InvoiceGeneration.java

@@ -95,6 +95,9 @@ public class InvoiceGeneration implements Serializable {
 
     private String timesheetId;
 
+    // 20260405 should we skip peppol
+    private boolean skipPeppol;
+
     @Deprecated
     @Transient
     public static String generateInvoiceNumber() {

artcoded/src/main/java/tech/artcoded/websitev2/pages/invoice/InvoiceService.java

@@ -200,6 +200,7 @@ private InvoiceGeneration getTemplate(Supplier<Optional<InvoiceGeneration>> invo
                 .locked(false).archived(false).peppolStatus(PeppolStatus.NOT_SENT).bookmarked(false)
                 .bookmarkedDate(null).structuredReference(null).creditNoteId(null).timesheetId(null)
                 .uploadedManually(false).dateCreation(new Date()).updatedDate(null).archivedDate(null).imported(false)
+                .skipPeppol(false)
                 .specialNote("").creditNoteInvoiceReference(null).invoiceUploadId(null).invoiceUBLId(null)
                 .logicalDelete(false).importedDate(null).dateOfInvoice(new Date()).build();
         return invoice;
@@ -338,6 +339,7 @@ public void manualUpload(MultipartFile file, String id, Date date) {
                 .filter(Predicate.not(InvoiceGeneration::isArchived))
                 .filter(Predicate.not(InvoiceGeneration::isLogicalDelete))
                 .map(invoiceGeneration -> invoiceGeneration.toBuilder().updatedDate(date)
+                        .skipPeppol(true)
                         .invoiceUploadId(this.fileUploadService.upload(file, invoiceGeneration.getId(), false)).build())
                 .map(repository::save).orElseThrow(() -> new RuntimeException("Invoice not found!!"));
     }
@@ -421,18 +423,23 @@ public InvoiceGeneration generateInvoice(InvoiceGeneration invoiceGeneration) {
                 }
                 String pdfId = null;
                 String ublId = null;
+                var peppolStatus = PeppolStatus.OLD;
                 if (!partialInvoice.isUploadedManually()) {
                     pdfId = this.fileUploadService.upload(
                             toMultipart(FilenameUtils.normalize(partialInvoice.getNewInvoiceNumber()),
                                     this.invoiceToPdf(partialInvoice), "pdf", MediaType.APPLICATION_PDF_VALUE),
                             id, false);
-                    ublId = this.fileUploadService.upload(
-                            toMultipart(FilenameUtils.normalize(partialInvoice.getNewInvoiceNumber()),
-                                    this.invoiceToUBL(partialInvoice, pdfId), "xml", MediaType.TEXT_XML_VALUE),
-                            id, false);
+                    if (!partialInvoice.isSkipPeppol()) {
+                        ublId = this.fileUploadService.upload(
+                                toMultipart(FilenameUtils.normalize(partialInvoice.getNewInvoiceNumber()),
+                                        this.invoiceToUBL(partialInvoice, pdfId), "xml", MediaType.TEXT_XML_VALUE),
+                                id, false);
+                        peppolStatus = PeppolStatus.NOT_SENT;
+                    }
+
                 }
                 InvoiceGeneration invoiceToSave = partialInvoice.toBuilder().invoiceUploadId(pdfId)
-                        .peppolStatus(PeppolStatus.NOT_SENT).invoiceUBLId(ublId).build();
+                        .peppolStatus(peppolStatus).invoiceUBLId(ublId).build();
                 InvoiceGeneration saved = repository.save(invoiceToSave);
                 this.notificationService.sendEvent(
                         "New Invoice Ready (%s)".formatted(invoiceToSave.getNewInvoiceNumber()), NOTIFICATION_TYPE,

artcoded/src/main/java/tech/artcoded/websitev2/peppol/PeppolAutoSendAction.java

@@ -66,8 +66,8 @@ public ActionResult run(List<ActionParameter> parameters) {
             if (!invoices.isEmpty()) {
                 for (var invoice : invoices) {
                     try {
-                        if (invoice.isUploadedManually()) {
-                            messages.add("skip invoice added manually");
+                        if (invoice.isUploadedManually() || invoice.isSkipPeppol()) {
+                            messages.add("skip invoice added manually or skip peppol set to true");
                             invoice.setPeppolStatus(PeppolStatus.OLD);
                             invoice.setUpdatedDate(new Date());
                             invoiceRepository.save(invoice);