From d4bfc8df5bf0d4324b37c7079267941a0d5498fa Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 12 Jun 2012 11:10:41 +0200
Subject: [PATCH] [IMP] module: rename field 'image' to 'icon_image' (leaving
 'image' for other kinds of module images)

bzr revid: rco@openerp.com-20120612091041-fpamk1r8b4e42k9v
---
 openerp/addons/base/module/module.py       | 4 ++--
 openerp/addons/base/module/module_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index e02fa87d941..d75f330afa2 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -161,7 +161,7 @@ class module(osv.osv):
                 res[key][k] = "\n".join(sorted(v))
         return res
 
-    def _get_image(self, cr, uid, ids, field_name=None, arg=None, context=None):
+    def _get_icon_image(self, cr, uid, ids, field_name=None, arg=None, context=None):
         res = dict.fromkeys(ids, '')
         for module in self.browse(cr, uid, ids, context=context):
             path = addons.get_module_resource(module.name, 'static', 'src', 'img', 'icon.png')
@@ -224,7 +224,7 @@ class module(osv.osv):
         'certificate' : fields.char('Quality Certificate', size=64, readonly=True),
         'application': fields.boolean('Application', readonly=True),
         'icon': fields.char('Icon URL', size=128),
-        'image': fields.function(_get_image, string='Icon', type="binary"),
+        'icon_image': fields.function(_get_icon_image, string='Icon', type="binary"),
     }
 
     _defaults = {
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 04119789813..d9d71cf880d 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -132,7 +132,7 @@
                 </header>
                 <sheet>
                     <div class="oe_right oe_form_button_box">
-                        <field name="image" widget="image"/>
+                        <field name="icon_image" widget="image"/>
                     </div>
                     <div class="oe_form_title">
                         <label for="shortdesc" class="oe_form_readonly_hidden"/>