diff --git a/__tryton__.py b/__tryton__.py index e5c670dfb4..ab6d7b5c68 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -14,7 +14,7 @@ 'website': 'http://www.tryton.org/', 'description': ''' ''', - 'description_ca_ES': '''Afegeix les hores de treball al dia, setmana, mes i + 'description_ca_ES': '''Afegeix les hores de treball al dia, setmana, mes i any per companyia. ''', 'depends': [ diff --git a/res.py b/res.py index 5ccef56323..e0950f60b9 100644 --- a/res.py +++ b/res.py @@ -7,7 +7,7 @@ class User(ModelSQL, ModelView): _name = 'res.user' def _get_preferences(self, user, context_only=False): - res = super(User, self)._get_preferences(user, + res = super(User, self)._get_preferences(user, context_only=context_only) if user.company: res['company_work_time'] = { diff --git a/tests/test_company_work_time.py b/tests/test_company_work_time.py index 4b2cc9e503..cea5fc5798 100644 --- a/tests/test_company_work_time.py +++ b/tests/test_company_work_time.py @@ -2,7 +2,8 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. -import sys, os +import sys +import os DIR = os.path.abspath(os.path.normpath(os.path.join(__file__, '..', '..', '..', '..', '..', 'trytond'))) if os.path.isdir(DIR): @@ -33,6 +34,7 @@ class CompanyWorkTimeTestCase(unittest.TestCase): ''' test_depends() + def suite(): suite = trytond.tests.test_tryton.suite() suite.addTests(unittest.TestLoader().loadTestsFromTestCase(