Merge branch '7.0'

[burette/remembership.git] / remembership.py

diff --git a/remembership.py b/remembership.py
index 14b7f4e..5560fbf 100644 (file)
--- a/remembership.py
+++ b/remembership.py
@@ -21,8 +21,7 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
-from openerp.osv import fields
+from openerp.osv import fields, osv
 import time
 from datetime import datetime, date
 from dateutil.relativedelta import relativedelta
@@ -226,7 +225,7 @@ Partner()
 
 
 class Product(osv.osv):
-    _inherit = 'product.product'
+    _inherit = 'product.template'
 
     _columns = {
         'membership_grouped': fields.boolean('Grouped membership product', help='Check if it\'s a grouped membership product.'),