From 703e20a992a117c788d6515f507deff01560ffe0 Mon Sep 17 00:00:00 2001
From: Mariam Flayyan <mflayyan@therp.nl>
Date: Thu, 11 Apr 2019 02:40:11 +0300
Subject: [PATCH] [MIG] base_delivery_carrier_files: Migration to 10.0

---
 base_delivery_carrier_files/README.rst        |  44 +++++---
 base_delivery_carrier_files/__manifest__.py   |  30 +++--
 .../demo/carrier_file_demo.xml                |   4 +-
 .../models/delivery_carrier_file.py           |  15 ++-
 .../models/stock_picking.py                   |   2 +-
 .../security/ir.model.access.csv              |   4 +-
 .../views/carrier_file_view.xml               | 105 +++++++++---------
 .../views/stock_view.xml                      |  72 ++++++------
 .../wizards/generate_carrier_files.py         |   4 +-
 .../wizards/generate_carrier_files_view.xml   |  91 ++++++++-------
 .../README.rst                                |  26 ++---
 .../__manifest__.py                           |   9 +-
 .../demo/carrier_file_demo.xml                |   4 +-
 .../views/carrier_file_view.xml               |  30 +++--
 delivery_carrier_file_tnt/README.rst          |  18 +++
 delivery_carrier_file_tnt/__manifest__.py     |  10 +-
 delivery_carrier_file_tnt/carrier_file.py     |  19 ++--
 .../carrier_file_view.xml                     |  38 +++----
 .../generator/tnt_generator.py                |   6 +-
 19 files changed, 267 insertions(+), 264 deletions(-)
 create mode 100644 delivery_carrier_file_tnt/README.rst

diff --git a/base_delivery_carrier_files/README.rst b/base_delivery_carrier_files/README.rst
index 21cd7854d5..f383cb3c5f 100644
--- a/base_delivery_carrier_files/README.rst
+++ b/base_delivery_carrier_files/README.rst
@@ -1,21 +1,33 @@
-**This file is going to be generated by oca-gen-addon-readme.**
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+    :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
 
-*Manual changes will be overwritten.*
+===========================
+base_delivery_carrier_files
+===========================
 
-Please provide content in the ``readme`` directory:
+This module was written to extend the functionality of picking to support generating one or more files according to carrier_file configuration for all pickings
+and writes this file to a configurable location on your computer eg. /opt/data/carrier_files
 
-* **DESCRIPTION.rst** (required)
-* INSTALL.rst (optional)
-* CONFIGURE.rst (optional)
-* **USAGE.rst** (optional, highly recommended)
-* DEVELOP.rst (optional)
-* ROADMAP.rst (optional)
-* HISTORY.rst (optional, recommended)
-* **CONTRIBUTORS.rst** (optional, highly recommended)
-* CREDITS.rst (optional)
+Discription:
+Base module for creation of carrier files (La Poste, TNT Express Shipper, ...).
+Files are exported as text (csv, ...).
+It contains :
+- the base structure to handle the export of files on Delivery Orders
+- an API to ease the generation of the files for the developers in sub-modules.
 
-Content of this README will also be drawn from the addon manifest,
-from keys such as name, authors, maintainers, development_status,
-and license.
+The delivery orders can be grouped in one files
+or be exported each one in a separate file.
+The files can be generated automatically
+on the shipment of a Delivery Order or from a manual action.
+They are exported to a defined path or
+in a document directory of your choice if the "document" module is installed.
 
-A good, one sentence summary in the manifest is also highly recommended.
+A generic carrier file is included in the module.
+It can also be used as a basis to create your own sub-module.
+
+Sub-modules already exist to generate file according to specs of :
+ - La Poste (France) : delivery_carrier_file_laposte
+ - TNT Express Shipper (France) : delivery_carrier_file_tnt
+ - Make your own ! Look at the code of the modules above,
+   it's trivial to create a sub-module for a carrier.
diff --git a/base_delivery_carrier_files/__manifest__.py b/base_delivery_carrier_files/__manifest__.py
index 30f3247880..e84081d959 100644
--- a/base_delivery_carrier_files/__manifest__.py
+++ b/base_delivery_carrier_files/__manifest__.py
@@ -4,26 +4,24 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': 'Base Delivery Carrier Files',
-    'version': '8.0.1.2.4',
+    'version': '10.0.1.0.1',
     'category': 'Generic Modules/Warehouse',
