Skip to content

[18.0][FIX] mis_builder: fix multi-company account display + migration #782

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 2 commits into
base: 18.0
Choose a base branch
from
Open

[18.0][FIX] mis_builder: fix multi-company account display + migration #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bb74cc
[18.0][FIX] mis_builder: fix multi-company account display
dnplkndll Mar 27, 2026
9ef9acc
[18.0][ADD] mis_builder: add multi-company demo data
dnplkndll Mar 27, 2026
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,4 @@ docs/_build/

# OCA rules
!static/lib/
node_modules/
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 @@ -28,6 +28,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 -->
<record id="company_branch" model="res.company">
<field name="name">Branch Office</field>
</record>

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

<!-- Expense account for Branch Office -->
<record id="account_expense_branch" 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_branch')])]" />
</record>

<!-- Equipment account for Branch Office -->
<record id="account_equipment_branch" 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_branch')])]" />
</record>

<!-- Bank account for Branch Office -->
<record id="account_bank_branch" 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_branch')])]" />
</record>

<!-- Journal for Branch Office -->
<record id="journal_misc_branch" model="account.journal">
<field name="name">Miscellaneous</field>
<field name="type">general</field>
<field name="code">MISC</field>
<field name="company_id" ref="company_branch" />
</record>

<!-- Journal entry: Branch Office consulting fees -->
<record id="move_branch_consulting" model="account.move">
<field name="company_id" ref="company_branch" />
<field name="journal_id" ref="journal_misc_branch" />
<field name="date">2026-03-10</field>
<field
name="line_ids"
eval="[
(0, 0, {'account_id': ref('account_expense_branch'), 'debit': 22000, 'name': 'Branch Consulting Fees'}),
(0, 0, {'account_id': ref('account_bank_branch'), 'credit': 22000, 'name': 'Branch Consulting Fees'}),
]"
/>
</record>

