merge...
This commit is contained in:
parent
21828b296d
commit
b38120bf2f
2 changed files with 2 additions and 16 deletions
|
@ -10,7 +10,7 @@ from .currency import Currency
|
||||||
from .evaluation_context import EvaluationContext
|
from .evaluation_context import EvaluationContext
|
||||||
from .evaluation_wizard import OpenChartWizard
|
from .evaluation_wizard import OpenChartWizard
|
||||||
from .investment import InvestmentEvaluation, InvestmentLine
|
from .investment import InvestmentEvaluation, InvestmentLine
|
||||||
from .ir import Rule, IrActWindow
|
from .ir import IrActWindow
|
||||||
|
|
||||||
|
|
||||||
def register():
|
def register():
|
||||||
|
@ -19,7 +19,6 @@ def register():
|
||||||
Evaluation,
|
Evaluation,
|
||||||
EvaluationLine,
|
EvaluationLine,
|
||||||
EvaluationContext,
|
EvaluationContext,
|
||||||
Rule,
|
|
||||||
IrActWindow,
|
IrActWindow,
|
||||||
module='cashbook_report', type_='model')
|
module='cashbook_report', type_='model')
|
||||||
Pool.register(
|
Pool.register(
|
||||||
|
|
15
ir.py
15
ir.py
|
@ -7,19 +7,6 @@ from trytond.transaction import Transaction
|
||||||
from trytond.pool import PoolMeta
|
from trytond.pool import PoolMeta
|
||||||
|
|
||||||
|
|
||||||
class Rule(metaclass=PoolMeta):
|
|
||||||
__name__ = 'ir.rule'
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def _context_modelnames(cls):
|
|
||||||
""" list of models to add 'user_id' to context
|
|
||||||
"""
|
|
||||||
return super(Rule, cls)._context_modelnames() + [
|
|
||||||
'ir.action.act_window', 'cashbook_report.evaluation']
|
|
||||||
|
|
||||||
# end Rule
|
|
||||||
|
|
||||||
|
|
||||||
class IrActWindow(metaclass=PoolMeta):
|
class IrActWindow(metaclass=PoolMeta):
|
||||||
__name__ = 'ir.action.act_window'
|
__name__ = 'ir.action.act_window'
|
||||||
|
|
||||||
|
@ -27,7 +14,7 @@ class IrActWindow(metaclass=PoolMeta):
|
||||||
def __register__(cls, module_name):
|
def __register__(cls, module_name):
|
||||||
super(IrActWindow, cls).__register__(module_name)
|
super(IrActWindow, cls).__register__(module_name)
|
||||||
|
|
||||||
# migrate (6.0 --> 7.0): domain --> context_domain
|
# migrate: domain --> context_domain
|
||||||
records = cls.search([
|
records = cls.search([
|
||||||
('res_model', '=', 'cashbook_report.eval_line'),
|
('res_model', '=', 'cashbook_report.eval_line'),
|
||||||
('domain', '!=', None),
|
('domain', '!=', None),
|
||||||
|
|
Loading…
Reference in a new issue