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

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

Browse Source
This commit is contained in:
elforjani3
2021-09-11 17:28:33 +02:00
parent eaef50102b 6493fcbcfe
commit 5f8f4b1cbd
5 changed files with 12 additions and 14 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,

10
server/src/models/BillPayment.Settings.ts
View File

@@ -29,13 +29,13 @@ export default {
payment_account: { payment_account: {
name: 'bill_payment.field.payment_account', name: 'bill_payment.field.payment_account',
column: 'payment_account_id', column: 'payment_account_id',
fieldType: 'relation', fieldType: 'relation',
fieldRelation: 'paymentAccount',
fieldRelationType: 'enumeration', relationType: 'enumeration',
relationLabelField: 'name', relationKey: 'paymentAccount',
relationKeyField: 'slug',
relationEntityLabel: 'name',
relationEntityKey: 'slug',
}, },
payment_number: { payment_number: {
name: 'bill_payment.field.payment_number', name: 'bill_payment.field.payment_number',

2
server/src/models/PaymentReceive.Settings.ts
View File

@@ -9,7 +9,7 @@ export default {
relationType: 'enumeration', relationType: 'enumeration',
relationKey: 'customer', relationKey: 'customer',
relationEntityLabel: 'name', relationEntityLabel: 'display_name',
relationEntityKey: 'id', relationEntityKey: 'id',
}, },
payment_date: { payment_date: {

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

@@ -38,13 +38,13 @@ export default class PaymentReceive extends mixin(TenantModel, [
static get relationMappings() { static get relationMappings() {
const PaymentReceiveEntry = require('models/PaymentReceiveEntry'); const PaymentReceiveEntry = require('models/PaymentReceiveEntry');
const AccountTransaction = require('models/AccountTransaction'); const AccountTransaction = require('models/AccountTransaction');
const Contact = require('models/Contact'); const Customer = require('models/Customer');
const Account = require('models/Account'); const Account = require('models/Account');
return { return {
customer: { customer: {
relation: Model.BelongsToOneRelation, relation: Model.BelongsToOneRelation,
modelClass: Contact.default, modelClass: Customer.default,
join: { join: {
from: 'payment_receives.customerId', from: 'payment_receives.customerId',
to: 'contacts.id', to: 'contacts.id',

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