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/customer_return_restocking_list.fodt b/customer_return_restocking_list.fodt
new file mode 100644
index 0000000000..0618eb1bb5
--- /dev/null
+++ b/customer_return_restocking_list.fodt
@@ -0,0 +1,491 @@
+
+
+
+ LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-2Bertrand Chenal2009-03-26T13:54:482016-03-21T16:02:20.53387491256PT7H2M27S
+
+
+ 0
+ 0
+ 43760
+ 21691
+ true
+ false
+
+
+ view2
+ 2630
+ 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
+ 440606
+ false
+ true
+ true
+ 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
+ 68753
+ 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>
+ 2/2
+
+
+
+
+
+
+
+
+
+
+
+
+ <for each="shipment in records">
+ Restocking List
+ Shipment Number: <shipment.number>
+ Reference: <shipment.origins or ''><', ' if (shipment.origins and shipment.reference) else ''><shipment.reference or ''>
+ Customer: <shipment.customer.rec_name>
+ Planned Date: <shipment.planned_date and format_date(shipment.planned_date, user.language) or ''>
+ Warehouse: <shipment.warehouse.rec_name>
+
+
+
+
+
+
+
+ From Location
+
+
+ To Location
+
+
+ Product
+
+
+ Quantity
+
+
+
+
+
+ <for each="move in moves[shipment.id]">
+
+
+
+
+
+
+
+
+
+
+
+ <move.from_location.rec_name>
+
+
+ <move.to_location.rec_name>
+
+
+ <move.product.rec_name>
+
+
+ <format_number(move.quantity, user.language, digits=move.unit_digits)> <move.uom.symbol>
+
+
+
+
+ </for>
+
+
+
+
+
+
+
+
+
+
+ </for>
+
+
+
\ No newline at end of file
diff --git a/customer_return_restocking_list.odt b/customer_return_restocking_list.odt
deleted file mode 100644
index 3de0c68bbe..0000000000
Binary files a/customer_return_restocking_list.odt and /dev/null differ
diff --git a/delivery_note.fodt b/delivery_note.fodt
new file mode 100644
index 0000000000..2d36c1dde5
--- /dev/null
+++ b/delivery_note.fodt
@@ -0,0 +1,451 @@
+
+
+
+ LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-22008-06-07T15:29:022009-03-26T18:33:131PT0S
+
+
+ 0
+ 0
+ 43760
+ 21324
+ true
+ false
+
+
+ view2
+ 2630
+ 5313
+ 0
+ 0
+ 43759
+ 21322
+ 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
+ 2636102
+ 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
+ 1813180
+ 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>
+ 2/2
+
+
+
+
+
+
+
+
+
+
+
+
+ <for each="shipment in records">
+ <set_lang(shipment.delivery_address.party.lang and shipment.delivery_address.party.lang.code or 'en')><shipment.set_lang(shipment.delivery_address.party.lang and shipment.delivery_address.party.lang.code or 'en')><for each="line in shipment.delivery_address.full_address.split('\n')">
+ <line>
+ </for>
+ Delivery Note
+ Shipment Number: <shipment.number>Customer Code: <shipment.customer.code>Reference: <shipment.origins or ''><', ' if (shipment.origins and shipment.reference) else ''><shipment.reference or ''>Date: <format_date(shipment.effective_date and shipment.effective_date or datetime.datetime.today(), shipment.delivery_address.party.lang)>
+
+
+
+
+
+
+ Product
+
+
+ Quantity
+
+
+
+
+
+ <for each="move in shipment.outgoing_moves">
+
+
+
+
+
+ <move.product.rec_name>
+
+
+ <format_number(move.quantity, shipment.delivery_address.party.lang, digits=move.unit_digits)> <move.uom.symbol>
+
+
+
+
+ </for>
+
+
+
+
+ </for>
+
+
+
\ No newline at end of file
diff --git a/delivery_note.odt b/delivery_note.odt
deleted file mode 100644
index 89068e9a4f..0000000000
Binary files a/delivery_note.odt and /dev/null differ
diff --git a/internal_shipment.fodt b/internal_shipment.fodt
new file mode 100644
index 0000000000..ff1be2ffe4
--- /dev/null
+++ b/internal_shipment.fodt
@@ -0,0 +1,496 @@
+
+
+
+ LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-2Bertrand Chenal2009-03-26T13:54:482016-08-14T17:42:50.32737860461PT7H26M47S
+
+
+ 0
+ 0
+ 43760
+ 21691
+ true
+ false
+
+
+ view2
+ 2630
+ 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
+ 2010487
+ false
+ true
+ true
+ 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
+ 1178252
+ 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>
+ 2/2
+
+
+
+
+
+
+
+
+
+
+
+
+ <for each="shipment in records">
+ <if test="shipment.to_location.warehouse and shipment.to_location.warehouse.address">
+ <for each="line in shipment.to_location.warehouse.address.full_address.split('\n')">
+ <line>
+ </for>
+ </if>
+ Internal Shipment
+ Shipment Number: <shipment.number>
+ Reference: <shipment.reference or ''>
+ From Location: <shipment.from_location.rec_name>
+ To Location: <shipment.to_location.rec_name>
+ Planned Date: <shipment.planned_date and format_date(shipment.planned_date, user.language) or ''>
+
+
+
+
+
+
+
+ From Location
+
+
+ To Location
+
+
+ Product
+
+
+ Quantity
+
+
+
+
+
+ <for each="move in moves[shipment.id]">
+
+
+
+
+
+
+
+
+
+
+
+ <move.from_location.rec_name>
+
+
+ <move.to_location.rec_name>
+
+
+ <move.product.rec_name>
+
+
+ <format_number(move.quantity, user.language, digits=move.unit_digits)> <move.uom.symbol>
+
+
+
+
+ </for>
+
+
+
+
+
+
+
+
+
+
+ </for>
+
+
+
\ No newline at end of file
diff --git a/internal_shipment.odt b/internal_shipment.odt
deleted file mode 100644
index 0de628ea33..0000000000
Binary files a/internal_shipment.odt and /dev/null differ
diff --git a/picking_list.fodt b/picking_list.fodt
new file mode 100644
index 0000000000..8b0bb53727
--- /dev/null
+++ b/picking_list.fodt
@@ -0,0 +1,490 @@
+
+
+
+ LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-2Bertrand Chenal2009-03-26T13:54:482016-03-21T16:05:27.39538848350PT7H39M6S
+
+
+ 0
+ 0
+ 43760
+ 21691
+ true
+ false
+
+
+ view2
+ 2630
+ 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
+ 2539458
+ false
+ true
+ true
+ 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
+ 1812667
+ 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>
+ 2/2
+
+
+
+
+
+
+
+
+
+
+
+
+ <for each="shipment in records">
+ Picking List
+ Shipment Number: <shipment.number>
+ Reference: <shipment.origins or ''><', ' if (shipment.origins and shipment.reference) else ''><shipment.reference or ''>
+ Customer: <shipment.customer.rec_name>
+ Planned Date: <shipment.planned_date and format_date(shipment.planned_date, user.language) or ''>
+ Warehouse: <shipment.warehouse.rec_name>
+
+
+
+
+
+
+
+ From Location
+
+
+ To Location
+
+
+ Product
+
+
+ Quantity
+
+
+
+
+
+ <for each="move in moves[shipment.id]">
+
+
+
+
+
+
+
+
+
+
+
+ <move.from_location.rec_name>
+
+
+ <move.to_location.rec_name>
+
+
+ <move.product.rec_name>
+
+
+ <format_number(move.quantity, user.language, digits=move.unit_digits)> <move.uom.symbol>
+
+
+
+
+ </for>
+
+
+
+
+
+
+
+
+
+
+ </for>
+
+
+
\ No newline at end of file
diff --git a/picking_list.odt b/picking_list.odt
deleted file mode 100644
index a48d3c0196..0000000000
Binary files a/picking_list.odt and /dev/null differ
diff --git a/setup.py b/setup.py
index 2c54199cbc..31f38093cd 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ setup(name=name,
],
package_data={
'trytond.modules.stock': (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/shipment.xml b/shipment.xml
index ab51f00d0f..8051c14406 100644
--- a/shipment.xml
+++ b/shipment.xml
@@ -353,7 +353,7 @@ this repository contains the full copyright notices and license terms. -->
Delivery Note
stock.shipment.out
stock.shipment.out.delivery_note
- stock/delivery_note.odt
+ stock/delivery_note.fodt
@@ -366,7 +366,7 @@ this repository contains the full copyright notices and license terms. -->
Picking List
stock.shipment.out
stock.shipment.out.picking_list
- stock/picking_list.odt
+ stock/picking_list.fodt
@@ -379,7 +379,7 @@ this repository contains the full copyright notices and license terms. -->
Restocking List
stock.shipment.in
stock.shipment.in.restocking_list
- stock/supplier_restocking_list.odt
+ stock/supplier_restocking_list.fodt
@@ -392,7 +392,7 @@ this repository contains the full copyright notices and license terms. -->
Restocking List
stock.shipment.out.return
stock.shipment.out.return.restocking_list
- stock/customer_return_restocking_list.odt
+ stock/customer_return_restocking_list.fodt
@@ -405,7 +405,7 @@ this repository contains the full copyright notices and license terms. -->
Internal Shipment
stock.shipment.internal
stock.shipment.internal.report
- stock/internal_shipment.odt
+ stock/internal_shipment.fodt
diff --git a/supplier_restocking_list.fodt b/supplier_restocking_list.fodt
new file mode 100644
index 0000000000..867063d80d
--- /dev/null
+++ b/supplier_restocking_list.fodt
@@ -0,0 +1,482 @@
+
+
+
+ LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-2Bertrand Chenal2009-03-26T13:54:482016-03-21T16:06:02.54015281351PT6H57M42S
+
+
+ 0
+ 0
+ 43760
+ 21691
+ true
+ false
+
+
+ view2
+ 2630
+ 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
+ 1829759
+ false
+ true
+ true
+ 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
+ 1289861
+ 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>
+ 2/2
+
+
+
+
+
+
+
+
+
+
+
+
+ <for each="shipment in records">
+ Restocking List
+ Shipment Number: <shipment.number>
+ Reference: <shipment.origins or ''><', ' if (shipment.origins and shipment.reference) else ''><shipment.reference or ''>
+ Supplier: <shipment.supplier.rec_name>
+ Planned Date: <shipment.planned_date and format_date(shipment.planned_date, user.language) or ''>
+ Warehouse: <shipment.warehouse.rec_name>
+
+
+
+
+
+
+
+ From Location
+
+
+ To Location
+
+
+ Product
+
+
+ Quantity
+
+
+
+
+
+ <for each="move in moves[shipment.id]">
+
+
+
+
+
+
+
+
+
+
+
+ <move.from_location.rec_name>
+
+
+ <move.to_location.rec_name>
+
+
+ <move.product.rec_name>
+
+
+ <format_number(move.quantity, user.language, digits=move.unit_digits)> <move.uom.symbol>
+
+
+
+
+ </for>
+
+
+
+
+
+
+
+
+
+
+ </for>
+
+
+
\ No newline at end of file
diff --git a/supplier_restocking_list.odt b/supplier_restocking_list.odt
deleted file mode 100644
index df8175f0f9..0000000000
Binary files a/supplier_restocking_list.odt and /dev/null differ