Remove OSV and WizardOSV

category.py

@@ -1,9 +1,9 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-from trytond.osv import fields, OSV
+from trytond.model import ModelView, ModelSQL, fields
 
 
-class Category(OSV):
+class Category(ModelSQL, ModelView):
     "Product Category"
     _name = "product.category"
     _description = __doc__

product.py

@@ -1,13 +1,13 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-from trytond.osv import fields, OSV
+from trytond.model import ModelView, ModelSQL, fields
 
 STATES = {
     'readonly': "active == False",
 }
 
 
-class Template(OSV):
+class Template(ModelSQL, ModelView):
     "Product Template"
     _name = "product.template"
     _description = __doc__
@@ -69,7 +69,7 @@ class Template(OSV):
 Template()
 
 
-class Product(OSV):
+class Product(ModelSQL, ModelView):
     "Product"
     _name = "product.product"
     _description = __doc__

uom.py

@@ -1,6 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-from trytond.osv import fields, OSV
+from trytond.model import ModelView, ModelSQL, fields
 from trytond.model.modelstorage import OPERATORS
 from decimal import Decimal
 
@@ -8,7 +8,7 @@ STATES = {
     'readonly': "active == False",
 }
 
-class UomCategory(OSV):
+class UomCategory(ModelSQL, ModelView):
     'Product uom category'
     _name = 'product.uom.category'
     _description = __doc__
@@ -22,7 +22,7 @@ class UomCategory(OSV):
 UomCategory()
 
 
-class Uom(OSV):
+class Uom(ModelSQL, ModelView):
     'Unit of measure'
     _name = 'product.uom'
     _description = __doc__