[Merge]with: lp:openobject-addons

bzr revid: dbr@tinyerp.com-20110920064550-v90yjoblpzp5ebiq

2 files changed, 11 insertions, 12 deletions

diff --git a/addons/document/wizard/document_configuration.py b/addons/document/wizard/document_configuration.py
index 40dc2b3afd8..3485e7412c7 100644
--- a/addons/document/wizard/document_configuration.py
+++ b/addons/document/wizard/document_configuration.py
@@ -28,9 +28,9 @@ class document_configuration(osv.osv_memory):
     _inherit = 'res.config'
 
     _columns = {
-        'sale_order' : fields.boolean('Sale Order', help="Auto directory configuration for Sale Orders and Quotation with report."),
-        'product' : fields.boolean('Product', help="Auto directory configuration for Products."),
-        'project': fields.boolean('Project', help="Auto directory configuration for Projects."),
+        '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"),
     }
 
 
@@ -81,7 +81,7 @@ class document_configuration(osv.osv_memory):
                 })
 
                 content_pool.create(cr, uid, {
-                    'name': "Print Qutation",
+                    'name': "Print Quotation",
                     'suffix': "_print",
                     'report_id': order_report_id,
                     'extension': '.pdf',
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index c2bf3245afb..eaba3b7115e 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -11,14 +11,14 @@
               <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="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">
@@ -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"/>
@@ -51,8 +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="state">skip</field>
+        <field name="type">automatic</field>
     </record>
   </data>
 </openerp>