[account_financial_report] adds the following features to Trial Balance:
- Adds 'Period balance' column - Renames the option 'Hide accounts at 0'. Means no initial, no debit, credit or ending balance for the period. - Fixes logic to remove lines with 0 activity for the period. - improve the calculation in the Trial Balance of undistributed profits/losses account, and provide a footer note to the user explaining why will the ending balances will not be zero, but the period's total profit and loss. - add an extra line for P&L application so that the trial balance zeroes in the balance, and total debits = total credits - refactoring of the unaffected earnings reporting in the general ledger and trial balance.
This commit is contained in:
committed by
chaule97
parent
9afe86cb7e
commit
c90bafbb61
@@ -21,6 +21,7 @@ class AbstractReportXslx(models.AbstractModel):
|
||||
|
||||
# Formats
|
||||
self.format_right = None
|
||||
self.format_left = None
|
||||
self.format_right_bold_italic = None
|
||||
self.format_bold = None
|
||||
self.format_header_left = None
|
||||
@@ -41,6 +42,7 @@ class AbstractReportXslx(models.AbstractModel):
|
||||
self._define_formats(workbook)
|
||||
|
||||
report_name = self._get_report_name()
|
||||
report_footer = self._get_report_footer()
|
||||
filters = self._get_report_filters(report)
|
||||
self.columns = self._get_report_columns(report)
|
||||
self.workbook = workbook
|
||||
@@ -54,6 +56,8 @@ class AbstractReportXslx(models.AbstractModel):
|
||||
|
||||
self._generate_report_content(workbook, report)
|
||||
|
||||
self._write_report_footer(report_footer)
|
||||
|
||||
def _define_formats(self, workbook):
|
||||
""" Add cell formats to current workbook.
|
||||
Those formats can be used on all cell.
|
||||
@@ -71,6 +75,7 @@ class AbstractReportXslx(models.AbstractModel):
|
||||
"""
|
||||
self.format_bold = workbook.add_format({'bold': True})
|
||||
self.format_right = workbook.add_format({'align': 'right'})
|
||||
self.format_left = workbook.add_format({'align': 'left'})
|
||||
self.format_right_bold_italic = workbook.add_format(
|
||||
{'align': 'right', 'bold': True, 'italic': True}
|
||||
)
|
||||
@@ -120,6 +125,18 @@ class AbstractReportXslx(models.AbstractModel):
|
||||
)
|
||||
self.row_pos += 3
|
||||
|
||||
def _write_report_footer(self, footer):
|
||||
"""Write report footer .
|
||||
Columns are defined with `_get_report_columns` method.
|
||||
"""
|
||||
if footer:
|
||||
self.row_pos += 1
|
||||
self.sheet.merge_range(
|
||||
self.row_pos, 0, self.row_pos, len(self.columns) - 1,
|
||||
footer, self.format_left
|
||||
)
|
||||
self.row_pos += 1
|
||||
|
||||
def _write_filters(self, filters):
|
||||
"""Write one line per filters on starting on current line.
|
||||
Columns number for filter name is defined
|
||||
@@ -322,6 +339,13 @@ class AbstractReportXslx(models.AbstractModel):
|
||||
"""
|
||||
raise NotImplementedError()
|
||||
|
||||
def _get_report_footer(self):
|
||||
"""
|
||||
Allow to define the report footer.
|
||||
:return: the report footer
|
||||
"""
|
||||
return False
|
||||
|
||||
def _get_report_columns(self, report):
|
||||
"""
|
||||
Allow to define the report columns
|
||||
|
||||
@@ -1287,173 +1287,9 @@ ORDER BY
|
||||
query_inject_move_line_centralized_params
|
||||
)
|
||||
|
||||
def _get_unaffected_earnings_account_sub_subquery_sum_initial(
|
||||
self
|
||||
):
|
||||
""" Return subquery used to compute sum amounts on
|
||||
unaffected earnings accounts """
|
||||
sub_subquery_sum_amounts = """
|
||||
SELECT
|
||||
SUM(ml.balance) AS initial_balance,
|
||||
0.0 AS final_balance
|
||||
FROM
|
||||
account_account a
|
||||
INNER JOIN
|
||||
account_account_type at ON a.user_type_id = at.id
|
||||
INNER JOIN
|
||||
account_move_line ml
|
||||
ON a.id = ml.account_id
|
||||
AND ml.date < %(date_from)s
|
||||
"""
|
||||
if self.only_posted_moves:
|
||||
sub_subquery_sum_amounts += """
|
||||
INNER JOIN
|
||||
account_move m ON ml.move_id = m.id AND m.state = 'posted'
|
||||
"""
|
||||
if self.filter_cost_center_ids:
|
||||
sub_subquery_sum_amounts += """
|
||||
INNER JOIN
|
||||
account_analytic_account aa
|
||||
ON
|
||||
ml.analytic_account_id = aa.id
|
||||
AND aa.id IN %(cost_center_ids)s
|
||||
"""
|
||||
sub_subquery_sum_amounts += """
|
||||
WHERE
|
||||
a.company_id = %(company_id)s
|
||||
AND
|
||||
a.id IN %(unaffected_earnings_account_ids)s
|
||||
"""
|
||||
if self.filter_journal_ids:
|
||||
sub_subquery_sum_amounts += """
|
||||
AND
|
||||
ml.journal_id in %(filter_journal_ids)s
|
||||
"""
|
||||
return sub_subquery_sum_amounts
|
||||
|
||||
def _get_unaffected_earnings_account_sub_subquery_sum_final(self):
|
||||
""" Return subquery used to compute sum amounts on
|
||||
unaffected earnings accounts """
|
||||
|
||||
sub_subquery_sum_amounts = """
|
||||
SELECT
|
||||
0.0 AS initial_balance,
|
||||
SUM(ml.balance) AS final_balance
|
||||
"""
|
||||
sub_subquery_sum_amounts += """
|
||||
FROM
|
||||
account_account a
|
||||
INNER JOIN
|
||||
account_account_type at ON a.user_type_id = at.id
|
||||
INNER JOIN
|
||||
account_move_line ml
|
||||
ON a.id = ml.account_id
|
||||
AND ml.date <= %(date_to)s
|
||||
"""
|
||||
if self.only_posted_moves:
|
||||
sub_subquery_sum_amounts += """
|
||||
INNER JOIN
|
||||
account_move m ON ml.move_id = m.id AND m.state = 'posted'
|
||||
"""
|
||||
if self.filter_cost_center_ids:
|
||||
sub_subquery_sum_amounts += """
|
||||
INNER JOIN
|
||||
account_analytic_account aa
|
||||
ON
|
||||
ml.analytic_account_id = aa.id
|
||||
AND aa.id IN %(cost_center_ids)s
|
||||
"""
|
||||
sub_subquery_sum_amounts += """
|
||||
WHERE
|
||||
a.company_id = %(company_id)s
|
||||
AND
|
||||
a.id IN %(unaffected_earnings_account_ids)s
|
||||
"""
|
||||
if self.filter_journal_ids:
|
||||
sub_subquery_sum_amounts += """
|
||||
AND
|
||||
ml.journal_id in %(filter_journal_ids)s
|
||||
"""
|
||||
return sub_subquery_sum_amounts
|
||||
|
||||
def _inject_unaffected_earnings_account_values(self):
|
||||
"""Inject the report values of the unaffected earnings account
|
||||
for report_general_ledger_account."""
|
||||
subquery_sum_amounts = """
|
||||
SELECT
|
||||
SUM(COALESCE(sub.initial_balance, 0.0)) AS initial_balance,
|
||||
SUM(COALESCE(sub.final_balance, 0.0)) AS final_balance
|
||||
FROM
|
||||
(
|
||||
"""
|
||||
# Initial balances
|
||||
subquery_sum_amounts += \
|
||||
self._get_unaffected_earnings_account_sub_subquery_sum_initial()
|
||||
subquery_sum_amounts += """
|
||||
UNION
|
||||
"""
|
||||
subquery_sum_amounts += \
|
||||
self._get_unaffected_earnings_account_sub_subquery_sum_final()
|
||||
subquery_sum_amounts += """
|
||||
) sub
|
||||
"""
|
||||
|
||||
# pylint: disable=sql-injection
|
||||
query_inject_account = """
|
||||
WITH
|
||||
sum_amounts AS ( """ + subquery_sum_amounts + """ )
|
||||
INSERT INTO
|
||||
report_general_ledger_account
|
||||
(
|
||||
report_id,
|
||||
create_uid,
|
||||
create_date,
|
||||
account_id,
|
||||
code,
|
||||
name,
|
||||
is_partner_account,
|
||||
initial_balance,
|
||||
final_balance,
|
||||
currency_id
|
||||
)
|
||||
SELECT
|
||||
%(report_id)s AS report_id,
|
||||
%(user_id)s AS create_uid,
|
||||
NOW() AS create_date,
|
||||
a.id AS account_id,
|
||||
a.code,
|
||||
a.name,
|
||||
False AS is_partner_account,
|
||||
COALESCE(i.initial_balance, 0.0) AS initial_balance,
|
||||
COALESCE(i.final_balance, 0.0) AS final_balance,
|
||||
c.id as currency_id
|
||||
FROM
|
||||
account_account a
|
||||
LEFT JOIN
|
||||
res_currency c ON c.id = a.currency_id,
|
||||
sum_amounts i
|
||||
WHERE
|
||||
a.company_id = %(company_id)s
|
||||
AND a.id = %(unaffected_earnings_account_id)s
|
||||
"""
|
||||
query_inject_account_params = {
|
||||
'date_from': self.date_from,
|
||||
'date_to': self.date_to,
|
||||
'fy_start_date': self.fy_start_date,
|
||||
}
|
||||
if self.filter_cost_center_ids:
|
||||
query_inject_account_params['cost_center_ids'] = \
|
||||
tuple(self.filter_cost_center_ids.ids)
|
||||
query_inject_account_params['company_id'] = self.company_id.id
|
||||
query_inject_account_params['unaffected_earnings_account_id'] = \
|
||||
self.unaffected_earnings_account.id
|
||||
query_inject_account_params['report_id'] = self.id
|
||||
query_inject_account_params['user_id'] = self.env.uid
|
||||
|
||||
if self.filter_journal_ids:
|
||||
query_inject_account_params['filter_journal_ids'] = (tuple(
|
||||
self.filter_journal_ids.ids,
|
||||
),)
|
||||
# Fetch the profit and loss accounts
|
||||
query_unaffected_earnings_account_ids = """
|
||||
SELECT a.id
|
||||
@@ -1464,7 +1300,155 @@ ORDER BY
|
||||
"""
|
||||
self.env.cr.execute(query_unaffected_earnings_account_ids)
|
||||
pl_account_ids = [r[0] for r in self.env.cr.fetchall()]
|
||||
query_inject_account_params['unaffected_earnings_account_ids'] = \
|
||||
tuple(pl_account_ids + [self.unaffected_earnings_account.id])
|
||||
unaffected_earnings_account_ids = \
|
||||
pl_account_ids + [self.unaffected_earnings_account.id]
|
||||
# Fetch the current fiscal year start date
|
||||
date = fields.Datetime.from_string(self.date_from)
|
||||
res = self.company_id.compute_fiscalyear_dates(date)
|
||||
fy_start_date = res['date_from']
|
||||
query_select_previous_fy_unaffected_earnings_params = {
|
||||
'date_to': fy_start_date,
|
||||
'company_id': self.company_id.id,
|
||||
'account_ids': tuple(unaffected_earnings_account_ids),
|
||||
}
|
||||
query_select_previous_fy_unaffected_earnings = """
|
||||
SELECT sum(aml.balance) as balance
|
||||
FROM account_move_line as aml
|
||||
INNER JOIN account_move as am
|
||||
ON am.id = aml.move_id
|
||||
INNER JOIN account_journal j
|
||||
ON am.journal_id = j.id
|
||||
"""
|
||||
if self.filter_cost_center_ids:
|
||||
query_select_previous_fy_unaffected_earnings += """
|
||||
INNER JOIN account_analytic_account aa
|
||||
ON aml.analytic_account_id = aa.id
|
||||
AND aa.id IN %(cost_center_ids)s
|
||||
"""
|
||||
query_select_previous_fy_unaffected_earnings_params[
|
||||
'cost_center_ids'] = tuple(self.filter_cost_center_ids.ids)
|
||||
|
||||
query_select_previous_fy_unaffected_earnings += """
|
||||
WHERE aml.date < %(date_to)s
|
||||
AND aml.company_id = %(company_id)s
|
||||
AND aml.account_id IN %(account_ids)s
|
||||
"""
|
||||
if self.filter_journal_ids:
|
||||
query_select_previous_fy_unaffected_earnings += """
|
||||
AND j.id IN %(journal_ids)s
|
||||
"""
|
||||
query_select_previous_fy_unaffected_earnings_params[
|
||||
'journal_ids'] = tuple(self.filter_journal_ids.ids)
|
||||
if self.only_posted_moves:
|
||||
query_select_previous_fy_unaffected_earnings += """
|
||||
AND am.state = 'posted'
|
||||
"""
|
||||
self.env.cr.execute(
|
||||
query_select_previous_fy_unaffected_earnings,
|
||||
query_select_previous_fy_unaffected_earnings_params)
|
||||
res = self.env.cr.fetchone()
|
||||
unaffected_earnings_initial_balance = res[0] or 0.0
|
||||
# Now select the current period unaffected earnings,
|
||||
# excluding the current period P&L.
|
||||
query_select_period_unaffected_earnings_params = {
|
||||
'date_from': self.date_from,
|
||||
'date_to': self.date_to,
|
||||
'company_id': self.company_id.id,
|
||||
'unaffected_earnings_id': self.unaffected_earnings_account.id,
|
||||
}
|
||||
query_select_period_unaffected_earnings = """
|
||||
SELECT
|
||||
sum(aml.debit) as sum_debit,
|
||||
sum(aml.credit) as sum_credit,
|
||||
sum(aml.balance) as balance
|
||||
FROM account_move_line as aml
|
||||
INNER JOIN account_move as am
|
||||
ON am.id = aml.move_id
|
||||
INNER JOIN account_journal j
|
||||
ON am.journal_id = j.id
|
||||
"""
|
||||
if self.filter_cost_center_ids:
|
||||
query_select_period_unaffected_earnings += """
|
||||
INNER JOIN account_analytic_account aa
|
||||
ON aml.analytic_account_id = aa.id
|
||||
AND aa.id IN %(cost_center_ids)s
|
||||
"""
|
||||
query_select_period_unaffected_earnings_params[
|
||||
'cost_center_ids'] = tuple(self.filter_cost_center_ids.ids)
|
||||
query_select_period_unaffected_earnings += """
|
||||
WHERE am.date >= %(date_from)s
|
||||
AND aml.date <= %(date_to)s
|
||||
AND aml.company_id = %(company_id)s
|
||||
AND aml.account_id = %(unaffected_earnings_id)s
|
||||
"""
|
||||
if self.filter_journal_ids:
|
||||
query_select_period_unaffected_earnings += """
|
||||
AND j.id IN %(journal_ids)s
|
||||
"""
|
||||
query_select_period_unaffected_earnings_params[
|
||||
'journal_ids'] = tuple(self.filter_journal_ids.ids)
|
||||
if self.only_posted_moves:
|
||||
query_select_period_unaffected_earnings += """
|
||||
AND am.state = 'posted'
|
||||
"""
|
||||
self.env.cr.execute(query_select_period_unaffected_earnings,
|
||||
query_select_period_unaffected_earnings_params)
|
||||
res = self.env.cr.fetchone()
|
||||
unaffected_earnings_period_debit = res[0] or 0.0
|
||||
unaffected_earnings_period_credit = res[1] or 0.0
|
||||
unaffected_earnings_period_balance = res[2] or 0.0
|
||||
# pylint: disable=sql-injection
|
||||
query_inject_account = """
|
||||
INSERT INTO
|
||||
report_general_ledger_account (
|
||||
report_id,
|
||||
create_uid,
|
||||
create_date,
|
||||
account_id,
|
||||
code,
|
||||
name,
|
||||
is_partner_account,
|
||||
initial_debit,
|
||||
initial_credit,
|
||||
initial_balance,
|
||||
final_debit,
|
||||
final_credit,
|
||||
final_balance
|
||||
)
|
||||
VALUES (
|
||||
%(report_id)s,
|
||||
%(user_id)s,
|
||||
NOW(),
|
||||
%(account_id)s,
|
||||
%(code)s,
|
||||
%(name)s,
|
||||
False,
|
||||
%(initial_debit)s,
|
||||
%(initial_credit)s,
|
||||
%(initial_balance)s,
|
||||
%(final_debit)s,
|
||||
%(final_credit)s,
|
||||
%(final_balance)s
|
||||
)
|
||||
"""
|
||||
initial_debit = unaffected_earnings_initial_balance >= 0 and \
|
||||
unaffected_earnings_initial_balance or 0
|
||||
initial_credit = unaffected_earnings_initial_balance < 0 and \
|
||||
-1 * unaffected_earnings_initial_balance or 0
|
||||
final_balance = unaffected_earnings_initial_balance + \
|
||||
unaffected_earnings_period_balance
|
||||
query_inject_account_params = {
|
||||
'report_id': self.id,
|
||||
'user_id': self.env.uid,
|
||||
'account_id': self.unaffected_earnings_account.id,
|
||||
'code': self.unaffected_earnings_account.code,
|
||||
'name': self.unaffected_earnings_account.name,
|
||||
'initial_debit': initial_debit,
|
||||
'initial_credit': initial_credit,
|
||||
'initial_balance': unaffected_earnings_initial_balance,
|
||||
'final_debit': initial_debit + unaffected_earnings_period_debit,
|
||||
'final_credit': initial_credit + unaffected_earnings_period_credit,
|
||||
'final_balance': final_balance,
|
||||
}
|
||||
self.env.cr.execute(query_inject_account,
|
||||
query_inject_account_params)
|
||||
|
||||
@@ -35,7 +35,12 @@
|
||||
<!-- Adapt -->
|
||||
<t t-set="style" t-value="'font-size:8px;'"/>
|
||||
<t t-set="padding" t-value="line.level * 4"/>
|
||||
<t t-set="style" t-value="'font-size: ' + str(14 - line.level) + 'px; margin-left: ' + str(line.level * 4) + 'px;'"/>
|
||||
<t t-if="o.hide_account_at_0">
|
||||
<t t-set="style" t-value="'font-size: 14px;'"/>
|
||||
</t>
|
||||
<t t-if="not o.hide_account_at_0">
|
||||
<t t-set="style" t-value="'font-size: ' + str(14 - line.level) + 'px; margin-left: ' + str(line.level * 4) + 'px;'"/>
|
||||
</t>
|
||||
<t t-if="line.account_group_id">
|
||||
<t t-set="style" t-value="style + 'font-weight: bold; color: blue;'"/>
|
||||
</t>
|
||||
@@ -96,7 +101,6 @@
|
||||
</t>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template id="account_financial_report.report_trial_balance_filters">
|
||||
<div class="act_as_table data_table" style="width: 100%;">
|
||||
<div class="act_as_row labels">
|
||||
@@ -113,8 +117,8 @@
|
||||
<t t-if="not o.only_posted_moves">All entries</t>
|
||||
</div>
|
||||
<div class="act_as_cell">
|
||||
<t t-if="o.hide_account_balance_at_0">Hide</t>
|
||||
<t t-if="not o.hide_account_balance_at_0">Show</t>
|
||||
<t t-if="o.hide_account_at_0">Hide</t>
|
||||
<t t-if="not o.hide_account_at_0">Show</t>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -143,6 +147,8 @@
|
||||
<div class="act_as_cell" style="width: 9.64%;">Debit</div>
|
||||
<!--## Credit-->
|
||||
<div class="act_as_cell" style="width: 9.64%;">Credit</div>
|
||||
<!--## Period balance-->
|
||||
<div class="act_as_cell" style="width: 9.64%;">Period balance</div>
|
||||
<!--## Ending balance-->
|
||||
<div class="act_as_cell" style="width: 9.64%;">Ending balance</div>
|
||||
<t t-if="foreign_currency">
|
||||
@@ -359,6 +365,38 @@
|
||||
</span>
|
||||
</t>
|
||||
</div>
|
||||
<!--## Period balance-->
|
||||
<div class="act_as_cell amount">
|
||||
<t t-if="type == 'account_type'">
|
||||
<t t-if="line.account_id">
|
||||
<t t-set="domain"
|
||||
t-value="[('account_id', '=', line.account_id.id),
|
||||
('date', '>=', line.report_id.date_from),
|
||||
('date', '<=', line.report_id.date_to)]"/>
|
||||
<span>
|
||||
<a t-att-data-domain="domain"
|
||||
t-att-data-res-model="'account.move.line'"
|
||||
class="o_account_financial_reports_web_action_monetary_multi"
|
||||
t-att-style="style">
|
||||
<t t-att-style="style" t-raw="line.period_balance" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>
|
||||
</span>
|
||||
</t>
|
||||
</t>
|
||||
<t t-if="type == 'partner_type'">
|
||||
<t t-set="domain"
|
||||
t-value="[('account_id', '=', line.report_account_id.account_id.id),
|
||||
('partner_id', '=', line.partner_id.id),
|
||||
('date', '>=', line.report_account_id.report_id.date_from),
|
||||
('date', '<=', line.report_account_id.report_id.date_to)]"/>
|
||||
<span>
|
||||
<a t-att-data-domain="domain"
|
||||
t-att-data-res-model="'account.move.line'"
|
||||
class="o_account_financial_reports_web_action_monetary_multi"
|
||||
t-att-style="style">
|
||||
<t t-att-style="style" t-raw="line.period_balance" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>
|
||||
</span>
|
||||
</t>
|
||||
</div>
|
||||
<!--## Ending balance-->
|
||||
<div class="act_as_cell amount">
|
||||
<t t-if="type == 'account_type'">
|
||||
@@ -551,6 +589,21 @@
|
||||
<t t-att-style="style" t-raw="account.credit" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>
|
||||
</span>
|
||||
</div>
|
||||
<!--## Period Balance -->
|
||||
<div class="act_as_cell amount" style="width: 9.64%;">
|
||||
<t t-set="domain"
|
||||
t-value="[('account_id', '=', account.account_id.id),
|
||||
('date', '>=', account.report_id.date_from),
|
||||
('date', '<=', account.report_id.date_to),
|
||||
('period_balance', '<>', 0)]"/>
|
||||
<span>
|
||||
<a t-att-data-domain="domain"
|
||||
t-att-data-res-model="'account.move.line'"
|
||||
class="o_account_financial_reports_web_action_monetary_multi"
|
||||
t-att-style="style">
|
||||
<t t-att-style="style" t-raw="account.period_balance" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>
|
||||
</span>
|
||||
</div>
|
||||
<!--## Ending balance-->
|
||||
<div class="act_as_cell amount" style="width: 9.64%;">
|
||||
<t t-set="domain"
|
||||
|
||||
@@ -24,18 +24,26 @@ class TrialBalanceReport(models.TransientModel):
|
||||
date_to = fields.Date()
|
||||
fy_start_date = fields.Date()
|
||||
only_posted_moves = fields.Boolean()
|
||||
hide_account_balance_at_0 = fields.Boolean()
|
||||
hide_account_at_0 = fields.Boolean()
|
||||
foreign_currency = fields.Boolean()
|
||||
company_id = fields.Many2one(comodel_name='res.company')
|
||||
filter_account_ids = fields.Many2many(comodel_name='account.account')
|
||||
filter_partner_ids = fields.Many2many(comodel_name='res.partner')
|
||||
filter_journal_ids = fields.Many2many(comodel_name='account.journal')
|
||||
show_partner_details = fields.Boolean()
|
||||
hierarchy_on = fields.Selection([('computed', 'Computed Accounts'),
|
||||
('relation', 'Child Accounts')],
|
||||
string='Hierarchy On',
|
||||
required=True,
|
||||
default='computed')
|
||||
hierarchy_on = fields.Selection(
|
||||
[('computed', 'Computed Accounts'),
|
||||
('relation', 'Child Accounts'),
|
||||
('none', 'No hierarchy')],
|
||||
string='Hierarchy On',
|
||||
required=True,
|
||||
default='computed',
|
||||
help="""Computed Accounts: Use when the account group have codes
|
||||
that represent prefixes of the actual accounts.\n
|
||||
Child Accounts: Use when your account groups are hierarchical.\n
|
||||
No hierarchy: Use to display just the accounts, without any grouping.
|
||||
""",
|
||||
)
|
||||
|
||||
# General Ledger Report Data fields,
|
||||
# used as base for compute the data reports
|
||||
@@ -94,6 +102,7 @@ class TrialBalanceReportAccount(models.TransientModel):
|
||||
initial_balance_foreign_currency = fields.Float(digits=(16, 2))
|
||||
debit = fields.Float(digits=(16, 2))
|
||||
credit = fields.Float(digits=(16, 2))
|
||||
period_balance = fields.Float(digits=(16, 2))
|
||||
final_balance = fields.Float(digits=(16, 2))
|
||||
final_balance_foreign_currency = fields.Float(digits=(16, 2))
|
||||
|
||||
@@ -128,6 +137,7 @@ class TrialBalanceReportPartner(models.TransientModel):
|
||||
initial_balance_foreign_currency = fields.Float(digits=(16, 2))
|
||||
debit = fields.Float(digits=(16, 2))
|
||||
credit = fields.Float(digits=(16, 2))
|
||||
period_balance = fields.Float(digits=(16, 2))
|
||||
final_balance = fields.Float(digits=(16, 2))
|
||||
final_balance_foreign_currency = fields.Float(digits=(16, 2))
|
||||
|
||||
@@ -186,7 +196,7 @@ class TrialBalanceReportCompute(models.TransientModel):
|
||||
'date_from': self.date_from,
|
||||
'date_to': self.date_to,
|
||||
'only_posted_moves': self.only_posted_moves,
|
||||
'hide_account_balance_at_0': self.hide_account_balance_at_0,
|
||||
'hide_account_at_0': self.hide_account_at_0,
|
||||
'foreign_currency': self.foreign_currency,
|
||||
'company_id': self.company_id.id,
|
||||
'filter_account_ids': [(6, 0, account_ids.ids)],
|
||||
@@ -220,18 +230,28 @@ class TrialBalanceReportCompute(models.TransientModel):
|
||||
self._inject_partner_values()
|
||||
if not self.filter_account_ids:
|
||||
self._inject_account_group_values()
|
||||
if self.hierarchy_on == 'computed':
|
||||
self._update_account_group_computed_values()
|
||||
else:
|
||||
self._update_account_group_child_values()
|
||||
self._update_account_sequence()
|
||||
self._add_account_group_account_values()
|
||||
if self.hierarchy_on != 'none':
|
||||
if self.hierarchy_on == 'computed':
|
||||
self._update_account_group_computed_values()
|
||||
else:
|
||||
self._update_account_group_child_values()
|
||||
self._update_account_sequence()
|
||||
self._add_account_group_account_values()
|
||||
self.refresh()
|
||||
if not self.filter_account_ids:
|
||||
if not self.filter_account_ids and self.hierarchy_on != 'none':
|
||||
self._compute_group_accounts()
|
||||
else:
|
||||
for line in self.account_ids:
|
||||
line.write({'level': 0})
|
||||
if self.hide_account_at_0:
|
||||
self.env.cr.execute("""
|
||||
DELETE FROM report_trial_balance_account
|
||||
WHERE report_id=%s
|
||||
AND (initial_balance IS NULL OR initial_balance = 0)
|
||||
AND (debit IS NULL OR debit = 0)
|
||||
AND (credit IS NULL OR credit = 0)
|
||||
AND (final_balance IS NULL OR final_balance = 0)
|
||||
""", [self.id])
|
||||
|
||||
def _inject_account_values(self, account_ids):
|
||||
"""Inject report values for report_trial_balance_account"""
|
||||
@@ -249,6 +269,7 @@ INSERT INTO
|
||||
initial_balance,
|
||||
debit,
|
||||
credit,
|
||||
period_balance,
|
||||
final_balance,
|
||||
currency_id,
|
||||
initial_balance_foreign_currency,
|
||||
@@ -265,6 +286,7 @@ SELECT
|
||||
coalesce(rag.initial_balance, 0) AS initial_balance,
|
||||
coalesce(rag.final_debit - rag.initial_debit, 0) AS debit,
|
||||
coalesce(rag.final_credit - rag.initial_credit, 0) AS credit,
|
||||
coalesce(rag.final_balance - rag.initial_balance, 0) AS period_balance,
|
||||
coalesce(rag.final_balance, 0) AS final_balance,
|
||||
rag.currency_id AS currency_id,
|
||||
coalesce(rag.initial_balance_foreign_currency, 0)
|
||||
@@ -278,9 +300,6 @@ FROM
|
||||
WHERE
|
||||
acc.id in %s
|
||||
"""
|
||||
if self.hide_account_balance_at_0:
|
||||
query_inject_account += """ AND
|
||||
final_balance IS NOT NULL AND final_balance != 0"""
|
||||
query_inject_account_params = (
|
||||
self.id,
|
||||
self.env.uid,
|
||||
@@ -304,6 +323,7 @@ INSERT INTO
|
||||
initial_balance_foreign_currency,
|
||||
debit,
|
||||
credit,
|
||||
period_balance,
|
||||
final_balance,
|
||||
final_balance_foreign_currency
|
||||
)
|
||||
@@ -317,6 +337,7 @@ SELECT
|
||||
rpg.initial_balance_foreign_currency AS initial_balance_foreign_currency,
|
||||
rpg.final_debit - rpg.initial_debit AS debit,
|
||||
rpg.final_credit - rpg.initial_credit AS credit,
|
||||
rpg.final_balance - rpg.initial_balance AS period_balance,
|
||||
rpg.final_balance AS final_balance,
|
||||
rpg.final_balance_foreign_currency AS final_balance_foreign_currency
|
||||
FROM
|
||||
|
||||
@@ -30,22 +30,26 @@ class TrialBalanceXslx(models.AbstractModel):
|
||||
'field': 'credit',
|
||||
'type': 'amount',
|
||||
'width': 14},
|
||||
5: {'header': _('Ending balance'),
|
||||
5: {'header': _('Period balance'),
|
||||
'field': 'period_balance',
|
||||
'type': 'amount',
|
||||
'width': 14},
|
||||
6: {'header': _('Ending balance'),
|
||||
'field': 'final_balance',
|
||||
'type': 'amount',
|
||||
'width': 14},
|
||||
}
|
||||
if report.foreign_currency:
|
||||
foreign_currency = {
|
||||
6: {'header': _('Cur.'),
|
||||
7: {'header': _('Cur.'),
|
||||
'field': 'currency_id',
|
||||
'field_currency_balance': 'currency_id',
|
||||
'type': 'many2one', 'width': 7},
|
||||
7: {'header': _('Initial balance'),
|
||||
8: {'header': _('Initial balance'),
|
||||
'field': 'initial_balance_foreign_currency',
|
||||
'type': 'amount_currency',
|
||||
'width': 14},
|
||||
8: {'header': _('Ending balance'),
|
||||
9: {'header': _('Ending balance'),
|
||||
'field': 'final_balance_foreign_currency',
|
||||
'type': 'amount_currency',
|
||||
'width': 14},
|
||||
@@ -67,7 +71,11 @@ class TrialBalanceXslx(models.AbstractModel):
|
||||
'field': 'credit',
|
||||
'type': 'amount',
|
||||
'width': 14},
|
||||
4: {'header': _('Ending balance'),
|
||||
4: {'header': _('Period balance'),
|
||||
'field': 'period_balance',
|
||||
'type': 'amount',
|
||||
'width': 14},
|
||||
5: {'header': _('Ending balance'),
|
||||
'field': 'final_balance',
|
||||
'type': 'amount',
|
||||
'width': 14},
|
||||
@@ -97,8 +105,8 @@ class TrialBalanceXslx(models.AbstractModel):
|
||||
[_('Target moves filter'),
|
||||
_('All posted entries') if report.only_posted_moves else _(
|
||||
'All entries')],
|
||||
[_('Account balance at 0 filter'),
|
||||
_('Hide') if report.hide_account_balance_at_0 else _('Show')],
|
||||
[_('Account at 0 filter'),
|
||||
_('Hide') if report.hide_account_at_0 else _('Show')],
|
||||
[_('Show foreign currency'),
|
||||
_('Yes') if report.foreign_currency else _('No')],
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user