Skip to content

[18.0][IMP] mis_builder: companies as columns in multi-company reports #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dnplkndll wants to merge 1 commit into
base: 18.0
Choose a base branch
from
Open

[18.0][IMP] mis_builder: companies as columns in multi-company reports #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions mis_builder/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.. image:: https://odoo-community.org/readme-banner-image
:target: https://odoo-community.org/get-involved?utm_source=readme
:alt: Odoo Community Association

===========
MIS Builder
===========
Expand All @@ -17,7 +13,7 @@ MIS Builder
.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
:target: https://odoo-community.org/page/development-status
:alt: Production/Stable
.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmis--builder-lightgray.png?logo=github
Expand Down
3 changes: 3 additions & 0 deletions mis_builder/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
"report/mis_report_instance_qweb.xml",
"report/mis_report_instance_xlsx.xml",
],
"demo": [
"demo/mis_multicompany_demo.xml",
],
"assets": {
"web.assets_backend": [
"mis_builder/static/src/components/mis_report_widget.esm.js",
Expand Down
147 changes: 147 additions & 0 deletions mis_builder/demo/mis_multicompany_demo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- Demo data for multi-company MIS reports. -->
<odoo noupdate="1">
<!-- Second company (an independent peer company, not a branch) -->
<record id="company_other" model="res.company">
<field name="name">Other Company</field>
</record>

<!-- Grant admin access to both companies -->
<record id="base.user_admin" model="res.users">
<field name="company_ids" eval="[(4, ref('company_other'))]" />
</record>

<!-- Expense account for Other Company -->
<record id="account_expense_other" model="account.account">
<field name="code">600000</field>
<field name="name">Expenses</field>
<field name="account_type">expense</field>
<field name="company_ids" eval="[(6, 0, [ref('company_other')])]" />
</record>

<!-- Equipment account for Other Company -->
<record id="account_equipment_other" model="account.account">
<field name="code">611000</field>
<field name="name">Purchase of Equipments</field>
<field name="account_type">expense</field>
<field name="company_ids" eval="[(6, 0, [ref('company_other')])]" />
</record>

<!-- Bank account for Other Company -->
<record id="account_bank_other" model="account.account">
<field name="code">101401</field>
<field name="name">Bank</field>
<field name="account_type">asset_current</field>
<field name="company_ids" eval="[(6, 0, [ref('company_other')])]" />
</record>

<!-- Journal for Other Company -->
<record id="journal_misc_other" model="account.journal">
<field name="name">Miscellaneous</field>
<field name="type">general</field>
<field name="code">MISC</field>
<field name="company_id" ref="company_other" />
</record>

<!-- Journal entry: Other Company consulting fees -->
<record id="move_other_consulting" model="account.move">
<field name="company_id" ref="company_other" />
<field name="journal_id" ref="journal_misc_other" />
<field name="date">2026-03-10</field>
<field
name="line_ids"
eval="[
(0, 0, {'account_id': ref('account_expense_other'), 'debit': 22000, 'name': 'Consulting Fees'}),
(0, 0, {'account_id': ref('account_bank_other'), 'credit': 22000, 'name': 'Consulting Fees'}),
]"
/>
</record>

<!-- Journal entry: Other Company furniture -->
<record id="move_other_furniture" model="account.move">
<field name="company_id" ref="company_other" />
<field name="journal_id" ref="journal_misc_other" />
<field name="date">2026-02-20</field>
<field
name="line_ids"
eval="[
(0, 0, {'account_id': ref('account_equipment_other'), 'debit': 5200, 'name': 'Office Furniture'}),
(0, 0, {'account_id': ref('account_bank_other'), 'credit': 5200, 'name': 'Office Furniture'}),
]"
/>
</record>

<!-- MIS report template with auto-expanded expense accounts -->
<record id="report_mc_expenses" model="mis.report">
<field name="name">Multi-Company Expenses</field>
</record>

<record id="report_mc_expenses_kpi_exp" model="mis.report.kpi">
<field name="report_id" ref="report_mc_expenses" />
<field name="name">exp</field>
<field name="description">Expenses</field>
<field name="auto_expand_accounts">True</field>
<field name="sequence">10</field>
</record>

