From 1ebb5cd8ad3f997803afb7d726fd6c4a618f1f4c Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Sat, 11 Sep 2021 16:50:09 +0200
Subject: [PATCH 1/2] BIG-9: fix estimates sorting by customer column. BIG-10:
 fix invoices sorting by balance column.

---
 .../containers/Sales/Invoices/InvoicesLanding/components.js | 6 ++----
 server/src/models/SaleEstimate.js                           | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/client/src/containers/Sales/Invoices/InvoicesLanding/components.js b/client/src/containers/Sales/Invoices/InvoicesLanding/components.js
index 066c45bd9..36f4c1d42 100644
--- a/client/src/containers/Sales/Invoices/InvoicesLanding/components.js
+++ b/client/src/containers/Sales/Invoices/InvoicesLanding/components.js
@@ -189,11 +189,9 @@ export function useInvoicesTableColumns() {
         clickable: true,
       },
       {
-        id: 'balance',
+        id: 'amount',
         Header: intl.get('balance'),
-        accessor: (r) => (
-          <Money amount={r.balance} currency={r.currency_code} />
-        ),
+        accessor: 'formatted_amount',
         width: 120,
         className: 'balance',
         clickable: true,
diff --git a/server/src/models/SaleEstimate.js b/server/src/models/SaleEstimate.js
index 547f3f5c2..aaace10e2 100644
--- a/server/src/models/SaleEstimate.js
+++ b/server/src/models/SaleEstimate.js
@@ -171,12 +171,12 @@ export default class SaleEstimate extends mixin(TenantModel, [
    */
   static get relationMappings() {
     const ItemEntry = require('models/ItemEntry');
-    const Contact = require('models/Contact');
+    const Customer = require('models/Customer');
 
     return {
       customer: {
         relation: Model.BelongsToOneRelation,
-        modelClass: Contact.default,
+        modelClass: Customer.default,
         join: {
           from: 'sales_estimates.customerId',
           to: 'contacts.id',

From 6493fcbcfe68413ff61cb2a6256be1da4cb1cb2c Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Sat, 11 Sep 2021 17:23:29 +0200
Subject: [PATCH 2/2] BIG-15: fix filtering payment receive by given customer.
 BIG-16: fix filtering payment mades by payment account.

---
 server/src/models/BillPayment.Settings.ts    | 10 +++++-----
 server/src/models/PaymentReceive.Settings.ts |  2 +-
 server/src/models/PaymentReceive.js          |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/src/models/BillPayment.Settings.ts b/server/src/models/BillPayment.Settings.ts
index c222ecafa..586d525d5 100644
--- a/server/src/models/BillPayment.Settings.ts
+++ b/server/src/models/BillPayment.Settings.ts
@@ -29,13 +29,13 @@ export default {
     payment_account: {
       name: 'bill_payment.field.payment_account',
       column: 'payment_account_id',
-
       fieldType: 'relation',
-      fieldRelation: 'paymentAccount',
 
-      fieldRelationType: 'enumeration',
-      relationLabelField: 'name',
-      relationKeyField: 'slug',
+      relationType: 'enumeration',
+      relationKey: 'paymentAccount',
+      
+      relationEntityLabel: 'name',
+      relationEntityKey: 'slug',
     },
     payment_number: {
       name: 'bill_payment.field.payment_number',
diff --git a/server/src/models/PaymentReceive.Settings.ts b/server/src/models/PaymentReceive.Settings.ts
index 9132398c9..0e9012806 100644
--- a/server/src/models/PaymentReceive.Settings.ts
+++ b/server/src/models/PaymentReceive.Settings.ts
@@ -9,7 +9,7 @@ export default {
       relationType: 'enumeration',
       relationKey: 'customer',
 
-      relationEntityLabel: 'name',
+      relationEntityLabel: 'display_name',
       relationEntityKey: 'id',
     },
     payment_date: {
diff --git a/server/src/models/PaymentReceive.js b/server/src/models/PaymentReceive.js
index ace14b831..14a48af00 100644
--- a/server/src/models/PaymentReceive.js
+++ b/server/src/models/PaymentReceive.js
@@ -38,13 +38,13 @@ export default class PaymentReceive extends mixin(TenantModel, [
   static get relationMappings() {
     const PaymentReceiveEntry = require('models/PaymentReceiveEntry');
     const AccountTransaction = require('models/AccountTransaction');
-    const Contact = require('models/Contact');
+    const Customer = require('models/Customer');
     const Account = require('models/Account');
 
     return {
       customer: {
         relation: Model.BelongsToOneRelation,
-        modelClass: Contact.default,
+        modelClass: Customer.default,
         join: {
           from: 'payment_receives.customerId',
           to: 'contacts.id',