Remove OSV and WizardOSV

move.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 Move(OSV):
+class Move(ModelSQL, ModelView):
     _name = 'stock.move'
     fifo_quantity = fields.Float('FIFO Quantity',
             digits="(16, unit_digits)")

product.py

@@ -1,11 +1,11 @@
 #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
 import copy
 import datetime
 
 
-class Template(OSV):
+class Template(ModelSQL, ModelView):
     _name = "product.template"
 
     def __init__(self):