<record id="report_mc_expenses_kpi_exp_expr" model="mis.report.kpi.expression">
<field name="kpi_id" ref="report_mc_expenses_kpi_exp" />
<field name="name">balp[600%]</field>
</record>

<record id="report_mc_expenses_kpi_equip" model="mis.report.kpi">
<field name="report_id" ref="report_mc_expenses" />
<field name="name">equip</field>
<field name="description">Equipment</field>
<field name="auto_expand_accounts">True</field>
<field name="sequence">20</field>
</record>

<record id="report_mc_expenses_kpi_equip_expr" model="mis.report.kpi.expression">
<field name="kpi_id" ref="report_mc_expenses_kpi_equip" />
<field name="name">balp[611%]</field>
</record>

<record id="report_mc_expenses_kpi_total" model="mis.report.kpi">
<field name="report_id" ref="report_mc_expenses" />
<field name="name">total</field>
<field name="description">Total</field>
<field name="sequence">100</field>
<field name="style_expression">AccountingTotal</field>
</record>

<record id="report_mc_expenses_kpi_total_expr" model="mis.report.kpi.expression">
<field name="kpi_id" ref="report_mc_expenses_kpi_total" />
<field name="name">exp + equip</field>
</record>

<!-- Multi-company report instance -->
<record id="instance_mc_expenses" model="mis.report.instance">
<field name="name">Multi-Company Expenses Report</field>
<field name="report_id" ref="report_mc_expenses" />
<field name="multi_company">True</field>
<field name="comparison_mode">True</field>
<field
name="company_ids"
eval="[
(4, ref('base.main_company')),
(4, ref('company_other')),
]"
/>
</record>

<!-- Period: Year to Date -->
<record id="instance_mc_expenses_period" model="mis.report.instance.period">
<field name="report_instance_id" ref="instance_mc_expenses" />
<field name="name">Year to Date</field>
<field name="mode">relative</field>
<field name="source">actuals</field>
<field name="type">y</field>
<field name="offset">0</field>
<field name="duration">1</field>
<field name="sequence">10</field>
</record>

<!-- Post the demo journal entries so they appear in reports -->
<function model="mis.report.instance" name="_post_demo_moves" />
</odoo>
10 changes: 9 additions & 1 deletion mis_builder/models/kpimatrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,15 @@ def __init__(
env,
companies=None,
account_model="account.account",
companies_as_columns=False,
):
# cache language id for faster rendering
lang_model = env["res.lang"]
self.lang = lang_model._lang_get(env.user.lang)
self._style_model = env["mis.report.style"]
self._account_model = env[account_model]
self._companies = companies
self._companies_as_columns = companies_as_columns
# data structures
# { kpi: KpiMatrixRow }
self._kpi_rows = OrderedDict()
Expand Down Expand Up @@ -489,7 +491,11 @@ def _get_account_name(self, account):
# (this may return a name without code)
account_name = account.display_name
is_multi_company = self._companies and len(self._companies) > 1
if is_multi_company and len(account_companies) == 1:
if (
is_multi_company
and len(account_companies) == 1
and not self._companies_as_columns
):
# In a multi-company report, if the account is bound to one
# company, it makes sense to show the company name. If the account
# is bound to multiple companies it does not make sense, because we
Expand All @@ -498,6 +504,8 @@ def _get_account_name(self, account):
# information. To be able to accurately display the company on
# detail lines when the account is bound to multiple companies,
# we'll need a generalized kpi details expansion.
# When companies are shown as separate columns, each column is
# already a single company, so the per-row suffix is redundant.
account_name = f"{account_name} [{account_companies.display_name}]"
return account_name

Expand Down
9 changes: 7 additions & 2 deletions mis_builder/models/mis_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,9 +539,14 @@ def copy(self, default=None):

# TODO: kpi name cannot be start with query name

def prepare_kpi_matrix(self, companies=None):
def prepare_kpi_matrix(self, companies=None, companies_as_columns=False):
self.ensure_one()
kpi_matrix = KpiMatrix(self.env, companies, self.account_model)
kpi_matrix = KpiMatrix(
self.env,
companies,
self.account_model,
companies_as_columns=companies_as_columns,
)
for kpi in self.kpi_ids:
kpi_matrix.declare_kpi(kpi)
return kpi_matrix
Expand Down
Loading
Loading