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(server): sales tax liability summary report

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2023-09-23 14:40:21 +02:00
parent 1d1049043e
commit f1e7d0fc44
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/server/src/database/seeds/core/20230912121909_update_tax_payable_account.ts Normal file
View File

@@ -0,0 +1,16 @@
import { TenantSeeder } from '@/lib/Seeder/TenantSeeder';
import { InitialTaxRates } from '../data/TaxRates';
export default class UpdateTaxPayableAccount extends TenantSeeder {
/**
* Seeds initial tax rates to the organization.
*/
up(knex) {
return knex('accounts').then(async () => {
// Inserts seed entries.
return knex('accounts').where('slug', 'tax-payable').update({
account_type: 'tax-payable',
});
});
}
}

2
packages/server/src/database/seeds/data/accounts.js
View File

@@ -1,7 +1,7 @@
export const TaxPayableAccount = {
name: 'Tax Payable',
slug: 'tax-payable',
account_type: 'other-current-liability',
account_type: 'tax-payable',
code: '20006',
description: '',
active: 1,

14
packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryRepository.ts
View File

@@ -31,14 +31,17 @@ export class SalesTaxLiabilitySummaryRepository {
public async taxesPayableSumGroupedByRateId(
tenantId: number
): Promise<SalesTaxLiabilitySummaryPayableById> {
const { AccountTransaction } = this.tenancy.models(tenantId);
const { accountRepository } = this.tenancy.repositories(tenantId);
const { AccountTransaction, Account } = this.tenancy.models(tenantId);
// Finds or creates tax payable account.
const payableTaxAccount = await accountRepository.findOrCreateTaxPayable();
// Retrieves tax payable accounts.
const taxPayableAccounts = await Account.query().whereIn('accountType', [
ACCOUNT_TYPE.TAX_PAYABLE,
]);
const payableAccountsIds = taxPayableAccounts.map((account) => account.id);
const groupedTaxesById = await AccountTransaction.query()
.where('account_id', payableTaxAccount.id)
.whereIn('account_id', payableAccountsIds)
.whereNot('tax_rate_id', null)
.groupBy('tax_rate_id')
.select(['tax_rate_id'])
.sum('credit as credit')
@@ -65,6 +68,7 @@ export class SalesTaxLiabilitySummaryRepository {
const groupedTaxesById = await AccountTransaction.query()
.whereIn('account_id', incomeAccountsIds)
.whereNot('tax_rate_id', null)
.groupBy('tax_rate_id')
.select(['tax_rate_id'])
.sum('credit as credit')