diff --git a/CHANGELOG b/CHANGELOG index ee5e7b0534..c4db95c095 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Remove header_A4.odt style + Version 3.6.0 - 2015-04-20 * Bug fixes (see mercurial logs for details) * Add support for PyPy diff --git a/company.py b/company.py index 3034e2a1f6..275f36eabb 100644 --- a/company.py +++ b/company.py @@ -48,7 +48,7 @@ class Company(ModelSQL, ModelView): cls.check_recursion(companies) def get_rec_name(self, name): - return self.party.rec_name + return self.party.name @classmethod def write(cls, companies, values, *args): diff --git a/company.xml b/company.xml index f042f41bd0..04827d5f2e 100644 --- a/company.xml +++ b/company.xml @@ -221,7 +221,6 @@ this repository contains the full copyright notices and license terms. --> party.party party.letter company/letter.odt - company/header_A4.odt form_print diff --git a/header_A4.odt b/header_A4.odt deleted file mode 100644 index e377a27cce..0000000000 Binary files a/header_A4.odt and /dev/null differ diff --git a/letter.odt b/letter.odt index 243368d6c3..d69afed307 100644 Binary files a/letter.odt and b/letter.odt differ diff --git a/setup.py b/setup.py index fa1a9cc5fa..a9be76b7f6 100644 --- a/setup.py +++ b/setup.py @@ -63,8 +63,7 @@ setup(name=name, ], package_data={ 'trytond.modules.company': (info.get('xml', []) - + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'header_A4.odt', - 'letter.odt']), + + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'letter.odt']), }, classifiers=[ 'Development Status :: 5 - Production/Stable',