<!-- Journal entry: Branch Office furniture -->
<record id="move_branch_furniture" model="account.move">
<field name="company_id" ref="company_branch" />
<field name="journal_id" ref="journal_misc_branch" />
<field name="date">2026-02-20</field>
<field
name="line_ids"
eval="[
(0, 0, {'account_id': ref('account_equipment_branch'), 'debit': 5200, 'name': 'Branch Office Furniture'}),
(0, 0, {'account_id': ref('account_bank_branch'), 'credit': 5200, 'name': 'Branch 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_branch')),
]"
/>
</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>
22 changes: 19 additions & 3 deletions mis_builder/models/kpimatrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,19 @@ def __init__(


class KpiMatrix:
def __init__(self, env, multi_company=False, account_model="account.account"):
def __init__(
self,
env,
multi_company=False,
query_companies=None,
account_model="account.account",
):
# 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._query_companies = query_companies
# data structures
# { kpi: KpiMatrixRow }
self._kpi_rows = OrderedDict()
Expand Down Expand Up @@ -467,9 +474,18 @@ def _load_account_names(self):
self._account_names = {a.id: self._get_account_name(a) for a in accounts}

def _get_account_name(self, account):
result = f"{account.code} {account.name}"
code = account.code
# In Odoo 18, account.code is company-dependent. If the current env
# company doesn't match the account's company, code may be False.
# Read the code from the account's owning company.
if not code and self._query_companies:
account_companies = account.company_ids & self._query_companies
if account_companies:
code = account.with_company(account_companies[0]).code
result = f"{code} {account.name}" if code else account.name
if self._multi_company:
result = f"{result} [{account.company_id.name}]"
company_names = ", ".join(account.company_ids.mapped("name"))
result = f"{result} [{company_names}]"
return result

def get_account_name(self, account_id):
Expand Down
8 changes: 5 additions & 3 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,11 @@ def copy(self, default=None):

# TODO: kpi name cannot be start with query name

def prepare_kpi_matrix(self, multi_company=False):
def prepare_kpi_matrix(self, multi_company=False, query_companies=None):
self.ensure_one()
kpi_matrix = KpiMatrix(self.env, multi_company, self.account_model)
kpi_matrix = KpiMatrix(
self.env, multi_company, query_companies, self.account_model
)
for kpi in self.kpi_ids:
kpi_matrix.declare_kpi(kpi)
return kpi_matrix
Expand Down Expand Up @@ -619,7 +621,7 @@ def _fetch_queries(self, date_from, date_to, get_additional_query_filter=None):
v = data[0][field_name]
except KeyError:
_logger.error(
"field %s not found in read_group " "for %s; not summable?",
"field %s not found in read_group for %s; not summable?",
field_name,
model._name,
)
Expand Down
36 changes: 24 additions & 12 deletions mis_builder/models/mis_report_instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,17 +423,15 @@ def _check_mode_source(self):
if rec.mode == MODE_NONE:
raise DateFilterRequired(
self.env._(
"A date filter is mandatory for this source "
"in column %s.",
"A date filter is mandatory for this source in column %s.",
rec.name,
)
)
elif rec.source in (SRC_SUMCOL, SRC_CMPCOL):
if rec.mode != MODE_NONE:
raise DateFilterForbidden(
self.env._(
"No date filter is allowed for this source "
"in column %s.",
"No date filter is allowed for this source in column %s.",
rec.name,
)
)
Expand All @@ -460,8 +458,7 @@ def _check_source_cmpcol(self):
):
raise ValidationError(
self.env._(
"Columns to compare must belong to the same report "
"in %s",
"Columns to compare must belong to the same report in %s",
rec.name,
)
)
Expand Down Expand Up @@ -499,7 +496,7 @@ def _compute_pivot_date(self):
sequence = fields.Integer(default=10)
description = fields.Char(related="report_id.description")
date = fields.Date(
string="Base date", help="Report base date " "(leave empty to use current date)"
string="Base date", help="Report base date (leave empty to use current date)"
)
pivot_date = fields.Date(compute="_compute_pivot_date")
report_id = fields.Many2one("mis.report", required=True, string="Report")
Expand Down Expand Up @@ -765,9 +762,7 @@ def get_views(self, views, options=None):
context.get("from_dashboard")
and context.get("active_model") == "mis.report.instance"
):
view_id = self.env.ref(
"mis_builder." "mis_report_instance_result_view_form"
)
view_id = self.env.ref("mis_builder.mis_report_instance_result_view_form")
mis_report_form_view = view_id and [view_id.id, "form"]
for view in views:
if view and view[1] == "form":
Expand All @@ -778,7 +773,7 @@ def get_views(self, views, options=None):

def preview(self):
self.ensure_one()
view_id = self.env.ref("mis_builder." "mis_report_instance_result_view_form")
view_id = self.env.ref("mis_builder.mis_report_instance_result_view_form")
return {
"type": "ir.actions.act_window",
"res_model": "mis.report.instance",
Expand Down Expand Up @@ -883,7 +878,9 @@ def _compute_matrix(self):
self.ensure_one()
aep = self.report_id._prepare_aep(self.query_company_ids, self.currency_id)
multi_company = self.multi_company and len(self.query_company_ids) > 1
kpi_matrix = self.report_id.prepare_kpi_matrix(multi_company)
kpi_matrix = self.report_id.prepare_kpi_matrix(
multi_company, self.query_company_ids
)
for period in self.period_ids:
description = None
if period.mode == MODE_NONE:
Expand Down Expand Up @@ -1029,3 +1026,18 @@ def _compute_user_can_edit_annotation(self):
self.user_can_edit_annotation = self.env.user.has_group(
"mis_builder.group_edit_annotation"
)

@api.model
def _post_demo_moves(self):
"""Post demo journal entries for the multi-company demo report."""
xmlids = [
"mis_builder.move_branch_consulting",
"mis_builder.move_branch_furniture",
]
for xmlid in xmlids:
move = self.env.ref(xmlid, raise_if_not_found=False)
if move and move.state == "draft":
try:
move.action_post()
except Exception:
_logger.debug("Could not post demo move %s", xmlid)
Loading
Loading