diff --git a/packages/server/src/api/controllers/Sales/PaymentReceives.ts b/packages/server/src/api/controllers/Sales/PaymentReceives.ts
index 0bef1e60d..823a13f95 100644
--- a/packages/server/src/api/controllers/Sales/PaymentReceives.ts
+++ b/packages/server/src/api/controllers/Sales/PaymentReceives.ts
@@ -531,7 +531,6 @@ export default class PaymentReceivesController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    * @param {NextFunction} next
-   * @returns
    */
   public sendPaymentReceiveByMail = async (
     req: Request,
@@ -546,6 +545,8 @@ export default class PaymentReceivesController extends BaseController {
         includeOptionals: false,
       }
     );
+    console.log(req.params);
+
     try {
       await this.paymentReceiveApplication.notifyPaymentByMail(
         tenantId,
diff --git a/packages/server/src/models/Contact.ts b/packages/server/src/models/Contact.ts
index d63a2ea60..69661f639 100644
--- a/packages/server/src/models/Contact.ts
+++ b/packages/server/src/models/Contact.ts
@@ -2,6 +2,9 @@ import { Model } from 'objection';
 import TenantModel from 'models/TenantModel';
 
 export default class Contact extends TenantModel {
+  email: string;
+  displayName: string;
+
   /**
    * Table name
    */
diff --git a/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetApplication.ts b/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetApplication.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetRepository.ts b/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetRepository.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetTable.ts b/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetTable.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetTableInjectable.ts b/packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetTableInjectable.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsApplication.ts b/packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsApplication.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsTable.ts b/packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsTable.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/server/src/services/Sales/Invoices/SendSaleInvoiceMailReminder.ts b/packages/server/src/services/Sales/Invoices/SendSaleInvoiceMailReminder.ts
index b5389a8a0..f16db0172 100644
--- a/packages/server/src/services/Sales/Invoices/SendSaleInvoiceMailReminder.ts
+++ b/packages/server/src/services/Sales/Invoices/SendSaleInvoiceMailReminder.ts
@@ -7,6 +7,7 @@ import {
   DEFAULT_INVOICE_REMINDER_MAIL_CONTENT,
   DEFAULT_INVOICE_REMINDER_MAIL_SUBJECT,
 } from './constants';
+import { parseAndValidateMailOptions } from '@/services/MailNotification/utils';
 
 @Service()
 export class SendInvoiceMailReminder {
@@ -66,10 +67,10 @@ export class SendInvoiceMailReminder {
   ) {
     const localMessageOpts = await this.getMailOption(tenantId, saleInvoiceId);
 
-    const messageOpts = {
-      ...localMessageOpts,
-      ...messageOptions,
-    };
+    const messageOpts = parseAndValidateMailOptions(
+      localMessageOpts,
+      messageOptions
+    );
     const mail = new Mail()
       .setSubject(messageOpts.subject)
       .setTo(messageOpts.to)
diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveMailNotificationJob.ts b/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveMailNotificationJob.ts
index 236a33758..b29570d42 100644
--- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveMailNotificationJob.ts
+++ b/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveMailNotificationJob.ts
@@ -1,5 +1,4 @@
 import Container, { Service } from 'typedi';
-import events from '@/subscribers/events';
 import { SendPaymentReceiveMailNotification } from './PaymentReceiveMailNotification';
 
 @Service()
@@ -22,8 +21,6 @@ export class PaymentReceiveMailNotificationJob {
     const { tenantId, paymentReceiveId, messageDTO } = job.attrs.data;
     const paymentMail = Container.get(SendPaymentReceiveMailNotification);
 
-    console.log(tenantId, paymentReceiveId, messageDTO);
-
     try {
       await paymentMail.sendMail(tenantId, paymentReceiveId, messageDTO);
       done();
diff --git a/packages/server/src/services/Sales/Receipts/SaleReceiptApplication.ts b/packages/server/src/services/Sales/Receipts/SaleReceiptApplication.ts
index 459d9c62e..d4c87df29 100644
--- a/packages/server/src/services/Sales/Receipts/SaleReceiptApplication.ts
+++ b/packages/server/src/services/Sales/Receipts/SaleReceiptApplication.ts
@@ -177,6 +177,7 @@ export class SaleReceiptApplication {
    * Sends the receipt mail of the given sale receipt.
    * @param {number} tenantId
    * @param {number} saleReceiptId
+   * @param {SaleReceiptMailOptsDTO} messageOpts
    * @returns {Promise<void>}
    */
   public sendSaleReceiptMail(
diff --git a/packages/webapp/src/components/Dashboard/Dashboard.tsx b/packages/webapp/src/components/Dashboard/Dashboard.tsx
index 2637128cf..467963849 100644
--- a/packages/webapp/src/components/Dashboard/Dashboard.tsx
+++ b/packages/webapp/src/components/Dashboard/Dashboard.tsx
@@ -51,8 +51,8 @@ export default function Dashboard() {
       </Switch>
 
       <DashboardUniversalSearch />
-      <DialogsContainer />
       <GlobalHotkeys />
+      <DialogsContainer />
       <DrawersContainer />
       <AlertsContainer />
     </DashboardProvider>
diff --git a/packages/webapp/src/containers/Accounts/AccountsDataTable.tsx b/packages/webapp/src/containers/Accounts/AccountsDataTable.tsx
index dfa4b90be..edcfe2e18 100644
--- a/packages/webapp/src/containers/Accounts/AccountsDataTable.tsx
+++ b/packages/webapp/src/containers/Accounts/AccountsDataTable.tsx
@@ -32,7 +32,7 @@ function AccountsDataTable({
   // #withAlertsDialog
   openAlert,
 
-  // #withDial
+  // #withDialog
   openDialog,
 
   // #withDrawerActions
diff --git a/packages/webapp/src/containers/Authentication/Authentication.tsx b/packages/webapp/src/containers/Authentication/Authentication.tsx
index 8d2887849..8b05570c4 100644
--- a/packages/webapp/src/containers/Authentication/Authentication.tsx
+++ b/packages/webapp/src/containers/Authentication/Authentication.tsx
@@ -8,9 +8,9 @@ import { TransitionGroup, CSSTransition } from 'react-transition-group';
 import authenticationRoutes from '@/routes/authentication';
 import { Icon, FormattedMessage as T } from '@/components';
 import { useIsAuthenticated } from '@/hooks/state';
+import { AuthMetaBootProvider } from './AuthMetaBoot';
 
 import '@/style/pages/Authentication/Auth.scss';
-import { AuthMetaBootProvider } from './AuthMetaBoot';
 
 export function Authentication() {
   const to = { pathname: '/' };