diff --git a/CHANGELOG b/CHANGELOG index 079575283b..22426bdb70 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Use report header for CompanyReport + Version 5.8.0 - 2020-11-02 * Bug fixes (see mercurial logs for details) * Remove support for Python 3.5 diff --git a/company.py b/company.py index 7de13a4203..78fdcb2181 100644 --- a/company.py +++ b/company.py @@ -141,7 +141,11 @@ class CompanyConfig(Wizard): class CompanyReport(Report): @classmethod - def get_context(cls, records, data): - report_context = super(CompanyReport, cls).get_context(records, data) - report_context['company'] = report_context['user'].company - return report_context + def header_key(cls, record): + return super().header_key(record) + (('company', record.company),) + + @classmethod + def get_context(cls, records, header, data): + context = super().get_context(records, header, data) + context['company'] = header['company'] + return context diff --git a/letter.fodt b/letter.fodt index 5c978e3323..476ec8ab4c 100644 --- a/letter.fodt +++ b/letter.fodt @@ -1,24 +1,24 @@ - LibreOffice/6.4.6.2$Linux_X86_64 LibreOffice_project/40$Build-22008-08-23T01:06:242008-10-22T19:27:101PT0S + LibreOffice/6.4.7.2$Linux_X86_64 LibreOffice_project/40$Build-22008-08-23T01:06:242008-10-22T19:27:101PT0S - 22437 + 21590 0 - 26301 - 24026 + 25640 + 24052 true false view2 - 4355 - 33754 + 9506 + 24980 0 - 22437 - 26300 - 46461 + 21590 + 25638 + 45641 0 0 false @@ -29,100 +29,102 @@ - false - true - true - true - 0 - true - true - - false - false - false - false - false - false - false - false - true - true - false - false - false - false - false - false - false - false - false - false - true - false - true - true - 222920 - false - - false - true - false - false - false - true - false - false - false - true - 1061908 - - true false - true - false - false - true - true - false - true - false - false - false - 0 - false - true - high-resolution - false - false - false - false - false - false - true - true - true - Adressen - true - false - false - true - false - false - false - - false - false - false - 1 - true - false - false - 0 - false - false - - false + + + false + false + 0 + false + false + 1 + false + false + false + false + true + false + false + true + true + false + false + false + false + false + false + high-resolution + false + 0 + false + true + false + false + false + + false + true + Adressen + false + false + false + + false + true + false + true + false + false + 1191135 + false + false + true + false + + false + 222920 + false + true + true + false + true + false + false + true + false + false + false + false + false + false + false + false + false + true + true + true + false + false + false + false + true + false + false + false + false + + true + true + true + 0 + true + true + true + true + true + true + false @@ -142,7 +144,7 @@ - + @@ -329,10 +331,6 @@ - - - - @@ -351,16 +349,16 @@ - <if test="company.header"> - <for each="line in company.header.split('\n')"> + <if test="user.company.header"> + <for each="line in user.company.header.split('\n')"> <line> </for> </if> - <company.rec_name> + <user.company.rec_name> - <if test="company.footer"> - <for each="line in company.footer.split('\n')"> + <if test="user.company.footer"> + <for each="line in user.company.footer.split('\n')"> <line> </for> </if> @@ -378,7 +376,7 @@ <for each="party in records"> - + <replace text:p="set_lang(party.lang)"> <if test="party.addresses"> <for each="line in party.addresses[0].full_address.split('\n')">