2
0
mirror of https://github.com/frappe/books.git synced 2024-11-09 23:30:56 +00:00

Merge pull request #37 from netchampfaris/trial-balance

Add Trial Balance Report
This commit is contained in:
Faris Ansari 2018-04-27 17:04:44 +05:30 committed by GitHub
commit cfbaf157a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 125 additions and 8 deletions

View File

@ -26,6 +26,7 @@ module.exports = {
frappe.desk.menu.addItem('General Ledger', '#report/general-ledger');
frappe.desk.menu.addItem('Profit And Loss', '#report/profit-and-loss');
frappe.desk.menu.addItem('Balance Sheet', '#report/balance-sheet');
frappe.desk.menu.addItem('Trial Balance', '#report/trial-balance');
frappe.desk.menu.addItem('Sales Register', '#report/sales-register');
frappe.desk.menu.addItem('Purchase Register', '#report/purchase-register');

View File

@ -3,13 +3,13 @@ const { DateTime } = require('luxon');
const { unique } = require('frappejs/utils');
async function getData({
rootType,
balanceMustBe = 'Debit',
fromDate,
toDate,
periodicity = 'Monthly',
accumulateValues = false
}) {
rootType,
balanceMustBe = 'Debit',
fromDate,
toDate,
periodicity = 'Monthly',
accumulateValues = false
}) {
let accounts = await getAccounts(rootType);
let fiscalYear = await getFiscalYear();
@ -64,6 +64,42 @@ async function getData({
return { accounts, totalRow, periodList };
}
async function getTrialBalance({ rootType, fromDate, toDate }) {
let accounts = await getAccounts(rootType);
let ledgerEntries = await getLedgerEntries(null, toDate, accounts);
for (let account of accounts) {
const accountEntries = ledgerEntries.filter(entry => entry.account === account.name);
// opening
const beforePeriodEntries = accountEntries.filter(entry => entry.date < fromDate);
account.opening = beforePeriodEntries.reduce((acc, entry) => {
return acc + (entry.debit - entry.credit);
}, 0);
if (account.opening >= 0) {
account.openingDebit = account.opening;
} else {
account.openingCredit = -account.opening;
}
// debit / credit
const periodEntries = accountEntries.filter(entry => entry.date >= fromDate);
account.debit = periodEntries.reduce((acc, entry) => acc + entry.debit, 0);
account.credit = periodEntries.reduce((acc, entry) => acc + entry.credit, 0);
// closing
account.closing = account.opening + account.debit - account.credit;
if (account.closing >= 0) {
account.closingDebit = account.closing;
} else {
account.closingCredit = -account.closing;
}
}
return accounts;
}
function getPeriodList(fromDate, toDate, periodicity, fiscalYear) {
if (!fromDate) {
fromDate = fiscalYear.start;
@ -210,5 +246,6 @@ async function getFiscalYear() {
}
module.exports = {
getData
getData,
getTrialBalance
}

View File

@ -0,0 +1,18 @@
const frappe = require('frappejs');
const { getTrialBalance } = require('../FinancialStatements/FinancialStatements');
module.exports = class TrialBalance {
async run({ fromDate, toDate }) {
const promises = ['Asset', 'Expense', 'Income', 'Liability', 'Equity'].map(rootType => {
return getTrialBalance({ rootType, fromDate, toDate });
});
const values = await Promise.all(promises);
let rows = values.reduce((acc, curr) => {
return [...acc, ...curr];
}, []);
return { rows };
}
}

View File

@ -0,0 +1,46 @@
const ReportPage = require('frappejs/client/desk/reportpage');
const frappe = require('frappejs');
module.exports = class TrialBalanceView extends ReportPage {
constructor(opts) {
super({
title: frappe._('Trial Balance'),
filterFields: [
{fieldtype: 'Date', fieldname: 'fromDate', label: 'From Date', required: 1},
{fieldtype: 'Date', fieldname: 'toDate', label: 'To Date', required: 1}
]
});
this.method = 'trial-balance';
this.datatableOptions = {
treeView: true,
layout: 'fixed'
}
}
async setDefaultFilterValues() {
const accountingSettings = await frappe.getSingle('AccountingSettings');
this.filters.setValue('fromDate', accountingSettings.fiscalYearStart);
this.filters.setValue('toDate', accountingSettings.fiscalYearEnd);
this.run();
}
getRowsForDataTable(data) {
return data.rows || [];
}
getColumns(data) {
const columns = [
{ label: 'Account', fieldtype: 'Data', fieldname: 'account', width: 340 },
{ label: 'Opening (Dr)', fieldtype: 'Currency', fieldname: 'openingDebit' },
{ label: 'Opening (Cr)', fieldtype: 'Currency', fieldname: 'openingCredit' },
{ label: 'Debit', fieldtype: 'Currency', fieldname: 'debit' },
{ label: 'Credit', fieldtype: 'Currency', fieldname: 'credit' },
{ label: 'Closing (Dr)', fieldtype: 'Currency', fieldname: 'closingDebit' },
{ label: 'Closing (Cr)', fieldtype: 'Currency', fieldname: 'closingCredit' }
];
return columns;
}
}

View File

@ -9,6 +9,9 @@ const ProfitAndLossView = require('./ProfitAndLoss/ProfitAndLossView');
const BalanceSheet = require('./BalanceSheet/BalanceSheet');
const BalanceSheetView = require('./BalanceSheet/BalanceSheetView');
const TrialBalance = require('./TrialBalance/TrialBalance');
const TrialBalanceView = require('./TrialBalance/TrialBalanceView');
const SalesRegister = require('./SalesRegister/SalesRegister');
const SalesRegisterView = require('./SalesRegister/SalesRegisterView');
@ -32,6 +35,11 @@ function registerReportMethods() {
handler: getReportData(BalanceSheet)
});
frappe.registerMethod({
method: 'trial-balance',
handler: getReportData(TrialBalance)
});
frappe.registerMethod({
method: 'sales-register',
handler: getReportData(SalesRegister)
@ -66,6 +74,13 @@ function registerReportRoutes() {
await frappe.views.BalanceSheet.show(params);
});
frappe.router.add('report/trial-balance', async (params) => {
if (!frappe.views.TrialBalance) {
frappe.views.TrialBalance = new TrialBalanceView();
}
await frappe.views.TrialBalance.show(params);
});
frappe.router.add('report/sales-register', async (params) => {
if (!frappe.views.SalesRegister) {
frappe.views.SalesRegister = new SalesRegisterView();