From: nch@tinyerp.com <>
Date: Wed, 5 May 2010 04:50:13 +0000 (+0530)
Subject: [IMP]:usability improvements
X-Git-Tag: 6.0.0-rc2-addons~58^2~85
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=54a79c4544ce768ba9695cdd670ff09b5908b0f0;hp=7151076eeea180cc1dda9a8a8681cc5ff128dd9e;p=odoo%2Fodoo.git
[IMP]:usability improvements
bzr revid: nch@tinyerp.com-20100505045013-3yhvi9ownzp7tjpj
---
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 41797f7..1818eb1 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -284,7 +284,7 @@
- Choose between the simplified interface and the extended one.If you are testing OpenERP or using it for the first time, we suggest you use the simplified interface. It has less options and fields but is easier to understand.You will be able to switch to the extended interface later.
+ Choose between the simplified interface and the extended one. If you are testing OpenERP or using it for the first time, We suggest you use the simplified interface. It has less options and fields but is easier to understand. You will be able to switch to the extended interface later.Choose Your Interface
@@ -325,6 +325,5 @@
1
-
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 77ae764..7eaa78c 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1370,6 +1370,7 @@
+
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 9899830..e885476 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -19,13 +19,19 @@
#
##############################################################################
+import os
+import base64
+import random
from operator import attrgetter
from osv import osv, fields
+import tools
from tools.translate import _
import netsvc
import pooler
+
+
class res_config_configurable(osv.osv_memory):
''' Base classes for new-style configuration items
@@ -45,11 +51,19 @@ class res_config_configurable(osv.osv_memory):
return round(open*100./total)
return 100.
+ def _get_image(self, cr, uid, context=None):
+ file_no = str(random.randint(1,3))
+ path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
+ file_data = tools.file_open(path,'rb').read()
+ return base64.encodestring(file_data)
+
_columns = dict(
- progress=fields.float('Configuration Progress', readonly=True),
+ progress = fields.float('Configuration Progress', readonly=True),
+ config_logo = fields.binary('Image', readonly=True),
)
_defaults = dict(
- progress=_progress
+ progress = _progress,
+ config_logo = _get_image
)
def _next_action(self, cr, uid):
diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index ca00a49..3981b8f 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -6,29 +6,29 @@
form
@@ -60,13 +60,11 @@
res.config.installerform
-