diff --git a/modules/account_payment/__init__.py b/modules/account_payment/__init__.py index 145264a32a..c5c9c0724d 100644 --- a/modules/account_payment/__init__.py +++ b/modules/account_payment/__init__.py @@ -29,6 +29,7 @@ def register(): account.StatementLine, module='account_payment', type_='model', depends=['account_statement']) Pool.register( + account.StatementRule, account.StatementRuleLine, module='account_payment', type_='model', depends=['account_statement_rule']) diff --git a/modules/account_payment/account.py b/modules/account_payment/account.py index 223ff89c60..67f1ac477c 100644 --- a/modules/account_payment/account.py +++ b/modules/account_payment/account.py @@ -896,6 +896,15 @@ class StatementLine(metaclass=PoolMeta): yield self.payment.kind, [self.payment] +class StatementRule(metaclass=PoolMeta): + __name__ = 'account.statement.rule' + + @classmethod + def __setup__(cls): + super().__setup__() + cls.description.help += "\n'payment'" + + class StatementRuleLine(metaclass=PoolMeta): __name__ = 'account.statement.rule.line' diff --git a/modules/account_payment_clearing/__init__.py b/modules/account_payment_clearing/__init__.py index ca8bb52387..ca97d6317d 100644 --- a/modules/account_payment_clearing/__init__.py +++ b/modules/account_payment_clearing/__init__.py @@ -24,6 +24,7 @@ def register(): module='account_payment_clearing', type_='model', depends=['account_statement']) Pool.register( + statement.StatementRule, statement.StatementRuleLine, module='account_payment_clearing', type_='model', depends=['account_statement_rule']) diff --git a/modules/account_payment_clearing/statement.py b/modules/account_payment_clearing/statement.py index 7ab4e08a6d..08dadecb4f 100644 --- a/modules/account_payment_clearing/statement.py +++ b/modules/account_payment_clearing/statement.py @@ -178,6 +178,15 @@ class StatementLine(metaclass=PoolMeta): and l.payment.clearing_move.state == 'draft']) +class StatementRule(metaclass=PoolMeta): + __name__ = 'account.statement.rule' + + @classmethod + def __setup__(cls): + super().__setup__() + cls.description.help += "\n'payment_group'" + + class StatementRuleLine(metaclass=PoolMeta): __name__ = 'account.statement.rule.line' diff --git a/modules/account_statement_rule/account.py b/modules/account_statement_rule/account.py index 4b30098d85..5162211290 100644 --- a/modules/account_statement_rule/account.py +++ b/modules/account_statement_rule/account.py @@ -94,7 +94,9 @@ class StatementRule(sequence_ordered(), ModelSQL, ModelView): description = fields.Char("Description", help="The regular expression the description is searched with.\n" "It may define the groups named:\n" - "'party', 'bank_account', 'invoice'.") + "'party'\n" + "'bank_account'\n" + "'invoice'") information_rules = fields.One2Many( 'account.statement.rule.information', 'rule', "Information Rules")