audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #548 from Tecnativa/12.0-account_payment_order-journal_domain

Browse Source 
[FIX] account_payment_order: Fix journal domain
This commit is contained in:
Pedro M. Baeza
2019-03-01 13:50:37 +01:00
committed by GitHub
parent d6d93b403f c71a8e9cb6
commit 12783085a5
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
account_payment_order/models/account_payment_order.py
View File

@@ -15,15 +15,6 @@ class AccountPaymentOrder(models.Model):
_inherit = ['mail.thread']
_order = 'id desc'
def domain_journal_id(self):
if not self.payment_mode_id:
return [('id', '=', False)]
if self.payment_mode_id.bank_account_link == 'fixed':
return [('id', '=', self.payment_mode_id.fixed_journal_id.id)]
elif self.payment_mode_id.bank_account_link == 'variable':
jrl_ids = self.payment_mode_id.variable_journal_ids.ids
return [('id', 'in', jrl_ids)]
name = fields.Char(
string='Number', readonly=True, copy=False) # v8 field : name
payment_mode_id = fields.Many2one(
@@ -44,10 +35,14 @@ class AccountPaymentOrder(models.Model):
readonly=True)
bank_account_link = fields.Selection(
related='payment_mode_id.bank_account_link', readonly=True)
allowed_journal_ids = fields.Many2many(
comodel_name='account.journal',
compute="_compute_allowed_journal_ids",
string="Allowed journals",
)
journal_id = fields.Many2one(
'account.journal', string='Bank Journal', ondelete='restrict',
readonly=True, states={'draft': [('readonly', False)]},
domain=domain_journal_id,
track_visibility='onchange')
# The journal_id field is only required at confirm step, to
# allow auto-creation of payment order from invoice
@@ -106,6 +101,16 @@ class AccountPaymentOrder(models.Model):
readonly=True)
description = fields.Char()
@api.depends('payment_mode_id')
def _compute_allowed_journal_ids(self):
for record in self:
if record.payment_mode_id.bank_account_link == 'fixed':
record.allowed_journal_ids = (
record.payment_mode_id.fixed_journal_id)
elif record.payment_mode_id.bank_account_link == 'variable':
record.allowed_journal_ids = (
self.payment_mode_id.variable_journal_ids)
@api.multi
def unlink(self):
for order in self:
@@ -174,16 +179,10 @@ class AccountPaymentOrder(models.Model):
@api.onchange('payment_mode_id')
def payment_mode_id_change(self):
domain = self.domain_journal_id()
res = {'domain': {
'journal_id': domain
}}
journals = self.env['account.journal'].search(domain)
if len(journals) == 1:
self.journal_id = journals
if len(self.allowed_journal_ids) == 1:
self.journal_id = self.allowed_journal_ids
if self.payment_mode_id.default_date_prefered:
self.date_prefered = self.payment_mode_id.default_date_prefered
return res
@api.multi
def action_done(self):

6
account_payment_order/views/account_payment_order.xml
View File

@@ -35,7 +35,11 @@
<field name="payment_mode_id"
domain="[('payment_order_ok', '=', True), ('payment_type', '=', payment_type)]"
widget="selection"/>
<field name="journal_id" widget="selection"/>
<field name="allowed_journal_ids" invisible="1"/>
<field name="journal_id"
widget="selection"
domain="[('id', 'in', allowed_journal_ids)]"
/>
<field name="bank_account_link" invisible="1"/>
<field name="company_partner_bank_id"/>
<field name="company_id" groups="base.group_multi_company"/>