From 5b3bae0a46f1f7cd0ed2be6058cefa03b62093bf Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 20 Apr 2012 15:31:43 +0200
Subject: [PATCH] [IMP] base_setup: improve knowledge config wizard

bzr revid: rco@openerp.com-20120420133143-9js93k9ggrphxa5l
---
 addons/base_setup/res_config.py         | 22 +++++++++++++---------
 addons/base_setup/res_config_view.xml   |  8 ++++----
 addons/document_ftp/res_config.py       |  4 ++--
 addons/document_ftp/res_config_view.xml |  2 +-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 8d0808a8870..b1dbe91a238 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -59,19 +59,23 @@ class report_config_settings(osv.osv_memory):
 
 
 class knowledge_config_settings(osv.osv_memory):
-    _name = 'knowledge.configuration'
+    _name = 'knowledge.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_wiki_quality_manual': fields.boolean('Use an internal wiki to group FAQ',
-            help="""It installs the wiki_quality_manual module."""),
-        'module_wiki_faq': fields.boolean('Track quality with wiki',
-            help="""It install the wiki_faq."""), 
-        'module_document': fields.boolean('Full Document Indexing',
-            help="""It install the document."""),
+        'module_wiki_faq': fields.boolean('Use a Wiki for Frequently Asked Questions',
+            help="""This installs the module wiki_faq."""), 
+        'module_wiki_quality_manual': fields.boolean('Track Quality with a Wiki',
+            help="""This installs the module wiki_quality_manual."""),
+        'module_document': fields.boolean('Document Management',
+            help="""This is a complete document management system, with: user authentication,
+                full document search (pptx and docx are not supported), and a document dashboard.
+                This installs the module document."""),
         'module_document_ftp': fields.boolean('Share repositories (FTP)',
-            help="""It install the document_ftp."""),
+            help="""Access your documents in OpenERP through an FTP interface.
+                This installs the module document_ftp."""),
         'module_document_webdav': fields.boolean('Share Repositories (WebDAV)',
-            help="""It install the document_webdav."""),                                   
+            help="""Access your documents in OpenERP through WebDAV.
+                This installs the module document_webdav."""),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 42378c11818..0d3297b20fb 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -65,7 +65,7 @@
 
         <record id="view_knowledge_configuration" model="ir.ui.view">
             <field name="name">Configure Knowledge</field>
-            <field name="model">knowledge.configuration</field>
+            <field name="model">knowledge.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Knowledge" layout="manual">
@@ -75,9 +75,9 @@
                     </div>
                     <sheet layout="auto">
                         <separator string="Wiki" colspan="4"/>
-                        <field name="module_wiki_quality_manual"/>
-                        <newline/>
                         <field name="module_wiki_faq"/>
+                        <newline/>
+                        <field name="module_wiki_quality_manual"/>
 
                         <separator string="Documents" colspan="4"/>
                         <field name="module_document"/>
@@ -92,7 +92,7 @@
 
         <record id="action_knowledge_configuration" model="ir.actions.act_window">
             <field name="name">Configure Knowledge</field>
-            <field name="res_model">knowledge.configuration</field>
+            <field name="res_model">knowledge.config.settings</field>
             <field name="view_mode">form</field>
             <field name="target">inline</field>
         </record>
diff --git a/addons/document_ftp/res_config.py b/addons/document_ftp/res_config.py
index 564fe4f5bf5..374368d60bd 100644
--- a/addons/document_ftp/res_config.py
+++ b/addons/document_ftp/res_config.py
@@ -23,8 +23,8 @@ from osv import fields, osv
 from tools import config
 
 class documnet_ftp_setting(osv.osv_memory):
-    _name = 'knowledge.configuration'
-    _inherit = 'knowledge.configuration'
+    _name = 'knowledge.config.settings'
+    _inherit = 'knowledge.config.settings'
     _columns = {
         'document_ftp_url': fields.char('Browse Documents', size=128,
             help ="""Click the url to browse the documents""", readonly=True),               
diff --git a/addons/document_ftp/res_config_view.xml b/addons/document_ftp/res_config_view.xml
index 19a152b5688..3b6b2f0f319 100644
--- a/addons/document_ftp/res_config_view.xml
+++ b/addons/document_ftp/res_config_view.xml
@@ -2,7 +2,7 @@
     <data>
         <record id="view_document_ftp_configuration" model="ir.ui.view">
             <field name="name">Knowledge Application</field>
-            <field name="model">knowledge.configuration</field>
+            <field name="model">knowledge.config.settings</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_knowledge_configuration"/>
             <field name="arch" type="xml">