[MERGE] sync with latest trunk

bzr revid: odo@openerp.com-20111013170327-9rvfdkbgj01hdgxb

3 files changed, 19 insertions, 35 deletions

diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index c98daa4eaaf..6b9cbd21f48 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -23,8 +23,7 @@
 {
     'name': 'Integrated Document Management System',
     'version': '2.1',
-    'category': 'Tools',
-    'category': 'Generic Modules/Others',
+    'category': 'Knowledge Management',
     'complexity': "normal",
     'description': """
 This is a complete document management system.
diff --git a/addons/document/wizard/document_configuration.py b/addons/document/wizard/document_configuration.py
index 3485e7412c7..97eda4e2d62 100644
--- a/addons/document/wizard/document_configuration.py
+++ b/addons/document/wizard/document_configuration.py
@@ -22,26 +22,16 @@
 from osv import osv, fields
 
 class document_configuration(osv.osv_memory):
-
     _name='document.configuration'
-    _description = 'Auto Directory Configuration'
+    _description = 'Directory Configuration'
     _inherit = 'res.config'
 
-    _columns = {
-        'sale_order' : fields.boolean('Sale Orders', help="Create virtual folders for Sale Orders and Quotations. One virtual folder will appear for each, in which the latest printed PDF document can be downloaded at any time, and where you can manage (view, add, delete) other attachments."),
-        'product' : fields.boolean('Products', help="Create virtual folders for Products. One virtual folder will appear for each product, where you can manage (view, add, delete) the files attached to the product"),
-        'project': fields.boolean('Projects', help="Create virtual folders for Projects. One virtual folder will appear for each project, where you can manage (view, add, delete) the files attached to the project"),
-    }
-
-
     def execute(self, cr, uid, ids, context=None):
-        conf_id = ids and ids[0] or False
-        conf = self.browse(cr, uid, conf_id, context=context)
         dir_pool = self.pool.get('document.directory')
         data_pool = self.pool.get('ir.model.data')
         model_pool = self.pool.get('ir.model')
         content_pool = self.pool.get('document.directory.content')
-        if conf.sale_order and self.pool.get('sale.order'):
+        if self.pool.get('sale.order'):
             # Sale order
             dir_data_id = data_pool._get_id(cr, uid, 'document', 'dir_sale_order_all')
             if dir_data_id:
@@ -90,7 +80,7 @@ class document_configuration(osv.osv_memory):
                 })
 
 
-        if conf.product and self.pool.get('product.product'):
+        if self.pool.get('product.product'):
             # Product
             dir_data_id = data_pool._get_id(cr, uid, 'document', 'dir_product')
             if dir_data_id:
@@ -104,7 +94,7 @@ class document_configuration(osv.osv_memory):
                 'ressource_type_id': mid[0],
             })
 
-        if conf.project and self.pool.get('account.analytic.account'):
+        if self.pool.get('account.analytic.account'):
             # Project
             dir_data_id = data_pool._get_id(cr, uid, 'document', 'dir_project')
             if dir_data_id:
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index eaba3b7115e..a51a7877e60 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -1,31 +1,27 @@
 <openerp>
   <data>
     <record id="view_auto_config_form" model="ir.ui.view">
-        <field name="name">Auto Configure Directory</field>
+        <field name="name">Auto Configure Directories</field>
         <field name="model">document.configuration</field>
         <field name="type">form</field>
         <field name="inherit_id" ref="base.res_config_view_base"/>
         <field name="arch" type="xml">
           <data>
             <form position="attributes">
-              <attribute name="string">Knowledge Application Configuration</attribute>
+                <attribute name="string">Knowledge Application Configuration</attribute>
             </form>
-             <separator string="title" position="attributes">
-            	<attribute name="string">Virtual Document Folders</attribute>
-          	</separator>
-          	<xpath expr="//label[@string='description']" position="attributes">
-            <attribute name="string">OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any document report. A few common virtual folders can be created for you automatically from this screen.</attribute>
-          </xpath>
-          <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-  				<attribute name="rowspan">12</attribute>
-      			<attribute name="string"/>
-	      	</xpath>
+            <separator string="title" position="attributes">
+            <attribute name="string">Configure Direcories</attribute>
+            </separator>
+            <xpath expr="//label[@string='description']" position="attributes">
+            <attribute name="string">OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed.</attribute>
+            </xpath>
+            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="rowspan">12</attribute>
+                    <attribute name="string"/>
+            </xpath>
             <group string="res_config_contents" position="replace">
-                <group col="6" colspan="4">
-                    <field name="sale_order"/>
-                    <field name="product"/>
-                    <field name="project"/>
-                </group>
+                  <label align="0.0" string="When executing this wizard, it will configure your directories automatically according to modules installed."/>
             </group>
             <xpath expr="//button[@name='action_skip']" position="replace"/>
           </data>
@@ -33,7 +29,7 @@
     </record>
 
     <record id="action_config_auto_directory" model="ir.actions.act_window">
-        <field name="name">Document Management System: Configure Virtual Folders</field>
+        <field name="name">Configure Directories</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">document.configuration</field>
         <field name="view_id" ref="view_auto_config_form"/>
@@ -50,7 +46,6 @@
     <record model="ir.actions.todo" id="config_auto_directory">
         <field name="action_id" ref="action_config_auto_directory"/>
         <field name="category_id" ref="category_knowledge_mgmt_config"/>
-        <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
         <field name="type">automatic</field>
     </record>
   </data>