From cc9f1e7c680d71d8abb058142b0db9b03cfff2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 11 Sep 2018 00:17:46 +0200 Subject: [PATCH] Enforce party required on account receivable and payable It is needed to correctly compute the payable and receivable amounts. issue5565 review50561002 --- CHANGELOG | 1 + configuration.py | 4 ++++ party.py | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index bb267a2592..255fc9a899 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Set party required on account payable and receivable of party * Add writeoff method * Remove default account from journal * Add replacement account diff --git a/configuration.py b/configuration.py index 29c1eaa5f7..dd4d80b44e 100644 --- a/configuration.py +++ b/configuration.py @@ -23,12 +23,14 @@ class Configuration( 'account.account', "Default Account Receivable", domain=[ ('kind', '=', 'receivable'), + ('party_required', '=', True), ('company', '=', Eval('context', {}).get('company', -1)), ])) default_account_payable = fields.MultiValue(fields.Many2One( 'account.account', "Default Account Payable", domain=[ ('kind', '=', 'payable'), + ('party_required', '=', True), ('company', '=', Eval('context', {}).get('company', -1)), ])) tax_rounding = fields.MultiValue(fields.Selection( @@ -53,6 +55,7 @@ class ConfigurationDefaultAccount(ModelSQL, CompanyValueMixin): 'account.account', "Default Account Receivable", domain=[ ('kind', '=', 'receivable'), + ('party_required', '=', True), ('company', '=', Eval('company', -1)), ], depends=['company']) @@ -60,6 +63,7 @@ class ConfigurationDefaultAccount(ModelSQL, CompanyValueMixin): 'account.account', "Default Account Payable", domain=[ ('kind', '=', 'payable'), + ('party_required', '=', True), ('company', '=', Eval('company', -1)), ], depends=['company']) diff --git a/party.py b/party.py index 7470184687..19231a7c7c 100644 --- a/party.py +++ b/party.py @@ -29,6 +29,7 @@ class Party(CompanyMultiValueMixin, metaclass=PoolMeta): 'account.account', "Account Payable", domain=[ ('kind', '=', 'payable'), + ('party_required', '=', True), ('company', '=', Eval('context', {}).get('company', -1)), ], states={ @@ -38,6 +39,7 @@ class Party(CompanyMultiValueMixin, metaclass=PoolMeta): 'account.account', "Account Receivable", domain=[ ('kind', '=', 'receivable'), + ('party_required', '=', True), ('company', '=', Eval('context', {}).get('company', -1)), ], states={ @@ -254,6 +256,7 @@ class PartyAccount(ModelSQL, CompanyValueMixin): 'account.account', "Account Payable", domain=[ ('kind', '=', 'payable'), + ('party_required', '=', True), ('company', '=', Eval('company', -1)), ], depends=['company']) @@ -261,6 +264,7 @@ class PartyAccount(ModelSQL, CompanyValueMixin): 'account.account', "Account Receivable", domain=[ ('kind', '=', 'receivable'), + ('party_required', '=', True), ('company', '=', Eval('company', -1)), ], depends=['company'])