diff --git a/stock_account_usability/__init__.py b/stock_account_usability/__init__.py
index b857415..40a96af 100644
--- a/stock_account_usability/__init__.py
+++ b/stock_account_usability/__init__.py
@@ -1,3 +1 @@
 # -*- coding: utf-8 -*-
-
-from . import stock
diff --git a/stock_account_usability/__manifest__.py b/stock_account_usability/__manifest__.py
index e28d321..a9b568c 100644
--- a/stock_account_usability/__manifest__.py
+++ b/stock_account_usability/__manifest__.py
@@ -1,29 +1,11 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Stock Account Usability module for Odoo
-#    Copyright (C) 2015 Akretion (http://www.akretion.com)
-#    @author Alexis de Lattre <alexis.delattre@akretion.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
+# Copyright 2021 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': 'Stock Account Usability',
-    'version': '0.1',
+    'version': '10.0.1.0.0',
     'category': 'Inventory, Logistic, Storage',
     'license': 'AGPL-3',
     'summary': 'Several usability enhancements in stock_account',
@@ -32,13 +14,13 @@ Stock Account Usability
 ========================
 
 The usability enhancements inclure:
-* tracking on the invoice_state field
+* show property_cost_method on product form
 
 This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
     """,
     'author': 'Akretion',
     'website': 'http://www.akretion.com',
     'depends': ['stock_account'],
-    'data': [],
-    'installable': False,
+    'data': ['product_view.xml'],
+    'installable': True,
 }
diff --git a/stock_account_usability/product_view.xml b/stock_account_usability/product_view.xml
new file mode 100644
index 0000000..d05806f
--- /dev/null
+++ b/stock_account_usability/product_view.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2021 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>
+
+
+<record id="view_template_property_form" model="ir.ui.view">
+    <field name="name">stock_account.product.template.form</field>
+    <field name="model">product.template</field>
+    <field name="inherit_id" ref="stock_account.view_template_property_form"/>
+    <field name="arch" type="xml">
+        <!--
+        I use replace instead of attributes with invisible=0
+        because I need a smooth display of property_cost_method even when
+        account_usability is installed, which replaces the field list_price
+        -->
+        <field name="property_cost_method" position="replace"/>
+        <field name="company_id" position="before">
+            <field name="property_cost_method" groups="stock_account.group_inventory_valuation"/>
+        </field>
+    </field>
+</record>
+
+
+</odoo>
diff --git a/stock_account_usability/stock.py b/stock_account_usability/stock.py
deleted file mode 100644
index 28f0a51..0000000
--- a/stock_account_usability/stock.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Stock Account Usability module for Odoo
-#    Copyright (C) 2015 Akretion (http://www.akretion.com)
-#    @author Alexis de Lattre <alexis.delattre@akretion.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp import models, fields
-
-
-class StockPicking(models.Model):
-    _inherit = 'stock.picking'
-
-    invoice_state = fields.Selection(track_visibility='onchange')