Merge branch 'master' of https://github.com/abouolia/Bigcapital

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,

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',

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: {

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',

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',