[MERGE]

bzr revid: uco@tinyerp.com-20100809123622-hpw9djl5wtu80ccp
bzr revid: uco@tinyerp.com-20100810043605-rnht1jq7lx1pazah

1 files changed, 16 insertions, 17 deletions

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 9c02c5f20c1..25309ff512a 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -91,24 +91,23 @@ class base_setup_installer(osv.osv_memory):
         'crm': True,
         }
 
+    def _if_mrp(self, cr, uid, ids, context=None):
+        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
+               .view == 'simple':
+            return ['mrp_jit']
+        return None
+
+    def _if_knowledge(self, cr, uid, ids, context=None):
+        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
+               .view == 'simple':
+            return ['document_ftp']
+        return None
 
     def onchange_moduleselection(self, cr, uid, ids, *args):
-        progress = self._progress(cr, uid) - round((len(filter(lambda x: x==1, args)))*80/len(args))
-        if progress <= 10.0:
-            progress = 10.0
-        return {'value':{'progress':progress}}
+        closed, total = self.get_current_progress(cr, uid)
 
-    def modules_to_install(self, cr, uid, ids, context=None):
-        modules = super(base_setup_installer, self).modules_to_install(cr, uid, ids, context=context)
-        interface_id = self.pool.get('res.config.view').search(cr, uid, [])
-        interface = self.pool.get('res.config.view').read(cr, uid, interface_id)[0]
-        modules_selected = self.read(cr, uid, ids)[0]
-        added_modules = []
-        if interface.get('view', '') == 'simple' :
-            if modules_selected.get('mrp', False):
-                added_modules.append('mrp_jit')
-            if modules_selected.get('knowledge', False):
-                added_modules.append('document_ftp')
-        return modules | set(added_modules)
+        progress = round(100. * closed / (total + len(filter(None, args))))
+        if progress < 10.:
+            progress = 10.
+        return {'value':{'progress':progress}}
 base_setup_installer()
-