QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-20 14:50:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

BIG-9: fix estimates sorting by customer column.

Browse Source 
BIG-10: fix invoices sorting by balance column.
This commit is contained in:
a.bouhuolia
2021-09-11 16:50:09 +02:00
parent 996f1d7718
commit 1ebb5cd8ad
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/containers/Sales/Invoices/InvoicesLanding/components.js
View File

@@ -189,11 +189,9 @@ export function useInvoicesTableColumns() {
clickable: true, clickable: true,
}, },
{ {
id: 'balance', id: 'amount',
Header: intl.get('balance'), Header: intl.get('balance'),
accessor: (r) => ( accessor: 'formatted_amount',
<Money amount={r.balance} currency={r.currency_code} />
),
width: 120, width: 120,
className: 'balance', className: 'balance',
clickable: true, clickable: true,

4
server/src/models/SaleEstimate.js
View File

@@ -171,12 +171,12 @@ export default class SaleEstimate extends mixin(TenantModel, [
*/ */
static get relationMappings() { static get relationMappings() {
const ItemEntry = require('models/ItemEntry'); const ItemEntry = require('models/ItemEntry');
const Contact = require('models/Contact'); const Customer = require('models/Customer');
return { return {
customer: { customer: {
relation: Model.BelongsToOneRelation, relation: Model.BelongsToOneRelation,
modelClass: Contact.default, modelClass: Customer.default,
join: { join: {
from: 'sales_estimates.customerId', from: 'sales_estimates.customerId',
to: 'contacts.id', to: 'contacts.id',