diff --git a/beesdoo_product/__init__.py b/beesdoo_product/__init__.py
index 8d752fb..9b42961 100644
--- a/beesdoo_product/__init__.py
+++ b/beesdoo_product/__init__.py
@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
-import models
-import wizard
+from . import models
+from . import wizard
diff --git a/beesdoo_product/__manifest__.py b/beesdoo_product/__manifest__.py
index ac8eb60..47bdad5 100644
--- a/beesdoo_product/__manifest__.py
+++ b/beesdoo_product/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': "beesdoo_product",
 
@@ -20,7 +19,7 @@
     'version': '0.1',
 
     # any module necessary for this one to work correctly
-    'depends': ['beesdoo_base', 'product', 'point_of_sale','pos_price_to_weight'],
+    'depends': ['beesdoo_base', 'product', 'sale', 'point_of_sale', 'pos_price_to_weight'],
 
     # always loaded
     'data': [
diff --git a/beesdoo_product/models/__init__.py b/beesdoo_product/models/__init__.py
index f270af8..52cfd16 100644
--- a/beesdoo_product/models/__init__.py
+++ b/beesdoo_product/models/__init__.py
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
-import beesdoo_product
\ No newline at end of file
+from . import beesdoo_product
\ No newline at end of file
diff --git a/beesdoo_product/models/beesdoo_product.py b/beesdoo_product/models/beesdoo_product.py
index 6fef74f..c097ae1 100644
--- a/beesdoo_product/models/beesdoo_product.py
+++ b/beesdoo_product/models/beesdoo_product.py
@@ -1,4 +1,3 @@
- # -*- coding: utf-8 -*-
 from odoo import models, fields, api
 from odoo.tools.translate import _
 from odoo.exceptions import UserError, ValidationError
@@ -15,8 +14,8 @@ class BeesdooProduct(models.Model):
 
     main_seller_id = fields.Many2one('res.partner', string='Main Seller', compute='_compute_main_seller_id', store=True)
 
-    display_unit = fields.Many2one('product.uom')
-    default_reference_unit = fields.Many2one('product.uom')
+    display_unit = fields.Many2one('uom.uom')
+    default_reference_unit = fields.Many2one('uom.uom')
     display_weight = fields.Float(compute='_get_display_weight', store=True)
 
     total_with_vat = fields.Float(compute='_get_total', store=True, string="Total Sales Price with VAT")
@@ -81,7 +80,7 @@ class BeesdooProduct(models.Model):
             while(self.search_count([('barcode', '=', bc)]) > 1):
                 ean = rule.pattern + str(uuid.uuid4().fields[-1])[:size]
                 bc = ean[0:12] + str(self.env['barcode.nomenclature'].ean_checksum(ean))
-        print 'barcode :', bc
+        print('barcode :', bc)
         self.barcode = bc
 
     @api.one
@@ -176,7 +175,7 @@ class BeesdooProductSupplierInfo(models.Model):
     price = fields.Float('exVAT Price')
 
 class BeesdooUOMCateg(models.Model):
-    _inherit = 'product.uom.categ'
+    _inherit = 'uom.category'
     
     type = fields.Selection([('unit','Unit'),
                               ('weight','Weight'),
diff --git a/beesdoo_product/views/beesdoo_product.xml b/beesdoo_product/views/beesdoo_product.xml
index 010d687..9b828b9 100644
--- a/beesdoo_product/views/beesdoo_product.xml
+++ b/beesdoo_product/views/beesdoo_product.xml
@@ -11,18 +11,12 @@
             <field name="list_price" position="after">
                 <field name="suggested_price" widget='monetary' options="{'currency_field': 'currency_id'}" />
             </field>
-            <field name="invoice_policy" position="attributes">
-                <attribute name="invisible">1</attribute>
-            </field>
             <field name="purchase_method" position="attributes">
                 <attribute name="invisible">1</attribute>
             </field>
             <field name="route_ids" position="attributes">
                 <attribute name="invisible">1</attribute>
             </field>
-            <group name="sale_condition" position="attributes">
-                <attribute name="invisible">1</attribute>
-            </group>
             <field name="property_account_creditor_price_difference"
                 position="attributes">
                 <attribute name="invisible">1</attribute>
@@ -72,6 +66,17 @@
         </field>
     </record>
 
+    <record model="ir.ui.view" id="beesdoo_product_sales_form">
+        <field name="name">bees.product.sales.form</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="sale.product_template_form_view_invoice_policy" />
+        <field name="arch" type="xml">
+            <field name="invoice_policy" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </field>
+        </field>
+    </record>
+
     <record model="ir.ui.view" id="beesdoo_product_label_form">
         <field name="name">bees.product.label.form</field>
         <field name="model">beesdoo.product.label</field>
@@ -91,7 +96,7 @@
         <field name="name">bees.product.label.tree</field>
         <field name="model">beesdoo.product.label</field>
         <field name="arch" type="xml">
-            <tree editable="Top">
+            <tree editable="top">
                 <field name="name" />
                 <field name="type" />
                 <field name="color_code" />
@@ -105,7 +110,7 @@
         <field name="model">product.category</field>
         <field name="inherit_id" ref="product.product_category_list_view" />
         <field name="arch" type="xml">
-            <field name="complete_name" position="after">
+            <field name="display_name" position="after">
                 <field name="profit_margin"></field>
             </field>
         </field>
@@ -139,13 +144,13 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <menuitem id="label_configuration_menu" name="Labels" parent="product.prod_config_main"
+    <menuitem id="label_configuration_menu" name="Labels" parent="sale.prod_config_main"
               action="action_labels" sequence="20"/>
               
     <record id="beesdoo_product_uom_categ_form" model="ir.ui.view">
-        <field name="name">product.uom.categ.form</field>
-        <field name="model">product.uom.categ</field>
-        <field name="inherit_id" ref="product.product_uom_categ_form_view" />
+        <field name="name">uom.category.form</field>
+        <field name="model">uom.category</field>
+        <field name="inherit_id" ref="uom.product_uom_categ_form_view" />
         <field name="arch" type="xml">
         	<field name="name" position="after">
         		<field name="type"/>
@@ -183,6 +188,6 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <menuitem id="scale_categories_configuration_menu" name="Scale categories" parent="product.prod_config_main"
+    <menuitem id="scale_categories_configuration_menu" name="Scale categories" parent="sale.prod_config_main"
               action="action_scale_categories" sequence="15"/>
 </odoo>
diff --git a/beesdoo_product/wizard/__init__.py b/beesdoo_product/wizard/__init__.py
index 183e6cc..0d01ffa 100644
--- a/beesdoo_product/wizard/__init__.py
+++ b/beesdoo_product/wizard/__init__.py
@@ -1 +1 @@
-import label_printing_utils
+from . import label_printing_utils
diff --git a/beesdoo_product/wizard/label_printing_utils.py b/beesdoo_product/wizard/label_printing_utils.py
index a3e0c17..4561b7c 100644
--- a/beesdoo_product/wizard/label_printing_utils.py
+++ b/beesdoo_product/wizard/label_printing_utils.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from odoo import models, fields, api
 
 class RequestLabelPrintingWizard(models.TransientModel):