changeset b0aa5154371e in modules/account_payment_clearing:default
details:
https://hg.tryton.org/modules/account_payment_clearing?cmd=changeset;node=b0aa5154371e
description:
Simplify cron
issue8201
issue6117
issue2286
diffstat:
__init__.py | 2 ++
ir.py | 14 ++++++++++++++
payment.py | 1 +
payment.xml | 24 +-----------------------
tests/scenario_account_payment_clearing.rst | 4 ++--
5 files changed, 20 insertions(+), 25 deletions(-)
diffs (99 lines):
diff -r 96d832184a6a -r b0aa5154371e __init__.py
--- a/__init__.py Sun Apr 07 19:50:02 2019 +0200
+++ b/__init__.py Fri Apr 12 15:59:24 2019 +0200
@@ -4,6 +4,7 @@
from . import payment
from . import account
from . import statement
+from . import ir
def register():
@@ -12,6 +13,7 @@
payment.Payment,
payment.SucceedStart,
account.Move,
+ ir.Cron,
module='account_payment_clearing', type_='model')
Pool.register(
statement.Statement,
diff -r 96d832184a6a -r b0aa5154371e ir.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ir.py Fri Apr 12 15:59:24 2019 +0200
@@ -0,0 +1,14 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+from trytond.pool import PoolMeta
+
+
+class Cron(metaclass=PoolMeta):
+ __name__ = 'ir.cron'
+
+ @classmethod
+ def __setup__(cls):
+ super().__setup__()
+ cls.method.selection.append(
+ ('account.payment.journal|cron_post_clearing_moves',
+ "Post Clearing Moves"))
diff -r 96d832184a6a -r b0aa5154371e payment.py
--- a/payment.py Sun Apr 07 19:50:02 2019 +0200
+++ b/payment.py Fri Apr 12 15:59:24 2019 +0200
@@ -47,6 +47,7 @@
('origin.journal.id', '=', journal.id,
'account.payment'),
('state', '=', 'draft'),
+ ('company', '=', Transaction().context.get('company')),
]))
Move.post(moves)
diff -r 96d832184a6a -r b0aa5154371e payment.xml
--- a/payment.xml Sun Apr 07 19:50:02 2019 +0200
+++ b/payment.xml Fri Apr 12 15:59:24 2019 +0200
@@ -39,32 +39,10 @@
<field name="model" search="[('model', '=', 'account.payment')]"/>
</record>
- <record model="res.user" id="user_post_clearing_moves">
- <field name="login">user_cron_post_clearing_moves</field>
- <field name="name">Cron Post Clearing Moves</field>
- <field name="signature"></field>
- <field name="active" eval="False"/>
- </record>
- <record model="res.user-res.group"
- id="user_post_clearing_moves_group_account">
- <field name="user" ref="user_post_clearing_moves"/>
- <field name="group" ref="account.group_account"/>
- </record>
- <record model="res.user-res.group"
- id="user_post_clearing_moves_group_payment">
- <field name="user" ref="user_post_clearing_moves"/>
- <field name="group" ref="account_payment.group_payment"/>
- </record>
-
<record model="ir.cron" id="cron_post_clearing_moves">
- <field name="name">Post Clearing Moves</field>
- <field name="request_user" ref="res.user_admin"/>
- <field name="user" ref="user_post_clearing_moves"/>
+ <field
name="method">account.payment.journal|cron_post_clearing_moves</field>
<field name="interval_number" eval="1"/>
<field name="interval_type">days</field>
- <field name="repeat_missed" eval="False"/>
- <field name="model">account.payment.journal</field>
- <field name="function">cron_post_clearing_moves</field>
</record>
</data>
</tryton>
diff -r 96d832184a6a -r b0aa5154371e tests/scenario_account_payment_clearing.rst
--- a/tests/scenario_account_payment_clearing.rst Sun Apr 07 19:50:02
2019 +0200
+++ b/tests/scenario_account_payment_clearing.rst Fri Apr 12 15:59:24
2019 +0200
@@ -195,8 +195,8 @@
>>> Cron = Model.get('ir.cron')
>>> Company = Model.get('company.company')
>>> cron_post_clearing_moves, = Cron.find([
- ... ('model', '=', 'account.payment.journal'),
- ... ('function', '=', 'cron_post_clearing_moves'),
+ ... ('method', '=',
+ ... 'account.payment.journal|cron_post_clearing_moves'),
... ])
>>> cron_post_clearing_moves.companies.append(Company(company.id))
>>> cron_post_clearing_moves.click('run_once')