+    'summary': """
+Base module for creation of carrier files (La Poste, TNT Express Shipper, ...).
+Files are exported as text (csv, ...).
+""",
     'author': "Camptocamp,Odoo Community Association (OCA)",
     'license': 'AGPL-3',
     'website': 'http://www.camptocamp.com',
-    'depends': [
-        'base',
-        'stock',
-        'delivery'
-    ],
-    'data': [
-        'views/carrier_file_view.xml',
-        'views/stock_view.xml',
-        'wizards/generate_carrier_files_view.xml',
-        'security/ir.model.access.csv'
-    ],
-    'demo': [
-        'demo/carrier_file_demo.xml',
-        'demo/carrier_file_demo.yml'
-    ],
+    'depends': ['base',
+                'stock',
+                'delivery'],
+    'data': ['carrier_file_view.xml',
+             'stock_view.xml',
+             'wizard/generate_carrier_files_view.xml',
+             'security/ir.model.access.csv'],
+    'demo': ['carrier_file_demo.xml', 'carrier_file_demo.yml'],
+    'test': [ '../account/test/account_minimal_test.xml'],
     'images': [],
     'installable': True,
     'auto_install': False,
diff --git a/base_delivery_carrier_files/demo/carrier_file_demo.xml b/base_delivery_carrier_files/demo/carrier_file_demo.xml
index 5f88c0f6b6..d49ad7a240 100644
--- a/base_delivery_carrier_files/demo/carrier_file_demo.xml
+++ b/base_delivery_carrier_files/demo/carrier_file_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
     <data noupdate="1">
 
         <!-- Carrier File -->
@@ -33,4 +33,4 @@
         </record>
 
     </data>
-</openerp>
+</odoo>
diff --git a/base_delivery_carrier_files/models/delivery_carrier_file.py b/base_delivery_carrier_files/models/delivery_carrier_file.py
index 9fd828282c..4216146ab4 100644
--- a/base_delivery_carrier_files/models/delivery_carrier_file.py
+++ b/base_delivery_carrier_files/models/delivery_carrier_file.py
@@ -6,8 +6,9 @@
 import os
 import logging
 
-from openerp import models, fields, api, exceptions
-from openerp.tools.translate import _
+from odoo import api, exceptions, fields, models 
+from odoo.tools.translate import _
+from .generator import new_file_generator
 
 from ..generator import new_file_generator
 
@@ -51,7 +52,7 @@ def _write_file(self, filename, file_content):
                 file_handle.write(file_content)
         return True
 
-    @api.multi
+    @api.model
     def _generate_files(self, picking_ids):
         """
         Generate one or more files according to carrier_file configuration
@@ -91,7 +92,7 @@ def _generate_files(self, picking_ids):
                                   picking_ids, e)
         return True
 
-    @api.multi
+    @api.model
     def generate_files(self, picking_ids):
         """
         Generate one or more files according to carrier_file
@@ -110,8 +111,7 @@ def generate_files(self, picking_ids):
     name = fields.Char('Name', size=64, required=True)
     type = fields.Selection(selection='get_type_selection',
                             string='Type', required=True)
