diff --git a/multi_branch_base/__manifest__.py b/multi_branch_base/__manifest__.py index 51e532fbe..2faabe41e 100644 --- a/multi_branch_base/__manifest__.py +++ b/multi_branch_base/__manifest__.py @@ -22,7 +22,7 @@ { 'name': "Multi Branch Operations", - 'version': "15.0.1.0.0", + 'version': "15.0.1.0.1", 'summary': """ Multiple Branch Unit Operation Setup for All Modules In Odoo""", 'description': """Multiple Branch Unit Operation Setup for All diff --git a/multi_branch_base/models/branch_account_account.py b/multi_branch_base/models/branch_account_account.py index b96a47189..36dc302ee 100644 --- a/multi_branch_base/models/branch_account_account.py +++ b/multi_branch_base/models/branch_account_account.py @@ -24,7 +24,7 @@ from odoo import models, fields class AccountAccount(models.Model): - """inherited account account""" + """inherited account_account""" _inherit = "account.account" def _get_branch_domain(self): diff --git a/multi_branch_base/models/branch_account_move.py b/multi_branch_base/models/branch_account_move.py index 0590b494b..0eadf595c 100644 --- a/multi_branch_base/models/branch_account_move.py +++ b/multi_branch_base/models/branch_account_move.py @@ -61,7 +61,6 @@ class AccountMove(models.Model): else: company_id = self.company_id.id if self.company_id else self._context.get('default_company_id', self.env.company.id) - domain = [('company_id', '=', company_id), ('type', 'in', journal_types)] journal = None @@ -84,6 +83,14 @@ class AccountMove(models.Model): return journal + @api.depends('journal_id') + def _compute_default_branch(self): + for record in self: + if record.journal_id: + record.branch_id = record.journal_id.branch_id.id + else: + record.branch_id = False + def _get_default_branch(self): branch = False if len(self.env.user.branch_ids) == 1: @@ -101,7 +108,8 @@ class AccountMove(models.Model): branch_id = fields.Many2one('res.branch', string='Branch', store=True, readonly=False, default=_get_default_branch, - domain=_get_branch_domain) + domain=_get_branch_domain, + compute=_compute_default_branch) @api.onchange('branch_id') def onchange_branch_id(self): @@ -157,7 +165,6 @@ class AccountMove(models.Model): journal_type = m.invoice_filter_type_domain or 'general' company_id = m.company_id.id if m.company_id else self.env.company.id domain = [('company_id', '=', company_id), - ('branch_id', '=', False), ('type', '=', journal_type)] m.suitable_journal_ids = self.env['account.journal'].search( domain)