diff --git a/MANIFEST.in b/MANIFEST.in
index fb91042a77..4a5843ddf0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,7 @@ include LICENSE
include tryton.cfg
include *.xml
include view/*.xml
-include *.odt
+include *.fodt
include locale/*.po
include doc/*
include icons/*
diff --git a/account.xml b/account.xml
index ffc8a6438f..0759105604 100644
--- a/account.xml
+++ b/account.xml
@@ -439,7 +439,7 @@ this repository contains the full copyright notices and license terms. -->
General Ledger
account.general_ledger.account
account.general_ledger
- account/general_ledger.odt
+ account/general_ledger.fodt
form_print
@@ -451,7 +451,7 @@ this repository contains the full copyright notices and license terms. -->
Trial Balance
account.general_ledger.account
account.trial_balance
- account/trial_balance.odt
+ account/trial_balance.fodt
form_print
@@ -687,7 +687,7 @@ this repository contains the full copyright notices and license terms. -->
Aged Balance
account.aged_balance
account.aged_balance
- account/aged_balance.odt
+ account/aged_balance.fodt
form_print
diff --git a/aged_balance.fodt b/aged_balance.fodt
new file mode 100644
index 0000000000..2eae6f7fd9
--- /dev/null
+++ b/aged_balance.fodt
@@ -0,0 +1,579 @@
+
+
+
+ LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-22008-08-27T16:35:462008-08-27T16:52:261PT0S
+
+
+ 0
+ 0
+ 43760
+ 21691
+ true
+ false
+
+
+ view2
+ 8162
+ 5443
+ 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
+ 2183537
+ false
+ true
+ false
+ false
+ true
+ true
+ false
+ true
+ 0
+ false
+ true
+ high-resolution
+ false
+ false
+ false
+ true
+ true
+ true
+
+ true
+ false
+ false
+ true
+ false
+ false
+ false
+
+ false
+ false
+ 765130
+ false
+ 1
+ true
+ false
+ false
+ 0
+ false
+ false
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Company: <company.rec_name>
+
+
+ Aged Balance for <type>
+
+
+ Print Date: <format_date(datetime.date.today(), user.language)> at <datetime.datetime.now().strftime('%H:%M:%S')>
+
+
+
+
+
+
+
+
+
+
+ User: <user.rec_name>
+
+
+ 1/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Aged Balance for <type>
+ Date: <format_date(date, user.language)>
+
+
+
+
+
+
+
+ Party
+
+
+ <str(term0)> <unit>
+
+
+ <str(term1)> <unit>
+
+
+ <str(term2)> <unit>
+
+
+ <str(term3)>+ <unit>
+
+
+ Balance
+
+
+
+
+
+ <for each="record in records">
+
+
+
+
+
+
+
+
+
+
+
+ <record.party.rec_name>
+
+
+ <format_currency(record.term0, user.language, currency=company.currency)or ''>
+
+
+ <format_currency(record.term1, user.language, currency=company.currency) or ''>
+
+
+ <format_currency(record.term2, user.language, currency=company.currency) or ''>
+
+
+ <format_currency(record.term3, user.language, currency=company.currency) or ''>
+
+
+ <format_currency(record.balance, user.language, currency=company.currency) or ''>
+
+
+
+
+ </for>
+
+
+
+
+
+
+
+
+
+
+
+ Total
+
+
+ <format_currency(sum(records, 'term0'), user.language, currency=company.currency)>
+
+
+ <format_currency(sum(records, 'term1'), user.language, currency=company.currency)>
+
+
+ <format_currency(sum(records, 'term2'), user.language, currency=company.currency)>
+
+
+ <format_currency(sum(records, 'term3'), user.language, currency=company.currency)>
+
+
+ <format_currency(sum(records, 'balance'), user.language, currency=company.currency)>
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/aged_balance.odt b/aged_balance.odt
deleted file mode 100644
index 82b91286a6..0000000000
Binary files a/aged_balance.odt and /dev/null differ
diff --git a/general_journal.fodt b/general_journal.fodt
new file mode 100644
index 0000000000..5536e0d89a
--- /dev/null
+++ b/general_journal.fodt
@@ -0,0 +1,531 @@
+
+
+
+ LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-22012-11-14T22:45:371P0D
+
+
+ 0
+ 0
+ 43760
+ 21691
+ true
+ false
+
+
+ view2
+ 19897
+ 5443
+ 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
+ 1410673
+ false
+ true
+ false
+ false
+ true
+ true
+ false
+ true
+ 0
+ false
+ true
+ high-resolution
+ false
+ false
+ false
+ true
+ true
+ true
+
+ true
+ false
+ false
+ true
+ false
+ false
+ false
+
+ false
+ false
+ 991389
+ false
+ 1
+ true
+ false
+ false
+ 0
+ false
+ false
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Company: <company.rec_name>
+
+
+ General Journal
+
+
+ Print Date: <format_date(datetime.date.today(), user.language)> at <datetime.datetime.now().strftime('%H:%M:%S')>
+
+
+
+
+
+
+
+
+
+
+ User: <user.rec_name>
+
+
+ 1/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ General Journal
+ From Date: <format_date(from_date, user.language)>
+ To Date: <format_date(to_date, user.language)>
+
+ <for each="move in records">
+
+
+
+
+
+
+
+ Journal Entry: <move.number><move.description>
+
+
+ Date: <format_date(move.date, user.language)>
+
+
+ Origin: <move.origin.rec_name if move.origin and move.origin.id >=0 else ''>
+
+
+ <if test="move.state == 'posted'">
+ Posted <move.post_number><format_date(move.post_date, user.language)>
+ </if>
+ <if test="move.state == 'draft'">
+ Draft
+ </if>
+
+
+
+
+
+ Account
+
+
+ Description
+
+
+
+ Debit
+
+
+ Credit
+
+
+
+
+
+ <for each="line in move.lines">
+
+
+
+
+
+
+
+
+ <(line.account.code and (line.account.code + ' ') or '') + line.account.name>
+
+
+ <line.description>
+
+
+
+ <format_currency(line.debit, user.language, company.currency)>
+
+
+ <format_currency(line.credit, user.language, company.currency)>
+
+
+
+
+ </for>
+
+
+
+
+
+
+
+ </for>
+
+
+
+
\ No newline at end of file
diff --git a/general_journal.odt b/general_journal.odt
deleted file mode 100644
index 7e0afad82d..0000000000
Binary files a/general_journal.odt and /dev/null differ
diff --git a/general_ledger.fodt b/general_ledger.fodt
new file mode 100644
index 0000000000..fce08aba92
--- /dev/null
+++ b/general_ledger.fodt
@@ -0,0 +1,979 @@
+
+
+
+ LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-22008-06-07T15:26:412008-08-27T17:03:361PT0S
+
+
+ 0
+ 0
+ 43760
+ 21691
+ true
+ false
+
+
+ view2
+ 19976
+ 5443
+ 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
+ 3708925
+ false
+ true
+ false
+ false
+ true
+ true
+ false
+ true
+ 0
+ false
+ true
+ high-resolution
+ false
+ false
+ false
+ true
+ true
+ true
+
+ true
+ false
+ false
+ true
+ false
+ false
+ false
+
+ false
+ false
+ 2070049
+ false
+ 1
+ true
+ false
+ false
+ 0
+ false
+ false
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Company: <company.rec_name>
+
+
+ General Ledger
+
+
+ Print Date: <format_date(datetime.date.today(), user.language)> at <datetime.datetime.now().strftime('%H:%M:%S')>
+
+
+
+
+
+
+
+
+
+
+ User: <user.rec_name>
+
+
+ 4/4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ General Ledger
+ Fiscal Year: <fiscalyear.rec_name>
+ From Period: <start_period.name if start_period else ''>
+ To Period: <end_period.name if end_period else ''>
+ <for each="account in accounts">
+
+
+
+
+
+
+
+ Code
+
+
+
+ Name
+
+
+
+
+
+
+
+
+
+ <account.code or ''>
+
+
+
+ <account.name or ''>
+
+
+
+
+
+
+
+
+
+
+ <choose test="">
+
+
+
+
+
+
+
+
+
+
+
+ <when test="account.general_ledger_balance">
+
+
+
+
+
+
+
+
+
+
+
+ Balance
+
+
+
+
+
+
+
+
+
+ <format_currency(account.end_balance, user.language, company.currency)>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ </when>
+
+
+
+
+
+
+
+
+
+
+
+ <otherwise test="">
+
+
+
+
+
+
+
+
+
+
+
+ Date
+
+
+ Move
+
+
+ Debit
+
+
+ Credit
+
+
+ Balance
+
+
+ Descr.
+
+
+ Origin
+
+
+ State
+
+
+
+
+ Balance
+
+
+
+
+
+
+
+
+
+ <format_currency(account.start_balance, user.language, company.currency)>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <for each="line in account.lines">
+
+
+
+
+
+
+
+
+
+
+
+ <format_date(line.date, user.language)>
+
+
+ <line.move.rec_name>
+
+
+ <format_currency(line.debit, user.language, company.currency)>
+
+
+ <format_currency(line.credit, user.language, company.currency)>
+
+
+ <format_currency(line.balance, user.language, company.currency)>
+
+
+ <line.description or ''><line.move_description or ''>
+
+
+ <line.origin.rec_name if line.origin and line.origin.id >= 0 else ''>
+
+
+ <line.state_string>
+
+
+
+
+ </for>
+
+
+
+
+
+
+
+
+
+
+
+
+ Total
+
+
+
+ <format_currency(account.end_debit - account.start_debit, user.language, company.currency)>
+
+
+ <format_currency(account.end_credit - account.start_credit, user.language, company.currency)>
+
+
+ <format_currency((account.end_debit - account.end_credit) - (account.start_debit - account.start_credit), user.language, company.currency)>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Balance
+
+
+
+
+
+
+
+
+
+ <format_currency(account.end_balance, user.language, company.currency)>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ </otherwise>
+
+
+
+
+
+
+
+
+
+
+
+ </choose>
+
+
+
+
+
+
+
+
+
+
+ </for>
+
+
+
\ No newline at end of file
diff --git a/general_ledger.odt b/general_ledger.odt
deleted file mode 100644
index 3ba4cb0989..0000000000
Binary files a/general_ledger.odt and /dev/null differ
diff --git a/move.xml b/move.xml
index f96461aec7..6a4e4cdb4e 100644
--- a/move.xml
+++ b/move.xml
@@ -360,7 +360,7 @@ this repository contains the full copyright notices and license terms. -->
General Journal
account.move
account.move.general_journal
- account/general_journal.odt
+ account/general_journal.fodt
diff --git a/setup.py b/setup.py
index 6442a7ed68..0fa010439c 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ setup(name=name,
],
package_data={
'trytond.modules.account': (info.get('xml', [])
- + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt',
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt',
'icons/*.svg', 'tests/*.rst']),
},
classifiers=[
diff --git a/trial_balance.fodt b/trial_balance.fodt
new file mode 100644
index 0000000000..2610766f94
--- /dev/null
+++ b/trial_balance.fodt
@@ -0,0 +1,519 @@
+
+
+
+ LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-22008-06-07T15:26:582008-08-27T17:08:381PT0S
+
+
+ 0
+ 0
+ 43760
+ 21691
+ true
+ false
+
+
+ view2
+ 20262
+ 5443
+ 0
+ 0
+ 43759
+ 21689
+ 0
+ 1
+ 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
+ 1456882
+ false
+ true
+ false
+ false
+ true
+ true
+ false
+ true
+ 0
+ false
+ true
+ high-resolution
+ false
+ false
+ false
+ true
+ true
+ true
+
+ true
+ false
+ false
+ true
+ false
+ false
+ false
+
+ false
+ false
+ 1253212
+ false
+ 1
+ true
+ false
+ false
+ 0
+ false
+ false
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Company: <company.rec_name>
+
+
+ Trial Balance
+
+
+ Print Date: <format_date(datetime.date.today(), user.language)> at <datetime.datetime.now().strftime('%H:%M:%S')>
+
+
+
+
+
+
+
+
+
+
+ User: <user.rec_name>
+
+
+ 1/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Trial Balance
+ Fiscal Year: <fiscalyear.rec_name>
+ From Period: <start_period.name if start_period else ''>
+ To Period: <end_period.name if end_period else ''>
+
+
+
+
+
+
+ Account
+
+
+ Start Balance
+
+
+ Debit
+
+
+ Credit
+
+
+ End Balance
+
+
+
+
+
+ <for each="account in accounts">
+
+
+
+
+
+
+
+
+ <account.code and account.code + ' ' or ''><account.name>
+
+
+ <format_currency(account.start_balance, user.language, company.currency)>
+
+
+ <format_currency(account.debit, user.language, company.currency)>
+
+
+ <format_currency(account.credit, user.language, company.currency)>
+
+
+ <format_currency(account.end_balance, user.language, company.currency)>
+
+
+
+
+ </for>
+
+
+
+
+
+
+
+
+ Total
+
+
+ <format_currency(sum(accounts, 'start_balance'), user.language, company.currency)>
+
+
+ <format_currency(sum(accounts, 'debit'), user.language, company.currency)>
+
+
+ <format_currency(sum(accounts, 'credit'), user.language, company.currency)>
+
+
+ <format_currency(sum(accounts, 'end_balance'), user.language, company.currency)>
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trial_balance.odt b/trial_balance.odt
deleted file mode 100644
index 7c7b38f4f4..0000000000
Binary files a/trial_balance.odt and /dev/null differ