From a5fdb75ad6a54db8dc3d5d68d8551cc093f7be0e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 14 Jul 2011 12:37:25 +0200
Subject: [FIX] ir.actions.todo are now unskippable

bzr revid: xmo@openerp.com-20110714103725-6r6j35qegobhvx5u
---
 addons/document/wizard/document_configuration_view.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/document/wizard/document_configuration_view.xml')

diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index c2bf3245afb..218c93e244c 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -52,7 +52,6 @@
         <field name="category_id" ref="category_knowledge_mgmt_config"/>
         <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
         <field name="type">special</field>
-        <field name="state">skip</field>
     </record>
   </data>
 </openerp>
-- 
cgit v1.2.3


From cc13113641442cd34ea5587ad109477efe8b1f0d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 29 Jul 2011 15:48:10 +0200
Subject: [REF] reformat xml files before applying automated search&replace on
 them

bzr revid: xmo@openerp.com-20110729134810-oiqptqs2omvo7o7c
---
 addons/document/wizard/document_configuration_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/document/wizard/document_configuration_view.xml')

diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index 218c93e244c..805795ac3ba 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -16,9 +16,9 @@
           	<xpath expr="//label[@string='description']" position="attributes">
             <attribute name="string">Choose the following Resouces to auto directory configuration.</attribute>
           </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-  				<attribute name='rowspan'>12</attribute>
-      			<attribute name='string'></attribute>
+          <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">
@@ -54,4 +54,4 @@
         <field name="type">special</field>
     </record>
   </data>
-</openerp>
+</openerp>
\ No newline at end of file
-- 
cgit v1.2.3


From 09cf4d40d0e8e558b8847bcb8853eac37a738285 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 29 Jul 2011 16:03:24 +0200
Subject: [FIX] convert ir.actions.todo fields to match model definition
 changes

* type = special => type = automatic
* type = recurring | normal => type = normal
* default type special => normal
* state = hidden => state = done

bzr revid: xmo@openerp.com-20110729140324-0nxus4p8ufj46z9y
---
 addons/document/wizard/document_configuration_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/document/wizard/document_configuration_view.xml')

diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index 805795ac3ba..f6c3131b3a0 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -51,7 +51,7 @@
         <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">special</field>
+        <field name="type">automatic</field>
     </record>
   </data>
-</openerp>
\ No newline at end of file
+</openerp>
-- 
cgit v1.2.3


From e8e6a91431c46eca2b08226164a37127f0e5f79c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 7 Sep 2011 22:55:18 +0200
Subject: [IMP] document: (usability) improved wording of virtual folder wizard
 screen

bzr revid: odo@openerp.com-20110907205518-we9s9ws5dphrcs7b
---
 addons/document/wizard/document_configuration_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/document/wizard/document_configuration_view.xml')

diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index f6c3131b3a0..eaba3b7115e 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -11,10 +11,10 @@
               <attribute name="string">Knowledge Application Configuration</attribute>
             </form>
              <separator string="title" position="attributes">
-            	<attribute name="string">Configure Resource Directory</attribute>
+            	<attribute name="string">Virtual Document Folders</attribute>
           	</separator>
           	<xpath expr="//label[@string='description']" position="attributes">
-            <attribute name="string">Choose the following Resouces to auto directory configuration.</attribute>
+            <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>
@@ -33,7 +33,7 @@
     </record>
 
     <record id="action_config_auto_directory" model="ir.actions.act_window">
-        <field name="name">Auto Configure Directory</field>
+        <field name="name">Document Management System: Configure Virtual Folders</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"/>
-- 
cgit v1.2.3