From 61f2eda50f6f6aa1c5d314163049380d0cacf075 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@live.com>
Date: Mon, 26 Oct 2020 15:12:21 +0200
Subject: [PATCH] fix: sale invoices and bills date formating.

---
 server/src/services/Purchases/Bills.ts     | 2 +-
 server/src/services/Sales/SalesInvoices.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/services/Purchases/Bills.ts b/server/src/services/Purchases/Bills.ts
index 3c9060b2c..1ed75445f 100644
--- a/server/src/services/Purchases/Bills.ts
+++ b/server/src/services/Purchases/Bills.ts
@@ -149,7 +149,7 @@ export default class BillsService extends SalesInvoicesCost {
     const amount = sumBy(entries, 'amount');
 
     return {
-      ...formatDateFields(billDTO, ['bill_date', 'due_date']),
+      ...formatDateFields(billDTO, ['billDate', 'dueDate']),
       amount,
       invLotNumber,
       entries,
diff --git a/server/src/services/Sales/SalesInvoices.ts b/server/src/services/Sales/SalesInvoices.ts
index d1bd86970..8af2f5ef4 100644
--- a/server/src/services/Sales/SalesInvoices.ts
+++ b/server/src/services/Sales/SalesInvoices.ts
@@ -116,7 +116,7 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
     const invLotNumber = 1;
 
     const saleInvoiceObj: ISaleInvoice = {
-      ...formatDateFields(saleInvoiceDTO, ['invoice_date', 'due_date']),
+      ...formatDateFields(saleInvoiceDTO, ['invoiceDate', 'dueDate']),
       balance,
       paymentAmount: 0,
       // invLotNumber,
@@ -166,7 +166,7 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
     const oldSaleInvoice = await this.getInvoiceOrThrowError(tenantId, saleInvoiceId);
 
     const saleInvoiceObj = {
-      ...formatDateFields(saleInvoiceDTO, ['invoice_date', 'due_date']),
+      ...formatDateFields(saleInvoiceDTO, ['invoiceDate', 'dueDate']),
       balance,
       // invLotNumber: oldSaleInvoice.invLotNumber,
     };