From 55c4899dd8052c81254b9b246a1909f6f8a68cd8 Mon Sep 17 00:00:00 2001 From: "aswani.saseendran@beo.in" Date: Thu, 11 Jan 2024 17:38:49 +0530 Subject: [PATCH] [FIX] account_operating_unit: Fixed issue in setting default operating unit in muti-company scenario --- account_operating_unit/__manifest__.py | 2 +- account_operating_unit/models/account_move.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/account_operating_unit/__manifest__.py b/account_operating_unit/__manifest__.py index 6dc8c1f284..6fb461a910 100644 --- a/account_operating_unit/__manifest__.py +++ b/account_operating_unit/__manifest__.py @@ -5,7 +5,7 @@ "name": "Accounting with Operating Units", "summary": "Introduces Operating Unit (OU) in invoices and " "Accounting Entries with clearing account", - "version": "13.0.1.3.0", + "version": "13.0.1.3.1", "author": "ForgeFlow, " "Serpent Consulting Services Pvt. Ltd.," "WilldooIT Pty Ltd," diff --git a/account_operating_unit/models/account_move.py b/account_operating_unit/models/account_move.py index 90ef21e0a5..6a57152811 100644 --- a/account_operating_unit/models/account_move.py +++ b/account_operating_unit/models/account_move.py @@ -102,9 +102,15 @@ def _onchange_operating_unit(self): not self.journal_id or self.journal_id.operating_unit_id != self.operating_unit_id ): - journal = self.env["account.journal"].search( - [("type", "=", self.journal_id.type)] - ) + domain = [] + if self.company_id: + domain = [ + "|", + ("company_id", "=", False), + ("company_id", "=", self.company_id.id), + ] + domain.append(("type", "=", self.journal_id.type)) + journal = self.env["account.journal"].search(domain) jf = journal.filtered( lambda aj: aj.operating_unit_id == self.operating_unit_id )