From 5980cd0292529283512462e314b5008f3fd6fe95 Mon Sep 17 00:00:00 2001
From: "Bharat (OpenERP)" <bde@tinyerp.com>
Date: Mon, 29 Aug 2011 14:42:22 +0530
Subject: [PATCH 1/3] [CONVERT] converted wizard.ineterface into osv.osv_memory
 for base_module_quality

bzr revid: bde@tinyerp.com-20110829091222-jrbktyaoix1uecj4
---
 addons/base_module_quality/__openerp__.py     |  2 +-
 .../base_module_quality_view.xml              |  2 +-
 .../base_module_quality_wizard.xml            | 12 -----
 .../wizard/module_quality_check.py            | 31 +++++++------
 .../wizard/module_quality_check.xml           | 32 ++++++++++++++
 .../wizard/quality_save_report.py             | 44 ++++++++-----------
 .../wizard/quality_save_report_view.xml       | 31 +++++++++++++
 7 files changed, 101 insertions(+), 53 deletions(-)
 delete mode 100644 addons/base_module_quality/base_module_quality_wizard.xml
 create mode 100644 addons/base_module_quality/wizard/module_quality_check.xml
 create mode 100644 addons/base_module_quality/wizard/quality_save_report_view.xml

diff --git a/addons/base_module_quality/__openerp__.py b/addons/base_module_quality/__openerp__.py
index ec9ec1191d2..855084f3a7d 100644
--- a/addons/base_module_quality/__openerp__.py
+++ b/addons/base_module_quality/__openerp__.py
@@ -42,7 +42,7 @@ using it, otherwise it may crash.
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
-    'update_xml': ['base_module_quality_wizard.xml', 'base_module_quality_view.xml', 'security/ir.model.access.csv'],
+    'update_xml': ['wizard/module_quality_check.xml', 'wizard/quality_save_report_view.xml', 'base_module_quality_view.xml', 'security/ir.model.access.csv'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/base_module_quality/base_module_quality_view.xml b/addons/base_module_quality/base_module_quality_view.xml
index 6b56eb41a5d..21e84c27c43 100644
--- a/addons/base_module_quality/base_module_quality_view.xml
+++ b/addons/base_module_quality/base_module_quality_view.xml
@@ -44,7 +44,7 @@
                             <field name="state" readonly="1"/>
                         </page>
                         <page string="Detail">
-	                        <button name="%(quality_detail_save)d" string="Save Report" type="action"/>
+	                        <button name="%(action_view_quality_save_report)d" string="Save Report" type="action"/>
                             <field name="detail" widget="text_html" nolabel="1" colspan="4" readonly="1"/>
                         </page>
                     </notebook>
diff --git a/addons/base_module_quality/base_module_quality_wizard.xml b/addons/base_module_quality/base_module_quality_wizard.xml
deleted file mode 100644
index fe5c7ef5aa0..00000000000
--- a/addons/base_module_quality/base_module_quality_wizard.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-		<wizard id="quality_detail_save" model="ir.module.module" name="quality_detail_save" string="Report Save" menu="False"/>
-
-      	<wizard string="Quality Check"
-            model="ir.module.module"
-            name="create_quality_check_wiz"
-            id="create_quality_check_id"
-            menu="True"/>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/base_module_quality/wizard/module_quality_check.py b/addons/base_module_quality/wizard/module_quality_check.py
index 9e836ec9d0e..3e9247416b2 100644
--- a/addons/base_module_quality/wizard/module_quality_check.py
+++ b/addons/base_module_quality/wizard/module_quality_check.py
@@ -26,7 +26,20 @@ from tools.translate import _
 import pooler
 from osv import osv, fields
 
-class quality_check(wizard.interface):
+class quality_check(osv.osv_memory):
+    _name = "quality.check"
+
+    def create_quality_check(self, cr, uid, ids, context=None):
+        pool = pooler.get_pool(cr.dbname)
+        obj_quality = pool.get('module.quality.check')
+        objs = []
+        module_id = context.get('active_id', False)
+        for id in ids:
+            module_data = pool.get('ir.module.module').browse(cr, uid, module_id)
+            data = obj_quality.check_quality(cr, uid, module_data.name, module_data.state)
+            obj = obj_quality.create(cr, uid, data, context)
+            objs.append(obj)
+        return objs
 
     def _create_quality_check(self, cr, uid, data, context=None):
         pool = pooler.get_pool(cr.dbname)
@@ -39,8 +52,8 @@ class quality_check(wizard.interface):
             objs.append(obj)
         return objs
 
-    def _open_quality_check(self, cr, uid, data, context):
-        obj_ids = self._create_quality_check(cr, uid, data, context)
+    def open_quality_check(self, cr, uid, data, context):
+        obj_ids = self.create_quality_check(cr, uid, data, context)
         return {
             'domain': "[('id','in', ["+','.join(map(str,obj_ids))+"])]",
             'name': _('Quality Check'),
@@ -49,14 +62,6 @@ class quality_check(wizard.interface):
             'res_model': 'module.quality.check',
             'type': 'ir.actions.act_window'
             }
+quality_check()
 
-    states = {
-        'init' : {
-            'actions' : [],
-            'result': {'type':'action', 'action':_open_quality_check, 'state':'end'}
-        }
-    }
-
-quality_check("create_quality_check_wiz")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_quality/wizard/module_quality_check.xml b/addons/base_module_quality/wizard/module_quality_check.xml
new file mode 100644
index 00000000000..9eef017ebcb
--- /dev/null
+++ b/addons/base_module_quality/wizard/module_quality_check.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_base_module_quality" model="ir.ui.view">
+            <field name="name">view_base_module_quality_form</field>
+            <field name="model">quality.check</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Quality Check">
+                    <group colspan="4">
+                        <label string = "Check Quality" help="You can check the quality of selected module"/>
+                        <separator colspan="4"/>
+                        <newline/>
+                        <button name="open_quality_check" icon="gtk-ok" string="Check" type="object"/>
+                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <act_window
+            name="Quality Check"
+            id="act_base_module_quality"
+            res_model="quality.check"
+            src_model="ir.module.module"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            />
+    </data>
+</openerp>
diff --git a/addons/base_module_quality/wizard/quality_save_report.py b/addons/base_module_quality/wizard/quality_save_report.py
index 7d03338e623..fd4b03d4446 100644
--- a/addons/base_module_quality/wizard/quality_save_report.py
+++ b/addons/base_module_quality/wizard/quality_save_report.py
@@ -26,36 +26,28 @@ import wizard
 from osv import osv
 import pooler
 from tools.translate import _
+from osv import osv, fields
 
-form_rep = '''<?xml version="1.0"?>
-<form string="Standard entries">
-    <field name="name"/>
-    <newline/>
-    <field name="module_file"/>
-</form>'''
+class save_report(osv.osv_memory):
 
+    _name = "save.report"
 
-fields_rep = {
-  'name': {'string': 'File name', 'type': 'char', 'required': True, 'help': 'Save report as .html format', 'size':64},
-  'module_file': {'string': 'Save report', 'type': 'binary', 'required': True},
-}
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(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]
+        if not data.detail:
+            raise osv.except_osv(_('Warning'), _('No report to save!'))
+        buf = cStringIO.StringIO(data.detail)
+        out = base64.encodestring(buf.getvalue())
+        buf.close()
+        return {'module_file': out, 'name': data.name + '.html'}
 
-def get_detail(self, cr, uid, datas, context=None):
-    data = pooler.get_pool(cr.dbname).get('module.quality.detail').browse(cr, uid, datas['id'])
-    if not data.detail:
-        raise wizard.except_wizard(_('Warning'), _('No report to save!'))
-    buf = cStringIO.StringIO(data.detail)
-    out = base64.encodestring(buf.getvalue())
-    buf.close()
-    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),
+               }
 
