Browse Source

Jan 8 [UPDT] : Updated 'multi_branch_base'

pull/195/merge
AjmalCybro 2 years ago
parent
commit
c1306d026c
  1. 2
      multi_branch_base/__manifest__.py
  2. 2
      multi_branch_base/models/branch_account_account.py
  3. 13
      multi_branch_base/models/branch_account_move.py

2
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

2
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):

13
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)

Loading…
Cancel
Save