diff --git a/server/src/api/controllers/Currencies.ts b/server/src/api/controllers/Currencies.ts
index 357083e34..e7fc42e24 100644
--- a/server/src/api/controllers/Currencies.ts
+++ b/server/src/api/controllers/Currencies.ts
@@ -112,6 +112,7 @@ export default class CurrenciesController extends BaseController {
 
       return res.status(200).send({
         currency_code: currencyDTO.currencyCode,
+        message: 'The currency has been created successfully.',
       });
     } catch (error) {
       next(error);
@@ -130,7 +131,10 @@ export default class CurrenciesController extends BaseController {
 
     try {
       await this.currenciesService.deleteCurrency(tenantId, currencyCode);
-      return res.status(200).send({ currency_code: currencyCode });
+      return res.status(200).send({
+        currency_code: currencyCode,
+        message: 'The currency has been deleted successfully.',
+      });
     } catch (error) {
       next(error);
     }
@@ -149,7 +153,10 @@ export default class CurrenciesController extends BaseController {
 
     try {
       const currency = await this.currenciesService.editCurrency(tenantId, currencyId, editCurrencyDTO);
-      return res.status(200).send({ currency_code: currency.currencyCode });
+      return res.status(200).send({
+        currency_code: currency.currencyCode,
+        message: 'The currency has been edited successfully.',
+      });
     } catch (error) {
       next(error);
     }
diff --git a/server/src/api/controllers/Sales/SalesInvoices.ts b/server/src/api/controllers/Sales/SalesInvoices.ts
index c2d286401..67783d9a6 100644
--- a/server/src/api/controllers/Sales/SalesInvoices.ts
+++ b/server/src/api/controllers/Sales/SalesInvoices.ts
@@ -159,7 +159,10 @@ export default class SaleInvoicesController extends BaseController{
       const storedSaleInvoice = await this.saleInvoiceService.createSaleInvoice(
         tenantId, saleInvoiceOTD,
       );
-      return res.status(200).send({ id: storedSaleInvoice.id });
+      return res.status(200).send({
+        id: storedSaleInvoice.id,
+        message: 'The sale invoice has been created successfully.',
+      });
     } catch (error) {
       next(error)
     }
@@ -179,7 +182,10 @@ export default class SaleInvoicesController extends BaseController{
     try {
       // Update the given sale invoice details.
       await this.saleInvoiceService.editSaleInvoice(tenantId, saleInvoiceId, saleInvoiceOTD);
-      return res.status(200).send({ id: saleInvoiceId });
+      return res.status(200).send({
+        id: saleInvoiceId,
+        message: 'The sale invoice has beeen edited successfully.',
+      });
     } catch (error) {
       next(error);
     }
@@ -221,7 +227,10 @@ export default class SaleInvoicesController extends BaseController{
       // Deletes the sale invoice with associated entries and journal transaction.
       await this.saleInvoiceService.deleteSaleInvoice(tenantId, saleInvoiceId);
   
-      return res.status(200).send({ id: saleInvoiceId });
+      return res.status(200).send({
+        id: saleInvoiceId,
+        message: 'The sale invoice has been deleted successfully.',
+      });
     } catch (error) {
       next(error);
     }
diff --git a/server/src/services/Sales/SalesInvoices.ts b/server/src/services/Sales/SalesInvoices.ts
index 9d315d755..9b2eff3ea 100644
--- a/server/src/services/Sales/SalesInvoices.ts
+++ b/server/src/services/Sales/SalesInvoices.ts
@@ -134,10 +134,10 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
     );
 
     return {
-      ...formatDateFields(omit(saleInvoiceDTO, ['delivered', 'entries']), [
-        'invoiceDate',
-        'dueDate',
-      ]),
+      ...formatDateFields(
+        omit(saleInvoiceDTO, ['delivered', 'entries']),
+        ['invoiceDate', 'dueDate']
+      ),
       // Avoid rewrite the deliver date in edit mode when already published.
       ...(saleInvoiceDTO.delivered &&
         !oldSaleInvoice?.deliveredAt && {
@@ -145,7 +145,7 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
         }),
       balance,
       paymentAmount: 0,
-      entries: saleInvoiceObj.entries.map((entry) => ({
+      entries: saleInvoiceDTO.entries.map((entry) => ({
         reference_type: 'SaleInvoice',
         ...omit(entry, ['amount', 'id']),
       })),