diff --git a/document_page/__openerp__.py b/document_page/__openerp__.py
index 48e0d60c..116aa153 100644
--- a/document_page/__openerp__.py
+++ b/document_page/__openerp__.py
@@ -30,7 +30,9 @@ Web pages
     """,
     'author': ['OpenERP SA'],
     'website': 'http://www.openerp.com/',
-    'depends': ['knowledge'],
+    'depends': [
+        'knowledge'
+    ],
     'data': [
         'wizard/document_page_create_menu_view.xml',
         'wizard/document_page_show_diff_view.xml',
diff --git a/document_page/document_page.py b/document_page/document_page.py
index 7aba083d..50aabce2 100644
--- a/document_page/document_page.py
+++ b/document_page/document_page.py
@@ -18,10 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp import models, fields, _
-from openerp import exceptions
-# , fields, api, _
 import difflib
+from openerp import models, fields, api, _
+from openerp import exceptions
 
 
 class document_page(models.Model):
@@ -117,16 +116,11 @@ class document_page(models.Model):
                 display_content = page.content
             page.display_content = display_content
 
-    def onchange_parent_id(self, cr, uid, ids, parent_id, content,
-                           context=None):
-        res = {}
-        if parent_id and not content:
-            parent = self.browse(cr, uid, parent_id, context=context)
-            if parent.type == "category":
-                res['value'] = {
-                    'content': parent.content,
-                }
-        return res
+    @api.onchange("parent_id")
+    def do_set_content(self):
+        if self.parent_id and not self.content:
+            if self.parent_id.type == "category":
+                self.content = self.parent_id.content
 
     def create_history(self, cr, uid, ids, vals, context=None):
         for i in ids:
diff --git a/document_page/document_page_view.xml b/document_page/document_page_view.xml
index f05a2d52..e9990ef2 100644
--- a/document_page/document_page_view.xml
+++ b/document_page/document_page_view.xml
@@ -49,16 +49,22 @@
                     <h1><field name="name" placeholder="Name"/></h1>
                     <group class="oe_edit_only">
                         <group>
-                            <field name="parent_id" on_change="onchange_parent_id(parent_id,content)" string="Category" context="{'default_type':'category'}"/>
+                            <field name="parent_id"
+                                   string="Category"
+                                   context="{'default_type':'category'}"/>
                         </group>
                         <group>
-                            <field name="write_uid" groups="base.group_no_one"/>
-                            <field name="write_date" groups="base.group_no_one"/>
-                            <field name="menu_id" groups="base.group_no_one"/>
+                            <field name="write_uid"
+                                   groups="base.group_no_one"/>
+                            <field name="write_date"
+                                   groups="base.group_no_one"/>
+                            <field name="menu_id"
+                                   groups="base.group_no_one"/>
                         </group>
                     </group>
 
-                    <div class="oe_edit_only" attrs="{'invisible':[('type','=','content')]}">
+                    <div class="oe_edit_only"
+                         attrs="{'invisible':[('type','=','content')]}">
                         <label for="content" string="Template"/>
                         that will be used as a content template for all new page of this category.
                     </div>
diff --git a/document_page/wizard/document_page_create_menu.py b/document_page/wizard/document_page_create_menu.py
index 87a63c69..ee00d6ba 100644
--- a/document_page/wizard/document_page_create_menu.py
+++ b/document_page/wizard/document_page_create_menu.py
@@ -20,27 +20,33 @@
 ##############################################################################
 
 from openerp import SUPERUSER_ID
-from openerp.osv import fields, osv
+from openerp import models, fields
 
 
-class document_page_create_menu(osv.osv_memory):
+class document_page_create_menu(models.TransientModel):
     """ Create Menu """
     _name = "document.page.create.menu"
     _description = "Wizard Create Menu"
 
-    _columns = {
-        'menu_name': fields.char('Menu Name', size=256, required=True),
-        'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu',
-                                          required=True),
-    }
+    menu_name = fields.Char(
+        'Menu Name',
+        required=True
+    )
+
+    menu_parent_id = fields.Many2one(
+        'ir.ui.menu',
+        'Parent Menu',
+        required=True
+    )
 
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
             context = {}
-        res = super(document_page_create_menu, self).default_get(cr, uid,
-                                                                 fields,
-                                                                 context=
-                                                                 context)
+        res = super(document_page_create_menu, self).default_get(
+            cr, uid,
+            fields,
+            context=context
+        )
         page_id = context.get('active_id')
         obj_page = self.pool.get('document.page')
         page = obj_page.browse(cr, uid, page_id, context=context)
diff --git a/document_page/wizard/document_page_show_diff.py b/document_page/wizard/document_page_show_diff.py
index bc47a8ff..0ec96b29 100644
--- a/document_page/wizard/document_page_show_diff.py
+++ b/document_page/wizard/document_page_show_diff.py
@@ -18,13 +18,12 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
+from openerp import models, fields, _
+from openerp import exceptions
 
 
-class showdiff(osv.osv_memory):
-    """ Disp[ay Difference for History """
+class showdiff(models.TransientModel):
+    """ Display Difference for History """
 
     _name = 'wizard.document.page.history.show_diff'
 
@@ -47,17 +46,16 @@ class showdiff(osv.osv_memory):
             nids.sort()
             diff = history.getDiff(cr, uid, ids[0], nids[-1])
         else:
-            raise osv.except_osv(_('Warning!'), _('You need to select minimum \
-                                                  one or maximum two history \
-                                                  revisions!'))
+            raise exceptions.Warning(
+                _("You need to select minimum one or maximum "
+                  "two history revisions!")
+            )
         return diff
 
-    _columns = {
-        'diff': fields.text('Diff', readonly=True),
-    }
-
-    _defaults = {
-        'diff': get_diff
-    }
+    diff = fields.Text(
+        'Diff',
+        readonly=True,
+        default=get_diff
+    )
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: