wip

2019-03-28 17:45:34 +01:00
311 changed files with 1089 additions and 12711 deletions
--- a/account_fiscal_position_payable_receivable/init.py
+++ b/account_fiscal_position_payable_receivable/init.py
@@ -1 +0,0 @@
-from . import models
--- a/account_fiscal_position_payable_receivable/manifest.py
+++ b/account_fiscal_position_payable_receivable/manifest.py
@@ -1,23 +0,0 @@
-# © 2016-2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-{
-    "name": "Account Fiscal Position Payable Receivable",
-    "version": "12.0.1.0.0",
-    "category": "Accounting & Finance",
-    "license": "AGPL-3",
-    "summary": "Configure payable/receivable accounts on fiscal positions",
-    "description": """
-Account Fiscal Position Payable Receivable
-==========================================
-
-This module allows to configure a special *Partner Receivable Account* and a special *Partner Payable Account* on fiscal positions. This is used in the onchange of the fiscal position of partners.
-
-This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
-    """,
-    "author": "Akretion",
-    "website": "http://www.akretion.com",
-    "depends": ["account"],
-    "data": ["views/account_fiscal_position_view.xml"],
-    "installable": True,
-}
--- a/account_fiscal_position_payable_receivable/models/init.py
+++ b/account_fiscal_position_payable_receivable/models/init.py
@@ -1,2 +0,0 @@
-from . import account_fiscal_position
-from . import res_partner
--- a/account_fiscal_position_payable_receivable/models/account_fiscal_position.py
+++ b/account_fiscal_position_payable_receivable/models/account_fiscal_position.py
@@ -1,21 +0,0 @@
-# © 2016-2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import models, fields
-
-
-class AccountFiscalPosition(models.Model):
-    _inherit = "account.fiscal.position"
-
-    receivable_account_id = fields.Many2one(
-        "account.account",
-        string="Partner Receivable Account",
-        company_dependent=True,
-        domain=[("internal_type", "=", "receivable")],
-    )
-    payable_account_id = fields.Many2one(
-        "account.account",
-        string="Partner Payable Account",
-        company_dependent=True,
-        domain=[("internal_type", "=", "payable")],
-    )
--- a/account_fiscal_position_payable_receivable/models/res_partner.py
+++ b/account_fiscal_position_payable_receivable/models/res_partner.py
@@ -1,25 +0,0 @@
-# © 2016-2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import models, api
-
-
-class ResPartner(models.Model):
-    _inherit = "res.partner"
-
-    @api.onchange("property_account_position_id")
-    def fiscal_position_receivable_payable_change(self):
-        fp = self.property_account_position_id
-        ipo = self.env["ir.property"]
-        if fp.receivable_account_id:
-            self.property_account_receivable_id = fp.receivable_account_id
-        else:
-            self.property_account_receivable_id = ipo.get(
-                "property_account_receivable_id", "res.partner"
-            )
-        if fp.payable_account_id:
-            self.property_account_payable_id = fp.payable_account_id
-        else:
-            self.property_account_payable_id = ipo.get(
-                "property_account_payable_id", "res.partner"
-            )
--- a/account_fiscal_position_payable_receivable/views/account_fiscal_position_view.xml
+++ b/account_fiscal_position_payable_receivable/views/account_fiscal_position_view.xml
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  © 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
-
-<odoo>
-
-
-<record id="view_account_position_form" model="ir.ui.view">
-    <field name="name">receivable_payable.fiscal_position_form</field>
-    <field name="model">account.fiscal.position</field>
-    <field name="inherit_id" ref="account.view_account_position_form" />
-    <field name="arch" type="xml">
-        <field name="company_id" position="after">
-            <field name="receivable_account_id"/>
-            <field name="payable_account_id"/>
-        </field>
-    </field>
-</record>
-
-
-</odoo>
--- a/account_invoice_margin/init.py
+++ b/account_invoice_margin/init.py
@@ -1,2 +0,0 @@
-from . import account_invoice
-from . import account_invoice_report
--- a/account_invoice_margin/manifest.py
+++ b/account_invoice_margin/manifest.py
@@ -1,24 +0,0 @@
-# Copyright 2015-2019 Akretion France (http://www.akretion.com)
-# @author Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-{
-    'name': 'Account Invoice Margin',
-    'version': '12.0.1.0.0',
-    'category': 'Invoicing Management',
-    'license': 'AGPL-3',
-    'summary': 'Copy standard price on invoice line and compute margins',
-    'description': """
-This module copies the field *standard_price* of the product on the invoice line when the invoice line is created. The allows the computation of the margin of the invoice.
-
-This module has been written by Alexis de Lattre from Akretion
-<alexis.delattre@akretion.com>.
-    """,
-    'author': 'Akretion',
-    'website': 'http://www.akretion.com',
-    'depends': ['account'],
-    'data': [
-        'account_invoice_view.xml',
-    ],
-    'installable': True,
-}
--- a/account_invoice_margin/account_invoice.py
+++ b/account_invoice_margin/account_invoice.py
@@ -1,152 +0,0 @@
-# Copyright 2015-2019 Akretion France (http://www.akretion.com)
-# @author Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import api, fields, models
-import odoo.addons.decimal_precision as dp
-
-
-class AccountInvoiceLine(models.Model):
-    _inherit = 'account.invoice.line'
-
-    standard_price_company_currency = fields.Float(
-        string='Cost Price in Company Currency', readonly=True,
-        digits=dp.get_precision('Product Price'),
-        help="Cost price in company currency in the unit of measure "
-        "of the invoice line (which may be different from the unit "
-        "of measure of the product).")
-    standard_price_invoice_currency = fields.Float(
-        string='Cost Price in Invoice Currency', readonly=True,
-        compute='_compute_margin', store=True,
-        digits=dp.get_precision('Product Price'),
-        help="Cost price in invoice currency in the unit of measure "
-        "of the invoice line")
-    margin_invoice_currency = fields.Monetary(
-        string='Margin in Invoice Currency', readonly=True, store=True,
-        compute='_compute_margin', currency_field='currency_id')
-    margin_company_currency = fields.Monetary(
-        string='Margin in Company Currency', readonly=True, store=True,
-        compute='_compute_margin', currency_field='company_currency_id')
-    margin_rate = fields.Float(
-        string="Margin Rate", readonly=True, store=True,
-        compute='_compute_margin',
-        digits=(16, 2), help="Margin rate in percentage of the sale price")
-
-    @api.depends(
-        'standard_price_company_currency', 'invoice_id.currency_id',
-        'invoice_id.type', 'invoice_id.company_id',
-        'invoice_id.date_invoice', 'quantity', 'price_subtotal')
-    def _compute_margin(self):
-        for il in self:
-            standard_price_inv_cur = 0.0
-            margin_inv_cur = 0.0
-            margin_comp_cur = 0.0
-            margin_rate = 0.0
-            inv = il.invoice_id
-            if inv and inv.type in ('out_invoice', 'out_refund'):
-                # it works in _get_current_rate
-                # even if we set date = False in context
-                # standard_price_inv_cur is in the UoM of the invoice line
-                date = inv._get_currency_rate_date() or\
-                    fields.Date.context_today(self)
-                company = inv.company_id
-                company_currency = company.currency_id
-                standard_price_inv_cur =\
-                    company_currency._convert(
-                        il.standard_price_company_currency,
-                        inv.currency_id, company, date)
-                margin_inv_cur =\
-                    il.price_subtotal - il.quantity * standard_price_inv_cur
-                margin_comp_cur = inv.currency_id._convert(
-                    margin_inv_cur, company_currency, company, date)
-                if il.price_subtotal:
-                    margin_rate = 100 * margin_inv_cur / il.price_subtotal
-                # for a refund, margin should be negative
-                # but margin rate should stay positive
-                if inv.type == 'out_refund':
-                    margin_inv_cur *= -1
-                    margin_comp_cur *= -1
-            il.standard_price_invoice_currency = standard_price_inv_cur
-            il.margin_invoice_currency = margin_inv_cur
-            il.margin_company_currency = margin_comp_cur
-            il.margin_rate = margin_rate
-
-    # We want to copy standard_price on invoice line for customer
-    # invoice/refunds. We can't do that via on_change of product_id,
-    # because it is not always played when invoice is created from code
-    # => we inherit write/create
-    # We write standard_price_company_currency even on supplier invoice/refunds
-    # because we don't have access to the 'type' of the invoice
-    @api.model
-    def create(self, vals):
-        if vals.get('product_id'):
-            pp = self.env['product.product'].browse(vals['product_id'])
-            std_price = pp.standard_price
-            inv_uom_id = vals.get('uom_id')
-            if inv_uom_id and inv_uom_id != pp.uom_id.id:
-                inv_uom = self.env['uom.uom'].browse(inv_uom_id)
-                std_price = pp.uom_id._compute_price(
-                    std_price, inv_uom)
-            vals['standard_price_company_currency'] = std_price
-        return super(AccountInvoiceLine, self).create(vals)
-
-    def write(self, vals):
-        if not vals:
-            vals = {}
-        if 'product_id' in vals or 'uom_id' in vals:
-            for il in self:
-                if 'product_id' in vals:
-                    if vals.get('product_id'):
-                        pp = self.env['product.product'].browse(
-                            vals['product_id'])
-                    else:
-                        pp = False
-                else:
-                    pp = il.product_id or False
-                # uom_id is NOT a required field
-                if 'uom_id' in vals:
-                    if vals.get('uom_id'):
-                        inv_uom = self.env['uom.uom'].browse(
-                            vals['uom_id'])
-                    else:
-                        inv_uom = False
-                else:
-                    inv_uom = il.uom_id or False
-                std_price = 0.0
-                if pp:
-                    std_price = pp.standard_price
-                    if inv_uom and inv_uom != pp.uom_id:
-                        std_price = pp.uom_id._compute_price(
-                            std_price, inv_uom)
-                il.write({'standard_price_company_currency': std_price})
-        return super(AccountInvoiceLine, self).write(vals)
-
-
-class AccountInvoice(models.Model):
-    _inherit = 'account.invoice'
-
-    margin_invoice_currency = fields.Monetary(
-        string='Margin in Invoice Currency',
-        compute='_compute_margin', store=True, readonly=True,
-        currency_field='currency_id')
-    margin_company_currency = fields.Monetary(
-        string='Margin in Company Currency',
-        compute='_compute_margin', store=True, readonly=True,
-        currency_field='company_currency_id')
-
-    @api.depends(
-        'type',
-        'invoice_line_ids.margin_invoice_currency',
-        'invoice_line_ids.margin_company_currency')
-    def _compute_margin(self):
-        res = self.env['account.invoice.line'].read_group(
-            [('invoice_id', 'in', self.ids)],
-            ['invoice_id', 'margin_invoice_currency',
-             'margin_company_currency'],
-            ['invoice_id'])
-        for re in res:
-            if re['invoice_id']:
-                inv = self.browse(re['invoice_id'][0])
-                if inv.type in ('out_invoice', 'out_refund'):
-                    inv.margin_invoice_currency = re['margin_invoice_currency']
-                    inv.margin_company_currency = re['margin_company_currency']
--- a/account_invoice_margin/account_invoice_report.py
+++ b/account_invoice_margin/account_invoice_report.py
@@ -1,60 +0,0 @@
-# Copyright 2018-2019 Akretion France (http://www.akretion.com)
-# @author Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import api, fields, models
-
-
-class AccountInvoiceReport(models.Model):
-    _inherit = 'account.invoice.report'
-
-    margin = fields.Float(string='Margin', readonly=True)
-    # why digits=0 ??? Why is it like that in the native "account" module
-    user_currency_margin = fields.Float(
-        string="Margin", compute='_compute_user_currency_margin', digits=0)
-
-    _depends = {
-        'account.invoice': [
-            'account_id', 'amount_total_company_signed',
-            'commercial_partner_id', 'company_id',
-            'currency_id', 'date_due', 'date_invoice', 'fiscal_position_id',
-            'journal_id', 'number', 'partner_bank_id', 'partner_id',
-            'payment_term_id', 'residual', 'state', 'type', 'user_id',
-        ],
-        'account.invoice.line': [
-            'account_id', 'invoice_id', 'price_subtotal', 'product_id',
-            'quantity', 'uom_id', 'account_analytic_id',
-            'margin_company_currency',
-        ],
-        'product.product': ['product_tmpl_id'],
-        'product.template': ['categ_id'],
-        'uom.uom': ['category_id', 'factor', 'name', 'uom_type'],
-        'res.currency.rate': ['currency_id', 'name'],
-        'res.partner': ['country_id'],
-    }
-
-    @api.depends('currency_id', 'date', 'margin')
-    def _compute_user_currency_margin(self):
-        user_currency = self.env.user.company_id.currency_id
-        currency_rate = self.env['res.currency.rate'].search([
-            ('rate', '=', 1),
-            '|',
-            ('company_id', '=', self.env.user.company_id.id),
-            ('company_id', '=', False)], limit=1)
-        base_currency = currency_rate.currency_id
-        for record in self:
-            date = record.date or fields.Date.today()
-            company = record.company_id
-            record.user_currency_margin = base_currency._convert(
-                record.margin, user_currency, company, date)
-
-    # TODO check for refunds
-    def _sub_select(self):
-        select_str = super(AccountInvoiceReport, self)._sub_select()
-        select_str += ", SUM(ail.margin_company_currency) AS margin"
-        return select_str
-
-    def _select(self):
-        select_str = super(AccountInvoiceReport, self)._select()
-        select_str += ", sub.margin AS margin"
-        return select_str
--- a/account_invoice_margin/account_invoice_view.xml
+++ b/account_invoice_margin/account_invoice_view.xml
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  © 2015-2017 Akretion (http://www.akretion.com/)
-  @author: Alexis de Lattre <alexis.delattre@akretion.com>
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
-
-<odoo>
-
-<record id="view_invoice_line_form" model="ir.ui.view">
-    <field name="name">margin.account.invoice.line.form</field>
-    <field name="model">account.invoice.line</field>
-    <field name="inherit_id" ref="account.view_invoice_line_form"/>
-    <field name="arch" type="xml">
-        <xpath expr="//field[@name='analytic_tag_ids']/.." position="inside">
-            <field name="standard_price_company_currency"
-                string="Cost Price in Comp. Cur."
-                groups="base.group_no_one"/>
-            <field name="standard_price_invoice_currency"
-                string="Cost Price in Inv. Cur."
-                groups="base.group_no_one"/>
-            <field name="margin_invoice_currency"
-                string="Margin in Inv. Cur."
-                groups="base.group_no_one"/>
-            <field name="margin_company_currency"
-                string="Margin in Comp. Cur."
-                groups="base.group_no_one"/>
-            <label for="margin_rate" groups="base.group_no_one"/>
-            <div name="margin_rate" groups="base.group_no_one">
-                <field name="margin_rate" class="oe_inline"/> %
-            </div>
-        </xpath>
-    </field>
-</record>
-
-<record id="invoice_form" model="ir.ui.view">
-    <field name="name">margin.account.invoice.form</field>
-    <field name="model">account.invoice</field>
-    <field name="inherit_id" ref="account.invoice_form"/>
-    <field name="arch" type="xml">
-        <field name="move_id" position="after">
-            <field name="margin_invoice_currency"
-                string="Margin in Inv. Cur." groups="base.group_no_one"/>
-            <field name="margin_company_currency"
-                string="Margin in Comp. Cur." groups="base.group_no_one"/>
-        </field>
-    </field>
-</record>
-
-
-</odoo>
--- a/account_invoice_update_wizard/README.rst
+++ b/account_invoice_update_wizard/README.rst
@@ -1,39 +0,0 @@
-.. 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
-
-Account Invoice Update Wizard
-=============================
-
-This module adds a button *Update Invoice* on Customer and Supplier invoices in
-Open or Paid state. This button starts a wizard which allows the user to update
-non-legal fields of the invoice:
-
-* Source Document
-* Reference/Description
-* Payment terms (update allowed only to a payment term with same number of terms
-  of the same amount and on invoices without any payment)
-* Bank Account
-* Salesman
-* Notes
-* Description of invoice lines
-* Analytic account
-* Analytic tags
-
-Bug Tracker
-===========
-
-Bugs are tracked on `GitHub Issues
-<https://github.com/akretion/odoo-usability/issues>`_. In case of trouble, please
-check there if your issue has already been reported. If you spotted it first,
-help us smash it by providing detailed and welcomed feedback.
-
-Contributors
------------
-
-* Alexis de Lattre <alexis.delattre@akretion.com>
-* Florian da Costa <florian.dacosta@akretion.com>
-* Matthieu Dietrich <matthieu.dietrich@camptocamp.com>
-* Yannick Vaucher <yannick.vaucher@camptocamp.com>
-* Mykhailo Panarin <m.panarin@mobilunity.com>
-* Artem Kostyuk <a.kostyuk@mobilunity.com>
--- a/account_invoice_update_wizard/init.py
+++ b/account_invoice_update_wizard/init.py
@@ -1,2 +0,0 @@
-from . import models
-from . import wizard
--- a/account_invoice_update_wizard/manifest.py
+++ b/account_invoice_update_wizard/manifest.py
@@ -1,21 +0,0 @@
-# Copyright 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
-# Copyright 2018-2019 Camptocamp
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-{
-    'name': 'Account Invoice Update Wizard',
-    'version': '12.0.1.0.0',
-    'category': 'Accounting & Finance',
-    'license': 'AGPL-3',
-    'summary': 'Wizard to update non-legal fields of an open/paid invoice',
-    'author': 'Akretion',
-    'website': 'https://github.com/akretion/odoo-usability',
-    'depends': [
-        'account',
-    ],
-    'data': [
-        'wizard/account_invoice_update_view.xml',
-        'views/account_invoice.xml',
-        ],
-    'installable': True,
-}
--- a/account_invoice_update_wizard/models/init.py
+++ b/account_invoice_update_wizard/models/init.py
@@ -1 +0,0 @@
-from . import account_invoice
--- a/account_invoice_update_wizard/models/account_invoice.py
+++ b/account_invoice_update_wizard/models/account_invoice.py
@@ -1,22 +0,0 @@
-# Copyright 2019 Camptocamp
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import models, fields, api, _
-from odoo.exceptions import UserError
-import odoo.addons.decimal_precision as dp
-
-
-class AccountInvoice(models.Model):
-    _inherit = 'account.invoice'
-    
-    def prepare_update_wizard(self):
-        self.ensure_one()
-        wizard = self.env['account.invoice.update']
-        res = wizard._prepare_default_get(self)
-        action = self.env.ref(
-            'account_invoice_update_wizard.account_invoice_update_action'
-        ).read()[0]
-        action['name'] = "Update Wizard"
-        action['res_id'] = wizard.create(res).id
-        return action
-
--- a/account_invoice_update_wizard/tests/init.py
+++ b/account_invoice_update_wizard/tests/init.py
@@ -1 +0,0 @@
-from . import test_account_invoice_update_wizard
--- a/account_invoice_update_wizard/tests/test_account_invoice_update_wizard.py
+++ b/account_invoice_update_wizard/tests/test_account_invoice_update_wizard.py
@@ -1,196 +0,0 @@
-# Copyright 2018-2019 Camptocamp
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo.tests.common import SavepointCase
-from odoo.exceptions import UserError
-
-
-class TestAccountInvoiceUpdateWizard(SavepointCase):
-
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.customer12 = cls.env.ref('base.res_partner_12')
-        cls.product16 = cls.env.ref('product.product_product_16')
-        cls.product24 = cls.env.ref('product.product_product_24')
-        uom_unit = cls.env.ref('uom.product_uom_categ_unit')
-
-        cls.invoice1 = cls.env['account.invoice'].create({
-            'name': 'Test invoice',
-            'partner_id': cls.customer12.id,
-        })
-        cls.inv_line1 = cls.env['account.invoice.line'].create({
-            'invoice_id': cls.invoice1.id,
-            'name': "Line1",
-            'product_id': cls.product16.id,
-            'product_uom_id': uom_unit.id,
-            'account_id': cls.invoice1.account_id.id,
-            'price_unit': 42.0,
-        })
-        cls.inv_line2 = cls.env['account.invoice.line'].create({
-            'invoice_id': cls.invoice1.id,
-            'name': "Line2",
-            'product_id': cls.product24.id,
-            'product_uom_id': uom_unit.id,
-            'account_id': cls.invoice1.account_id.id,
-            'price_unit': 1111.1,
-        })
-
-        cls.aa1 = cls.env.ref('analytic.analytic_partners_camp_to_camp')
-        cls.aa2 = cls.env.ref('analytic.analytic_nebula')
-        cls.atag1 = cls.env.ref('analytic.tag_contract')
-        cls.atag2 = cls.env['account.analytic.tag'].create({
-            'name': 'の',
-        })
-
-    def create_wizard(self, invoice):
-        res = self.invoice1.prepare_update_wizard()
-        self.wiz = self.env['account.invoice.update'].browse(res['res_id'])
-
-    def test_add_analytic_account_line1(self):
-        """ Add analytic account on an invoice line
-        after the invoice has been approved.
-
-        This will:
-            - update the move line
-            - create a new analytic line.
-        """
-        self.invoice1.action_invoice_open()
-        self.create_wizard(self.invoice1)
-
-        wiz_line = self.wiz.line_ids.filtered(
-            lambda rec: rec.invoice_line_id == self.inv_line1)
-        wiz_line.account_analytic_id = self.aa1
-        self.wiz.run()
-
-        related_ml = self.invoice1.move_id.line_ids.filtered(
-            lambda rec: rec.product_id == self.product16)
-        self.assertEqual(related_ml.analytic_account_id, self.aa1)
-        self.assertEqual(related_ml.analytic_line_ids.account_id, self.aa1)
-
-    def test_change_analytic_account_line1(self):
-        """ Change analytic account on an invoice line
-        after the invoice has been approved.
-
-        This will:
-            - update the move line
-            - update the existing analytic line."""
-        self.inv_line1.account_analytic_id = self.aa2
-
-        self.invoice1.action_invoice_open()
-        self.create_wizard(self.invoice1)
-
-        wiz_line = self.wiz.line_ids.filtered(
-            lambda rec: rec.invoice_line_id == self.inv_line1)
-        wiz_line.account_analytic_id = self.aa1
-        self.wiz.run()
-
-        related_ml = self.invoice1.move_id.line_ids.filtered(
-            lambda rec: rec.product_id == self.product16)
-        self.assertEqual(related_ml.analytic_account_id, self.aa1)
-        self.assertEqual(related_ml.analytic_line_ids.account_id, self.aa1)
-
-    def test_error_grouped_move_lines(self):
-        """ Change analytic account on an invoice line
-        after the invoice has been approved where both
-        lines were grouped in the same move line.
-
-        This will raise an error.
-        """
-        self.invoice1.journal_id.group_invoice_lines = True
-
-        self.inv_line2.product_id = self.product16
-        self.inv_line2.unit_price = 42.0
-
-        self.invoice1.action_invoice_open()
-        self.create_wizard(self.invoice1)
-
-        line1 = self.wiz.line_ids[0]
-        line1.account_analytic_id = self.aa1
-        with self.assertRaises(UserError):
-            self.wiz.run()
-
-    def test_add_analytic_tags_line1(self):
-        """ Add analytic tags on an invoice line
-        after the invoice has been approved.
-
-        This will update move line.
-        """
-        self.invoice1.action_invoice_open()
-        self.create_wizard(self.invoice1)
-
-        wiz_line = self.wiz.line_ids.filtered(
-            lambda rec: rec.invoice_line_id == self.inv_line1)
-        wiz_line.analytic_tag_ids = self.atag2
-        self.wiz.run()
-
-        related_ml = self.invoice1.move_id.line_ids.filtered(
-            lambda rec: rec.product_id == self.product16)
-        self.assertEqual(related_ml.analytic_tag_ids, self.atag2)
-        self.assertFalse(related_ml.analytic_line_ids)
-
-    def test_change_analytic_tags_line1(self):
-        """ Change analytic tags on an invoice line
-        after the invoice has been approved.
-
-        It will update move line and analytic line
-        """
-        self.inv_line1.account_analytic_id = self.aa2
-        self.inv_line1.analytic_tag_ids = self.atag1
-
-        self.invoice1.action_invoice_open()
-        self.create_wizard(self.invoice1)
-
-        wiz_line = self.wiz.line_ids.filtered(
-            lambda rec: rec.invoice_line_id == self.inv_line1)
-        wiz_line.analytic_tag_ids = self.atag2
-        self.wiz.run()
-
-        related_ml = self.invoice1.move_id.line_ids.filtered(
-            lambda rec: rec.product_id == self.product16)
-        self.assertEqual(related_ml.analytic_tag_ids, self.atag2)
-        self.assertEqual(related_ml.analytic_line_ids.tag_ids, self.atag2)
-
-    def test_add_analytic_info_line1(self):
-        """ Add analytic account and tags on an invoice line
-        after the invoice has been approved.
-
-        This will:
-            - update move line
-            - create an analytic line
-        """
-        self.invoice1.action_invoice_open()
-        self.create_wizard(self.invoice1)
-
-        wiz_line = self.wiz.line_ids.filtered(
-            lambda rec: rec.invoice_line_id == self.inv_line1)
-        wiz_line.account_analytic_id = self.aa1
-        wiz_line.analytic_tag_ids = self.atag2
-        self.wiz.run()
-
-        related_ml = self.invoice1.move_id.line_ids.filtered(
-            lambda rec: rec.product_id == self.product16)
-        self.assertEqual(related_ml.analytic_account_id, self.aa1)
-        self.assertEqual(related_ml.analytic_tag_ids, self.atag2)
-        self.assertEqual(related_ml.analytic_line_ids.account_id, self.aa1)
-        self.assertEqual(related_ml.analytic_line_ids.tag_ids, self.atag2)
-
-    def test_empty_analytic_account_line1(self):
-        """ Remove analytic account
-        after the invoice has been approved.
-
-        This will raise an error as it is not implemented.
-        """
-        self.inv_line1.account_analytic_id = self.aa2
-
-        self.invoice1.action_invoice_open()
-        self.create_wizard(self.invoice1)
-
-        wiz_line = self.wiz.line_ids.filtered(
-            lambda rec: rec.invoice_line_id == self.inv_line1)
-        wiz_line.account_analytic_id = False
-        self.wiz.run()
-        related_ml = self.invoice1.move_id.line_ids.filtered(
-            lambda rec: rec.product_id == self.product16)
-        self.assertFalse(related_ml.analytic_account_id)
-        self.assertFalse(related_ml.analytic_line_ids)
--- a/account_invoice_update_wizard/views/account_invoice.xml
+++ b/account_invoice_update_wizard/views/account_invoice.xml
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
-
-<odoo>
-
-<record id="invoice_supplier_form" model="ir.ui.view">
-    <field name="model">account.invoice</field>
-    <field name="inherit_id" ref="account.invoice_supplier_form"/>
-    <field name="arch" type="xml">
-        <button name="action_invoice_draft" position="before">
-            <button name="prepare_update_wizard" type="object" string="Update Invoice" states="open,paid" groups="account.group_account_invoice"/>
-        </button>
-    </field>
-</record>
-
-<record id="invoice_form" model="ir.ui.view">
-    <field name="model">account.invoice</field>
-    <field name="inherit_id" ref="account.invoice_form"/>
-    <field name="arch" type="xml">
-        <button name="action_invoice_draft" position="before">
-            <button name="prepare_update_wizard" type="object" string="Update Invoice" states="open,paid" groups="account.group_account_invoice"/>
-        </button>
-    </field>
-</record>
-
-</odoo>
--- a/account_invoice_update_wizard/wizard/init.py
+++ b/account_invoice_update_wizard/wizard/init.py
@@ -1 +0,0 @@
-from . import account_invoice_update
--- a/account_invoice_update_wizard/wizard/account_invoice_update.py
+++ b/account_invoice_update_wizard/wizard/account_invoice_update.py
@@ -1,302 +0,0 @@
-# Copyright 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
-# Copyright 2018-2019 Camptocamp
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import models, fields, api, _
-from odoo.exceptions import UserError
-import odoo.addons.decimal_precision as dp
-
-
-class AccountInvoiceUpdate(models.TransientModel):
-    _name = 'account.invoice.update'
-    _description = 'Wizard to update non-legal fields of invoice'
-
-    invoice_id = fields.Many2one(
-        'account.invoice', string='Invoice', required=True,
-        readonly=True)
-    type = fields.Selection(related='invoice_id.type', readonly=True)
-    company_id = fields.Many2one(
-        related='invoice_id.company_id', readonly=True)
-    partner_id = fields.Many2one(
-        related='invoice_id.partner_id', readonly=True)
-    user_id = fields.Many2one('res.users', string='Salesperson')
-    payment_term_id = fields.Many2one(
-        'account.payment.term', string='Payment Term')
-    reference = fields.Char(string='Invoice Reference')
-    name = fields.Char(string='Reference/Description')
-    origin = fields.Char(string='Source Document')
-    comment = fields.Text('Additional Information')
-    partner_bank_id = fields.Many2one(
-        'res.partner.bank', string='Bank Account')
-    line_ids = fields.One2many(
-        'account.invoice.line.update', 'parent_id', string='Invoice Lines')
-
-    @api.model
-    def _simple_fields2update(self):
-        '''List boolean, date, datetime, char, text fields'''
-        return ['reference', 'name', 'origin', 'comment']
-
-    @api.model
-    def _m2o_fields2update(self):
-        return ['payment_term_id', 'user_id', 'partner_bank_id']
-
-    @api.model
-    def _prepare_default_get(self, invoice):
-        res = {'invoice_id': invoice.id, 'line_ids': []}
-        for sfield in self._simple_fields2update():
-            res[sfield] = invoice[sfield]
-        for m2ofield in self._m2o_fields2update():
-            res[m2ofield] = invoice[m2ofield].id or False
-        for line in invoice.invoice_line_ids:
-            aa_tags = line.analytic_tag_ids
-            aa_tags = [(6, 0, aa_tags.ids)] if aa_tags else False
-            res['line_ids'].append([0, 0, {
-                'invoice_line_id': line.id,
-                'name': line.name,
-                'quantity': line.quantity,
-                'price_subtotal': line.price_subtotal,
-                'account_analytic_id': line.account_analytic_id.id,
-                'analytic_tag_ids': aa_tags,
-                'display_type': line.display_type,
-            }])
-        return res
-
-    @api.onchange('type')
-    def type_on_change(self):
-        res = {'domain': {}}
-        if self.type in ('out_invoice', 'out_refund'):
-            res['domain']['partner_bank_id'] =\
-                "[('partner_id.ref_company_ids', 'in', [company_id])]"
-        else:
-            res['domain']['partner_bank_id'] =\
-                "[('partner_id', '=', partner_id)]"
-        return res
-
-    @api.multi
-    def _prepare_invoice(self):
-        vals = {}
-        inv = self.invoice_id
-        for sfield in self._simple_fields2update():
-            if self[sfield] != inv[sfield]:
-                vals[sfield] = self[sfield]
-        for m2ofield in self._m2o_fields2update():
-            if self[m2ofield] != inv[m2ofield]:
-                vals[m2ofield] = self[m2ofield].id or False
-        if 'payment_term_id' in vals:
-            pterm_list = self.payment_term_id.compute(
-                value=1, date_ref=inv.date_invoice)[0]
-            if pterm_list:
-                vals['date_due'] = max(line[0] for line in pterm_list)
-        return vals
-
-    @api.model
-    def _line_simple_fields2update(self):
-        return ["name",]
-
-    @api.model
-    def _line_m2o_fields2update(self):
-        return ["account_analytic_id",]
-
-    @api.model
-    def _line_m2m_fields2update(self):
-        return ["analytic_tag_ids",]
-
-    @api.model
-    def _prepare_invoice_line(self, line):
-        vals = {}
-        for field in self._line_simple_fields2update():
-            if line[field] != line.invoice_line_id[field]:
-                vals[field] = line[field]
-        for field in self._line_m2o_fields2update():
-            if line[field] != line.invoice_line_id[field]:
-                vals[field] = line[field].id
-        for field in self._line_m2m_fields2update():
-            if line[field] != line.invoice_line_id[field]:
-                vals[field] = [(6, 0, line[field].ids)]
-        return vals
-
-    @api.multi
-    def _prepare_move(self):
-        mvals = {}
-        inv = self.invoice_id
-        ini_ref = inv.move_id.ref
-        ref = inv.reference or inv.name
-        if ini_ref != ref:
-            mvals['ref'] = ref
-        return mvals
-
-    @api.multi
-    def _get_matching_inv_line(self, move_line):
-        """ Find matching invoice line by product """
-        # TODO make it accept more case as lines won't
-        # be grouped unless journal.group_invoice_line is True
-        inv_line = self.invoice_id.invoice_line_ids.filtered(
-            lambda rec: rec.product_id == move_line.product_id)
-        if len(inv_line) != 1:
-            raise UserError(
-                "Cannot match a single invoice line to move line %s" %
-                move_line.name)
-        return inv_line
-
-    @api.multi
-    def _prepare_move_line(self, inv_line):
-        mlvals = {}
-        inv_line_upd = self.line_ids.filtered(
-            lambda rec: rec.invoice_line_id == inv_line)
-
-        ini_aa = inv_line.account_analytic_id
-        new_aa = inv_line_upd.account_analytic_id
-
-        if ini_aa != new_aa:
-            mlvals['analytic_account_id'] = new_aa.id
-
-        ini_aa_tags = inv_line.analytic_tag_ids
-        new_aa_tags = inv_line_upd.analytic_tag_ids
-
-        if ini_aa_tags != new_aa_tags:
-            mlvals['analytic_tag_ids'] = [(6, None, new_aa_tags.ids)]
-        return mlvals
-
-    @api.multi
-    def _prepare_analytic_line(self, inv_line):
-        alvals = {}
-        inv_line_upd = self.line_ids.filtered(
-            lambda rec: rec.invoice_line_id == inv_line)
-
-        ini_aa = inv_line.account_analytic_id
-        new_aa = inv_line_upd.account_analytic_id
-
-        if ini_aa != new_aa:
-            alvals['account_id'] = new_aa.id
-
-        ini_aa_tags = inv_line.analytic_tag_ids
-        new_aa_tags = inv_line_upd.analytic_tag_ids
-
-        if ini_aa_tags != new_aa_tags:
-            alvals['tag_ids'] = [(6, None, new_aa_tags.ids)]
-        return alvals
-
-    @api.multi
-    def _update_payment_term_move(self):
-        self.ensure_one()
-        inv = self.invoice_id
-        if (
-                self.payment_term_id and
-                self.payment_term_id != inv.payment_term_id and
-                inv.move_id):
-            # I don't update pay term when the invoice is partially (or fully)
-            # paid because if you have a payment term with several lines
-            # of the same amount, you would also have to take into account
-            # the reconcile marks to put the new maturity date on the right
-            # lines
-            if inv.payment_ids:
-                raise UserError(_(
-                    "This wizard doesn't support the update of payment "
-                    "terms on an invoice which is partially or fully "
-                    "paid."))
-            prec = self.env['decimal.precision'].precision_get('Account')
-            term_res = self.payment_term_id.compute(
-                inv.amount_total, inv.date_invoice)[0]
-            new_pterm = {}  # key = int(amount * 100), value = [date1, date2]
-            for entry in term_res:
-                amount = int(entry[1] * 10 * prec)
-                if amount in new_pterm:
-                    new_pterm[amount].append(entry[0])
-                else:
-                    new_pterm[amount] = [entry[0]]
-            mlines = {}  # key = int(amount * 100), value : [line1, line2]
-            for line in inv.move_id.line_ids:
-                if line.account_id == inv.account_id:
-                    amount = int(abs(line.credit - line.debit) * 10 * prec)
-                    if amount in mlines:
-                        mlines[amount].append(line)
-                    else:
-                        mlines[amount] = [line]
-            for iamount, lines in mlines.items():
-                if len(lines) != len(new_pterm.get(iamount, [])):
-                    raise UserError(_(
-                        "The original payment term '%s' doesn't have the "
-                        "same terms (number of terms and/or amount) as the "
-                        "new payment term '%s'. You can only switch to a "
-                        "payment term that has the same number of terms "
-                        "with the same amount.") % (
-                        inv.payment_term_id.name, self.payment_term_id.name))
-                for line in lines:
-                    line.date_maturity = new_pterm[iamount].pop()
-
-    @api.multi
-    def run(self):
-        self.ensure_one()
-        inv = self.invoice_id
-        updated = False
-        # re-write date_maturity on move line
-        self._update_payment_term_move()
-        ivals = self._prepare_invoice()
-        if ivals:
-            updated = True
-            inv.write(ivals)
-        if inv.move_id:
-            mvals = self._prepare_move()
-            if mvals:
-                inv.move_id.write(mvals)
-            for ml in inv.move_id.line_ids.filtered(
-                    # we are only interested in invoice lines, not tax lines
-                    lambda rec: bool(rec.product_id)
-            ):
-                if ml.credit == 0.0:
-                    continue
-                inv_line = self._get_matching_inv_line(ml)
-                mlvals = self._prepare_move_line(inv_line)
-                if mlvals:
-                    updated = True
-                    ml.write(mlvals)
-                aalines = ml.analytic_line_ids
-                alvals = self._prepare_analytic_line(inv_line)
-                if aalines and alvals:
-                    updated = True
-                    if ('account_id' in alvals and
-                            alvals['account_id'] is False):
-                        former_aa = inv_line.account_analytic_id
-                        to_remove_aalines = aalines.filtered(
-                            lambda rec: rec.account_id == former_aa)
-                        # remove existing analytic line
-                        to_remove_aalines.unlink()
-                    else:
-                        aalines.write(alvals)
-                elif 'account_id' in alvals:
-                    # Create analytic lines if analytic account
-                    # is added later
-                    ml.create_analytic_lines()
-        for line in self.line_ids:
-            ilvals = self._prepare_invoice_line(line)
-            if ilvals:
-                updated = True
-                line.invoice_line_id.write(ilvals)
-        if updated:
-            inv.message_post(body=_(
-                'Non-legal fields of invoice updated via the Invoice Update '
-                'wizard.'))
-        return True
-
-
-class AccountInvoiceLineUpdate(models.TransientModel):
-    _name = 'account.invoice.line.update'
-    _description = 'Update non-legal fields of invoice lines'
-
-    parent_id = fields.Many2one(
-        'account.invoice.update', string='Wizard', ondelete='cascade')
-    invoice_line_id = fields.Many2one(
-        'account.invoice.line', string='Invoice Line', readonly=True)
-    name = fields.Text(string='Description', required=True)
-    display_type = fields.Selection([
-        ('line_section', "Section"),
-        ('line_note', "Note")], default=False, help="Technical field for UX purpose.")
-    quantity = fields.Float(
-        string='Quantity', digits=dp.get_precision('Product Unit of Measure'),
-        readonly=True)
-    price_subtotal = fields.Float(
-        string='Amount', readonly=True, digits=dp.get_precision('Account'))
-    account_analytic_id = fields.Many2one(
-        'account.analytic.account', string='Analytic Account')
-    analytic_tag_ids = fields.Many2many(
-        'account.analytic.tag', string='Analytic Tags')
--- a/account_invoice_update_wizard/wizard/account_invoice_update_view.xml
+++ b/account_invoice_update_wizard/wizard/account_invoice_update_view.xml
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
-
-<odoo>
-
-    <record id="account_invoice_update_form" model="ir.ui.view">
-        <field name="model">account.invoice.update</field>
-        <field name="arch" type="xml">
-            <form string="Update Invoice Wizard">
-                <group name="main">
-                    <field name="invoice_id" invisible="1"/>
-                    <field name="type" invisible="1"/>
-                    <field name="company_id" invisible="1"/>
-                    <field name="partner_id" invisible="1"/>
-                    <field name="reference" attrs="{'invisible': [('type', 'not in', ('in_invoice', 'in_refund'))]}"/>
-                    <field name="origin"/>
-                    <field name="name"/>
-                    <field name="payment_term_id" widget="selection"/>
-                    <field name="partner_bank_id"/>
-                    <field name="user_id"/>
-                    <field name="comment"/>
-                </group>
-                <group name="lines">
-                    <field name="line_ids" nolabel="1">
-                        <tree editable="bottom" create="false" delete="false" edit="true">
-                            <field name="invoice_line_id" invisible="1"/>
-                            <field name="display_type" invisible="1"/>
-                            <field name="name"/>
-                            <field name="quantity" attrs="{'invisible': [('display_type', '!=', False)]}"/>
-                            <field name="price_subtotal" attrs="{'invisible': [('display_type', '!=', False)]}"/>
-                            <field name="account_analytic_id" attrs="{'invisible': [('display_type', '!=', False)]}" groups="analytic.group_analytic_accounting"/>
-                            <field name="analytic_tag_ids" attrs="{'invisible': [('display_type', '!=', False)]}" groups="analytic.group_analytic_accounting" widget="many2many_tags"/>
-                    </tree>
-                    </field>
-                </group>
-                <footer>
-                    <button name="run" type="object" class="oe_highlight" string="Update"/>
-                    <button special="cancel" string="Cancel" class="oe_link"/>
-                </footer>
-            </form>
-        </field>
-    </record>
-
-    <record id="account_invoice_update_action" model="ir.actions.act_window">
-        <field name="name">Invoice Update Wizard</field>
-        <field name="res_model">account.invoice.update</field>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
-
-</odoo>
--- a/account_usability/README.rst
+++ b/account_usability/README.rst
@@ -1,96 +0,0 @@
-=================
-Account Usability
-=================
-
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! This file is generated by oca-gen-addon-readme !!
-   !! changes will be overwritten.                   !!
-   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
-    :target: https://odoo-community.org/page/development-status
-    :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
-    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
-    :alt: License: AGPL-3
-.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fodoo--usability-lightgray.png?logo=github
-    :target: https://github.com/akretion/odoo-usability/tree/12.0/account_usability
-    :alt: akretion/odoo-usability
-
-|badge1| |badge2| |badge3| 
-
-This modules adds the following functions:
-
-* Add an *Overdue* filter on invoice search view (this feature was previously 
-  located in te module *account_invoice_overdue_filter*)
-* Increase the default limit of 80 lines in account move and account move line view.
-* disable reconciliation "guessing"
-* fast search on *Reconcile Ref* for account move line.
-* add sale dates to invoice report to be compliant with
-  https://www.service-public.fr/professionnels-entreprises/vosdroits/F31808
-* Sale date on qweb invoices
-* A wizard to mark several invoices as sent at once (forward from v8)
-* Default date for Account Move Reversal is now D+1 instead of today
-* Track more fields on invoice (see details in account.py)
-* Add boolean fields `has_discount` and `has_attachment` on invoice
-* Add button "Delete line qty = 0" on supplier invoice
-* Cut name_get() of invoice if too long
-* A script for if Odoo screws up invoice attachment filename
-* help functions for py3o reports
-* Show code on name_get of journal
-* add direct search of journal using code
-* add copy=False on some fields
-* Add unicity constraint on analytic codes per company
-* Better default values on account move
-* Add link from account move line to invoice
-* Add start_date and end_date on bank statements
-* Add transfer_account_id to invoicing config page
-* Improve domain reconciliation widget
-* account.reconcile.model don't copy name to label via onchange
-* Add method to get fiscal position without partner_id
-* Restore drill-through on sale and invoice reports
-* don't attach PDF upon invoice report generation on supplier invoices/refunds
-* Add filter on debit and credit amount for Move Lines
-* Add supplier invoice number in invoice tree view
-
-Together with this module, I recommend the use of the following modules:
-
-* account_invoice_supplier_ref_unique (OCA project account-invoicing)
-* account_move_line_no_default_search (OCA project account-financial-tools)
-* invoice_fiscal_position_update (OCA project account-invoicing)
-
-**Table of contents**
-
-.. contents::
-   :local:
-
-Bug Tracker
-===========
-
-Bugs are tracked on `GitHub Issues <https://github.com/akretion/odoo-usability/issues>`_.
-In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/akretion/odoo-usability/issues/new?body=module:%20account_usability%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
-
-Do not contact contributors directly about support or help with technical issues.
-
-Credits
-=======
-
-Authors
-~~~~~~~
-
-* Akretion
-
-Contributors
-~~~~~~~~~~~~
-
-* Alexis de Lattre <alexis.delattre@akretion.com>
-* David Beal <david.beal@akretion.com>
-
-Maintainers
-~~~~~~~~~~~
-
-This module is part of the `akretion/odoo-usability <https://github.com/akretion/odoo-usability/tree/12.0/account_usability>`_ project on GitHub.
-
-You are welcome to contribute.
--- a/account_usability/manifest.py
+++ b/account_usability/manifest.py
@@ -4,10 +4,28 @@

 {
    'name': 'Account Usability',
-    'version': '12.0.1.0.0',
+    'version': '10.0.1.0.0',
    'category': 'Accounting & Finance',
    'license': 'AGPL-3',
    'summary': 'Small usability enhancements in account module',
+    'description': """
+Account Usability
+=================
+
+The usability enhancements include:
+* show the supplier invoice number in the tree view of supplier invoices
+* add an *Overdue* filter on invoice search view (this feature was previously located in te module *account_invoice_overdue_filter*)
+* Increase the default limit of 80 lines in account move and account move line view.
+* Fast search on *Reconcile Ref* for account move line.
+* disable reconciliation "guessing"
+
+Together with this module, I recommend the use of the following modules:
+* account_invoice_supplier_ref_unique (OCA project account-invoicing)
+* account_move_line_no_default_search (OCA project account-financial-tools)
+* invoice_fiscal_position_update (OCA project account-invoicing)
+
+This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
+    """,
    'author': 'Akretion',
    'website': 'http://www.akretion.com',
    'depends': [
@@ -22,7 +40,6 @@
        'account_invoice_report_view.xml',
        'partner_view.xml',
        'wizard/account_invoice_mark_sent_view.xml',
-        'report/invoice_report.xml',
        ],
    'installable': True,
 }
--- a/account_usability/account.py
+++ b/account_usability/account.py
@@ -3,10 +3,9 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

 from odoo import models, fields, api, _
-from odoo.tools import float_compare, float_is_zero, float_round
+from odoo.tools import float_compare, float_is_zero
 from odoo.tools.misc import formatLang
 from odoo.exceptions import UserError, ValidationError
-from odoo.osv import expression
 from odoo import SUPERUSER_ID
 import logging

@@ -38,10 +37,6 @@ class AccountInvoice(models.Model):
    has_attachment = fields.Boolean(
        compute='_compute_has_attachment',
        search='_search_has_attachment', readonly=True)
-    sale_dates = fields.Char(
-        compute="_compute_sales_dates", readonly=True,
-        help="This information appears on invoice qweb report "
-             "(you may use it for your own report)")

    def _compute_has_discount(self):
        prec = self.env['decimal.precision'].precision_get('Discount')
@@ -83,7 +78,7 @@ class AccountInvoice(models.Model):
    # top of the screen
    # That's why we have to cut the name_get() when it's too long
    def name_get(self):
-        old_res = super().name_get()
+        old_res = super(AccountInvoice, self).name_get()
        res = []
        for old_re in old_res:
            name = old_re[1]
@@ -103,8 +98,9 @@ class AccountInvoice(models.Model):
    # 2) the 'name' field of the account.move.line is used in the overdue
    # letter, and '/' is not meaningful for our customer !
 # TODO mig to v12
+#    @api.multi
 #    def action_move_create(self):
-#        res = super().action_move_create()
+#        res = super(AccountInvoice, self).action_move_create()
 #        for inv in self:
 #            self._cr.execute(
 #                "UPDATE account_move_line SET name= "
@@ -174,24 +170,6 @@ class AccountInvoice(models.Model):
        # ]
        return res

-    def _compute_sales_dates(self):
-        """ French law requires to set sale order dates into invoice
-            returned string: "sale1 (date1), sale2 (date2) ..."
-        """
-        for inv in self:
-            sales = inv.invoice_line_ids.mapped(
-                'sale_line_ids').mapped('order_id')
-            lang = inv.partner_id.commercial_partner_id.lang
-            date_format = self.env["res.lang"]._lang_get(
-                lang or "").date_format
-            dates = ["%s%s" % (
-                     x.name,
-                     x.confirmation_date and " (%s)" %
-                     # only when confirmation_date display it
-                     x.confirmation_date.strftime(date_format) or "")
-                     for x in sales]
-            inv.sale_dates = ", ".join(dates)
-

 class AccountInvoiceLine(models.Model):
    _inherit = 'account.invoice.line'
@@ -215,15 +193,7 @@ class AccountInvoiceLine(models.Model):
 class AccountJournal(models.Model):
    _inherit = 'account.journal'

-    hide_bank_statement_balance = fields.Boolean(
-        string='Hide Bank Statement Balance',
-        help="You may want to enable this option when your bank "
-        "journal is generated from a bank statement file that "
-        "doesn't handle start/end balance (QIF for instance) and "
-        "you don't want to enter the start/end balance manually: it "
-        "will prevent the display of wrong information in the accounting "
-        "dashboard and on bank statements.")
-
+    @api.multi
    @api.depends(
        'name', 'currency_id', 'company_id', 'company_id.currency_id', 'code')
    def name_get(self):
@@ -269,6 +239,7 @@ class AccountJournal(models.Model):
 class AccountAccount(models.Model):
    _inherit = 'account.account'

+    @api.multi
    @api.depends('name', 'code')
    def name_get(self):
        if self._context.get('account_account_show_code_only'):
@@ -277,7 +248,7 @@ class AccountAccount(models.Model):
                res.append((record.id, record.code))
            return res
        else:
-            return super().name_get()
+            return super(AccountAccount, self).name_get()

    # https://github.com/odoo/odoo/issues/23040
    # TODO mig to v12
@@ -318,6 +289,7 @@ class AccountAccount(models.Model):
        logger.info("END of the script 'fix bank and cash account types'")
        return True

+    # TODO mig to v12
    @api.model
    def create_account_groups(self, level=2, name_prefix=u'Comptes '):
        '''Should be launched by a script. Make sure the account_group module is installed
@@ -359,6 +331,7 @@ class AccountAccount(models.Model):
 class AccountAnalyticAccount(models.Model):
    _inherit = 'account.analytic.account'

+    @api.multi
    def name_get(self):
        if self._context.get('analytic_account_show_code_only'):
            res = []
@@ -366,7 +339,7 @@ class AccountAnalyticAccount(models.Model):
                res.append((record.id, record.code or record.name))
            return res
        else:
-            return super().name_get()
+            return super(AccountAnalyticAccount, self).name_get()

    _sql_constraints = [(
        'code_company_unique',
@@ -407,58 +380,6 @@ class AccountMove(models.Model):
            move.default_credit = default_credit
            move.default_debit = default_debit

-    @api.model
-    def _fix_debit_credit_round_bug(self):
-        logger.info('START script _fix_debit_credit_round_bug')
-        moves = self.sudo().search([])  # sudo to search in all companies
-        bug_move_ids = []
-        for move in moves:
-            buggy = False
-            for l in move.line_ids:
-                if not float_is_zero(l.debit, precision_digits=2):
-                    debit_rounded = float_round(l.debit, precision_digits=2)
-                    if float_compare(l.debit, debit_rounded, precision_digits=6):
-                        logger.info('Bad move to fix ID %d company_id %d name %s ref %s date %s journal %s (line ID %d debit=%s)', move.id, move.company_id.id, move.name, move.ref, move.date, move.journal_id.code, l.id, l.debit)
-                        buggy = True
-                        break
-                else:
-                    credit_rounded = float_round(l.credit, precision_digits=2)
-                    if float_compare(l.credit, credit_rounded, precision_digits=6):
-                        logger.info('Bad move to fix ID %d company_id %d name %s ref %s date %s journal %s (line ID %d credit=%s)', move.id, move.company_id.id, move.name, move.ref, move.date, move.journal_id.code, l.id, l.credit)
-                        buggy = True
-                        break
-            if buggy:
-                bug_move_ids.append(move.id)
-                bal = 0.0
-                max_credit = (False, 0)
-                for l in move.line_ids:
-                    if not float_is_zero(l.debit, precision_digits=2):
-                        new_debit = float_round(l.debit, precision_digits=2)
-                        self._cr.execute(
-                            'UPDATE account_move_line set debit=%s, balance=%s where id=%s',
-                            (new_debit, new_debit, l.id))
-                        bal -= new_debit
-                    elif not float_is_zero(l.credit, precision_digits=2):
-                        new_credit = float_round(l.credit, precision_digits=2)
-                        self._cr.execute(
-                            'UPDATE account_move_line set credit=%s, balance=%s where id=%s',
-                            (new_credit, new_credit * -1, l.id))
-                        bal += new_credit
-                        if new_credit > max_credit[1]:
-                            max_credit = (l, new_credit)
-                if not float_is_zero(bal, precision_digits=2):
-                    assert abs(bal) < 0.05
-                    l = max_credit[0]
-                    new_credit = max_credit[1]
-                    new_new_credit = float_round(new_credit - bal, precision_digits=2)
-                    assert new_new_credit > 0
-                    self._cr.execute(
-                        'UPDATE account_move_line set credit=%s, balance=%s where id=%s',
-                        (new_new_credit, new_new_credit * -1, l.id))
-                logger.info('Move ID %d fixed', move.id)
-        logger.info('%d buggy moves fixed (IDs: %s)', len(bug_move_ids), bug_move_ids)
-        logger.info('END _fix_debit_credit_round_bug')
-

 class AccountMoveLine(models.Model):
    _inherit = 'account.move.line'
@@ -565,9 +486,8 @@ class AccountBankStatement(models.Model):
    end_date = fields.Date(
        compute='_compute_dates', string='End Date', readonly=True,
        store=True)
-    hide_bank_statement_balance = fields.Boolean(
-        related='journal_id.hide_bank_statement_balance', readonly=True)

+    @api.multi
    @api.depends('line_ids.date')
    def _compute_dates(self):
        for st in self:
@@ -575,14 +495,7 @@ class AccountBankStatement(models.Model):
            st.start_date = dates and min(dates) or False
            st.end_date = dates and max(dates) or False

-    def _balance_check(self):
-        for stmt in self:
-            if stmt.hide_bank_statement_balance:
-                continue
-            else:
-                super(AccountBankStatement, stmt)._balance_check()
-        return True
-
+    @api.multi
    @api.depends('name', 'start_date', 'end_date')
    def name_get(self):
        res = []
@@ -620,14 +533,15 @@ class AccountBankStatementLine(models.Model):
    #        search_reconciliation_proposition=False, context=None):
    #    # Make variable name shorted for PEP8 !
    #    search_rec_prop = search_reconciliation_proposition
-    #    return super().\
+    #    return super(AccountBankStatementLine, self).\
    #        get_data_for_reconciliations(
    #            cr, uid, ids, excluded_ids=excluded_ids,
    #            search_reconciliation_proposition=search_rec_prop,
    #            context=context)

    def _prepare_reconciliation_move(self, move_ref):
-        vals = super()._prepare_reconciliation_move(move_ref)
+        vals = super(AccountBankStatementLine, self).\
+            _prepare_reconciliation_move(move_ref)
        # By default, ref contains the name of the statement + name of the
        # statement line. It causes 2 problems:
        # 1) The 'ref' field is too big
@@ -645,13 +559,13 @@ class AccountBankStatementLine(models.Model):
    def show_account_move(self):
        self.ensure_one()
        action = self.env['ir.actions.act_window'].for_xml_id(
-            'account', 'action_move_line_form')
+            'account', 'action_move_journal_line')
        if self.journal_entry_ids:
            action.update({
                'views': False,
                'view_id': False,
                'view_mode': 'form,tree',
-                'res_id': self.journal_entry_ids[0].move_id.id,
+                'res_id': self.journal_entry_ids[0].id,
                })
            return action
        else:
@@ -712,76 +626,3 @@ class AccountReconcileModel(models.Model):
        # Because it's much better to have the bank statement line label as
        # label of the counter-part move line, then the label of the button
        assert True  # Stupid line of code just to have something...
-
-
-class AccountIncoterms(models.Model):
-    _inherit = 'account.incoterms'
-
-    @api.depends('code', 'name')
-    def name_get(self):
-        res = []
-        for rec in self:
-            res.append((rec.id, '[%s] %s' % (rec.code, rec.name)))
-        return res
-
-    @api.model
-    def name_search(self, name='', args=None, operator='ilike', limit=80):
-        if args is None:
-            args = []
-        if name and operator == 'ilike':
-            recs = self.search([('code', '=', name)] + args, limit=limit)
-            if recs:
-                return recs.name_get()
-        return super().name_search(name=name, args=args, operator=operator, limit=limit)
-
-
-class AccountReconciliation(models.AbstractModel):
-    _inherit = 'account.reconciliation.widget'
-
-    # Add ability to filter by account code in the work interface of the
-    # bank statement
-    @api.model
-    def _domain_move_lines(self, search_str):
-        str_domain = super()._domain_move_lines(search_str)
-        account_code_domain = [('account_id.code', '=ilike', search_str + '%')]
-        str_domain = expression.OR([str_domain, account_code_domain])
-        return str_domain
-
-    @api.model
-    def _domain_move_lines_for_reconciliation(
-            self, st_line, aml_accounts, partner_id,
-            excluded_ids=None, search_str=False):
-        domain = super()._domain_move_lines_for_reconciliation(
-            st_line, aml_accounts, partner_id,
-            excluded_ids=excluded_ids, search_str=search_str)
-        # We want to replace a domain item by another one
-        if ('payment_id', '<>', False) in domain:
-            position = domain.index(('payment_id', '<>', False))
-            domain[position] = ['journal_id', '=', st_line.journal_id.id]
-        return domain
-
-
-class ResConfigSettings(models.TransientModel):
-    _inherit = 'res.config.settings'
-
-    transfer_account_id = fields.Many2one(
-        related='company_id.transfer_account_id', readonly=False)
-
-
-class AccountChartTemplate(models.Model):
-    _inherit = "account.chart.template"
-
-    @api.model
-    def _prepare_transfer_account_template(self):
-        """Change the type of default account in order to be
-        compliant with _check_account_type_on_bank_journal
-        Used at installation of payment modules like stripe
-        See https://github.com/akretion/odoo-usability/issues/115
-        """
-        vals = super()._prepare_transfer_account_template()
-        current_assets_type = self.env.ref(
-            'account.data_account_type_liquidity', raise_if_not_found=False)
-        vals.update({
-            'user_type_id': current_assets_type and current_assets_type.id or False,
-        })
-        return vals
--- a/account_usability/account_several_improvements.diff
+++ b/account_usability/account_several_improvements.diff
@@ -1,13 +1,53 @@
-diff --git a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
-index 53f28e0c620..1721d01edf9 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
-+++ b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
-@@ -514,7 +514,7 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
-         }
-         return this.model.makeRecord('account.bank.statement.line', [field], {
-             partner_id: {
-                domain: ["|", ["is_company", "=", true], ["parent_id", "=", false], "|", ["customer", "=", true], ["supplier", "=", true]],
-+                domain: ["|", ["is_company", "=", true], ["parent_id", "=", false]],
-                 options: {
-                     no_open: true
-                 }
+diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py
+index 8ed1e48..615da43 100644
+--- a/addons/account/models/account_bank_statement.py
+++ b/addons/account/models/account_bank_statement.py
+@@ -563,7 +563,13 @@ class AccountBankStatementLine(models.Model):
+         """
+         # Blue lines = payment on bank account not assigned to a statement yet
+         reconciliation_aml_accounts = [self.journal_id.default_credit_account_id.id, self.journal_id.default_debit_account_id.id]
+-        domain_reconciliation = ['&', '&', ('statement_id', '=', False), ('account_id', 'in', reconciliation_aml_accounts), ('payment_id','<>', False)]
+        # AKRETION HACK 11/7/2017
+        # Remove ('payment_id','<>', False) in order to allow to select move lines
+        # generated from payment orders or check deposit
+        # but I add ('journal_id', '=', self.journal_id.id) to exclude the
+        # opening entry of the first fiscal year
+        #domain_reconciliation = ['&', '&', ('statement_id', '=', False), ('account_id', 'in', reconciliation_aml_accounts), ('payment_id','<>', False)]
+        domain_reconciliation = ['&', '&', ('statement_id', '=', False), ('account_id', 'in', reconciliation_aml_accounts), ('journal_id', '=', self.journal_id.id)]
+ 
+         # Black lines = unreconciled & (not linked to a payment or open balance created by statement
+         domain_matching = [('reconciled', '=', False)]
+diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
+index b60ffbe..6c27c57 100644
+--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
+@@ -599,6 +599,7 @@ class AccountMoveLine(models.Model):
+             domain = expression.AND([domain, [('id', 'not in', excluded_ids)]])
+         if str:
+             str_domain = [
+                '|', ('account_id.code', '=ilike', str + '%'),
+                 '|', ('move_id.name', 'ilike', str),
+                 '|', ('move_id.ref', 'ilike', str),
+                 '|', ('date_maturity', 'like', str),
+diff --git a/addons/account/static/src/js/account_reconciliation_widgets.js b/addons/account/static/src/js/account_reconciliation_widgets.js
+index 453bd41..48c396e 100644
+--- a/addons/account/static/src/js/account_reconciliation_widgets.js
+++ b/addons/account/static/src/js/account_reconciliation_widgets.js
+@@ -76,7 +76,7 @@ var abstractReconciliation = Widget.extend(ControlPanelMixin, {
+         this.model_res_users = new Model("res.users");
+         this.model_tax = new Model("account.tax");
+         this.model_presets = new Model("account.reconcile.model");
+-        this.max_move_lines_displayed = 5;
+        this.max_move_lines_displayed = 15;
+         // Number of reconciliations loaded initially and by clicking 'show more'
+         this.num_reconciliations_fetched_in_batch = 10;
+         this.animation_speed = 100; // "Blocking" animations
+@@ -1755,7 +1755,7 @@ var bankStatementReconciliationLine = abstractReconciliationLine.extend({
+             relation: "res.partner",
+             string: _t("Partner"),
+             type: "many2one",
+-            domain: [['parent_id','=',false], '|', ['customer','=',true], ['supplier','=',true]],
+            domain: [['parent_id','=',false]],  // AKRETION HACK 26/6/2017 allow all parent partners
+             help: "",
+             readonly: false,
+             required: true,
--- a/account_usability/account_statement_black_cancel_blue_ok.diff
+++ b/account_usability/account_statement_black_cancel_blue_ok.diff
@@ -0,0 +1,14 @@
+diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py
+index 4374528..aea1361 100644
+--- a/addons/account/models/account_bank_statement.py
+++ b/addons/account/models/account_bank_statement.py
+@@ -1008,7 +1008,7 @@ class AccountBankStatementLine(models.Model):
+             #record the move name on the statement line to be able to retrieve it in case of unreconciliation
+             self.write({'move_name': move.name})
+             payment.write({'payment_reference': move.name})
+-        elif self.move_name:
+-            raise UserError(_('Operation not allowed. Since your statement line already received a number, you cannot reconcile it entirely with existing journal entries otherwise it would make a gap in the numbering. You should book an entry and make a regular revert of it in case you want to cancel it.'))
+        #elif self.move_name:
+        #    raise UserError(_('Operation not allowed. Since your statement line already received a number, you cannot reconcile it entirely with existing journal entries otherwise it would make a gap in the numbering. You should book an entry and make a regular revert of it in case you want to cancel it.'))
+         counterpart_moves.assert_balanced()
+         return counterpart_moves
--- a/account_usability/account_view.xml
+++ b/account_usability/account_view.xml
@@ -16,9 +16,6 @@
        <field name="fiscal_position_id" position="attributes">
            <attribute name="widget">selection</attribute>
        </field>
-        <field name="incoterm_id" position="attributes">
-            <attribute name="widget">selection</attribute>
-        </field>
        <field name="invoice_line_ids" position="before">
            <button name="delete_lines_qty_zero" states="draft" string="⇒ Delete lines qty=0" type="object" class="oe_link oe_right" groups="account.group_account_invoice"/>
        </field>
@@ -36,9 +33,6 @@
        <field name="fiscal_position_id" position="attributes">
            <attribute name="widget">selection</attribute>
        </field>
-        <field name="incoterm_id" position="attributes">
-            <attribute name="widget">selection</attribute>
-        </field>
        <!-- move sent field and make it visible -->
        <field name="sent" position="replace"/>
        <field name="move_id" position="before">
@@ -360,9 +354,8 @@ module -->
    <field name="model">account.move.line</field>
    <field name="inherit_id" ref="account.view_move_line_tree"/>
    <field name="arch" type="xml">
-        <field name="full_reconcile_id" position="attributes">
-            <attribute name="invisible">1</attribute>
-        </field>
+        <!-- Move reconcile_id to a better position -->
+        <field name="full_reconcile_id" position="replace"/>
        <field name="credit" position="after">
            <field name="balance" sum="Total Balance"/>
            <field name="reconcile_string"/>
@@ -409,42 +402,6 @@ module -->
    </field>
 </record>

-<record id="view_account_journal_form" model="ir.ui.view">
-    <field name="name">usability.account.journal.form</field>
-    <field name="model">account.journal</field>
-    <field name="inherit_id" ref="account.view_account_journal_form"/>
-    <field name="arch" type="xml">
-        <field name="bank_statements_source" position="after">
-            <field name="hide_bank_statement_balance" groups="account.group_account_user"/>
-        </field>
-    </field>
-</record>
-
-<record id="account_journal_dashboard_kanban_view" model="ir.ui.view">
-    <field name="name">usability.account.journal.dashboard</field>
-    <field name="model">account.journal</field>
-    <field name="inherit_id" ref="account.account_journal_dashboard_kanban_view"/>
-    <field name="arch"  type="xml">
-        <field name="kanban_dashboard" position="after">
-            <field name="hide_bank_statement_balance"/>
-        </field>
-        <xpath expr="//div[@name='latest_statement']/.." position="attributes">
-            <attribute name="t-if">dashboard.last_balance != dashboard.account_balance &amp;&amp; !record.hide_bank_statement_balance.raw_value</attribute>
-        </xpath>
-    </field>
-</record>
-
-<record id="view_account_journal_tree" model="ir.ui.view">
-    <field name="name">usability.account.journal.tree</field>
-    <field name="model">account.journal</field>
-    <field name="inherit_id" ref="account.view_account_journal_tree"/>
-    <field name="arch" type="xml">
-        <field name="name" position="after">
-            <field name="code"/>
-        </field>
-    </field>
-</record>
-
 <record id="view_account_journal_search" model="ir.ui.view">
    <field name="name">usability.account.journal.search</field>
    <field name="model">account.journal</field>
@@ -466,32 +423,16 @@ module -->
        <xpath expr="//field[@name='line_ids']/tree/field[@name='bank_account_id']" position="after">
            <!-- The cancel button is provided by the account_cancel module, but we don't want to depend on it -->
            <button name="show_account_move" type="object"
-                string="View Account Move" icon="fa-arrow-right"
+                string="View Account Move" icon="fa fa-arrow-right"
                attrs="{'invisible': [('journal_entry_ids', '=', [])]}"/>
        </xpath>
        <field name="date" position="after">
            <field name="start_date"/>
            <field name="end_date"/>
-            <field name="hide_bank_statement_balance" invisible="1"/>
        </field>
        <field name="date" position="attributes">
            <attribute name="invisible">1</attribute>
        </field>
-        <label for="balance_start" position="attributes">
-            <attribute name="attrs">{'invisible': [('hide_bank_statement_balance', '=', True)]}</attribute>
-        </label>
-        <label for="balance_end_real" position="attributes">
-            <attribute name="attrs">{'invisible': [('hide_bank_statement_balance', '=', True)]}</attribute>
-        </label>
-        <xpath expr="//field[@name='balance_start']/.." position="attributes">
-            <attribute name="attrs">{'invisible': [('hide_bank_statement_balance', '=', True)]}</attribute>
-        </xpath>
-        <xpath expr="//field[@name='balance_end_real']/.." position="attributes">
-            <attribute name="attrs">{'invisible': [('hide_bank_statement_balance', '=', True)]}</attribute>
-        </xpath>
-        <group name="sale_total" position="attributes">
-            <attribute name="attrs">{'invisible': [('hide_bank_statement_balance', '=', True)]}</attribute>
-        </group>
    </field>
 </record>

@@ -534,17 +475,6 @@ module -->
    </field>
 </record>

-<!-- ACCOUNT TAX -->
-<record id="view_tax_tree" model="ir.ui.view">
-    <field name="model">account.tax</field>
-    <field name="inherit_id" ref="account.view_tax_tree"/>
-    <field name="arch" type="xml">
-        <field name="company_id" position="before">
-            <field name="price_include" string="Include"/>
-        </field>
-    </field>
-</record>
-
 <!-- ACCOUNT TAX GROUP -->
 <!-- in the account module, there is nothing for account.tax.group : no form/tree view, no menu... -->
 <record id="account_tax_group_form" model="ir.ui.view">
@@ -579,28 +509,6 @@ module -->

 <menuitem id="account_tax_group_menu" action="account_tax_group_action" parent="account.account_account_menu" sequence="2"/>

-<!-- Account config page -->
-<record id="res_config_settings_view_form" model="ir.ui.view">
-    <field name="name">account_usability account config page</field>
-    <field name="model">res.config.settings</field>
-    <field name="inherit_id" ref="account.res_config_settings_view_form"/>
-    <field name="arch" type="xml">
-        <xpath expr="//field[@name='account_bank_reconciliation_start']/../.." position="after">
-            <div class="col-xs-12 col-md-6 o_setting_box">
-                <div class="o_setting_left_pane"/>
-                <div class="o_setting_right_pane">
-                    <label for="transfer_account_id"/>
-                    <div class="text-muted">
-                    Transit account when you transfer money from a bank account of your company to another bank account of your company.
-                    </div>
-                    <field name="transfer_account_id"/>
-                </div>
-            </div>
-        </xpath>
-    </field>
-</record>
-
-
 <!-- Remove menu entry "Accounting > Configuration > Accounting > Bank Accounts"
 (account.journal filtered on type = 'bank' with special tree and form view)
 because it is useless and confusing -->
--- a/account_usability/invoice_register_payment_writeoff_analytic.diff
+++ b/account_usability/invoice_register_payment_writeoff_analytic.diff
@@ -1,33 +1,33 @@
 diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py
-index f38f459c533..a475d6a82c7 100644
+index b1d8012329d..b8a8e2a673d 100644
 --- a/addons/account/models/account_payment.py
 +++ b/addons/account/models/account_payment.py
-@@ -62,6 +62,7 @@ class account_abstract_payment(models.AbstractModel):
+@@ -210,6 +210,7 @@ class account_payment(models.Model):
     payment_difference = fields.Monetary(compute='_compute_payment_difference', readonly=True)
-     payment_difference_handling = fields.Selection([('open', 'Keep open'), ('reconcile', 'Mark invoice as fully paid')], default='open', string="Payment Difference Handling", copy=False)
+     payment_difference_handling = fields.Selection([('open', 'Keep open'), ('reconcile', 'Mark invoice as fully paid')], default='open', string="Payment Difference", copy=False)
     writeoff_account_id = fields.Many2one('account.account', string="Difference Account", domain=[('deprecated', '=', False)], copy=False)
 +    writeoff_analytic_account_id = fields.Many2one('account.analytic.account', string="Difference Analytic Account", copy=False)
-     writeoff_label = fields.Char(
-         string='Journal Item Label',
-         help='Change label of the counterpart that will hold the payment difference',
-@@ -717,6 +718,7 @@ class account_payment(models.Model):
-             debit_wo, credit_wo, amount_currency_wo, currency_id = aml_obj.with_context(date=self.payment_date)._compute_amount_fields(self.payment_difference, self.currency_id, self.company_id.currency_id)
-             writeoff_line['name'] = self.writeoff_label
+ 
+     # FIXME: ondelete='restrict' not working (eg. cancel a bank statement reconciliation with a payment)
+     move_line_ids = fields.One2many('account.move.line', 'payment_id', readonly=True, copy=False, ondelete='restrict')
+@@ -431,6 +432,7 @@ class account_payment(models.Model):
+                 amount_currency_wo = -abs(amount_currency_wo)
+             writeoff_line['name'] = _('Counterpart')
             writeoff_line['account_id'] = self.writeoff_account_id.id
 +            writeoff_line['analytic_account_id'] = self.writeoff_analytic_account_id.id or False
             writeoff_line['debit'] = debit_wo
             writeoff_line['credit'] = credit_wo
             writeoff_line['amount_currency'] = amount_currency_wo
 diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml
-index 07230902ee8..1359009bf23 100644
+index 2460458fbaa..4065d8f9952 100644
 --- a/addons/account/views/account_payment_view.xml
 +++ b/addons/account/views/account_payment_view.xml
-@@ -277,6 +277,8 @@
-                                     <div attrs="{'invisible': [('payment_difference_handling','=','open')]}">
-                                         <label for="writeoff_account_id" class="oe_edit_only" string="Post Difference In"/>
-                                         <field name="writeoff_account_id" string="Post Difference In" attrs="{'required': [('payment_difference_handling', '=', 'reconcile')]}"/>
-+                                        <label for="writeoff_analytic_account_id" class="oe_edit_only" string="Analytic Account" groups="analytic.group_analytic_accounting"/>
-+                                        <field name="writeoff_analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                                         <label for="journal_id" string="Journal" attrs="{'invisible': [('amount', '!=', 0)]}"/>
-                                         <field name="journal_id" string="Journal" widget="selection" attrs="{'invisible': [('amount', '!=', 0)]}"/>
-                                         <label for="writeoff_label" class="oe_edit_only" string="Label"/>
+@@ -206,6 +206,8 @@
+                                 </div>
+                                 <field name="writeoff_account_id" string="Post Difference In"
+                                     attrs="{'invisible': [('payment_difference_handling','=','open')], 'required': [('payment_difference_handling', '=', 'reconcile')]}"/>
+                                <field name="writeoff_analytic_account_id" string="Post Difference In Analytic Account"
+                                    attrs="{'invisible': [('payment_difference_handling','=','open')]}"/>
+                             </group>
+                         </group>
+                     </sheet>
--- a/account_usability/readme/CONTRIBUTORS.rst
+++ b/account_usability/readme/CONTRIBUTORS.rst
@@ -1,2 +0,0 @@
-* Alexis de Lattre <alexis.delattre@akretion.com>
-* David Beal <david.beal@akretion.com>
--- a/account_usability/readme/DESCRIPTION.rst
+++ b/account_usability/readme/DESCRIPTION.rst
@@ -1,40 +0,0 @@
-This modules adds the following functions:
-
-* Add an *Overdue* filter on invoice search view (this feature was previously 
-  located in te module *account_invoice_overdue_filter*)
-* Increase the default limit of 80 lines in account move and account move line view.
-* disable reconciliation "guessing"
-* fast search on *Reconcile Ref* for account move line.
-* add sale dates to invoice report to be compliant with
-  https://www.service-public.fr/professionnels-entreprises/vosdroits/F31808
-* Sale date on qweb invoices
-* A wizard to mark several invoices as sent at once (forward from v8)
-* Default date for Account Move Reversal is now D+1 instead of today
-* Track more fields on invoice (see details in account.py)
-* Add boolean fields `has_discount` and `has_attachment` on invoice
-* Add button "Delete line qty = 0" on supplier invoice
-* Cut name_get() of invoice if too long
-* A script for if Odoo screws up invoice attachment filename
-* help functions for py3o reports
-* Show code on name_get of journal
-* add direct search of journal using code
-* add copy=False on some fields
-* Add unicity constraint on analytic codes per company
-* Better default values on account move
-* Add link from account move line to invoice
-* Add start_date and end_date on bank statements
-* Add transfer_account_id to invoicing config page
-* Improve domain reconciliation widget
-* account.reconcile.model don't copy name to label via onchange
-* Add method to get fiscal position without partner_id
-* Restore drill-through on sale and invoice reports
-* don't attach PDF upon invoice report generation on supplier invoices/refunds
-* Add filter on debit and credit amount for Move Lines
-* Add supplier invoice number in invoice tree view
-* Change type from current_assets to  liquidity for transfert account template.
-
-Together with this module, I recommend the use of the following modules:
-
-* account_invoice_supplier_ref_unique (OCA project account-invoicing)
-* account_move_line_no_default_search (OCA project account-financial-tools)
-* invoice_fiscal_position_update (OCA project account-invoicing)
--- a/account_usability/report/invoice_report.xml
+++ b/account_usability/report/invoice_report.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="report_invoice_document" inherit_id="account.report_invoice_document">
-    <xpath expr="//div[@name='origin']/p" position="replace">
-        <p class="m-0" t-field="o.sale_dates"/>
-    </xpath>
-</template>
-
-</odoo>
--- a/account_usability/static/description/index.html
+++ b/account_usability/static/description/index.html
@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
-<title>Account Usability</title>
-<style type="text/css">
-
-/*
-:Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
-:Copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
-customize this style sheet.
-*/
-
-/* used to remove borders from tables and images */
-.borderless, table.borderless td, table.borderless th {
-  border: 0 }
-
-table.borderless td, table.borderless th {
-  /* Override padding for "table.docutils td" with "! important".
-     The right padding separates the table cells. */
-  padding: 0 0.5em 0 0 ! important }
-
-.first {
-  /* Override more specific margin styles with "! important". */
-  margin-top: 0 ! important }
-
-.last, .with-subtitle {
-  margin-bottom: 0 ! important }
-
-.hidden {
-  display: none }
-
-.subscript {
-  vertical-align: sub;
-  font-size: smaller }
-
-.superscript {
-  vertical-align: super;
-  font-size: smaller }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-blockquote.epigraph {
-  margin: 2em 5em ; }
-
-dl.docutils dd {
-  margin-bottom: 0.5em }
-
-object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
-  overflow: hidden;
-}
-
-/* Uncomment (and remove this text!) to get bold-faced definition list terms
-dl.docutils dt {
-  font-weight: bold }
-*/
-
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.admonition, div.attention, div.caution, div.danger, div.error,
-div.hint, div.important, div.note, div.tip, div.warning {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.admonition p.admonition-title, div.hint p.admonition-title,
-div.important p.admonition-title, div.note p.admonition-title,
-div.tip p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title, .code .error {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-/* Uncomment (and remove this text!) to get reduced vertical space in
-   compound paragraphs.
-div.compound .compound-first, div.compound .compound-middle {
-  margin-bottom: 0.5em }
-
-div.compound .compound-last, div.compound .compound-middle {
-  margin-top: 0.5em }
-*/
-
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em ;
-  margin-right: 2em }
-
-div.footer, div.header {
-  clear: both;
-  font-size: smaller }
-
-div.line-block {
-  display: block ;
-  margin-top: 1em ;
-  margin-bottom: 1em }
-
-div.line-block div.line-block {
-  margin-top: 0 ;
-  margin-bottom: 0 ;
-  margin-left: 1.5em }
-
-div.sidebar {
-  margin: 0 0 0.5em 1em ;
-  border: medium outset ;
-  padding: 1em ;
-  background-color: #ffffee ;
-  width: 40% ;
-  float: right ;
-  clear: right }
-
-div.sidebar p.rubric {
-  font-family: sans-serif ;
-  font-size: medium }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
-h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
-  margin-top: 0.4em }
-
-h1.title {
-  text-align: center }
-
-h2.subtitle {
-  text-align: center }
-
-hr.docutils {
-  width: 75% }
-
-img.align-left, .figure.align-left, object.align-left, table.align-left {
-  clear: left ;
-  float: left ;
-  margin-right: 1em }
-
-img.align-right, .figure.align-right, object.align-right, table.align-right {
-  clear: right ;
-  float: right ;
-  margin-left: 1em }
-
-img.align-center, .figure.align-center, object.align-center {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-table.align-center {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.align-left {
-  text-align: left }
-
-.align-center {
-  clear: both ;
-  text-align: center }
-
-.align-right {
-  text-align: right }
-
-/* reset inner alignment in figures */
-div.align-right {
-  text-align: inherit }
-
-/* div.align-center * { */
-/*   text-align: left } */
-
-.align-top    {
-  vertical-align: top }
-
-.align-middle {
-  vertical-align: middle }
-
-.align-bottom {
-  vertical-align: bottom }
-
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-p.attribution {
-  text-align: right ;
-  margin-left: 50% }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.rubric {
-  font-weight: bold ;
-  font-size: larger ;
-  color: maroon ;
-  text-align: center }
-
-p.sidebar-title {
-  font-family: sans-serif ;
-  font-weight: bold ;
-  font-size: larger }
-
-p.sidebar-subtitle {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-p.topic-title {
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font: inherit }
-
-pre.literal-block, pre.doctest-block, pre.math, pre.code {
-  margin-left: 2em ;
-  margin-right: 2em }
-
-pre.code .ln { color: grey; } /* line numbers */
-pre.code, code { background-color: #eeeeee }
-pre.code .comment, code .comment { color: #5C6576 }
-pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
-pre.code .literal.string, code .literal.string { color: #0C5404 }
-pre.code .name.builtin, code .name.builtin { color: #352B84 }
-pre.code .deleted, code .deleted { background-color: #DEB0A1}
-pre.code .inserted, code .inserted { background-color: #A3D289}
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option {
-  white-space: nowrap }
-
-span.pre {
-  white-space: pre }
-
-span.problematic {
-  color: red }
-
-span.section-subtitle {
-  /* font-size relative to parent (h1..h6 element) */
-  font-size: 80% }
-
-table.citation {
-  border-left: solid 1px gray;
-  margin-left: 1px }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.docutils {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.footnote {
-  border-left: solid 1px black;
-  margin-left: 1px }
-
-table.docutils td, table.docutils th,
-table.docinfo td, table.docinfo th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-table.docutils th.field-name, table.docinfo th.docinfo-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap ;
-  padding-left: 0 }
-
-/* "booktabs" style (no vertical lines) */
-table.docutils.booktabs {
-  border: 0px;
-  border-top: 2px solid;
-  border-bottom: 2px solid;
-  border-collapse: collapse;
-}
-table.docutils.booktabs * {
-  border: 0px;
-}
-table.docutils.booktabs th {
-  border-bottom: thin solid;
-  text-align: left;
-}
-
-h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
-h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
-  font-size: 100% }
-
-ul.auto-toc {
-  list-style-type: none }
-
-</style>
-</head>
-<body>
-<div class="document" id="account-usability">
-<h1 class="title">Account Usability</h1>
-
-<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! This file is generated by oca-gen-addon-readme !!
-!! changes will be overwritten.                   !!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/akretion/odoo-usability/tree/12.0/account_usability"><img alt="akretion/odoo-usability" src="https://img.shields.io/badge/github-akretion%2Fodoo--usability-lightgray.png?logo=github" /></a></p>
-<p>This modules adds the following functions:</p>
-<ul class="simple">
-<li>Add an <em>Overdue</em> filter on invoice search view (this feature was previously
-located in te module <em>account_invoice_overdue_filter</em>)</li>
-<li>Increase the default limit of 80 lines in account move and account move line view.</li>
-<li>disable reconciliation “guessing”</li>
-<li>fast search on <em>Reconcile Ref</em> for account move line.</li>
-<li>add sale dates to invoice report to be compliant with
-<a class="reference external" href="https://www.service-public.fr/professionnels-entreprises/vosdroits/F31808">https://www.service-public.fr/professionnels-entreprises/vosdroits/F31808</a></li>
-<li>Sale date on qweb invoices</li>
-<li>A wizard to mark several invoices as sent at once (forward from v8)</li>
-<li>Default date for Account Move Reversal is now D+1 instead of today</li>
-<li>Track more fields on invoice (see details in account.py)</li>
-<li>Add boolean fields <cite>has_discount</cite> and <cite>has_attachment</cite> on invoice</li>
-<li>Add button “Delete line qty = 0” on supplier invoice</li>
-<li>Cut name_get() of invoice if too long</li>
-<li>A script for if Odoo screws up invoice attachment filename</li>
-<li>help functions for py3o reports</li>
-<li>Show code on name_get of journal</li>
-<li>add direct search of journal using code</li>
-<li>add copy=False on some fields</li>
-<li>Add unicity constraint on analytic codes per company</li>
-<li>Better default values on account move</li>
-<li>Add link from account move line to invoice</li>
-<li>Add start_date and end_date on bank statements</li>
-<li>Add transfer_account_id to invoicing config page</li>
-<li>Improve domain reconciliation widget</li>
-<li>account.reconcile.model don’t copy name to label via onchange</li>
-<li>Add method to get fiscal position without partner_id</li>
-<li>Restore drill-through on sale and invoice reports</li>
-<li>don’t attach PDF upon invoice report generation on supplier invoices/refunds</li>
-<li>Add filter on debit and credit amount for Move Lines</li>
-<li>Add supplier invoice number in invoice tree view</li>
-</ul>
-<p>Together with this module, I recommend the use of the following modules:</p>
-<ul class="simple">
-<li>account_invoice_supplier_ref_unique (OCA project account-invoicing)</li>
-<li>account_move_line_no_default_search (OCA project account-financial-tools)</li>
-<li>invoice_fiscal_position_update (OCA project account-invoicing)</li>
-</ul>
-<p><strong>Table of contents</strong></p>
-<div class="contents local topic" id="contents">
-<ul class="simple">
-<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
-<p>Bugs are tracked on <a class="reference external" href="https://github.com/akretion/odoo-usability/issues">GitHub Issues</a>.
-In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/akretion/odoo-usability/issues/new?body=module:%20account_usability%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
-<p>Do not contact contributors directly about support or help with technical issues.</p>
-</div>
-<div class="section" id="credits">
-<h1><a class="toc-backref" href="#id2">Credits</a></h1>
-<div class="section" id="authors">
-<h2><a class="toc-backref" href="#id3">Authors</a></h2>
-<ul class="simple">
-<li>Akretion</li>
-</ul>
-</div>
-<div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
-<ul class="simple">
-<li>Alexis de Lattre &lt;<a class="reference external" href="mailto:alexis.delattre&#64;akretion.com">alexis.delattre&#64;akretion.com</a>&gt;</li>
-<li>David Beal &lt;<a class="reference external" href="mailto:david.beal&#64;akretion.com">david.beal&#64;akretion.com</a>&gt;</li>
-</ul>
-</div>
-<div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
-<p>This module is part of the <a class="reference external" href="https://github.com/akretion/odoo-usability/tree/12.0/account_usability">akretion/odoo-usability</a> project on GitHub.</p>
-<p>You are welcome to contribute.</p>
-</div>
-</div>
-</div>
-</body>
-</html>
--- a/base_company_extension/README.rst
+++ b/base_company_extension/README.rst
@@ -1,61 +0,0 @@
-======================
-Base Company Extension
-======================
-
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! This file is generated by oca-gen-addon-readme !!
-   !! changes will be overwritten.                   !!
-   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
-    :target: https://odoo-community.org/page/development-status
-    :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
-    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
-    :alt: License: AGPL-3
-.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fodoo--usability-lightgray.png?logo=github
-    :target: https://github.com/akretion/odoo-usability/tree/12.0/base_company_extension
-    :alt: akretion/odoo-usability
-
-|badge1| |badge2| |badge3| 
-
-This module adds the following fields to the ResCompany model:
-* Capital Amount
-* Legal Type
-
-This is useful to display the legal name of the company in reports
-
-**Table of contents**
-
-.. contents::
-   :local:
-
-Bug Tracker
-===========
-
-Bugs are tracked on `GitHub Issues <https://github.com/akretion/odoo-usability/issues>`_.
-In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/akretion/odoo-usability/issues/new?body=module:%20base_company_extension%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
-
-Do not contact contributors directly about support or help with technical issues.
-
-Credits
-=======
-
-Authors
-~~~~~~~
-
-* Akretion
-
-Contributors
-~~~~~~~~~~~~
-
-* Alexis de Lattre <alexis.delattre@akretion.com>
-
-Maintainers
-~~~~~~~~~~~
-
-This module is part of the `akretion/odoo-usability <https://github.com/akretion/odoo-usability/tree/12.0/base_company_extension>`_ project on GitHub.
-
-You are welcome to contribute.
--- a/base_company_extension/manifest.py
+++ b/base_company_extension/manifest.py
@@ -9,6 +9,16 @@
    'category': 'Partner',
    'license': 'AGPL-3',
    'summary': 'Adds capital and title on company',
+    'description': """
+Base Company Extension
+======================
+
+This module adds 2 fields on the Company :
+
+* *Capital Amount*
+
+* *Legal Form*
+    """,
    'author': 'Akretion',
    'website': 'http://www.akretion.com',
    # I depend on base_usability only for _report_company_legal_name()
--- a/base_company_extension/readme/CONTRIBUTORS.rst
+++ b/base_company_extension/readme/CONTRIBUTORS.rst
@@ -1 +0,0 @@
-* Alexis de Lattre <alexis.delattre@akretion.com>
--- a/base_company_extension/readme/DESCRIPTION.rst
+++ b/base_company_extension/readme/DESCRIPTION.rst
@@ -1,5 +0,0 @@
-This module adds the following fields to the ResCompany model:
-* Capital Amount
-* Legal Type
-
-This is useful to display the legal name of the company in reports
--- a/base_company_extension/static/description/index.html
+++ b/base_company_extension/static/description/index.html
@@ -1,417 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
-<title>Base Company Extension</title>
-<style type="text/css">
-
-/*
-:Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
-:Copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
-customize this style sheet.
-*/
-
-/* used to remove borders from tables and images */
-.borderless, table.borderless td, table.borderless th {
-  border: 0 }
-
-table.borderless td, table.borderless th {
-  /* Override padding for "table.docutils td" with "! important".
-     The right padding separates the table cells. */
-  padding: 0 0.5em 0 0 ! important }
-
-.first {
-  /* Override more specific margin styles with "! important". */
-  margin-top: 0 ! important }
-
-.last, .with-subtitle {
-  margin-bottom: 0 ! important }
-
-.hidden {
-  display: none }
-
-.subscript {
-  vertical-align: sub;
-  font-size: smaller }
-
-.superscript {
-  vertical-align: super;
-  font-size: smaller }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-blockquote.epigraph {
-  margin: 2em 5em ; }
-
-dl.docutils dd {
-  margin-bottom: 0.5em }
-
-object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
-  overflow: hidden;
-}
-
-/* Uncomment (and remove this text!) to get bold-faced definition list terms
-dl.docutils dt {
-  font-weight: bold }
-*/
-
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.admonition, div.attention, div.caution, div.danger, div.error,
-div.hint, div.important, div.note, div.tip, div.warning {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.admonition p.admonition-title, div.hint p.admonition-title,
-div.important p.admonition-title, div.note p.admonition-title,
-div.tip p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title, .code .error {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-/* Uncomment (and remove this text!) to get reduced vertical space in
-   compound paragraphs.
-div.compound .compound-first, div.compound .compound-middle {
-  margin-bottom: 0.5em }
-
-div.compound .compound-last, div.compound .compound-middle {
-  margin-top: 0.5em }
-*/
-
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em ;
-  margin-right: 2em }
-
-div.footer, div.header {
-  clear: both;
-  font-size: smaller }
-
-div.line-block {
-  display: block ;
-  margin-top: 1em ;
-  margin-bottom: 1em }
-
-div.line-block div.line-block {
-  margin-top: 0 ;
-  margin-bottom: 0 ;
-  margin-left: 1.5em }
-
-div.sidebar {
-  margin: 0 0 0.5em 1em ;
-  border: medium outset ;
-  padding: 1em ;
-  background-color: #ffffee ;
-  width: 40% ;
-  float: right ;
-  clear: right }
-
-div.sidebar p.rubric {
-  font-family: sans-serif ;
-  font-size: medium }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
-h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
-  margin-top: 0.4em }
-
-h1.title {
-  text-align: center }
-
-h2.subtitle {
-  text-align: center }
-
-hr.docutils {
-  width: 75% }
-
-img.align-left, .figure.align-left, object.align-left, table.align-left {
-  clear: left ;
-  float: left ;
-  margin-right: 1em }
-
-img.align-right, .figure.align-right, object.align-right, table.align-right {
-  clear: right ;
-  float: right ;
-  margin-left: 1em }
-
-img.align-center, .figure.align-center, object.align-center {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-table.align-center {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.align-left {
-  text-align: left }
-
-.align-center {
-  clear: both ;
-  text-align: center }
-
-.align-right {
-  text-align: right }
-
-/* reset inner alignment in figures */
-div.align-right {
-  text-align: inherit }
-
-/* div.align-center * { */
-/*   text-align: left } */
-
-.align-top    {
-  vertical-align: top }
-
-.align-middle {
-  vertical-align: middle }
-
-.align-bottom {
-  vertical-align: bottom }
-
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-p.attribution {
-  text-align: right ;
-  margin-left: 50% }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.rubric {
-  font-weight: bold ;
-  font-size: larger ;
-  color: maroon ;
-  text-align: center }
-
-p.sidebar-title {
-  font-family: sans-serif ;
-  font-weight: bold ;
-  font-size: larger }
-
-p.sidebar-subtitle {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-p.topic-title {
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font: inherit }
-
-pre.literal-block, pre.doctest-block, pre.math, pre.code {
-  margin-left: 2em ;
-  margin-right: 2em }
-
-pre.code .ln { color: grey; } /* line numbers */
-pre.code, code { background-color: #eeeeee }
-pre.code .comment, code .comment { color: #5C6576 }
-pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
-pre.code .literal.string, code .literal.string { color: #0C5404 }
-pre.code .name.builtin, code .name.builtin { color: #352B84 }
-pre.code .deleted, code .deleted { background-color: #DEB0A1}
-pre.code .inserted, code .inserted { background-color: #A3D289}
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option {
-  white-space: nowrap }
-
-span.pre {
-  white-space: pre }
-
-span.problematic {
-  color: red }
-
-span.section-subtitle {
-  /* font-size relative to parent (h1..h6 element) */
-  font-size: 80% }
-
-table.citation {
-  border-left: solid 1px gray;
-  margin-left: 1px }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.docutils {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.footnote {
-  border-left: solid 1px black;
-  margin-left: 1px }
-
-table.docutils td, table.docutils th,
-table.docinfo td, table.docinfo th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-table.docutils th.field-name, table.docinfo th.docinfo-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap ;
-  padding-left: 0 }
-
-/* "booktabs" style (no vertical lines) */
-table.docutils.booktabs {
-  border: 0px;
-  border-top: 2px solid;
-  border-bottom: 2px solid;
-  border-collapse: collapse;
-}
-table.docutils.booktabs * {
-  border: 0px;
-}
-table.docutils.booktabs th {
-  border-bottom: thin solid;
-  text-align: left;
-}
-
-h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
-h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
-  font-size: 100% }
-
-ul.auto-toc {
-  list-style-type: none }
-
-</style>
-</head>
-<body>
-<div class="document" id="base-company-extension">
-<h1 class="title">Base Company Extension</h1>
-
-<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! This file is generated by oca-gen-addon-readme !!
-!! changes will be overwritten.                   !!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/akretion/odoo-usability/tree/12.0/base_company_extension"><img alt="akretion/odoo-usability" src="https://img.shields.io/badge/github-akretion%2Fodoo--usability-lightgray.png?logo=github" /></a></p>
-<p>This module adds the following fields to the ResCompany model:
-* Capital Amount
-* Legal Type</p>
-<p>This is useful to display the legal name of the company in reports</p>
-<p><strong>Table of contents</strong></p>
-<div class="contents local topic" id="contents">
-<ul class="simple">
-<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
-<p>Bugs are tracked on <a class="reference external" href="https://github.com/akretion/odoo-usability/issues">GitHub Issues</a>.
-In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/akretion/odoo-usability/issues/new?body=module:%20base_company_extension%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
-<p>Do not contact contributors directly about support or help with technical issues.</p>
-</div>
-<div class="section" id="credits">
-<h1><a class="toc-backref" href="#id2">Credits</a></h1>
-<div class="section" id="authors">
-<h2><a class="toc-backref" href="#id3">Authors</a></h2>
-<ul class="simple">
-<li>Akretion</li>
-</ul>
-</div>
-<div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
-<ul class="simple">
-<li>Alexis de Lattre &lt;<a class="reference external" href="mailto:alexis.delattre&#64;akretion.com">alexis.delattre&#64;akretion.com</a>&gt;</li>
-</ul>
-</div>
-<div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
-<p>This module is part of the <a class="reference external" href="https://github.com/akretion/odoo-usability/tree/12.0/base_company_extension">akretion/odoo-usability</a> project on GitHub.</p>
-<p>You are welcome to contribute.</p>
-</div>
-</div>
-</div>
-</body>
-</html>
--- a/base_dynamic_list/init.py
+++ b/base_dynamic_list/init.py
@@ -1 +0,0 @@
-from . import models
--- a/base_dynamic_list/manifest.py
+++ b/base_dynamic_list/manifest.py
@@ -1,62 +0,0 @@
-# Copyright 2020-2022 Akretion France (http://www.akretion.com)
-# @author Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-{
-    'name': 'Base Dynamic List',
-    'version': '12.0.1.0.0',
-    'category': 'Tools',
-    'license': 'AGPL-3',
-    'summary': 'Dynamic lists',
-    'description': """
-Base Dynamic List
-=================
-
-Very often during an Odoo implementation, we need to add selection fields on a native objet, and we don't want to have a hard-coded selection list (fields.Selection), but a selection list that can be changed by users (Many2one field). For that, the developper needs to add a new object (with just a 'name' and 'sequence' field) with a form/tree view. The goal of this module is to speed-up this process by defining a dynamic list object that already has all the required views.
-
-This module provides several ready-to-go objects:
-
-* simple list : fields *name*, *sequence* and *active*
-* translatable list : fields *name* with translate=True, *sequence* and *active*
-* code list : fields *code* (unique), *name*, *sequence* and *active*
-* translatable code list : fields *code* (unique), *name* with translate=True, *sequence* and *active*
-
-These objects are readable by the employee group. The system group has full rights on it.
-
-To use it, you need to do 2 or 3 things :
-
-1) Add an entry in the domain field and the object you selected:
-
-domain = fields.Selection(selection_add=[('risk.type', "Risk Type")], ondelete={"risk.type": "cascade"})
-
-2) Add the many2one field on your object:
-
-risk_type_id = fields.Many2one(
-    'dynamic.list', string="Risk Type",
-    ondelete='restrict', domain=[('domain', '=', 'risk.type')])
-
-
-3) Optionally, you can add a dedicated action and a menu entry (otherwize, you can use the generic menu entry under *Settings > Technical > Dynamic Lists*:
-
-<record id="dynamic_list_risk_type_action" model="ir.actions.act_window">
-    <field name="name">Risk Type</field>
-    <field name="res_model">dynamic.list</field>
-    <field name="view_mode">tree,form</field>
-    <field name="domain">[('domain', '=', 'risk.type')]</field>
-    <field name="context">{'default_domain': 'risk.type'}</field>
-</record>
-
-<menuitem id="dynamic_list_risk_type_menu" action="dynamic_list_risk_type_action"
-parent="parent_menu_xmlid"/>
-
-Limitation: when you want to have different access rights on these lists depending on the source object, you should prefer to use dedicated objects.
-""",
-    'author': 'Akretion',
-    'website': 'http://www.akretion.com',
-    'depends': ['base'],
-    'data': [
-        'security/ir.model.access.csv',
-        'views/dynamic_list.xml',
-        ],
-    'installable': True,
-}
--- a/base_dynamic_list/models/init.py
+++ b/base_dynamic_list/models/init.py
@@ -1 +0,0 @@
-from . import dynamic_list
--- a/base_dynamic_list/models/dynamic_list.py
+++ b/base_dynamic_list/models/dynamic_list.py
@@ -1,115 +0,0 @@
-# Copyright 2020-2022 Akretion France (http://www.akretion.com)
-# @author Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import api, fields, models
-
-
-class DynamicList(models.Model):
-    _name = 'dynamic.list'
-    _description = 'Dynamic List (non translatable)'
-    _order = 'sequence, id'
-
-    name = fields.Char(required=True)
-    sequence = fields.Integer(default=10)
-    active = fields.Boolean(default=True)
-    domain = fields.Selection([], string='Domain', required=True, index=True)
-
-    _sql_constraint = [(
-        'domain_name_uniq',
-        'unique(domain, name)',
-        'This entry already exists!'
-        )]
-
-
-class DynamicListTranslate(models.Model):
-    _name = 'dynamic.list.translate'
-    _description = 'Translatable Dynamic List'
-    _order = 'sequence, id'
-
-    name = fields.Char(translate=True, required=True)
-    sequence = fields.Integer(default=10)
-    active = fields.Boolean(default=True)
-    domain = fields.Selection([], string='Domain', required=True, index=True)
-
-    _sql_constraint = [(
-        'domain_name_uniq',
-        'unique(domain, name)',
-        'This entry already exists!'
-        )]
-
-
-class DynamicListCode(models.Model):
-    _name = 'dynamic.list.code'
-    _description = 'Dynamic list with code'
-    _order = 'sequence, id'
-
-    code = fields.Char(required=True)
-    name = fields.Char(translate=True, required=True)
-    sequence = fields.Integer(default=10)
-    active = fields.Boolean(default=True)
-    domain = fields.Selection([], string='Domain', required=True, index=True)
-
-    _sql_constraint = [(
-        'domain_code_uniq',
-        'unique(domain, code)',
-        'This code already exists!'
-        )]
-
-    @api.depends('code', 'name')
-    def name_get(self):
-        res = []
-        for rec in self:
-            res.append((rec.id, '[%s] %s' % (rec.code, rec.name)))
-        return res
-
-    @api.model
-    def name_search(
-            self, name='', args=None, operator='ilike', limit=80):
-        if args is None:
-            args = []
-        if name and operator == 'ilike':
-            recs = self.search(
-                [('code', '=', name)] + args, limit=limit)
-            if recs:
-                return recs.name_get()
-        return super().name_search(
-            name=name, args=args, operator=operator, limit=limit)
-
-
-class DynamicListCodeTranslate(models.Model):
-    _name = 'dynamic.list.code.translate'
-    _description = 'Translatable dynamic list with code'
-    _order = 'sequence, id'
-
-    code = fields.Char(required=True)
-    name = fields.Char(translate=True, required=True)
-    sequence = fields.Integer(default=10)
-    active = fields.Boolean(default=True)
-    domain = fields.Selection([], string='Domain', required=True, index=True)
-
-    _sql_constraint = [(
-        'domain_code_uniq',
-        'unique(domain, code)',
-        'This code already exists!'
-        )]
-
-    @api.depends('code', 'name')
-    def name_get(self):
-        res = []
-        for rec in self:
-            res.append((rec.id, '[%s] %s' % (rec.code, rec.name)))
-        return res
-
-    @api.model
-    def name_search(
-            self, name='', args=None, operator='ilike', limit=80):
-        if args is None:
-            args = []
-        if name and operator == 'ilike':
-            recs = self.search(
-                [('code', '=', name)] + args, limit=limit)
-            if recs:
-                return recs.name_get()
-        return super().name_search(
-            name=name, args=args, operator=operator, limit=limit)
--- a/base_dynamic_list/security/ir.model.access.csv
+++ b/base_dynamic_list/security/ir.model.access.csv
@@ -1,9 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_dynamic_list_read,Read access on dynamic.list to employees,model_dynamic_list,base.group_user,1,0,0,0
-access_dynamic_list_full,Full access to dynamic.list to System group,model_dynamic_list,base.group_system,1,1,1,1
-access_dynamic_list_translate_read,Read access on dynamic.list.translate to employees,model_dynamic_list_translate,base.group_user,1,0,0,0
-access_dynamic_list_translate_full,Full access to dynamic.list.translate to System group,model_dynamic_list_translate,base.group_system,1,1,1,1
-access_dynamic_list_code_read,Read access on dynamic.list.code to employees,model_dynamic_list_code,base.group_user,1,0,0,0
-access_dynamic_list_code_full,Full access to dynamic.list.code to System group,model_dynamic_list_code,base.group_system,1,1,1,1
-access_dynamic_list_code_translate_read,Read access on dynamic.list.code.translate to employees,model_dynamic_list_code_translate,base.group_user,1,0,0,0
-access_dynamic_list_code_translate_full,Full access to dynamic.list.code.translate to System group,model_dynamic_list_code_translate,base.group_system,1,1,1,1
--- a/base_dynamic_list/views/dynamic_list.xml
+++ b/base_dynamic_list/views/dynamic_list.xml
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2020 Akretion France (http://www.akretion.com/)
-  @author: Alexis de Lattre <alexis.delattre@akretion.com>
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
-
-<odoo>
-
-
-<menuitem id="dynamic_list_root_menu" name="Dynamic Lists" parent="base.menu_custom" sequence="100"/>
-
-<record id="dynamic_list_form" model="ir.ui.view">
-    <field name="model">dynamic.list</field>
-    <field name="arch" type="xml">
-        <form>
-            <sheet>
-                <div class="oe_button_box" name="button_box">
-                    <button name="toggle_active" type="object"
-                        class="oe_stat_button" icon="fa-archive">
-                        <field name="active" widget="boolean_button"
-                            options='{"terminology": "archive"}'/>
-                    </button>
-                </div>
-                <group name="main">
-                    <field name="name"/>
-                    <field name="domain" invisible="not context.get('dynamic_list_main_view')"/>
-                </group>
-            </sheet>
-        </form>
-    </field>
-</record>
-
-<record id="dynamic_list_tree" model="ir.ui.view">
-    <field name="model">dynamic.list</field>
-    <field name="arch" type="xml">
-        <tree>
-            <field name="sequence" widget="handle"/>
-            <field name="name"/>
-            <field name="domain" invisible="not context.get('dynamic_list_main_view')"/>
-        </tree>
-    </field>
-</record>
-
-<record id="dynamic_list_search" model="ir.ui.view">
-    <field name="model">dynamic.list</field>
-    <field name="arch" type="xml">
-        <search>
-            <field name="name"/>
-            <separator/>
-            <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
-            <group string="Group By" name="groupby">
-                <filter name="domain_groupby" string="Domain" context="{'group_by': 'domain'}"/>
-            </group>
-        </search>
-    </field>
-</record>
-
-<record id="dynamic_list_action" model="ir.actions.act_window">
-    <field name="name">Simple List</field>
-    <field name="res_model">dynamic.list</field>
-    <field name="view_mode">tree,form</field>
-    <field name="context">{'dynamic_list_main_view': True, 'search_default_domain_groupby': True}</field>
-</record>
-
-<menuitem id="dynamic_list_menu" action="dynamic_list_action" parent="dynamic_list_root_menu" sequence="10"/>
-
-<record id="dynamic_list_translate_form" model="ir.ui.view">
-    <field name="model">dynamic.list.translate</field>
-    <field name="arch" type="xml">
-        <form>
-            <sheet>
-                <div class="oe_button_box" name="button_box">
-                    <button name="toggle_active" type="object"
-                        class="oe_stat_button" icon="fa-archive">
-                        <field name="active" widget="boolean_button"
-                            options='{"terminology": "archive"}'/>
-                    </button>
-                </div>
-                <group name="main">
-                    <field name="name"/>
-                    <field name="domain" invisible="not context.get('dynamic_list_translate_main_view')"/>
-                </group>
-            </sheet>
-        </form>
-    </field>
-</record>
-
-<record id="dynamic_list_translate_tree" model="ir.ui.view">
-    <field name="model">dynamic.list.translate</field>
-    <field name="arch" type="xml">
-        <tree>
-            <field name="sequence" widget="handle"/>
-            <field name="name"/>
-            <field name="domain" invisible="not context.get('dynamic_list_translate_main_view')"/>
-        </tree>
-    </field>
-</record>
-
-<record id="dynamic_list_translate_search" model="ir.ui.view">
-    <field name="model">dynamic.list.translate</field>
-    <field name="arch" type="xml">
-        <search>
-            <field name="name"/>
-            <separator/>
-            <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
-            <group string="Group By" name="groupby">
-                <filter name="domain_groupby" string="Domain" context="{'group_by': 'domain'}"/>
-            </group>
-        </search>
-    </field>
-</record>
-
-<record id="dynamic_list_translate_action" model="ir.actions.act_window">
-    <field name="name">Translatable Simple List</field>
-    <field name="res_model">dynamic.list.translate</field>
-    <field name="view_mode">tree,form</field>
-    <field name="context">{'dynamic_list_translate_main_view': True, 'search_default_domain_groupby': True}</field>
-</record>
-
-<menuitem id="dynamic_list_translate_menu" action="dynamic_list_translate_action" parent="dynamic_list_root_menu" sequence="20"/>
-
-<record id="dynamic_list_code_form" model="ir.ui.view">
-    <field name="model">dynamic.list.code</field>
-    <field name="arch" type="xml">
-        <form>
-            <sheet>
-                <div class="oe_button_box" name="button_box">
-                    <button name="toggle_active" type="object"
-                        class="oe_stat_button" icon="fa-archive">
-                        <field name="active" widget="boolean_button"
-                            options='{"terminology": "archive"}'/>
-                    </button>
-                </div>
-                <group name="main">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="domain" invisible="not context.get('dynamic_list_code_main_view')"/>
-                </group>
-            </sheet>
-        </form>
-    </field>
-</record>
-
-<record id="dynamic_list_code_tree" model="ir.ui.view">
-    <field name="model">dynamic.list.code</field>
-    <field name="arch" type="xml">
-        <tree>
-            <field name="sequence" widget="handle"/>
-            <field name="code"/>
-            <field name="name"/>
-            <field name="domain" invisible="not context.get('dynamic_list_code_main_view')"/>
-        </tree>
-    </field>
-</record>
-
-<record id="dynamic_list_code_search" model="ir.ui.view">
-    <field name="model">dynamic.list.code</field>
-    <field name="arch" type="xml">
-        <search>
-            <field name="name" string="Name or Code" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"/>
-            <separator/>
-            <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
-            <field name="code"/>
-            <group string="Group By" name="groupby">
-                <filter name="domain_groupby" string="Domain" context="{'group_by': 'domain'}"/>
-            </group>
-        </search>
-    </field>
-</record>
-
-<record id="dynamic_list_code_action" model="ir.actions.act_window">
-    <field name="name">Code List</field>
-    <field name="res_model">dynamic.list.code</field>
-    <field name="view_mode">tree,form</field>
-    <field name="context">{'dynamic_list_code_main_view': True, 'search_default_domain_groupby': True}</field>
-</record>
-
-<menuitem id="dynamic_list_code_menu" action="dynamic_list_code_action" parent="dynamic_list_root_menu" sequence="30"/>
-
-<record id="dynamic_list_code_translate_form" model="ir.ui.view">
-    <field name="model">dynamic.list.code.translate</field>
-    <field name="arch" type="xml">
-        <form>
-            <sheet>
-                <div class="oe_button_box" name="button_box">
-                    <button name="toggle_active" type="object"
-                        class="oe_stat_button" icon="fa-archive">
-                        <field name="active" widget="boolean_button"
-                            options='{"terminology": "archive"}'/>
-                    </button>
-                </div>
-                <group name="main">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="domain" invisible="not context.get('dynamic_list_code_translate_main_view')"/>
-                </group>
-            </sheet>
-        </form>
-    </field>
-</record>
-
-<record id="dynamic_list_code_translate_tree" model="ir.ui.view">
-    <field name="model">dynamic.list.code.translate</field>
-    <field name="arch" type="xml">
-        <tree>
-            <field name="sequence" widget="handle"/>
-            <field name="code"/>
-            <field name="name"/>
-            <field name="domain" invisible="not context.get('dynamic_list_code_translate_main_view')"/>
-        </tree>
-    </field>
-</record>
-
-<record id="dynamic_list_code_translate_search" model="ir.ui.view">
-    <field name="model">dynamic.list.code.translate</field>
-    <field name="arch" type="xml">
-        <search>
-            <field name="name" string="Name or Code" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"/>
-            <field name="code"/>
-            <separator/>
-            <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
-            <group string="Group By" name="groupby">
-                <filter name="domain_groupby" string="Domain" context="{'group_by': 'domain'}"/>
-            </group>
-        </search>
-    </field>
-</record>
-
-<record id="dynamic_list_code_translate_action" model="ir.actions.act_window">
-    <field name="name">Translatable Code List</field>
-    <field name="res_model">dynamic.list.code.translate</field>
-    <field name="view_mode">tree,form</field>
-    <field name="context">{'dynamic_list_code_translate_main_view': True, 'search_default_domain_groupby': True}</field>
-</record>
-
-<menuitem id="dynamic_list_code_translate_menu" action="dynamic_list_code_translate_action" parent="dynamic_list_root_menu" sequence="40"/>
-
-
-</odoo>
--- a/base_partner_ref/partner.py
+++ b/base_partner_ref/partner.py
@@ -2,14 +2,13 @@
 # @author: Alexis de Lattre <alexis.delattre@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

-from odoo import api, fields, models
+from odoo import models, fields


 class ResPartner(models.Model):
    _inherit = 'res.partner'

    ref = fields.Char(copy=False)  # To avoid blocking duplicate
-    invalidate_display_name = fields.Boolean()

    _sql_constraints = [(
        'ref_unique',
@@ -17,11 +16,6 @@ class ResPartner(models.Model):
        'A partner already exists with this internal reference!'
        )]

-    # add 'ref' in depends
-    @api.depends('is_company', 'name', 'parent_id.name', 'type', 'company_name', 'ref', 'invalidate_display_name')
-    def _compute_display_name(self):
-        super(ResPartner, self)._compute_display_name()
-
    def _get_name(self):
        partner = self
        name = partner.name or ''
--- a/base_usability/README.rst
+++ b/base_usability/README.rst
@@ -1,82 +0,0 @@
-==============
-Base Usability
-==============
-
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! This file is generated by oca-gen-addon-readme !!
-   !! changes will be overwritten.                   !!
-   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
-    :target: https://odoo-community.org/page/development-status
-    :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
-    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
-    :alt: License: AGPL-3
-.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fodoo--usability-lightgray.png?logo=github
-    :target: https://github.com/akretion/odoo-usability/tree/12.0/base_usability
-    :alt: akretion/odoo-usability
-
-|badge1| |badge2| |badge3| 
-
-This module adds the following functions:
-
-* Adds *track_visibility='onchange'* on all the important fields of the Partner object
-* By default, Odoo doesn't display the title field on all the partner form views. This module fixes it (it replaces the module base_title_on_partner)
-* Adds a log message at INFO level when sending an email via SMTP
-* Displays the local modules with installable filter
-* A group by "State" is added to module search view
-* Provides a _display_report_header method on the res.company object and _display_full_address on res.partner which are useful for reporting.
-* Add model in cron tree view
-* Add prefix field in sequence search view
-* Better search and form view for country and state
-* Display technical name of modules in kanban view
-* Change module filter to `installable`
-* Add widget=handle on sequence of res.partner.bank 
-* Add city and country in partner tree view
-* Add widget="email" on email of contacts
-* Add script to fix partners related to users in multi-company setup
-* Add methods for py3o reports
-* Add name_get() on ir.model
-* Language wizard defaults to ".po"
-* Add tracking on partner fields
-* Handle lang in name_title field
-* Remove empty lines in address
-* Add bank Name field on res.partner.bank
-* Partners auto-created for users are Suppliers and not Customers
-
-**Table of contents**
-
-.. contents::
-   :local:
-
-Bug Tracker
-===========
-
-Bugs are tracked on `GitHub Issues <https://github.com/akretion/odoo-usability/issues>`_.
-In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/akretion/odoo-usability/issues/new?body=module:%20base_usability%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
-
-Do not contact contributors directly about support or help with technical issues.
-
-Credits
-=======
-
-Authors
-~~~~~~~
-
-* Akretion
-
-Contributors
-~~~~~~~~~~~~
-
-* Alexis de Lattre <alexis.delattre@akretion.com>
-* David Beal <david.beal@akretion.com>
-
-Maintainers
-~~~~~~~~~~~
-
-This module is part of the `akretion/odoo-usability <https://github.com/akretion/odoo-usability/tree/12.0/base_usability>`_ project on GitHub.
-
-You are welcome to contribute.
--- a/base_usability/manifest.py
+++ b/base_usability/manifest.py
@@ -8,6 +8,22 @@
    'category': 'Partner',
    'license': 'AGPL-3',
    'summary': 'Better usability in base module',
+    'description': """
+Base Usability
+==============
+
+This module adds *track_visibility='onchange'* on all the important fields of the Partner object.
+
+By default, Odoo doesn't display the title field on all the partner form views. This module fixes it (it replaces the module base_title_on_partner).
+
+It also adds a log message at INFO level when sending an email via SMTP.
+
+It displays the local modules with installable filter.
+A group by 'State' is added to module search view.
+
+It provides a _display_report_header method on the res.company object and
+_display_full_address on res.partner which are useful for reporting.
+    """,
    'author': 'Akretion',
    'website': 'http://www.akretion.com',
    'depends': ['base'],
--- a/base_usability/models/init.py
+++ b/base_usability/models/init.py
@@ -3,4 +3,3 @@ from . import partner
 from . import company
 from . import mail
 from . import misc
-from . import ir_model
--- a/base_usability/models/ir_model.py
+++ b/base_usability/models/ir_model.py
@@ -1,16 +0,0 @@
-# Copyright 2019 Akretion France (http://www.akretion.com/)
-# @author: Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import api, models
-
-
-class IrModel(models.Model):
-    _inherit = 'ir.model'
-
-    @api.depends('name', 'model')
-    def name_get(self):
-        res = []
-        for rec in self:
-            res.append((rec.id, '%s (%s)' % (rec.name, rec.model)))
-        return res
--- a/base_usability/models/users.py
+++ b/base_usability/models/users.py
@@ -23,9 +23,12 @@ class ResUsers(models.Model):

    @api.model
    def _script_partners_linked_to_users_no_company(self):
+        if self.env.user.id != SUPERUSER_ID:
+            raise UserError(_('You must run this script as admin user'))
        logger.info(
            'START to set company_id=False on partners related to users')
-        users = self.sudo().with_context(active_test=False).search([])
+        users = self.search(
+            ['|', ('active', '=', True), ('active', '=', False)])
        for user in users:
            if user.partner_id.company_id:
                user.partner_id.company_id = False
@@ -34,3 +37,4 @@ class ResUsers(models.Model):
                    user.login, user.id)
        logger.info(
            'END setting company_id=False on partners related to users')
+        return True
--- a/base_usability/readme/CONTRIBUTORS.rst
+++ b/base_usability/readme/CONTRIBUTORS.rst
@@ -1,3 +0,0 @@
-* Alexis de Lattre <alexis.delattre@akretion.com>
-* Raphaël Valyi <rvalyi@akretion.com>
-* David Beal <david.beal@akretion.com>
--- a/base_usability/readme/DESCRIPTION.rst
+++ b/base_usability/readme/DESCRIPTION.rst
@@ -1,25 +0,0 @@
-This module adds the following functions:
-
-* Adds *track_visibility='onchange'* on all the important fields of the Partner object
-* By default, Odoo doesn't display the title field on all the partner form views. This module fixes it (it replaces the module base_title_on_partner)
-* Adds a log message at INFO level when sending an email via SMTP
-* Displays the local modules with installable filter
-* A group by "State" is added to module search view
-* Provides a _display_report_header method on the res.company object and _display_full_address on res.partner which are useful for reporting.
-* Add model in cron tree view
-* Add prefix field in sequence search view
-* Better search and form view for country and state
-* Display technical name of modules in kanban view
-* Change module filter to `installable`
-* Add widget=handle on sequence of res.partner.bank 
-* Add city and country in partner tree view
-* Add widget="email" on email of contacts
-* Add script to fix partners related to users in multi-company setup
-* Add methods for py3o reports
-* Add name_get() on ir.model
-* Language wizard defaults to ".po"
-* Add tracking on partner fields
-* Handle lang in name_title field
-* Remove empty lines in address
-* Add bank Name field on res.partner.bank
-* Partners auto-created for users are Suppliers and not Customers
--- a/base_usability/static/description/index.html
+++ b/base_usability/static/description/index.html
@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
-<title>Base Usability</title>
-<style type="text/css">
-
-/*
-:Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
-:Copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
-customize this style sheet.
-*/
-
-/* used to remove borders from tables and images */
-.borderless, table.borderless td, table.borderless th {
-  border: 0 }
-
-table.borderless td, table.borderless th {
-  /* Override padding for "table.docutils td" with "! important".
-     The right padding separates the table cells. */
-  padding: 0 0.5em 0 0 ! important }
-
-.first {
-  /* Override more specific margin styles with "! important". */
-  margin-top: 0 ! important }
-
-.last, .with-subtitle {
-  margin-bottom: 0 ! important }
-
-.hidden {
-  display: none }
-
-.subscript {
-  vertical-align: sub;
-  font-size: smaller }
-
-.superscript {
-  vertical-align: super;
-  font-size: smaller }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-blockquote.epigraph {
-  margin: 2em 5em ; }
-
-dl.docutils dd {
-  margin-bottom: 0.5em }
-
-object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
-  overflow: hidden;
-}
-
-/* Uncomment (and remove this text!) to get bold-faced definition list terms
-dl.docutils dt {
-  font-weight: bold }
-*/
-
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.admonition, div.attention, div.caution, div.danger, div.error,
-div.hint, div.important, div.note, div.tip, div.warning {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.admonition p.admonition-title, div.hint p.admonition-title,
-div.important p.admonition-title, div.note p.admonition-title,
-div.tip p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title, .code .error {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-/* Uncomment (and remove this text!) to get reduced vertical space in
-   compound paragraphs.
-div.compound .compound-first, div.compound .compound-middle {
-  margin-bottom: 0.5em }
-
-div.compound .compound-last, div.compound .compound-middle {
-  margin-top: 0.5em }
-*/
-
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em ;
-  margin-right: 2em }
-
-div.footer, div.header {
-  clear: both;
-  font-size: smaller }
-
-div.line-block {
-  display: block ;
-  margin-top: 1em ;
-  margin-bottom: 1em }
-
-div.line-block div.line-block {
-  margin-top: 0 ;
-  margin-bottom: 0 ;
-  margin-left: 1.5em }
-
-div.sidebar {
-  margin: 0 0 0.5em 1em ;
-  border: medium outset ;
-  padding: 1em ;
-  background-color: #ffffee ;
-  width: 40% ;
-  float: right ;
-  clear: right }
-
-div.sidebar p.rubric {
-  font-family: sans-serif ;
-  font-size: medium }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
-h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
-  margin-top: 0.4em }
-
-h1.title {
-  text-align: center }
-
-h2.subtitle {
-  text-align: center }
-
-hr.docutils {
-  width: 75% }
-
-img.align-left, .figure.align-left, object.align-left, table.align-left {
-  clear: left ;
-  float: left ;
-  margin-right: 1em }
-
-img.align-right, .figure.align-right, object.align-right, table.align-right {
-  clear: right ;
-  float: right ;
-  margin-left: 1em }
-
-img.align-center, .figure.align-center, object.align-center {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-table.align-center {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.align-left {
-  text-align: left }
-
-.align-center {
-  clear: both ;
-  text-align: center }
-
-.align-right {
-  text-align: right }
-
-/* reset inner alignment in figures */
-div.align-right {
-  text-align: inherit }
-
-/* div.align-center * { */
-/*   text-align: left } */
-
-.align-top    {
-  vertical-align: top }
-
-.align-middle {
-  vertical-align: middle }
-
-.align-bottom {
-  vertical-align: bottom }
-
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-p.attribution {
-  text-align: right ;
-  margin-left: 50% }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.rubric {
-  font-weight: bold ;
-  font-size: larger ;
-  color: maroon ;
-  text-align: center }
-
-p.sidebar-title {
-  font-family: sans-serif ;
-  font-weight: bold ;
-  font-size: larger }
-
-p.sidebar-subtitle {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-p.topic-title {
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font: inherit }
-
-pre.literal-block, pre.doctest-block, pre.math, pre.code {
-  margin-left: 2em ;
-  margin-right: 2em }
-
-pre.code .ln { color: grey; } /* line numbers */
-pre.code, code { background-color: #eeeeee }
-pre.code .comment, code .comment { color: #5C6576 }
-pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
-pre.code .literal.string, code .literal.string { color: #0C5404 }
-pre.code .name.builtin, code .name.builtin { color: #352B84 }
-pre.code .deleted, code .deleted { background-color: #DEB0A1}
-pre.code .inserted, code .inserted { background-color: #A3D289}
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option {
-  white-space: nowrap }
-
-span.pre {
-  white-space: pre }
-
-span.problematic {
-  color: red }
-
-span.section-subtitle {
-  /* font-size relative to parent (h1..h6 element) */
-  font-size: 80% }
-
-table.citation {
-  border-left: solid 1px gray;
-  margin-left: 1px }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.docutils {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.footnote {
-  border-left: solid 1px black;
-  margin-left: 1px }
-
-table.docutils td, table.docutils th,
-table.docinfo td, table.docinfo th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-table.docutils th.field-name, table.docinfo th.docinfo-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap ;
-  padding-left: 0 }
-
-/* "booktabs" style (no vertical lines) */
-table.docutils.booktabs {
-  border: 0px;
-  border-top: 2px solid;
-  border-bottom: 2px solid;
-  border-collapse: collapse;
-}
-table.docutils.booktabs * {
-  border: 0px;
-}
-table.docutils.booktabs th {
-  border-bottom: thin solid;
-  text-align: left;
-}
-
-h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
-h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
-  font-size: 100% }
-
-ul.auto-toc {
-  list-style-type: none }
-
-</style>
-</head>
-<body>
-<div class="document" id="base-usability">
-<h1 class="title">Base Usability</h1>
-
-<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! This file is generated by oca-gen-addon-readme !!
-!! changes will be overwritten.                   !!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/akretion/odoo-usability/tree/12.0/base_usability"><img alt="akretion/odoo-usability" src="https://img.shields.io/badge/github-akretion%2Fodoo--usability-lightgray.png?logo=github" /></a></p>
-<p>This module adds the following functions:</p>
-<ul class="simple">
-<li>Adds <em>track_visibility=’onchange’</em> on all the important fields of the Partner object</li>
-<li>By default, Odoo doesn’t display the title field on all the partner form views. This module fixes it (it replaces the module base_title_on_partner)</li>
-<li>Adds a log message at INFO level when sending an email via SMTP</li>
-<li>Displays the local modules with installable filter</li>
-<li>A group by “State” is added to module search view</li>
-<li>Provides a _display_report_header method on the res.company object and _display_full_address on res.partner which are useful for reporting.</li>
-<li>Add model in cron tree view</li>
-<li>Add prefix field in sequence search view</li>
-<li>Better search and form view for country and state</li>
-<li>Display technical name of modules in kanban view</li>
-<li>Change module filter to <cite>installable</cite></li>
-<li>Add widget=handle on sequence of res.partner.bank</li>
-<li>Add city and country in partner tree view</li>
-<li>Add widget=”email” on email of contacts</li>
-<li>Add script to fix partners related to users in multi-company setup</li>
-<li>Add methods for py3o reports</li>
-<li>Add name_get() on ir.model</li>
-<li>Language wizard defaults to “.po”</li>
-<li>Add tracking on partner fields</li>
-<li>Handle lang in name_title field</li>
-<li>Remove empty lines in address</li>
-<li>Add bank Name field on res.partner.bank</li>
-<li>Partners auto-created for users are Suppliers and not Customers</li>
-</ul>
-<p><strong>Table of contents</strong></p>
-<div class="contents local topic" id="contents">
-<ul class="simple">
-<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
-<p>Bugs are tracked on <a class="reference external" href="https://github.com/akretion/odoo-usability/issues">GitHub Issues</a>.
-In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/akretion/odoo-usability/issues/new?body=module:%20base_usability%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
-<p>Do not contact contributors directly about support or help with technical issues.</p>
-</div>
-<div class="section" id="credits">
-<h1><a class="toc-backref" href="#id2">Credits</a></h1>
-<div class="section" id="authors">
-<h2><a class="toc-backref" href="#id3">Authors</a></h2>
-<ul class="simple">
-<li>Akretion</li>
-</ul>
-</div>
-<div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
-<ul class="simple">
-<li>Alexis de Lattre &lt;<a class="reference external" href="mailto:alexis.delattre&#64;akretion.com">alexis.delattre&#64;akretion.com</a>&gt;</li>
-<li>David Beal &lt;<a class="reference external" href="mailto:david.beal&#64;akretion.com">david.beal&#64;akretion.com</a>&gt;</li>
-</ul>
-</div>
-<div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
-<p>This module is part of the <a class="reference external" href="https://github.com/akretion/odoo-usability/tree/12.0/base_usability">akretion/odoo-usability</a> project on GitHub.</p>
-<p>You are welcome to contribute.</p>
-</div>
-</div>
-</div>
-</body>
-</html>
--- a/base_usability/views/base_view.xml
+++ b/base_usability/views/base_view.xml
@@ -12,14 +12,4 @@
    </field>
 </record>

-<record id="view_sequence_search" model="ir.ui.view">
-    <field name="model">ir.sequence</field>
-    <field name="inherit_id" ref="base.view_sequence_search"/>
-    <field name="arch" type="xml">
-        <field name="name" position="after">
-            <field name="prefix"/>
-        </field>
-    </field>
-</record>
-
 </odoo>
--- a/base_usability/views/module_view.xml
+++ b/base_usability/views/module_view.xml
@@ -1,23 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2015-2019 Akretion France (http://www.akretion.com/)
+  © 2015-2016 Akretion (http://www.akretion.com/)
  @author: Alexis de Lattre <alexis.delattre@akretion.com>
  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->

 <odoo>

-<record id="module_view_kanban" model="ir.ui.view">
-    <field name="name">Better display of module technical name</field>
-    <field name="model">ir.module.module</field>
-    <field name="inherit_id" ref="base.module_view_kanban"/>
-    <field name="arch" type="xml">
-        <xpath expr="//h4[hasclass('o_kanban_record_title')]/code[@groups='base.group_no_one']" position="before">
-            <br/>
-        </xpath>
-    </field>
-</record>
-
 <record id="view_module_filter" model="ir.ui.view">
    <field name="model">ir.module.module</field>
    <field name="inherit_id" ref="base.view_module_filter"/>
@@ -35,5 +24,4 @@
    <field name="context">{'search_default_installable': 1}</field>
 </record>

-
 </odoo>
--- a/base_usability/views/partner_view.xml
+++ b/base_usability/views/partner_view.xml
@@ -12,6 +12,10 @@
    <field name="model">res.partner</field>
    <field name="inherit_id" ref="base.view_partner_form"/>
    <field name="arch" type="xml">
+        <!-- Wider 'name' field -->
+        <xpath expr="//sheet/div[hasclass('oe_title')]" position="attributes">
+            <attribute name="style">width: 650px;</attribute>
+        </xpath>
        <xpath expr="//field[@name='child_ids']/form//field[@name='email']" position="attributes">
            <attribute name="widget">email</attribute>
        </xpath>
@@ -57,9 +61,6 @@
            <!-- for 'ref', change '=' to 'start with' -->
            <attribute name="filter_domain">['|','|',('display_name','ilike',self),('ref','=ilike',self + '%'),('email','ilike',self)]</attribute>
        </field>
-        <filter name="inactive" position="before">
-            <separator/>
-        </filter>
    </field>
 </record>

--- a/delivery_usability/init.py
+++ b/delivery_usability/init.py
@@ -1 +0,0 @@
-from . import stock
--- a/delivery_usability/manifest.py
+++ b/delivery_usability/manifest.py
@@ -1,29 +0,0 @@
-# Copyright 2018-2019 Akretion (http://www.akretion.com)
-# @author Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-{
-    'name': 'Delivery Usability',
-    'version': '12.0.1.0.0',
-    'category': 'Stock',
-    'license': 'AGPL-3',
-    'summary': 'Several usability enhancements in Delivery',
-    'description': """
-Delivery Usability
-===================
-
-The usability enhancements include:
-* allow modification of carrier and it's tracking ref. on a done picking
-* display field 'invoice_shipping_on_delivery' on sale.order form view
-
-This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
-    """,
-    'author': 'Akretion',
-    'website': 'http://www.akretion.com',
-    'depends': ['delivery'],
-    'data': [
-        'sale_view.xml',
-        'stock_view.xml',
-        ],
-    'installable': True,
-}
--- a/delivery_usability/sale_view.xml
+++ b/delivery_usability/sale_view.xml
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2018-2019 Akretion
-  @author: Alexis de Lattre <alexis.delattre@akretion.com>
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
-
-<odoo>
-
-
-<record id="view_order_form_with_carrier" model="ir.ui.view">
-    <field name="name">delivery_usability.sale.order.form</field>
-    <field name="model">sale.order</field>
-    <field name="inherit_id" ref="delivery.view_order_form_with_carrier"/>
-    <field name="arch" type="xml">
-        <group name="sale_pay" position="inside">
-            <field name="invoice_shipping_on_delivery"/>
-        </group>
-    </field>
-</record>
-
-
-</odoo>
--- a/delivery_usability/stock.py
+++ b/delivery_usability/stock.py
@@ -1,12 +0,0 @@
-# Copyright 2018-2019 Akretion (http://www.akretion.com)
-# @author Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import fields, models
-
-
-class StockPicking(models.Model):
-    _inherit = 'stock.picking'
-
-    carrier_id = fields.Many2one(track_visibility='onchange')
-    carrier_tracking_ref = fields.Char(track_visibility='onchange')
--- a/delivery_usability/stock_view.xml
+++ b/delivery_usability/stock_view.xml
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2018 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
-
-<odoo>
-
-<record id="view_picking_withcarrier_out_form" model="ir.ui.view">
-    <field name="name">delivery_usability.stock.picking.form</field>
-    <field name="model">stock.picking</field>
-    <field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form"/>
-    <field name="arch" type="xml">
-        <field name="carrier_id" position="attributes">
-            <!-- Sometimes we have to modify carrier_id when state is done
-            so remove readonly when state = done from view and add tracking on_change in
-            field definition -->
-            <attribute name="attrs">{}</attribute>
-        </field>
-        <field name="carrier_tracking_ref" position="attributes">
-            <attribute name="attrs">{}</attribute>
-        </field>
-    </field>
-</record>
-
-</odoo>
--- a/developer_menu/menu_view.xml
+++ b/developer_menu/menu_view.xml
@@ -2,7 +2,7 @@

 <odoo>

-<menuitem id="conf_tech" parent="base.menu_administration" name="🧰" groups="base.group_erp_manager" sequence="1"/>
+<menuitem id="conf_tech" parent="base.menu_administration" name="🧰" groups="base.group_erp_manager" sequence="100"/>
 <menuitem id="model" name="Model" parent="conf_tech" action="base.action_model_model" sequence="10"/>
 <menuitem id="view" name="View" parent="conf_tech" action="base.action_ui_view" sequence="20" />
 <menuitem id="rec_rule" name="Record Rule" parent="conf_tech" action="base.action_rule" sequence="30" />
--- a/eradicate_quick_create/init.py
+++ b/eradicate_quick_create/init.py
@@ -1 +0,0 @@
-from .hooks import web_m2x_options_create
--- a/eradicate_quick_create/manifest.py
+++ b/eradicate_quick_create/manifest.py
@@ -1,25 +0,0 @@
-# Copyright 2014-2019 Akretion France (http://www.akretion.com)
-# @author Alexis de Lattre <alexis.delattre@akretion.com>
-
-{
-    'name': 'Eradicate Quick Create',
-    'version': '12.0.2.0.0',
-    'category': 'Tools',
-    'license': 'AGPL-3',
-    'summary': 'Disable quick create on all objects',
-    'description': """
-Eradicate Quick Create
-======================
-
-Disable quick create on all objects of Odoo.
-
-This new version of the module uses the module *web_m2x_options* from the OCA *web* project instead of the module *base_optional_quick_create* from the OCA project *server-ux*.
-
-This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
-    """,
-    'author': 'Akretion',
-    'website': 'http://www.akretion.com',
-    'depends': ['web_m2x_options'],
-    'post_init_hook': 'web_m2x_options_create',
-    'installable': True,
-}
--- a/eradicate_quick_create/hooks.py
+++ b/eradicate_quick_create/hooks.py
@@ -1,19 +0,0 @@
-# Copyright 2019 Akretion France
-# @author: Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import SUPERUSER_ID
-from odoo.api import Environment
-
-
-def web_m2x_options_create(cr, registry):
-    env = Environment(cr, SUPERUSER_ID, {})
-    config_parameter = env['ir.config_parameter'].search(
-        [('key', '=', 'web_m2x_options.create')])
-    if config_parameter and config_parameter.value != 'False':
-        config_parameter.value = 'False'
-    else:
-        env['ir.config_parameter'].create({
-            'key': 'web_m2x_options.create',
-            'value': 'False',
-            })
--- a/eradicate_quick_create/static/description/icon.png
+++ b/eradicate_quick_create/static/description/icon.png
--- a/intrastat_product_type/manifest.py
+++ b/intrastat_product_type/manifest.py
@@ -20,7 +20,8 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
    """,
    'author': 'Akretion',
    'website': 'http://www.akretion.com',
-    'depends': ['intrastat_product', 'l10n_fr_intrastat_service'],
+#    'depends': ['intrastat_product', 'l10n_fr_intrastat_service'],
+    'depends': ['intrastat_product'],
    'data': ['product_view.xml'],
    'post_init_hook': 'set_intrastat_type_on_products',
    'installable': True,
--- a/intrastat_product_type/intrastat_product_type.py
+++ b/intrastat_product_type/intrastat_product_type.py
@@ -60,14 +60,14 @@ class ProductTemplate(models.Model):
        return super(ProductTemplate, self).create(vals)


-class L10nFrIntrastatServiceDeclaration(models.Model):
-    _inherit = "l10n.fr.intrastat.service.declaration"
+#class L10nFrIntrastatServiceDeclaration(models.Model):
+#    _inherit = "l10n.fr.intrastat.service.declaration"

-    def _is_service(self, invoice_line):
-        if invoice_line.product_id.intrastat_type == 'service':
-            return True
-        else:
-            return False
+#    def _is_service(self, invoice_line):
+#        if invoice_line.product_id.intrastat_type == 'service':
+#            return True
+#        else:
+#            return False


 class IntrastatProductDeclaration(models.Model):
--- a/mail_usability/README.rst
+++ b/mail_usability/README.rst
@@ -1,19 +0,0 @@
-# Mail Usability
-
-Take back the control on your email
-
-## Feature
-
- do not follow automatically a object when sending an email
- better email preview, allow to select between the whole database object and not only the last 10
- use a light template version for notification without link (link should be explicit)
- add some additional style in the white list when santizing html field (see tools.py)
- make the email template by default not 'auto_delete'
-
-## TIPS
-
-Never, never tick the 'auto_delete' on mail template because it fucking hard to debug
-and understand what have been sent (we should create a module with a crontask, that drop them latter)
-
-If the template of mail do not look like the same when saving it in odoo, maybe the sanitize style have drop some balise
-please run odoo with "LOG_STYLE_SANITIZE=True odoo" to understand what have been drop, magic warning logger will tell you everthing
--- a/mail_usability/init.py
+++ b/mail_usability/init.py
@@ -1,2 +0,0 @@
-from . import models
-from . import wizard
--- a/mail_usability/manifest.py
+++ b/mail_usability/manifest.py
@@ -1,33 +0,0 @@
-# Copyright 2020 Akretion France (http://www.akretion.com)
-# @author Benoît Guillot <benoit.guillot@akretion.com>
-# @author Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-{
-    'name': 'Mail Usability',
-    'version': '12.0.1.0.0',
-    'category': 'Base',
-    'license': 'AGPL-3',
-    'summary': 'Usability improvements on mails',
-    'description': """
-Mail Usability
-==============
-
-Small usability improvements on mails:
-
-* remove link in mail footer
-
-* remove 'sent by' in notification footer
-
-* add a new entry *All Messages Except Notifications* to the field *Receive Inbox Notifications by Email* of partners (becomes the default value)
-    """,
-    'author': 'Akretion',
-    'website': 'http://www.akretion.com',
-    'depends': ['mail'],
-    'data': [
-        'views/mail_view.xml',
-        'data/mail_data.xml',
-        'wizard/email_template_preview_view.xml',
-    ],
-    'installable': True,
-}
--- a/mail_usability/data/mail_data.xml
+++ b/mail_usability/data/mail_data.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo noupdate="1">
-    
-    <!--Default Notification Email template -->
-    <record id="mail_template_notification" model="mail.template">
-        <field name="name">Notification Email</field>
-        <field name="subject">${object.subject}</field>
-        <field name="model_id" ref="mail.model_mail_message"/>
-        <field name="auto_delete" eval="True"/>
-        <field name="body_html">${object.body | safe}</field>
-    </record>
-
-        <template id="message_notification_email_usability">
-<div t-raw="message.body"/>
-        </template>
-
-
-</odoo>
--- a/mail_usability/models/init.py
+++ b/mail_usability/models/init.py
@@ -1,5 +0,0 @@
-from . import mail
-from . import tools
-from . import mail_template
-from . import mail_message
-from . import res_partner
--- a/mail_usability/models/mail.py
+++ b/mail_usability/models/mail.py
@@ -1,36 +0,0 @@
-# Copyright 2016-2017 Akretion France (http://www.akretion.com)
-# @author: Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-
-from odoo import models, api
-import logging
-_logger = logging.getLogger(__name__)
-
-
-class MailThread(models.AbstractModel):
-    _inherit = 'mail.thread'
-
-    def _active_message_auto_subscribe_notify(self):
-        _logger.debug('Skip automatic subscribe notification')
-        return False
-
-    def _message_auto_subscribe_notify(self, partner_ids, template):
-        if self._active_message_auto_subscribe_notify():
-            return super(MailThread, self)._message_auto_subscribe_notify(
-                partner_ids, template)
-        else:
-            return True
-
-    @api.multi
-    @api.returns('self', lambda value: value.id)
-    def message_post(self, body='', subject=None, message_type='notification',
-                     subtype=None, parent_id=False, attachments=None,
-                     content_subtype='html', **kwargs):
-        if not 'mail_create_nosubscribe' in self._context:
-            # Do not implicitly follow an object by just sending a message
-            self = self.with_context(mail_create_nosubscribe=True)
-        return super(MailThread, self).message_post(
-            body=body, subject=subject, message_type=message_type,
-            subtype=subtype, parent_id=parent_id, attachments=attachments,
-            content_subtype=content_subtype, **kwargs)
--- a/mail_usability/models/mail_message.py
+++ b/mail_usability/models/mail_message.py
@@ -1,19 +0,0 @@
-# Copyright 2019 Akretion France (http://www.akretion.com)
-# @author Sébastien BEAU <sebastien.beau@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import models
-
-
-class MailMessage(models.Model):
-    _inherit = 'mail.message'
-
-    @property
-    def record_id(self):
-        # we do not use a reference field here as mail message
-        # are used everywhere and many model are not yet loaded
-        # so odoo raise exception
-        if self:
-            self.ensure_one()
-            return self.env[self.model].browse(self.res_id)
-        return None
--- a/mail_usability/models/mail_template.py
+++ b/mail_usability/models/mail_template.py
@@ -1,11 +0,0 @@
-# Copyright 2018 Akretion France (http://www.akretion.com)
-# @author Sébastien BEAU <sebastien.beau@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from openerp import fields, models
-
-
-class MailTemplate(models.Model):
-    _inherit = 'mail.template'
-
-    auto_delete = fields.Boolean(default=False)
--- a/mail_usability/models/res_partner.py
+++ b/mail_usability/models/res_partner.py
@@ -1,27 +0,0 @@
-# Copyright 2016-2019 Akretion France (http://www.akretion.com)
-# @author Sébastien BEAU <sebastien.beau@akretion.com>
-# @author: Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import models, fields, api
-
-
-class ResPartner(models.Model):
-    _inherit = 'res.partner'
-
-    opt_out = fields.Boolean(track_visibility='onchange')
-
-    @api.model
-    def _notify(self, message, rdata, record, force_send=False,
-                send_after_commit=True, model_description=False,
-                mail_auto_delete=True):
-        # use an empty layout for notification by default
-        if not message.layout:
-            message.layout = 'mail_usability.message_notification_email_usability'
-        # Never auto delete notification email
-        # fucking to hard to debug when message have been delete
-        mail_auto_delete = False
-        return super(ResPartner, self)._notify(
-            message=message, rdata=rdata, record=record,
-            force_send=force_send, send_after_commit=send_after_commit,
-            model_description=model_description, mail_auto_delete=mail_auto_delete)
--- a/mail_usability/models/tools.py
+++ b/mail_usability/models/tools.py
@@ -1,43 +0,0 @@
-# Copyright 2018 Akretion France (http://www.akretion.com)
-# @author Sébastien BEAU <sebastien.beau@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo.tools.mail import _Cleaner
-import os
-import logging
-_logger = logging.getLogger(__name__)
-
-_Cleaner._style_whitelist += [
-    'word-wrap',
-    'display'
-    'border-top',
-    'border-bottom',
-    'border-left',
-    'border-right',
-    'text-transform',
-    ]
-
-
-if os.getenv('LOG_STYLE_SANITIZE'):
-    # Monkey patch the parse style method to debug
-    # the missing style
-    def parse_style(self, el):
-        attributes = el.attrib
-        styling = attributes.get('style')
-        if styling:
-            valid_styles = {}
-            styles = self._style_re.findall(styling)
-            for style in styles:
-                if style[0].lower() in self._style_whitelist:
-                    valid_styles[style[0].lower()] = style[1]
-                # START HACK
-                else:
-                    _logger.warning('Remove style %s %s', *style)
-                # END HACK
-            if valid_styles:
-                el.attrib['style'] = '; '.join(
-			'%s:%s' % (key, val)
-			for (key, val) in valid_styles.iteritems())
-            else:
-                del el.attrib['style']
-    _Cleaner.parse_style = parse_style
--- a/mail_usability/static/description/icon.png
+++ b/mail_usability/static/description/icon.png
--- a/mail_usability/views/mail_view.xml
+++ b/mail_usability/views/mail_view.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="view_mail_tree" model="ir.ui.view">
-        <field name="model">mail.mail</field>
-        <field name="inherit_id" ref="mail.view_mail_tree"/>
-        <field name="arch" type="xml">
-            <field name="email_from" position="replace"/>
-            <field name="date" position="after">
-                <field name="email_from"/>
-                <field name="email_to"/>
-            </field>
-        </field>
-    </record>
-
-</odoo>
--- a/mail_usability/wizard/init.py
+++ b/mail_usability/wizard/init.py
@@ -1 +0,0 @@
-from . import email_template_preview
--- a/mail_usability/wizard/email_template_preview.py
+++ b/mail_usability/wizard/email_template_preview.py
@@ -1,43 +0,0 @@
-# Copyright 2019 Akretion France (http://www.akretion.com)
-# @author Sébastien BEAU <sebastien.beau@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from openerp import api, fields, models
-
-
-class TemplatePreview(models.TransientModel):
-    _inherit = "email_template.preview"
-
-    res_id = fields.Integer(compute='_compute_res_id')
-    object_id = fields.Reference(selection='_reference_models')
-
-    @api.model
-    def default_get(self, fields):
-        result = super(TemplatePreview, self).default_get(fields)
-        if result.get('model_id'):
-            model = self.env['ir.model'].browse(result['model_id'])
-            result['object_id'] = model.model
-        return result
-
-    def _reference_models(self):
-        result = self.default_get(['model_id'])
-        if result.get('model_id'):
-            model = self.env['ir.model'].browse(result['model_id'])
-            return [(model.model, model.name)]
-        else:
-            ir_models = self.env['ir.model'].search([('state', '!=', 'manual')])
-            return [(ir_model.model, ir_model.name)
-                    for ir_model in ir_models
-                    if not ir_model.model.startswith('ir.')]
-
-    @api.depends('object_id')
-    def _compute_res_id(self):
-        for record in self:
-            if self.object_id:
-                record.res_id = self.object_id.id
-
-    def send(self):
-        template = self.env['mail.template'].browse(
-            self._context['template_id'])
-        template.send_mail(
-            self.res_id, force_send=True, raise_exception=True)
--- a/mail_usability/wizard/email_template_preview_view.xml
+++ b/mail_usability/wizard/email_template_preview_view.xml
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-
-    <record id="email_template_preview_form" model="ir.ui.view">
-        <field name="model">email_template.preview</field>
-        <field name="inherit_id" ref="mail.email_template_preview_form"/>
-        <field name="arch" type="xml">
-            <field name="res_id" position="attributes">
-                <attribute name="invisible">True</attribute>
-            </field>
-            <field name="res_id" position="after">
-                <field name="object_id"/>
-            </field>
-            <footer position="inside">
-                <button
-                    string="Send"
-                    name="send"
-                    class="btn-primary"
-                    type='object'/>
-            </footer>
-        </field>
-    </record>
-
-</odoo>
--- a/mrp_average_cost/init.py
+++ b/mrp_average_cost/init.py
@@ -1,3 +1 @@
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from . import models
+from . import mrp
--- a/mrp_average_cost/manifest.py
+++ b/mrp_average_cost/manifest.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright (C) 2016-2019 Akretion (http://www.akretion.com)
 # @author Alexis de Lattre <alexis.delattre@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
@@ -24,10 +25,10 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
    'website': 'http://www.akretion.com',
    'depends': ['mrp'],
    'data': [
-        'security/mrp_average_cost_security.xml',
+        'mrp_view.xml',
+        'mrp_data.xml',
+        'security/labour_cost_profile_security.xml',
        'security/ir.model.access.csv',
-        'data/mrp_data.xml',
-        'views/mrp_view.xml',
        ],
    'installable': True,
 }
--- a/mrp_average_cost/models/init.py
+++ b/mrp_average_cost/models/init.py
@@ -1,3 +0,0 @@
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from . import mrp
--- a/mrp_average_cost/models/mrp.py
+++ b/mrp_average_cost/models/mrp.py
@@ -1,274 +0,0 @@
-# Copyright (C) 2016-2019 Akretion (http://www.akretion.com)
-# @author Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import models, fields, api, _
-import odoo.addons.decimal_precision as dp
-from odoo.exceptions import UserError
-from odoo.tools import float_compare, float_is_zero
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class MrpBomLabourLine(models.Model):
-    _name = 'mrp.bom.labour.line'
-    _description = 'Labour lines on BOM'
-
-    bom_id = fields.Many2one(
-        comodel_name='mrp.bom',
-        string='Bill of Material',
-        ondelete='cascade')
-
-    labour_time = fields.Float(
-        string='Labour Time',
-        required=True,
-        digits=dp.get_precision('Labour Hours'),
-        help="Average labour time for the production of "
-             "items of the BOM, in hours.")
-
-    labour_cost_profile_id = fields.Many2one(
-        comodel_name='labour.cost.profile',
-        string='Labour Cost Profile',
-        required=True)
-
-    note = fields.Text(
-        string='Note')
-
-    _sql_constraints = [(
-        'labour_time_positive',
-        'CHECK (labour_time >= 0)',
-        "The value of the field 'Labour Time' must be positive or 0.")]
-
-
-class MrpBom(models.Model):
-    _inherit = 'mrp.bom'
-
-    @api.depends(
-        'labour_line_ids.labour_time',
-        'labour_line_ids.labour_cost_profile_id.hour_cost')
-    def _compute_total_labour_cost(self):
-        for bom in self:
-            cost = 0.0
-            for lline in bom.labour_line_ids:
-                cost += lline.labour_time *\
-                    lline.labour_cost_profile_id.hour_cost
-            bom.total_labour_cost = cost
-
-    @api.depends(
-        'bom_line_ids.product_id.standard_price',
-        'total_labour_cost', 'extra_cost')
-    def _compute_total_cost(self):
-        for bom in self:
-            comp_cost = 0.0
-            for line in bom.bom_line_ids:
-                comp_price = line.product_id.standard_price
-                comp_qty_product_uom = line.product_uom_id._compute_quantity(
-                    line.product_qty, line.product_id.uom_id)
-                comp_cost += comp_price * comp_qty_product_uom
-            total_cost = comp_cost + bom.extra_cost + bom.total_labour_cost
-            bom.total_components_cost = comp_cost
-            bom.total_cost = total_cost
-
-    labour_line_ids = fields.One2many(
-        'mrp.bom.labour.line', 'bom_id', string='Labour Lines')
-    total_labour_cost = fields.Float(
-        compute='_compute_total_labour_cost', readonly=True,
-        digits=dp.get_precision('Product Price'),
-        string="Total Labour Cost", store=True, track_visibility='onchange')
-    extra_cost = fields.Float(
-        string='Extra Cost', track_visibility='onchange',
-        digits=dp.get_precision('Product Price'),
-        help="Extra cost for the production of the quantity of "
-        "items of the BOM, in company currency. "
-        "You can use this field to enter the cost of the consumables "
-        "that are used to produce the product but are not listed in "
-        "the BOM")
-    total_components_cost = fields.Float(
-        compute='_compute_total_cost', readonly=True,
-        digits=dp.get_precision('Product Price'),
-        string='Total Components Cost')
-    total_cost = fields.Float(
-        compute='_compute_total_cost', readonly=True,
-        string='Total Cost',
-        digits=dp.get_precision('Product Price'),
-        help="Total Cost = Total Components Cost + "
-        "Total Labour Cost + Extra Cost")
-    company_currency_id = fields.Many2one(
-        related='company_id.currency_id', string='Company Currency')
-
-    @api.model
-    def _phantom_update_product_standard_price(self):
-        logger.info('Start to auto-update cost price from phantom bom')
-        boms = self.search([('type', '=', 'phantom')])
-        boms.with_context(
-            product_price_history_origin='Automatic update of Phantom BOMs')\
-            .manual_update_product_standard_price()
-        logger.info('End of the auto-update cost price from phantom bom')
-        return True
-
-    def manual_update_product_standard_price(self):
-        if 'product_price_history_origin' not in self._context:
-            self = self.with_context(
-                product_price_history_origin='Manual update from BOM')
-        precision = self.env['decimal.precision'].precision_get(
-            'Product Price')
-        for bom in self:
-            wproduct = bom.product_id
-            if not wproduct:
-                wproduct = bom.product_tmpl_id
-            bom_cost_per_unit_in_product_uom = 0
-            qty_product_uom = bom.product_uom_id._compute_quantity(bom.product_qty, wproduct.uom_id)
-            if qty_product_uom:
-                bom_cost_per_unit_in_product_uom = bom.total_cost / qty_product_uom
-            if float_compare(
-                    wproduct.standard_price, bom_cost_per_unit_in_product_uom,
-                    precision_digits=precision):
-                wproduct.with_context().write(
-                    {'standard_price': bom_cost_per_unit_in_product_uom})
-                logger.info(
-                    'Cost price updated to %s on product %s',
-                    bom_cost_per_unit_in_product_uom, wproduct.display_name)
-
-
-class MrpBomLine(models.Model):
-    _inherit = 'mrp.bom.line'
-
-    standard_price = fields.Float(
-        related='product_id.standard_price',
-        readonly=True,
-        string='Standard Price')
-
-
-class LabourCostProfile(models.Model):
-    _name = 'labour.cost.profile'
-    _inherit = ['mail.thread']
-    _description = 'Labour Cost Profile'
-
-    name = fields.Char(
-        string='Name',
-        required=True,
-        track_visibility='onchange')
-
-    hour_cost = fields.Float(
-        string='Cost per Hour',
-        required=True,
-        digits=dp.get_precision('Product Price'),
-        track_visibility='onchange',
-        help="Labour cost per hour per person in company currency")
-
-    company_id = fields.Many2one(
-        comodel_name='res.company',
-        string='Company',
-        required=True,
-        default=lambda self: self.env['res.company']._company_default_get())
-
-    company_currency_id = fields.Many2one(
-        related='company_id.currency_id',
-        readonly=True,
-        store=True,
-        string='Company Currency')
-
-    @api.depends('name', 'hour_cost', 'company_currency_id.symbol')
-    def name_get(self):
-        res = []
-        for record in self:
-            res.append((record.id, u'%s (%s %s)' % (
-                record.name, record.hour_cost,
-                record.company_currency_id.symbol)))
-        return res
-
-
-class MrpProduction(models.Model):
-    _inherit = 'mrp.production'
-
-    unit_cost = fields.Float(
-        string='Unit Cost', readonly=True,
-        digits=dp.get_precision('Product Price'),
-        help="This cost per unit in the unit of measure of the product "
-        "in company currency takes into account "
-        "the cost of the raw materials and the labour cost defined on"
-        "the BOM.")
-
-    company_currency_id = fields.Many2one(
-        related='company_id.currency_id', readonly=True,
-        string='Company Currency')
-
-    def compute_order_unit_cost(self):
-        self.ensure_one()
-        mo_total_price = 0.0  # In the UoM of the M0
-        labor_cost_per_unit = 0.0  # In the UoM of the product
-        extra_cost_per_unit = 0.0  # In the UoM of the product
-        subcontract_cost_per_unit = 0.0
-        # I read the raw materials MO, not on BOM, in order to make
-        # it work with the "dynamic" BOMs (few raw material are auto-added
-        # on the fly on MO)
-        prec = self.env['decimal.precision'].precision_get(
-            'Product Unit of Measure')
-        for raw_smove in self.move_raw_ids:
-            # I don't filter on state, in order to make it work with
-            # partial productions
-            # For partial productions, mo.product_qty is not updated
-            # so we compute with fully qty and we compute with all raw
-            # materials (consumed or not), so it gives a good price
-            # per unit at the end
-            raw_price = raw_smove.product_id.standard_price
-            raw_material_cost = raw_price * raw_smove.product_qty
-            logger.info(
-                'MO %s product %s: raw_material_cost=%s',
-                self.name, raw_smove.product_id.display_name,
-                raw_material_cost)
-            mo_total_price += raw_material_cost
-        if self.bom_id:
-            bom = self.bom_id
-            # if not bom.total_labour_cost:
-            #    raise orm.except_orm(
-            #        _('Error:'),
-            #        _("Total Labor Cost is 0 on bill of material '%s'.")
-            #        % bom.name)
-            if float_is_zero(bom.product_qty, precision_digits=prec):
-                raise UserError(_(
-                    "Missing Product Quantity on bill of material '%s'.")
-                    % bom.display_name)
-            bom_qty_product_uom = bom.product_uom_id._compute_quantity(
-                bom.product_qty, bom.product_tmpl_id.uom_id)
-            assert bom_qty_product_uom > 0, 'BoM qty should be positive'
-            labor_cost_per_unit = bom.total_labour_cost / bom_qty_product_uom
-            extra_cost_per_unit = bom.extra_cost / bom_qty_product_uom
-            if bom.type == 'subcontract':
-                one_finished_move = self.env['stock.move'].search([
-                    ('production_id', '=', self.id),
-                    ('product_id', '=', self.product_id.id),
-                    ('move_dest_ids', '!=', False)], limit=1)
-                if one_finished_move:
-                    subcontract_cost_per_unit = one_finished_move.move_dest_ids[0].price_unit
-        # mo_standard_price and labor_cost_per_unit are
-        # in the UoM of the product (not of the MO/BOM)
-        mo_qty_product_uom = self.product_uom_id._compute_quantity(
-            self.product_qty, self.product_id.uom_id)
-        assert mo_qty_product_uom > 0, 'MO qty should be positive'
-        mo_standard_price = mo_total_price / mo_qty_product_uom
-        logger.info(
-            'MO %s: labor_cost_per_unit=%s extra_cost_per_unit=%s '
-            'subcontract_cost_per_unit=%s',
-            self.name, labor_cost_per_unit, extra_cost_per_unit,
-            subcontract_cost_per_unit)
-        mo_standard_price += labor_cost_per_unit
-        mo_standard_price += extra_cost_per_unit
-        mo_standard_price += subcontract_cost_per_unit
-        return mo_standard_price
-
-    def post_inventory(self):
-        '''This is the method where _action_done() is called on finished move
-        So we write on 'price_unit' of the finished move and THEN we call
-        super() which will call _action_done() which itself calls
-        product_price_update_before_done()'''
-        for order in self:
-            if order.product_id.cost_method == 'average':
-                unit_cost = order.compute_order_unit_cost()
-                order.write({'unit_cost': unit_cost})
-                logger.info('MO %s: unit_cost=%s', order.name, unit_cost)
-                order.move_finished_ids.filtered(
-                    lambda x: x.product_id == order.product_id).write({
-                        'price_unit': unit_cost})
-        return super(MrpProduction, self).post_inventory()
--- a/mrp_average_cost/mrp.py
+++ b/mrp_average_cost/mrp.py
@@ -0,0 +1,288 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2016-2019 Akretion (http://www.akretion.com)
+# @author Alexis de Lattre <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models, fields, api, _
+import odoo.addons.decimal_precision as dp
+from odoo.tools import float_compare, float_is_zero
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class MrpBomLabourLine(models.Model):
+    _name = 'mrp.bom.labour.line'
+    _description = 'Labour lines on BOM'
+
+    bom_id = fields.Many2one(
+        'mrp.bom', string='Labour Lines', ondelete='cascade')
+    labour_time = fields.Float(
+        string='Labour Time', required=True,
+        digits=dp.get_precision('Labour Hours'),
+        help="Average labour time for the production of "
+        "items of the BOM, in hours.")
+    labour_cost_profile_id = fields.Many2one(
+        'labour.cost.profile', string='Labour Cost Profile', required=True)
+    note = fields.Text(string='Note')
+
+    _sql_constraints = [(
+        'labour_time_positive',
+        'CHECK (labour_time >= 0)',
+        "The value of the field 'Labour Time' must be positive or 0.")]
+
+
+class MrpBom(models.Model):
+    _inherit = 'mrp.bom'
+
+    @api.depends('labour_line_ids.labour_time', 'labour_line_ids.labour_cost_profile_id.hour_cost')
+    def _compute_total_labour_cost(self):
+        for bom in self:
+            cost = 0.0
+            for lline in bom.labour_line_ids:
+                cost += lline.labour_time * lline.labour_cost_profile_id.hour_cost
+            bom.total_labour_cost = cost
+
+    @api.depends('bom_line_ids.product_id.standard_price', 'total_labour_cost', 'extra_cost')
+    def _compute_total_cost(self):
+        puo = self.pool['product.uom']
+        for bom in self:
+            component_cost = 0.0
+            for line in bom.bom_line_ids:
+                component_price = line.product_id.standard_price
+                component_qty_product_uom = puo._compute_qty_obj(
+                    cr, uid, line.product_uom, line.product_qty,
+                    line.product_id.uom_id, context=context)  # TODO
+                component_cost += component_price * component_qty_product_uom
+            total_cost = component_cost + bom.extra_cost + bom.total_labour_cost
+            bom.total_components_cost = component_cost
+            bom.total_cost = total_cost
+
+    labour_line_ids = fields.One2many(
+        'mrp.bom.labour.line', 'bom_id', string='Labour Lines')
+    total_labour_cost = fields.Float(
+        compute='_compute_total_labour_cost', readonly=True,
+        digits=dp.get_precision('Product Price'),
+        string="Total Labour Cost", store=True)
+    extra_cost = fields.Float(
+        string='Extra Cost', track_visibility='onchange',
+        digits=dp.get_precision('Product Price'),
+        help="Extra cost for the production of the quantity of "
+        "items of the BOM, in company currency. "
+        "You can use this field to enter the cost of the consumables "
+        "that are used to produce the product but are not listed in "
+        "the BOM")
+    total_components_cost = fields.Float(
+        compute='_compute_total_cost', readonly=True,
+        digits=dp.get_precision('Product Price'),
+        string='Total Components Cost')
+    total_cost = fields.Float(
+        compute='_compute_total_cost', readonly=True,
+        string='Total Cost',
+        digits=dp.get_precision('Product Price'),
+        help="Total Cost = Total Components Cost + "
+        "Total Labour Cost + Extra Cost")
+    company_currency_id = fields.Many2one(
+        related='company_id.currency_id', readonly=True,
+        string='Company Currency')
+        # to display in bom lines
+
+class MrpBomLine(models.Model):
+    _inherit = 'mrp.bom.line'
+
+    standard_price = fields.Float(
+        related='product_id.standard_price', readonly=True,
+        string='Standard Price')
+
+    def manual_update_product_standard_price(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        ctx = context.copy()
+        if 'product_price_history_origin' not in ctx:
+            ctx['product_price_history_origin'] = u'Manual update from BOM'
+        precision = self.pool['decimal.precision'].precision_get(
+            cr, uid, 'Product Price')
+        for bom in self.browse(cr, uid, ids, context=context):
+            if not bom.product_id:
+                continue
+            if float_compare(
+                    bom.product_id.standard_price, bom.total_cost,
+                    precision_digits=precision):
+                bom.product_id.write(
+                        {'standard_price': bom.total_cost}, context=ctx)
+                logger.info(
+                    'Cost price updated to %s on product %s',
+                    bom.total_cost, bom.product_id.name_get()[0][1])
+        return True
+
+    def _phantom_update_product_standard_price(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        ctx = context.copy()
+        ctx['product_price_history_origin'] = 'Automatic update of Phantom BOMs'
+        mbo = self.pool['mrp.bom']
+        bom_ids = mbo.search(
+            cr, uid, [('type', '=', 'phantom')], context=context)
+        self.manual_update_product_standard_price(
+            cr, uid, bom_ids, context=ctx)
+        return True
+
+
+class LabourCostProfile(models.Model):
+    _name = 'labour.cost.profile'
+    _inherit = ['mail.thread']
+    _description = 'Labour Cost Profile'
+
+    name = fields.Char(
+        string='Name', required=True, track_visibility='onchange')
+    hour_cost = fields.Float(
+        string='Cost per Hour', required=True,
+        digits=dp.get_precision('Product Price'),
+        track_visibility='onchange',
+        help="Labour cost per hour per person in company currency")
+    company_id = fields.Many2one(
+        'res.company', string='Company', required=True,
+        default=lambda self: self.env['res.company']._company_default_get())
+    company_currency_id = fields.Many2one(
+        related='company_id.currency_id', readonly=True, store=True,
+        string='Company Currency')
+
+    @api.depends('name', 'hour_cost', 'company_currency_id.symbol')
+    def name_get(self):
+        res = []
+        for record in self:
+            res.append((record.id, u'%s (%s %s)' % (
+                record.name, record.hour_cost,
+                record.company_currency_id.symbol)))
+        return res
+
+
+class MrpProduction(models.Model):
+    _inherit = 'mrp.production'
+
+    unit_cost = fields.Float(
+        string='Unit Cost', readonly=True,
+        digits=dp.get_precision('Product Price'),
+        help="This cost per unit in the unit of measure of the product "
+        "in company currency takes into account "
+        "the cost of the raw materials and the labour cost defined on"
+        "the BOM.")
+    company_currency_id = fields.Many2one(
+        related='company_id.currency_id', readonly=True,
+        string='Company Currency')
+
+    # TODO port to v12
+    def compute_order_unit_cost(self, cr, uid, order, context=None):
+        puo = self.pool['product.uom']
+        mo_total_price = 0.0  # In the UoM of the M0
+        labor_cost_per_unit = 0.0  # In the UoM of the product
+        extra_cost_per_unit = 0.0  # In the UoM of the product
+        # I read the raw materials MO, not on BOM, in order to make
+        # it work with the "dynamic" BOMs (few raw material are auto-added
+        # on the fly on MO)
+        for raw_smove in order.move_lines + order.move_lines2:
+            # I don't filter on state, in order to make it work with
+            # partial productions
+            # For partial productions, mo.product_qty is not updated
+            # so we compute with fully qty and we compute with all raw
+            # materials (consumed or not), so it gives a good price
+            # per unit at the end
+            raw_price = raw_smove.product_id.standard_price
+            raw_qty_product_uom = puo._compute_qty_obj(
+                cr, uid, raw_smove.product_uom, raw_smove.product_qty,
+                raw_smove.product_id.uom_id, context=context)
+            raw_material_cost = raw_price * raw_qty_product_uom
+            logger.info(
+                'MO %s product %s: raw_material_cost=%s',
+                order.name, raw_smove.product_id.name, raw_material_cost)
+            mo_total_price += raw_material_cost
+        if order.bom_id:
+            bom = order.bom_id
+            #if not bom.total_labour_cost:
+            #    raise orm.except_orm(
+            #        _('Error:'),
+            #        _("Total Labor Cost is 0 on bill of material '%s'.")
+            #        % bom.name)
+            if not bom.product_qty:
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("Missing Product Quantity on bill of material '%s'.")
+                    % bom.name)
+            bom_qty_product_uom = puo._compute_qty_obj(
+                cr, uid, bom.product_uom, bom.product_qty,
+                bom.product_id.uom_id, context=context)
+            assert bom_qty_product_uom > 0, 'BoM qty should be positive'
+            labor_cost_per_unit = bom.total_labour_cost / bom_qty_product_uom
+            extra_cost_per_unit = bom.extra_cost / bom_qty_product_uom
+        # mo_standard_price and labor_cost_per_unit are
+        # in the UoM of the product (not of the MO/BOM)
+        mo_qty_product_uom = puo._compute_qty_obj(
+            cr, uid, order.product_uom, order.product_qty,
+            order.product_id.uom_id, context=context)
+        assert mo_qty_product_uom > 0, 'MO qty should be positive'
+        mo_standard_price = mo_total_price / mo_qty_product_uom
+        logger.info(
+            'MO %s: labor_cost_per_unit=%s', order.name, labor_cost_per_unit)
+        logger.info(
+            'MO %s: extra_cost_per_unit=%s', order.name, extra_cost_per_unit)
+        mo_standard_price += labor_cost_per_unit
+        mo_standard_price += extra_cost_per_unit
+        order.write({'unit_cost': mo_standard_price}, context=context)
+        logger.info(
+            'MO %s: unit_cost=%s', order.name, mo_standard_price)
+        return mo_standard_price
+
+    def update_standard_price(self, cr, uid, order, context=None):
+        if context is None:
+            context = {}
+        puo = self.pool['product.uom']
+        product = order.product_id
+        mo_standard_price = self.compute_order_unit_cost(
+            cr, uid, order, context=context)
+        mo_qty_product_uom = puo._compute_qty_obj(
+            cr, uid, order.product_uom, order.product_qty,
+            order.product_id.uom_id, context=context)
+        # I can't use the native method _update_average_price of stock.move
+        # because it only works on move.picking_id.type == 'in'
+        # As we do the super() at the END of this method,
+        # the qty produced by this MO in NOT counted inside
+        # product.qty_available
+        qty_before_mo = product.qty_available
+        logger.info(
+            'MO %s product %s: standard_price before production: %s',
+            order.name, product.name, product.standard_price)
+        logger.info(
+            'MO %s product %s: qty before production: %s',
+            order.name, product.name, qty_before_mo)
+        # Here, we handle as if we were in v8 (!)
+        # so we consider that standard_price is in company currency
+        # It will not work if you are in multi-company environment
+        # with companies in different currencies
+        if not qty_before_mo + mo_qty_product_uom:
+            new_std_price = mo_standard_price
+        else:
+            new_std_price = (
+                (product.standard_price * qty_before_mo) +
+                (mo_standard_price * mo_qty_product_uom)) / \
+                (qty_before_mo + mo_qty_product_uom)
+        ctx_product = context.copy()
+        ctx_product['product_price_history_origin'] = _(
+            '%s (Qty before: %s - Added qty: %s - Unit price of '
+            'added qty: %s)') % (
+            order.name, qty_before_mo, mo_qty_product_uom, mo_standard_price)
+        product.write({'standard_price': new_std_price}, context=ctx_product)
+        logger.info(
+            'MO %s product %s: standard_price updated to %s',
+            order.name, product.name, new_std_price)
+        return True
+
+    def action_produce(
+            self, cr, uid, production_id, production_qty, production_mode,
+            context=None):
+        if production_mode == 'consume_produce':
+            order = self.browse(cr, uid, production_id, context=context)
+            if order.product_id.cost_method == 'average':
+                self.update_standard_price(cr, uid, order, context=context)
+        return super(MrpProduction, self).action_produce(
+            cr, uid, production_id, production_qty, production_mode,
+            context=context)
--- a/mrp_average_cost/data/mrp_data.xml
+++ b/mrp_average_cost/data/mrp_data.xml
@@ -16,7 +16,6 @@
    <field name="numbercall">-1</field> <!-- don't limit the number of calls -->
    <field name="doall" eval="False"/>
    <field name="model_id" ref="mrp.model_mrp_bom"/>
-    <field name="state">code</field>
    <field name="code">model._phantom_update_product_standard_price()</field>
 </record>

--- a/mrp_average_cost/views/mrp_view.xml
+++ b/mrp_average_cost/views/mrp_view.xml
@@ -37,7 +37,7 @@
                </group>
            </page>
        </notebook>
-        <xpath expr="//field[@name='bom_line_ids']/tree/field[@name='operation_id']" position="after">
+        <xpath expr="//field[@name='bom_line_ids']/tree/field[@name='product_uom_id']" position="after">
            <field name="standard_price"/>
        </xpath>
    </field>
--- a/mrp_average_cost/security/ir.model.access.csv
+++ b/mrp_average_cost/security/ir.model.access.csv
@@ -1,7 +1,9 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_labour_cost_profile_read,Read access on labour.cost.profile to MRP user,model_labour_cost_profile,mrp.group_mrp_user,1,0,0,0
+access_labour_cost_profile_read_sale,Read access on labour.cost.profile to Sale user,model_labour_cost_profile,sales_team.group_sale_salesman,1,0,0,0
 access_labour_cost_profile_read_stock,Read access on labour.cost.profile to Stock user,model_labour_cost_profile,stock.group_stock_user,1,0,0,0
 access_labour_cost_profile_full,Full access on labour.cost.profile to MRP manager,model_labour_cost_profile,mrp.group_mrp_manager,1,1,1,1
 access_mrp_bom_labour_line_read,Read access on mrp.bom.labour.line to MRP user,model_mrp_bom_labour_line,mrp.group_mrp_user,1,0,0,0
+access_mrp_bom_labour_line_read_sale,Read access on mrp.bom.labour.line to Sale user,model_mrp_bom_labour_line,sales_team.group_sale_salesman,1,0,0,0
 access_mrp_bom_labour_line_read_stock,Read access on mrp.bom.labour.line to Stock user,model_mrp_bom_labour_line,stock.group_stock_user,1,0,0,0
 access_mrp_bom_labour_line_full,Full access on mrp.bom.labour.line to MRP manager,model_mrp_bom_labour_line,mrp.group_mrp_manager,1,1,1,1
--- a/mrp_average_cost/security/labour_cost_profile_security.xml
+++ b/mrp_average_cost/security/labour_cost_profile_security.xml
--- a/mrp_no_product_template_menu/manifest.py
+++ b/mrp_no_product_template_menu/manifest.py
@@ -1,5 +1,4 @@
-# Copyright 2016-2019 Akretion France (http://www.akretion.com/)
-# @author: Alexis de Lattre <alexis.delattre@akretion.com>
+# © 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

 {
--- a/mrp_no_product_template_menu/mrp_view.xml
+++ b/mrp_no_product_template_menu/mrp_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2016-2019 Akretion France (http://www.akretion.com/)
-  @author: Alexis de Lattre <alexis.delattre@akretion.com>
+  © 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->

--- a/mrp_product_tree_default/init.py
+++ b/mrp_product_tree_default/init.py
--- a/mrp_product_tree_default/manifest.py
+++ b/mrp_product_tree_default/manifest.py
@@ -1,22 +0,0 @@
-# © 2019 Akretion (http://www.akretion.com)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-
-{
-    'name': 'MRP Product Tree Default',
-    'version': '12.0.1.0.0',
-    'category': 'Product',
-    'license': 'AGPL-3',
-    'summary': 'Tree view by default instead of kanban for Products',
-    'description': """
-        Replace default kanban view by tree view for product menu in MRP
-        main menu
-    """,
-    'author': 'Akretion',
-    'website': 'http://www.akretion.com',
-    'depends': ['mrp'],
-    'data': [
-        'views/product_template.xml'
-    ],
-    'installable': True,
-}
--- a/mrp_product_tree_default/views/product_template.xml
+++ b/mrp_product_tree_default/views/product_template.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<odoo>
-
-<record id="mrp.product_template_action" model="ir.actions.act_window">
-    <field name="view_mode">tree,form,kanban</field>
-</record>
-
-</odoo>
--- a/mrp_usability/README.rst
+++ b/mrp_usability/README.rst
@@ -17,7 +17,7 @@ MRP Usability
    :target: https://github.com/akretion/odoo-usability/tree/12.0/mrp_usability
    :alt: akretion/odoo-usability

-|badge1| |badge2| |badge3|
+|badge1| |badge2| |badge3| 

 Small usability improvements on MRP:

@@ -31,8 +31,6 @@ Small usability improvements on MRP:

 * complete Manufacturing Order report with unvailable products

-* improve smart button from products to BoMs (display BoM form if only one instead of displaying a list of one)
-
 **Table of contents**

 .. contents::
--- a/mrp_usability/init.py
+++ b/mrp_usability/init.py
@@ -1 +1 @@
-from . import models
+from . import mrp
--- a/mrp_usability/manifest.py
+++ b/mrp_usability/manifest.py
@@ -13,8 +13,7 @@
    'website': 'http://www.akretion.com',
    'depends': ['mrp'],
    'data': [
-        'views/mrp_views.xml',
-        'views/product_views.xml',
+        'mrp_view.xml',
        'report/mrp_report.xml'
    ],
    'installable': True,
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`from . import test_account_invoice_update_wizard`
				`@@ -1 +0,0 @@`
				`* Alexis de Lattre <alexis.delattre@akretion.com>`