-    group_pickings = fields.Boolean('Group all pickings in one file',
-                                    help='All the pickings will be '
+    group_pickings = fields.Boolean(help='All the pickings will be '
                                     'grouped in the same file. '
                                     'Has no effect when the files '
                                     'are automatically exported at '
@@ -119,8 +119,7 @@ def generate_files(self, picking_ids):
     write_mode = fields.Selection(selection='get_write_mode_selection',
                                   string='Write on', required=True)
     export_path = fields.Char('Export Path', size=256)
-    auto_export = fields.Boolean('Export at delivery order process',
-                                 help='The file will be automatically '
+    auto_export = fields.Boolean(help='The file will be automatically '
                                  'generated when a delivery order '
                                  'is processed. If activated, each '
                                  'delivery order will be exported '
diff --git a/base_delivery_carrier_files/models/stock_picking.py b/base_delivery_carrier_files/models/stock_picking.py
index f9a7dbe763..570b4efb1b 100644
--- a/base_delivery_carrier_files/models/stock_picking.py
+++ b/base_delivery_carrier_files/models/stock_picking.py
@@ -3,7 +3,7 @@
 # Author: Guewen Baconnier
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import models, fields, api
+from odoo import models, fields, api
 
 
 class StockPicking(models.Model):
diff --git a/base_delivery_carrier_files/security/ir.model.access.csv b/base_delivery_carrier_files/security/ir.model.access.csv
index 3934ead744..c3913b75a8 100644
--- a/base_delivery_carrier_files/security/ir.model.access.csv
+++ b/base_delivery_carrier_files/security/ir.model.access.csv
@@ -1,4 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_delivery_carrier_file,delivery.carrier.file,model_delivery_carrier_file,base.group_sale_salesman,1,0,0,0
-access_delivery_carrier_file_manager,delivery.carrier.file manager,model_delivery_carrier_file,base.group_sale_manager,1,1,1,1
+access_delivery_carrier_file,delivery.carrier.file,model_delivery_carrier_file,sales_team.group_sale_salesman,1,0,0,0
+access_delivery_carrier_file_manager,delivery.carrier.file manager,model_delivery_carrier_file,sales_team.group_sale_manager,1,1,1,1
 access_delivery_carrier_file_partner_manager,delivery.carrier.file partner_manager,model_delivery_carrier_file,base.group_partner_manager,1,0,0,0
diff --git a/base_delivery_carrier_files/views/carrier_file_view.xml b/base_delivery_carrier_files/views/carrier_file_view.xml
index 1833b67dc7..49992e672c 100644
--- a/base_delivery_carrier_files/views/carrier_file_view.xml
+++ b/base_delivery_carrier_files/views/carrier_file_view.xml
@@ -1,64 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
+    <record id="view_delivery_carrier_file_tree" model="ir.ui.view">
+        <field name="name">delivery.carrier.file.tree</field>
+        <field name="model">delivery.carrier.file</field>
+        <field name="arch" type="xml">
+            <tree string="Carrier File">
+                <field name="name"/>
+                <field name="type"/>
+                <field name="auto_export"/>
+                <field name="group_pickings"/>
+            </tree>
+        </field>
+    </record>
 
-        <record id="view_delivery_carrier_file_tree" model="ir.ui.view">
-            <field name="name">delivery.carrier.file.tree</field>
-            <field name="model">delivery.carrier.file</field>
-            <field name="arch" type="xml">
-                <tree string="Carrier File">
-                    <field name="name"/>
-                    <field name="type"/>
+    <record id="view_delivery_carrier_file_form" model="ir.ui.view">
+        <field name="name">delivery.carrier.file.form</field>
+        <field name="model">delivery.carrier.file</field>
+        <field name="arch" type="xml">
+            <form string="Carrier File">
+                <group colspan="4" col="4" name="general">
+                    <field name="name" select="1"/>
+                    <field name="type" select="1"/>
                     <field name="auto_export"/>
                     <field name="group_pickings"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_delivery_carrier_file_form" model="ir.ui.view">
-            <field name="name">delivery.carrier.file.form</field>
-            <field name="model">delivery.carrier.file</field>
-            <field name="arch" type="xml">
-                <form string="Carrier File">
-                    <group colspan="4" col="4" name="general">
-                        <field name="name" select="1"/>
-                        <field name="type" select="1"/>
-                        <field name="auto_export"/>
-                        <field name="group_pickings"/>
-                        <separator string="Write options" colspan="4"/>
-                        <group colspan="4" col="4">
-                            <field name="write_mode"/>
-                            <group colspan="2" col="2">
-                                <field name="export_path" attrs="{'required': [('write_mode', '=', 'disk')], 'invisible': [('write_mode', '!=', 'disk')]}"/>
-                            </group>
+                    <separator string="Write options" colspan="4"/>
+                    <group colspan="4" col="4">
+                        <field name="write_mode"/>
+                        <group colspan="2" col="2">
+                            <field name="export_path" attrs="{'required': [('write_mode', '=', 'disk')], 'invisible': [('write_mode', '!=', 'disk')]}"/>
                         </group>
                     </group>
-                </form>
-            </field>
-        </record>
+                </group>
+            </form>
+        </field>
+    </record>
 
-        <record id="action_delivery_carrier_file_form" model="ir.actions.act_window">
-            <field name="name">Carrier File</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">delivery.carrier.file</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
+    <record id="action_delivery_carrier_file_form" model="ir.actions.act_window">
+        <field name="name">Carrier File</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">delivery.carrier.file</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
 
-        <menuitem action="action_delivery_carrier_file_form" id="menu_action_delivery_carrier_file_form" parent="delivery.menu_delivery"/>
+    <menuitem action="action_delivery_carrier_file_form" id="menu_action_delivery_carrier_file_form" parent="delivery.menu_delivery"/>
 
-        <record id="view_delivery_carrier_form_inherit" model="ir.ui.view">
-            <field name="name">delivery.carrier.form.file</field>
-            <field name="model">delivery.carrier</field>
-            <field name="inherit_id" ref="delivery.view_delivery_carrier_form" />
-            <field name="arch" type="xml">
-                 <data>
-                    <field name="product_id" position="after">
-                        <field name="carrier_file_id"/>
-                    </field>
-                </data>
-            </field>
-        </record>
+    <record id="view_delivery_carrier_form_inherit" model="ir.ui.view">
+        <field name="name">delivery.carrier.form.file</field>
+        <field name="model">delivery.carrier</field>
+        <field name="inherit_id" ref="delivery.view_delivery_carrier_form" />
+        <field name="arch" type="xml">
+             <data>
+                <field name="name" position="after">
+                    <field name="carrier_file_id"/>
+                </field>
+            </data>
+        </field>
+    </record>
 
-    </data>
-</openerp>
+</odoo>
diff --git a/base_delivery_carrier_files/views/stock_view.xml b/base_delivery_carrier_files/views/stock_view.xml
index 320b93df1f..742ea5ff4f 100644
--- a/base_delivery_carrier_files/views/stock_view.xml
+++ b/base_delivery_carrier_files/views/stock_view.xml
@@ -1,39 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_picking_out_form_carrier_file" model="ir.ui.view">
-            <field name="name">stock.picking.form</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_form"/>
-            <field name="arch" type="xml">
-                <data>
-                    <page string="Additional Info" position="inside">
-                        <group>
-                            <field name="carrier_file_generated"/>
-                        </group>
-                    </page>
-                </data>
-            </field>
-        </record>
+<odoo>
+    <record id="view_picking_out_form_carrier_file" model="ir.ui.view">
+        <field name="name">stock.picking.form</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="arch" type="xml">
+            <data>
+                <page name="extra" position="inside">
+                    <group>
+                        <field name="carrier_file_generated"/>
+                    </group>
+                </page>
+            </data>
+        </field>
+    </record>
 
-        <record id="view_picking_out_search_carrier_file" model="ir.ui.view">
-            <field name="name">stock.picking.search</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="sale_stock.view_picking_internal_search_inherit"/>
-            <field name="arch" type="xml">
-                <data>
-                    <filter name="to_invoice" position="after">
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-emblem-documents" name="carrier_file" string="Carrier File To Generate"
-                          domain="[('carrier_file_generated', '=', False),
-                          ('carrier_id', '!=', False),
-                          ('carrier_id.carrier_file_id', '!=', False),
-                          ('picking_type_id.code', '=', 'outgoing'),
-                          ('state', '=', 'done')]"
-                          help="Delivery orders to invoice"/>
-                    </filter>
-                </data>
-            </field>
-        </record>
-    </data>
-</openerp>
+    <record id="view_picking_out_search_carrier_file" model="ir.ui.view">
+        <field name="name">stock.picking.search</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_internal_search"/>
+        <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='partner_id']" position="before">
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-emblem-documents" name="carrier_file" string="Carrier File To Generate"
+                      domain="[('carrier_file_generated', '=', False),
+                      ('carrier_id', '!=', False),
+                      ('carrier_id.carrier_file_id', '!=', False),
+                      ('picking_type_id.code', '=', 'outgoing'),
+                      ('state', '=', 'done')]"
+                      help="Delivery orders to invoice"/>
+                </xpath>
+            </data>
+        </field>
+    </record>
+</odoo>
diff --git a/base_delivery_carrier_files/wizards/generate_carrier_files.py b/base_delivery_carrier_files/wizards/generate_carrier_files.py
index 80523a67c3..31efc64fe1 100644
--- a/base_delivery_carrier_files/wizards/generate_carrier_files.py
+++ b/base_delivery_carrier_files/wizards/generate_carrier_files.py
@@ -3,8 +3,8 @@
 # Author: Guewen Baconnier
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import models, fields, exceptions, api
-from openerp.tools.translate import _
+from odoo import models, fields, exceptions, api
+from odoo.tools.translate import _
 
 
 class DeliveryCarrierFileGenerate(models.TransientModel):
diff --git a/base_delivery_carrier_files/wizards/generate_carrier_files_view.xml b/base_delivery_carrier_files/wizards/generate_carrier_files_view.xml
index 0ca8eb98b8..f3e72639b1 100644
--- a/base_delivery_carrier_files/wizards/generate_carrier_files_view.xml
+++ b/base_delivery_carrier_files/wizards/generate_carrier_files_view.xml
@@ -1,52 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_delivery_carrier_file_generate" model="ir.ui.view">
-            <field name="name">delivery.carrier.file.generate.form</field>
-            <field name="model">delivery.carrier.file.generate</field>
-            <field name="arch" type="xml">
-                <form string="Carrier Files">
-                    <label string="Generate the carrier files for the selected delivery orders."/>
-                    <field name="pickings" nolabel="1" colspan="4"
-                      domain="[('picking_type_id.code', '=', 'outgoing')]">
-                        <tree string="Delivery Orders">
-                            <field name="name"/>
-                            <field name="carrier_id"/>
-                            <field name="partner_id"/>
-                            <field name="origin"/>
-                            <field name="state" invisible="1"/>
-                        </tree>
-                    </field>
-                    <group>
-                      <field name="recreate"/>
-                    </group>
-                    <footer>
-                      <button name="action_generate" string="Generate Files" type="object" icon="gtk-execute" class="oe_highlight"/>
+<odoo>
+    <record id="view_delivery_carrier_file_generate" model="ir.ui.view">
+        <field name="name">delivery.carrier.file.generate.form</field>
+        <field name="model">delivery.carrier.file.generate</field>
+        <field name="arch" type="xml">
+            <form string="Carrier Files">
+                <label string="Generate the carrier files for the selected delivery orders."/>
+                <field name="pickings" nolabel="1" colspan="4"
+                  domain="[('picking_type_id.code', '=', 'outgoing')]">
+                    <tree string="Delivery Orders">
+                        <field name="name"/>
+                        <field name="carrier_id"/>
+                        <field name="partner_id"/>
+                        <field name="origin"/>
+                        <field name="state" invisible="1"/>
+                    </tree>
+                </field>
+                <group>
+                    <field name="recreate"/>
+                </group>
+                <footer>
+                    <button name="action_generate" string="Generate Files" type="object" icon="gtk-execute" class="oe_highlight"/>
                       or
-                      <button string="Close" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
+                    <button string="Close" class="oe_link" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
 
-        <record id="action_delivery_carrier_file_generate" model="ir.actions.act_window">
-            <field name="name">Generate Carrier Files</field>
-            <field name="res_model">delivery.carrier.file.generate</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_delivery_carrier_file_generate"/>
-            <field name="groups_id" eval="[(6, 0, [ref('stock.group_stock_manager')])]"/>
-            <field name="target">new</field>
-        </record>
+    <record id="action_delivery_carrier_file_generate" model="ir.actions.act_window">
+        <field name="name">Generate Carrier Files</field>
+        <field name="res_model">delivery.carrier.file.generate</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_delivery_carrier_file_generate"/>
+        <field name="groups_id" eval="[(6, 0, [ref('stock.group_stock_manager')])]"/>
+        <field name="target">new</field>
+    </record>
 
-        <record model="ir.values" id="delivery_carrier_file_generate_ir_values">
-            <field name="name">Generate Carrier Files</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_delivery_carrier_file_generate'))" />
-            <field name="key">action</field>
-            <field name="model">stock.picking</field>
-        </record>
+    <record model="ir.values" id="delivery_carrier_file_generate_ir_values">
+        <field name="name">Generate Carrier Files</field>
+        <field name="key2">client_action_multi</field>
+        <field name="value" eval="'ir.actions.act_window,' + str(ref('action_delivery_carrier_file_generate'))" />
+        <field name="key">action</field>
+        <field name="model">stock.picking</field>
+    </record>
 
-    </data>
-</openerp>
+</odoo>
diff --git a/base_delivery_carrier_files_document/README.rst b/base_delivery_carrier_files_document/README.rst
index 21cd7854d5..5f8a7f102f 100644
--- a/base_delivery_carrier_files_document/README.rst
+++ b/base_delivery_carrier_files_document/README.rst
@@ -1,21 +1,9 @@
-**This file is going to be generated by oca-gen-addon-readme.**
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+    :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
 
-*Manual changes will be overwritten.*
+====================================
+base_delivery_carrier_files_document
+====================================
 
-Please provide content in the ``readme`` directory:
-
-* **DESCRIPTION.rst** (required)
-* INSTALL.rst (optional)
-* CONFIGURE.rst (optional)
-* **USAGE.rst** (optional, highly recommended)
-* DEVELOP.rst (optional)
-* ROADMAP.rst (optional)
-* HISTORY.rst (optional, recommended)
-* **CONTRIBUTORS.rst** (optional, highly recommended)
-* CREDITS.rst (optional)
-
-Content of this README will also be drawn from the addon manifest,
-from keys such as name, authors, maintainers, development_status,
-and license.
-
-A good, one sentence summary in the manifest is also highly recommended.
+This module was written to extend the functionality of picking to support generating one or more files according to carrier_file configuration for all pickings and  puts the file into the Odoo filestore as an attachment in a certain configurable Odoo Data directory (eg. Carrier files)
diff --git a/base_delivery_carrier_files_document/__manifest__.py b/base_delivery_carrier_files_document/__manifest__.py
index e0c147bb0b..e7c5d6e579 100644
--- a/base_delivery_carrier_files_document/__manifest__.py
+++ b/base_delivery_carrier_files_document/__manifest__.py
@@ -4,9 +4,14 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': 'Base module for picking carrier files creation for document',
-    'version': '8.0.1.0.1',
+    'version': '10.0.1.0.0',
     'category': 'Generic Modules/Warehouse',
-    'author': 'Camptocamp,Odoo Community Association (OCA)',
+    'summary': """
+Allow to store the carrier files in a Document directory.
+Auto-install when the module Document and
+Base Delivery Carrier Files are installed.
+    """,
+    'author': "Camptocamp,Odoo Community Association (OCA)",
     'license': 'AGPL-3',
     'website': 'http://www.camptocamp.com',
     'depends': [
diff --git a/base_delivery_carrier_files_document/demo/carrier_file_demo.xml b/base_delivery_carrier_files_document/demo/carrier_file_demo.xml
index 3f4822e68e..ddf42b96fb 100644
--- a/base_delivery_carrier_files_document/demo/carrier_file_demo.xml
+++ b/base_delivery_carrier_files_document/demo/carrier_file_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
     <data noupdate="1">
 
         <!-- Carrier File -->
@@ -15,4 +15,4 @@
         </record>
 
     </data>
-</openerp>
+</odoo>
diff --git a/base_delivery_carrier_files_document/views/carrier_file_view.xml b/base_delivery_carrier_files_document/views/carrier_file_view.xml
index 37d097274b..1dc55e51b9 100644
--- a/base_delivery_carrier_files_document/views/carrier_file_view.xml
+++ b/base_delivery_carrier_files_document/views/carrier_file_view.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_delivery_carrier_file_form_document" model="ir.ui.view">
-            <field name="name">delivery.carrier.file.form</field>
-            <field name="model">delivery.carrier.file</field>
-            <field name="inherit_id" ref="base_delivery_carrier_files.view_delivery_carrier_file_form"/>
-            <field name="arch" type="xml">
-                <data>
-                    <field name="export_path" position="after">
-                        <field name="document_directory_id" attrs="{'required': [('write_mode', '=', 'document')], 'invisible': [('write_mode', '!=', 'document')]}"/>
-                    </field>
-                </data>
-            </field>
-        </record>
-    </data>
-</openerp>
+<odoo>
+    <record id="view_delivery_carrier_file_form_document" model="ir.ui.view">
+        <field name="name">delivery.carrier.file.form</field>
+        <field name="model">delivery.carrier.file</field>
+        <field name="inherit_id" ref="base_delivery_carrier_files.view_delivery_carrier_file_form"/>
+        <field name="arch" type="xml">
+            <data>
+                <field name="export_path" position="after">
+                    <field name="document_directory_id" attrs="{'required': [('write_mode', '=', 'document')], 'invisible': [('write_mode', '!=', 'document')]}"/>
+                </field>
+            </data>
+        </field>
+    </record>
+</odoo>
diff --git a/delivery_carrier_file_tnt/README.rst b/delivery_carrier_file_tnt/README.rst
new file mode 100644
index 0000000000..ec311f859e
--- /dev/null
+++ b/delivery_carrier_file_tnt/README.rst
@@ -0,0 +1,18 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+    :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+
+=========================
+delivery_carrier_file_tnt
+=========================
+
+This module was written to set tnt carrier files according to carrier_file configuration for all pickings
+
+discription:
+Sub-module for Base Delivery Carrier Files.
+
+Definition of the delivery carrier file for "TNT Express Shipper".
+
+File specifications on :
+http://www.tnt.com/express/fr_fr/site/home/support/downloads.html
+Chapter : "Guide d’importation d’un carnet d’adresses"
diff --git a/delivery_carrier_file_tnt/__manifest__.py b/delivery_carrier_file_tnt/__manifest__.py
index 72435f76e3..2d21c8f8ad 100644
--- a/delivery_carrier_file_tnt/__manifest__.py
+++ b/delivery_carrier_file_tnt/__manifest__.py
@@ -21,16 +21,12 @@
 
 {
     'name': 'Delivery Carrier File: TNT',
-    'version': '1.0',
+    'version': '10.0.1.0.0',
     'category': 'Generic Modules/Warehouse',
-    'description': """
+    'summary': """
 Sub-module for Base Delivery Carrier Files.
 
 Definition of the delivery carrier file for "TNT Express Shipper".
-
-File specifications on :
-http://www.tnt.com/express/fr_fr/site/home/support/downloads.html
-Chapter : "Guide d’importation d’un carnet d’adresses"
     """,
     'author': "Camptocamp,Odoo Community Association (OCA)",
     'license': 'AGPL-3',
@@ -41,6 +37,6 @@
     'demo_xml': [],
     'test': [],
     'images': [],
-    'installable': False,
+    'installable': True,
     'auto_install': False,
 }
diff --git a/delivery_carrier_file_tnt/carrier_file.py b/delivery_carrier_file_tnt/carrier_file.py
index 168e3d100c..befaa5b943 100644
--- a/delivery_carrier_file_tnt/carrier_file.py
+++ b/delivery_carrier_file_tnt/carrier_file.py
@@ -19,22 +19,21 @@
 #
 ##############################################################################
 
-from osv import osv, fields
+from odoo import api, fields, models
 
 
-class carrier_file(osv.osv):
+class CarrierFile(models.Model):
     _inherit = 'delivery.carrier.file'
 
-    def get_type_selection(self, cr, uid, context=None):
-        result = super(carrier_file, self
-                       ).get_type_selection(cr, uid, context=context)
+    @api.model
+    def get_type_selection(self):
+        result = super(CarrierFile, self
+                       ).get_type_selection()
         if 'tnt_express_shipper' not in result:
             result.append(('tnt_express_shipper', 'TNT Express Shipper'))
         return result
 
-    _columns = {
-        'type': fields.selection(get_type_selection, 'Type', required=True),
-        'tnt_account': fields.char('TNT Account', size=9),
-    }
+    type = fields.Selection(get_type_selection, 'Type', required=True)
+    tnt_account = fields.Char('TNT Account', size=9)
 
-carrier_file()
+CarrierFile()
diff --git a/delivery_carrier_file_tnt/carrier_file_view.xml b/delivery_carrier_file_tnt/carrier_file_view.xml
index 13f66d4a8f..3ea0fe2fc8 100644
--- a/delivery_carrier_file_tnt/carrier_file_view.xml
+++ b/delivery_carrier_file_tnt/carrier_file_view.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_delivery_carrier_file_form_tnt" model="ir.ui.view">
-            <field name="name">delivery.carrier.file.form.tnt</field>
-            <field name="model">delivery.carrier.file</field>
-            <field name="inherit_id" ref="base_delivery_carrier_files.view_delivery_carrier_file_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <data>
-                    <form position="inside">
-                        <group colspan="4" col="4" attrs="{'invisible': [('type', '!=', 'tnt_express_shipper')]}">
-                            <separator string="TNT Express Shipper Options" colspan="4"/>
-                            <field name="tnt_account"/>
-                        </group>
-                    </form>
-                </data>
-            </field>
-        </record>
-    </data>
-</openerp>
+<odoo>
+    <record id="view_delivery_carrier_file_form_tnt" model="ir.ui.view">
+        <field name="name">delivery.carrier.file.form.tnt</field>
+        <field name="model">delivery.carrier.file</field>
+        <field name="inherit_id" ref="base_delivery_carrier_files.view_delivery_carrier_file_form"/>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <data>
+                <form position="inside">
+                    <group colspan="4" col="4" attrs="{'invisible': [('type', '!=', 'tnt_express_shipper')]}">
+                        <separator string="TNT Express Shipper Options" colspan="4"/>
+                        <field name="tnt_account"/>
+                    </group>
+                </form>
+            </data>
+        </field>
+    </record>
+</odoo>
diff --git a/delivery_carrier_file_tnt/generator/tnt_generator.py b/delivery_carrier_file_tnt/generator/tnt_generator.py
index 2858b4f6d3..9370bd164b 100644
--- a/delivery_carrier_file_tnt/generator/tnt_generator.py
+++ b/delivery_carrier_file_tnt/generator/tnt_generator.py
@@ -21,11 +21,11 @@
 
 import csv
 
-from openerp.addons.base_delivery_carrier_files.generator import (
+from odoo.addons.base_delivery_carrier_files.generator import (
     CarrierFileGenerator
 )
-from openerp.addons.base_delivery_carrier_files.generator import BaseLine
-from openerp.addons.base_delivery_carrier_files.csv_writer import UnicodeWriter
+from odoo.addons.base_delivery_carrier_files.generator import BaseLine
+from odoo.addons.base_delivery_carrier_files.csv_writer import UnicodeWriter
 
 
 class TNTLine(BaseLine):