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

fix: customers/vendor reports.

Browse Source
This commit is contained in:
a.bouhuolia
2021-05-08 06:09:17 +02:00
parent 93dca653f9
commit 7d820c1495
6 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/config/financialReportsMenu.js
View File

@@ -72,22 +72,22 @@ export const SalesAndPurchasesReportMenus = [
},
{
title: 'Customer Balance summary',
desc: '',
desc: 'Summerize the total amount of each customer owes your business.',
link: '/financial-reports/customers-balance-summary',
},
{
title: 'Vendors Balance summary',
desc: '',
desc: 'Summerize the total amount your business owes each vendor.',
link: '/financial-reports/vendors-balance-summary',
},
{
title: 'Customers Transactions',
desc: '',
desc: 'Reports every transaction going in and out of each customer.',
link: '/financial-reports/transactions-by-customers',
},
{
title: 'Vendors Transactions',
desc: '',
desc: 'Reports every transaction going in and out of each vendor/supplier.',
link: '/financial-reports/transactions-by-vendors',
},
],

7
client/src/hooks/query/types.js
View File

@@ -14,6 +14,13 @@ const FINANCIAL_REPORTS = {
JOURNAL: 'JOURNAL',
AR_AGING_SUMMARY: 'AR-AGING-SUMMARY',
AP_AGING_SUMMARY: 'AP-AGING-SUMMARY',
VENDORS_TRANSACTIONS: 'VENDORS_TRANSACTIONS',
CUSTOMERS_TRANSACTIONS: 'CUSTOMERS_TRANSACTIONS',
VENDORS_BALANCE_SUMMARY: 'VENDORS_BALANCE_SUMMARY',
CUSTOMERS_BALANCE_SUMMARY: 'CUSTOMERS_BALANCE_SUMMARY',
SALES_BY_ITEMS: 'SALES_BY_ITEMS',
PURCHASES_BY_ITEMS: 'PURCHASES_BY_ITEMS',
INVENTORY_VALUATION: 'INVENTORY_VALUATION'
};
const BILLS = {

2
client/src/routes/dashboard.js
View File

@@ -244,7 +244,7 @@ export default [
),
),
breadcrumb: 'Customers Balance Summary ',
hint: '..',
hint: 'Summerize how much each customer owes your business.',
pageTitle: formatMessage({ id: 'customers_balance_summary' }),
backLink: true,
sidebarExpand: false,

14
client/src/style/pages/FinancialStatements/ContactsTransactions.scss
View File

@@ -1,6 +1,8 @@
.financial-sheet {
&--customer-transactions,
&--vendor-transactions {
width: 100%;
.financial-sheet__table {
.tbody,
.thead {
@@ -31,7 +33,7 @@
}
}
.tr:not(.no-results) .td {
// border-left: 1px solid #ececec;
border-left: 1px solid #ececec;
}
.tr.row-type {
@@ -43,7 +45,7 @@
font-weight: 500;
}
&.name {
border-left-color: transparent;
// border-left-color: transparent;
}
}
&:not(:first-child).is-expanded .td {
@@ -55,6 +57,14 @@
&--CLOSING_BALANCE {
font-weight: 500;
}
&--CUSTOMER,
&--VENDOR {
&.is-expanded{
.td.running_balance .cell-inner{
display: none;
}
}
}
&--CUSTOMER:last-child {
.td {
border-bottom: 1px solid #ddd;

9
server/src/services/FinancialStatements/TransactionsByCustomer/TransactionsByCustomersTableRows.ts
View File

@@ -26,8 +26,13 @@ export default class TransactionsByCustomersTableRows extends TransactionsByCont
return {
...tableRowMapper(customer, columns, { rowTypes: [ROW_TYPE.CUSTOMER] }),
children: R.pipe(
R.concat(this.contactTransactions(customer)),
R.prepend(this.contactOpeningBalance(customer)),
R.when(
R.always(customer.transactions.length > 0),
R.pipe(
R.concat(this.contactTransactions(customer)),
R.prepend(this.contactOpeningBalance(customer)),
),
),
R.append(this.contactClosingBalance(customer))
)([]),
};

18
server/src/services/FinancialStatements/TransactionsByVendor/TransactionsByVendorTableRows.ts
View File

@@ -17,13 +17,25 @@ export default class TransactionsByVendorsTableRows extends TransactionsByContac
* @returns {ITableRow[]}
*/
private vendorDetails(vendor: ITransactionsByVendorsVendor) {
const columns = [{ key: 'vendorName', accessor: 'vendorName' }];
const columns = [
{ key: 'vendorName', accessor: 'vendorName' },
...R.repeat({ key: 'empty', value: '' }, 5),
{
key: 'closingBalanceValue',
accessor: 'closingBalance.formattedAmount',
},
];
return {
...tableRowMapper(vendor, columns, { rowTypes: [ROW_TYPE.VENDOR] }),
children: R.pipe(
R.append(this.contactOpeningBalance(vendor)),
R.concat(this.contactTransactions(vendor)),
R.when(
R.always(vendor.transactions.length > 0),
R.pipe(
R.append(this.contactOpeningBalance(vendor)),
R.concat(this.contactTransactions(vendor))
)
),
R.append(this.contactClosingBalance(vendor))
)([]),
};