diff --git a/MANIFEST.in b/MANIFEST.in index 325b07998e..9cd4591235 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -6,6 +6,6 @@ include LICENSE include tryton.cfg include *.xml include view/*.xml -include *.odt +include *.fodt include locale/*.po include doc/* diff --git a/company.xml b/company.xml index fa20e4d40a..cfa7dc1a80 100644 --- a/company.xml +++ b/company.xml @@ -195,7 +195,7 @@ this repository contains the full copyright notices and license terms. --> Letter party.party party.letter - company/letter.odt + company/letter.fodt form_print diff --git a/letter.fodt b/letter.fodt new file mode 100644 index 0000000000..07f844c5ff --- /dev/null +++ b/letter.fodt @@ -0,0 +1,357 @@ + + + + LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-22008-08-23T01:06:242008-10-22T19:27:101PT0S + + + 0 + 0 + 43760 + 21691 + true + false + + + view2 + 13085 + 5313 + 0 + 0 + 43759 + 21689 + 0 + 0 + false + 100 + false + + + + + false + true + true + true + 0 + true + true + + false + false + false + false + false + false + false + false + false + false + false + false + false + true + false + true + true + false + false + false + false + + false + false + true + false + false + + false + false + false + false + true + 886152 + false + true + false + false + true + true + false + true + 0 + false + true + high-resolution + false + false + false + true + true + true + Adressen + true + false + false + true + false + false + false + + false + false + 222920 + false + 1 + true + false + false + 0 + false + false + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <if test="company.header"> + <for each="line in company.header.split('\n')"> + <line> + </for> + </if> + <company.rec_name> + + + <if test="company.footer"> + <for each="line in company.footer.split('\n')"> + <line> + </for> + </if> + + + + + + + + + + + + + <for each="party in records"> + <set_lang(party.lang and party.lang.code or 'en')><if test="party.addresses"> + <for each="line in party.addresses[0].full_address.split('\n')"> + <line> + </for> + </if> + Date: <format_date(datetime.date.today(), party.lang)>Subject: + Dear Madams and Sirs, + + Best Regards, + <user.signature> + </for> + + + \ No newline at end of file diff --git a/letter.odt b/letter.odt deleted file mode 100644 index 4e05524bf4..0000000000 Binary files a/letter.odt and /dev/null differ diff --git a/setup.py b/setup.py index 495afc7a6e..fbfc03b536 100644 --- a/setup.py +++ b/setup.py @@ -69,7 +69,7 @@ setup(name=name, ], package_data={ 'trytond.modules.company': (info.get('xml', []) - + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'letter.odt']), + + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt']), }, classifiers=[ 'Development Status :: 5 - Production/Stable',