diff --git a/addons/base_module_quality/wizard/module_quality_check.py b/addons/base_module_quality/wizard/module_quality_check.py
index 5693f0a0da1..8b6f1157a29 100644
--- a/addons/base_module_quality/wizard/module_quality_check.py
+++ b/addons/base_module_quality/wizard/module_quality_check.py
@@ -19,29 +19,25 @@
 #
 ##############################################################################
 
-import os
-
-import wizard
 from tools.translate import _
-import pooler
 from osv import osv, fields
 
 class quality_check(osv.osv_memory):
     _name = "quality.check"
-    _description = "Quality Check"
+    _description = "Module Quality Check"
 
     def _create_quality_check(self, cr, uid, ids, context=None):
         obj_quality = self.pool.get('module.quality.check')
         objs_ids = []
         module_id = context.get('active_id', False)
-        module_data = self.pool.get('ir.module.module').browse(cr, uid, module_id)
+        module_data = self.pool.get('ir.module.module').browse(cr, uid, module_id, context=context)
         data = obj_quality.check_quality(cr, uid, module_data.name, module_data.state)
-        obj = obj_quality.create(cr, uid, data, context)
+        obj = obj_quality.create(cr, uid, data, context=context)
         objs_ids.append(obj)
         return objs_ids
 
-    def open_quality_check(self, cr, uid, ids, context):
-        obj_ids = self._create_quality_check(cr, uid, ids, context)
+    def open_quality_check(self, cr, uid, ids, context=None):
+        obj_ids = self._create_quality_check(cr, uid, ids, context=context)
         return {
             'domain': "[('id','in', ["+','.join(map(str,obj_ids))+"])]",
             'name': _('Quality Check'),
@@ -50,6 +46,7 @@ class quality_check(osv.osv_memory):
             'res_model': 'module.quality.check',
             'type': 'ir.actions.act_window'
             }
+        
 quality_check()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_quality/wizard/module_quality_check.xml b/addons/base_module_quality/wizard/module_quality_check_view.xml
similarity index 96%
rename from addons/base_module_quality/wizard/module_quality_check.xml
rename to addons/base_module_quality/wizard/module_quality_check_view.xml
index 07606dccac0..d5ce83d9612 100644
--- a/addons/base_module_quality/wizard/module_quality_check.xml
+++ b/addons/base_module_quality/wizard/module_quality_check_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Quality Check">
                     <group colspan="4">
-                        <separator string = "This wizard will check Module quality" colspan="4"/>
+                        <separator string = "This wizard will check module(s) quality" colspan="4"/>
                         <newline/>
                         <button icon="gtk-cancel" string="Cancel" special="cancel"/>
                         <button name="open_quality_check" icon="terp-camera_test" string="Check" type="object"/>
diff --git a/addons/base_module_quality/wizard/quality_save_report.py b/addons/base_module_quality/wizard/quality_save_report.py
index bc8edd2e992..e4286e92237 100644
--- a/addons/base_module_quality/wizard/quality_save_report.py
+++ b/addons/base_module_quality/wizard/quality_save_report.py
@@ -22,21 +22,19 @@
 import base64
 import cStringIO
 
-import wizard
 from osv import osv
-import pooler
 from tools.translate import _
 from osv import osv, fields
 
-class save_report(osv.osv_memory):
+class quality_save_report(osv.osv_memory):
 
     _name = "save.report"
-    _description = "Save Report"
+    _description = "Save Report of Quality"
 
     def default_get(self, cr, uid, fields, context=None):
-        res = super(save_report, self).default_get(cr, uid, fields, context=context)
+        res = super(quality_save_report, self).default_get(cr, uid, fields, context=context)
         active_ids = context.get('active_ids')
-        data = pooler.get_pool(cr.dbname).get('module.quality.detail').browse(cr, uid, active_ids)[0]
+        data = self.pool.get('module.quality.detail').browse(cr, uid, active_ids, context=context)[0]
         if not data.detail:
             raise osv.except_osv(_('Warning'), _('No report to save!'))
         buf = cStringIO.StringIO(data.detail)
@@ -45,10 +43,10 @@ class save_report(osv.osv_memory):
         return {'module_file': out, 'name': data.name + '.html'}
 
     _columns = {
-                    'name': fields.char('File Name', required=True, size=64, help="Save report as .html format"),
-                    'module_file': fields.binary('Save report', required=True),
-               }
+        'name': fields.char('File Name', required=True, size=32, help="Save report as .html format"),
+        'module_file': fields.binary('Save report', required=True),
+    }
 
-save_report()
+quality_save_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_quality/wizard/quality_save_report_view.xml b/addons/base_module_quality/wizard/quality_save_report_view.xml
index ec75a24e387..89593b68742 100644
--- a/addons/base_module_quality/wizard/quality_save_report_view.xml
+++ b/addons/base_module_quality/wizard/quality_save_report_view.xml
@@ -13,7 +13,7 @@
                     <field name="module_file"/>
                     <separator colspan="4"/>
                     <label string=" " colspan="2"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button special="cancel" string="Close" icon="gtk-close"/>
                 </form>
             </field>
         </record>