for peppol: still allow emails with duplicates te be sent (ex when the timesheet arrived later)

Author: Laoujin

backend/src/models/config.ts

@@ -33,5 +33,12 @@ export interface ICompanyConfig {
   email: IEmail;
   emailSignature: string;
   emailReminder: string;
+  emailReminderCc: string;
+  emailReminderBcc: string;
+  emailCreditNotaSubject: string;
+  emailCreditNotaBody: string;
+  emailPeppolDuplicateSubject: string;
+  emailPeppolDuplicateBody: string;
+  emailInvoiceOnly: string;
   audit: IAudit;
 }

frontend/src/components/config/models/ConfigConfig.ts

@@ -48,6 +48,11 @@ export const configDefinition: FullFormConfig = [
   {key: 'email.body', component: 'InvoiceReplacementsTextEditor', cols: 12},
   {key: 'emailCreditNotaSubject', cols: 12, component: 'InvoiceReplacementsInput'},
   {key: 'emailCreditNotaBody', component: 'InvoiceReplacementsTextEditor', cols: 12},
+
+  {title: {title: 'config.emailPeppolDuplicate.title', level: 4}},
+  {key: 'emailPeppolDuplicateSubject', cols: 12, component: 'InvoiceReplacementsInput'},
+  {key: 'emailPeppolDuplicateBody', component: 'InvoiceReplacementsTextEditor', cols: 12},
+
   {key: 'emailSignature', component: 'InvoiceReplacementsTextEditor', cols: 12},
   {key: 'emailReminder', component: 'InvoiceReplacementsTextEditor', cols: 12},
   {key: 'emailReminderCc', component: 'email', cols: 6},

frontend/src/components/config/models/ConfigModel.ts

@@ -28,6 +28,10 @@ export type ConfigModel = {
   emailReminderBcc: string;
   emailCreditNotaSubject: string;
   emailCreditNotaBody: string;
+  /** Peppol Duplicate: subject for sending invoice+timesheet by email after peppol */
+  emailPeppolDuplicateSubject: string;
+  /** Peppol Duplicate: body for sending invoice+timesheet by email after peppol */
+  emailPeppolDuplicateBody: string;
   /** Email address to email the invoice pdf (without timesheet) */
   emailInvoiceOnly: string;
   /** How many months to load at initialLoad */

frontend/src/components/config/models/getNewConfig.ts

@@ -36,6 +36,8 @@ export const defaultConfig: ConfigModel = {
   emailReminderBcc: '',
   emailCreditNotaSubject: '',
   emailCreditNotaBody: '',
+  emailPeppolDuplicateSubject: '',
+  emailPeppolDuplicateBody: '',
   emailInvoiceOnly: '',
   initialMonthLoad: 12,
   peppolPivotDate: moment.utc('2026-01-01'),

frontend/src/components/controls/email/EmailModal.tsx

@@ -18,6 +18,7 @@ export enum EmailTemplate {
   None,
   InitialEmail,
   Reminder,
+  PeppolDuplicate,
 }
 
 
@@ -58,6 +59,13 @@ const getDefaultEmailValue = (
     if (config.emailReminderBcc && !client.email.bcc) {
       finalValues.bcc = config.emailReminderBcc;
     }
+  } else if (template === EmailTemplate.PeppolDuplicate) {
+    if (config.emailPeppolDuplicateSubject) {
+      finalValues.subject = invoiceReplacements(config.emailPeppolDuplicateSubject, invoice, creditNotes);
+    }
+    if (config.emailPeppolDuplicateBody) {
+      finalValues.body = config.emailPeppolDuplicateBody;
+    }
   } else if (invoice.money.total < 0 && config.emailCreditNotaSubject) {
     finalValues.subject = invoiceReplacements(config.emailCreditNotaSubject, invoice, creditNotes);
     finalValues.body = config.emailCreditNotaBody;

frontend/src/components/invoice/invoice-edit/EditInvoiceFooter.tsx

@@ -159,15 +159,26 @@ export const EditInvoiceFooter = ({invoice, initInvoice, hasChanges, setEmailMod
         </BusyButton>
       )}
       {!invoice.isNew && invoice.client && shouldUsePeppol(invoice, config) && isSentStatus && (
-        <Button
-          claim={invoice.isQuotation ? Claim.ManageQuotations : Claim.EmailInvoices}
-          variant="light"
-          icon="fas fa-paper-plane"
-          onClick={() => setShowStatusModal(true)}
-          className="tst-peppol-status"
-        >
-          {t('invoice.peppolStatus')}
-        </Button>
+        <>
+          <Button
+            claim={invoice.isQuotation ? Claim.ManageQuotations : Claim.EmailInvoices}
+            variant="light"
+            icon="fas fa-paper-plane"
+            onClick={() => setShowStatusModal(true)}
+            className="tst-peppol-status"
+          >
+            {t('invoice.peppolStatus')}
+          </Button>
+          <Button
+            claim={invoice.isQuotation ? Claim.ManageQuotations : Claim.EmailInvoices}
+            variant="light"
+            icon="far fa-envelope"
+            onClick={() => setEmailModal(EmailTemplate.PeppolDuplicate)}
+            className="tst-open-email-peppol-duplicate"
+          >
+            {t('email.preparePeppolDuplicate')}
+          </Button>
+        </>
       )}
       {!invoice.isNew && invoice.client && !shouldUsePeppol(invoice, config) && (
         <>

frontend/src/trans.en.ts

@@ -236,6 +236,11 @@ export const trans = {
     },
     emailCreditNotaSubject: 'Credit Note: Default subject',
     emailCreditNotaBody: 'Credit Note: Default email',
+    emailPeppolDuplicate: {
+      title: 'Peppol Duplicate',
+    },
+    emailPeppolDuplicateSubject: 'Default subject',
+    emailPeppolDuplicateBody: 'Default email',
     emailSignature: 'Default email signature',
     emailReminder: 'Email invoice reminder',
     emailReminderCc: 'Reminder CC',
@@ -753,6 +758,7 @@ export const trans = {
     title: 'Email invoice',
     prepareEmail: 'Prepare email',
     prepareEmailReminder: 'Email reminder',
+    preparePeppolDuplicate: 'Duplicate email',
     to: 'To',
     toPlaceholder: 'Separate email addresses with ;',
     cc: 'CC',

frontend/src/trans.nl.ts

@@ -236,6 +236,11 @@ export const trans = {
     },
     emailCreditNotaSubject: 'Credit Nota: Standaard onderwerp',
     emailCreditNotaBody: 'Credit Nota: Standaard email',
+    emailPeppolDuplicate: {
+      title: 'Peppol Duplicaat',
+    },
+    emailPeppolDuplicateSubject: 'Standaard onderwerp',
+    emailPeppolDuplicateBody: 'Standaard email',
     emailSignature: 'Standaard email signature',
     emailReminder: 'Email factuur herinnering',
     emailReminderCc: 'Herinnering CC',
@@ -753,6 +758,7 @@ export const trans = {
     title: 'Factuur emailen',
     prepareEmail: 'Email voorbereiden',
     prepareEmailReminder: 'Email herinnering',
+    preparePeppolDuplicate: 'Duplicaat email',
     to: 'Naar',
     toPlaceholder: 'Email adressen met ; scheiden',
     cc: 'CC',