From b217ec52a649091852b7b769b8dbcc4e7131e5f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 31 Aug 2017 22:53:01 +0200 Subject: [PATCH] Use Flat OpenDocument issue6545 review35031002 --- MANIFEST.in | 2 +- company.xml | 2 +- letter.fodt | 357 ++++++++++++++++++++++++++++++++++++++++++++++++++++ letter.odt | Bin 10320 -> 0 bytes setup.py | 2 +- 5 files changed, 360 insertions(+), 3 deletions(-) create mode 100644 letter.fodt delete mode 100644 letter.odt 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 4e05524bf4ebb697b547f3d71505ff6ae6d70f9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10320 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 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',