-class save_report(wizard.interface):
-    states = {
-        'init': {
-            'actions': [get_detail],
-            'result': {'type': 'form', 'arch': form_rep, 'fields':fields_rep, 'state': [('end','Cancel')]}
-        },
-    }
-save_report('quality_detail_save')
+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
new file mode 100644
index 00000000000..ec75a24e387
--- /dev/null
+++ b/addons/base_module_quality/wizard/quality_save_report_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_quality_save_report" model="ir.ui.view">
+            <field name="name">view_quality_save_report</field>
+            <field name="model">save.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Standard Entries">
+                    <field name="name"/>
+                    <newline/>
+                    <field name="module_file"/>
+                    <separator colspan="4"/>
+                    <label string=" " colspan="2"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_view_quality_save_report">
+            <field name="name">Standard Entries</field>
+            <field name="res_model">save.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="target">new</field>
+            <field name="view_id" ref="view_quality_save_report"/>
+        </record>
+
+    </data>
+</openerp>

From 4c9f3e1fe1900abbc2079d88ce3259fa43aa0d9f Mon Sep 17 00:00:00 2001
From: "Bharat (OpenERP)" <bde@tinyerp.com>
Date: Wed, 7 Sep 2011 14:20:56 +0530
Subject: [PATCH 2/3] [IMP] Improved the separator name, sequence of buttons
 with icon, file name, used proper variable name and removed unnecessary for
 loop for base_module_quality module

bzr revid: bde@tinyerp.com-20110907085056-pte4mgqa4uuy5pol
---
 addons/base_module_quality/__openerp__.py     |  2 +-
 .../wizard/module_quality_check.py            | 36 +++++++------------
 .../wizard/module_quality_check.xml           |  5 ++-
 .../wizard/quality_save_report.py             |  1 +
 4 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/addons/base_module_quality/__openerp__.py b/addons/base_module_quality/__openerp__.py
index 855084f3a7d..5459f14cb72 100644
--- a/addons/base_module_quality/__openerp__.py
+++ b/addons/base_module_quality/__openerp__.py
@@ -42,7 +42,7 @@ using it, otherwise it may crash.
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
-    'update_xml': ['wizard/module_quality_check.xml', 'wizard/quality_save_report_view.xml', 'base_module_quality_view.xml', 'security/ir.model.access.csv'],
+    'update_xml': ['wizard/module_quality_check_view.xml', 'wizard/quality_save_report_view.xml', 'base_module_quality_view.xml', 'security/ir.model.access.csv'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/base_module_quality/wizard/module_quality_check.py b/addons/base_module_quality/wizard/module_quality_check.py
index 3e9247416b2..5693f0a0da1 100644
--- a/addons/base_module_quality/wizard/module_quality_check.py
+++ b/addons/base_module_quality/wizard/module_quality_check.py
@@ -28,32 +28,20 @@ from osv import osv, fields
 
 class quality_check(osv.osv_memory):
     _name = "quality.check"
+    _description = "Quality Check"
 
-    def create_quality_check(self, cr, uid, ids, context=None):
-        pool = pooler.get_pool(cr.dbname)
-        obj_quality = pool.get('module.quality.check')
-        objs = []
+    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)
-        for id in ids:
-            module_data = pool.get('ir.module.module').browse(cr, uid, module_id)
-            data = obj_quality.check_quality(cr, uid, module_data.name, module_data.state)
-            obj = obj_quality.create(cr, uid, data, context)
-            objs.append(obj)
-        return objs
+        module_data = self.pool.get('ir.module.module').browse(cr, uid, module_id)
+        data = obj_quality.check_quality(cr, uid, module_data.name, module_data.state)
+        obj = obj_quality.create(cr, uid, data, context)
+        objs_ids.append(obj)
+        return objs_ids
 
-    def _create_quality_check(self, cr, uid, data, context=None):
-        pool = pooler.get_pool(cr.dbname)
-        obj_quality = pool.get('module.quality.check')
-        objs = []
-        for id in data['ids']:
-            module_data = pool.get('ir.module.module').browse(cr, uid, id)
-            data = obj_quality.check_quality(cr, uid, module_data.name, module_data.state)
-            obj = obj_quality.create(cr, uid, data, context)
-            objs.append(obj)
-        return objs
-
-    def open_quality_check(self, cr, uid, data, context):
-        obj_ids = self.create_quality_check(cr, uid, data, context)
+    def open_quality_check(self, cr, uid, ids, context):
+        obj_ids = self._create_quality_check(cr, uid, ids, context)
         return {
             'domain': "[('id','in', ["+','.join(map(str,obj_ids))+"])]",
             'name': _('Quality Check'),
@@ -64,4 +52,4 @@ class quality_check(osv.osv_memory):
             }
 quality_check()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# 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.xml
index 9eef017ebcb..07606dccac0 100644
--- a/addons/base_module_quality/wizard/module_quality_check.xml
+++ b/addons/base_module_quality/wizard/module_quality_check.xml
@@ -9,11 +9,10 @@
             <field name="arch" type="xml">
                 <form string="Quality Check">
                     <group colspan="4">
-                        <label string = "Check Quality" help="You can check the quality of selected module"/>
-                        <separator colspan="4"/>
+                        <separator string = "This wizard will check Module quality" colspan="4"/>
                         <newline/>
-                        <button name="open_quality_check" icon="gtk-ok" string="Check" type="object"/>
                         <button icon="gtk-cancel" string="Cancel" special="cancel"/>
+                        <button name="open_quality_check" icon="terp-camera_test" string="Check" type="object"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/base_module_quality/wizard/quality_save_report.py b/addons/base_module_quality/wizard/quality_save_report.py
index fd4b03d4446..bc8edd2e992 100644
--- a/addons/base_module_quality/wizard/quality_save_report.py
+++ b/addons/base_module_quality/wizard/quality_save_report.py
@@ -31,6 +31,7 @@ from osv import osv, fields
 class save_report(osv.osv_memory):
 
     _name = "save.report"
+    _description = "Save Report"
 
     def default_get(self, cr, uid, fields, context=None):
         res = super(save_report, self).default_get(cr, uid, fields, context=context)

From 1e767f0d14dfb0870767524bf16c9909bcaee995 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 7 Sep 2011 15:32:16 +0530
Subject: [PATCH 3/3] [FIX] Quality_module: Fix error on installation [IMP]
 Quality_module: improve code, remove unused imports

bzr revid: mra@tinyerp.com-20110907100216-g4u1pg6trvpv4y58
---
 .../wizard/module_quality_check.py             | 15 ++++++---------
 ...check.xml => module_quality_check_view.xml} |  2 +-
 .../wizard/quality_save_report.py              | 18 ++++++++----------
 .../wizard/quality_save_report_view.xml        |  2 +-
 4 files changed, 16 insertions(+), 21 deletions(-)
 rename addons/base_module_quality/wizard/{module_quality_check.xml => module_quality_check_view.xml} (96%)

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>