merges

bzr revid: nch@tinyerp.com-20081104054645-pqtvoho3hiyjb2yf

1 files changed, 35 insertions, 36 deletions

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 6b15382af63..434e00aa7d8 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -1,6 +1,7 @@
 <openerp>
 <data>
     <menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
+    <menuitem name="Configuration" id="menu_document_configuration" parent="menu_document"/>
 
     <record model="ir.ui.view" id="view_document_directory_form">
         <field name="name">document.directory</field>
@@ -8,11 +9,11 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Directories">
-                <notebook>
+                <field name="name" select="1" colspan="4"/>
+                <field name="user_id"/>
+                <field name="parent_id"/>
+                <notebook colspan="4">
                 <page string="Definition">
-                    <field name="name" select="1" colspan="4"/>
-                    <field name="user_id"/>
-                    <field name="parent_id"/>
                     <separator string="Directory Type" colspan="4"/>
                     <field name="type"/>
                     <field name="ressource_type_id"  on_change="onchange_content_id(ressource_type_id)"/>
@@ -29,14 +30,15 @@
                             <field name="sequence"/>
                             <field name="suffix"/>
                             <field name="extension"/>
+                            <field name="include_name"/>
+                            <separator string="PDF Report" colspan="4"/>
                             <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
                         </form>
                         <tree string="Contents">
-                            <field name="sequence"/>
+                            <field name="sequence" string="Seq."/>
                             <field name="name"/>
                             <field name="suffix"/>
                             <field name="extension"/>
-                            <field name="report_id"/>
                         </tree>
                     </field>
                 </page><page string="Security">
@@ -67,26 +69,37 @@
         <field name="res_model">document.directory</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-	</record>
-	<menuitem name="Configuration" id="menu_document_configuration" parent="menu_document"/>
+    </record>
     <menuitem
         name="Directories"
         action="action_document_directory_form"
-		id="menu_document_directories"
-		parent="menu_document_configuration"/>
+        id="menu_document_directories"
+        parent="menu_document_configuration"/>
+
 
     <record model="ir.actions.act_window" id="action_document_directory_tree">
         <field name="type">ir.actions.act_window</field>
+        <field name="name">Directorie's Structure</field>
         <field name="res_model">document.directory</field>
         <field name="view_type">tree</field>
         <field name="domain">[('ressource_parent_type_id','=',False),('parent_id','=',False)]</field>
     </record>
     <menuitem
-        name="Directorie's Structure"
         action="action_document_directory_tree"
-		id="menu_document_directories_tree"
-		parent="menu_document"/>
+        id="menu_document_directories_tree"
+        parent="menu_document_configuration"/>
 
+    <record model="ir.actions.url" id="action_document_browse">
+        <field name="name">Browse Files</field>
+        <field name="url">ftp://localhost:8021/</field>
+    </record>
+    <menuitem
+        name="Browse Files Using FTP"
+        action="action_document_browse"
+        id="menu_document_browse"
+        type="url"
+        icon="STOCK_EXECUTE"
+        parent="menu_document"/>
 
     <record model="ir.ui.view" id="view_document_file_form">
         <field name="name">ir.attachment</field>
@@ -146,8 +159,8 @@
     <menuitem
         name="Search a File"
         action="action_document_file_form"
-		id="menu_document_files"
-		parent="menu_document"/>
+        id="menu_document_files"
+        parent="menu_document"/>
 
     <record model="ir.actions.act_window" id="action_document_file_directory_form">
         <field name="type">ir.actions.act_window</field>
@@ -203,33 +216,20 @@
     </record>
 
 
-	<record id="view_auto_config_form" model="ir.ui.view">
+        <record id="view_auto_config_form" model="ir.ui.view">
             <field name="name">Auto Configure Directory</field>
             <field name="model">document.configuration.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Auto Configure">
-					<separator string="Connect to Document Management System." colspan="4"/>
-					<label align="0.0"  string="You can use ftp://admin:admin@localhost:8021 " colspan="4"/>
-                    <separator string="Configure Ressources Directory :" colspan="4"/>
-                    <newline/>
-                    <label string="'All Sales Order' -> sale.order" align="0.0" colspan="4"/>
-					<label string="'Sales by Salesman' -> res.users" align="0.0" colspan="4"/>
-                    <label string="'Personnal Folders' -> res.users" align="0.0" colspan="4"/>
-                    <label string="'Projects' -> account.analytic.account with ressource tree" align="0.0"  colspan="4"/>
-					<separator string="New Directories." colspan="4"/>
-					<label string="'Sales' -> sale.order which is link directory of 'res.users' model" align="0.0"  colspan="4"/>
-					<label align="0.0"  string="'Quotation','Meetings','Analysis Reports' -> static directories which are link directories of 'account.analytic.account' model" colspan="4"/>
-                    <newline/>
-                    <newline/>
-					<separator string="" colspan="4"/>
-					<label string="" colspan="2"/>
+                    <separator string="Document Management System." colspan="4"/>
+                    <label string="This wizard will automatically configure the document management system according to modules installed on your system." align="0.0" colspan="4"/>
+                    <separator string="" colspan="4"/>
+                    <label string="" colspan="2"/>
                     <group col="4" colspan="2">
                         <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
                         <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
                     </group>
-                    <newline/>
-                   
                 </form>
             </field>
         </record>
@@ -243,10 +243,9 @@
             <field name="target">new</field>
         </record>
 
-      <record model="ir.actions.todo"
-            id="config_auto_directory">
+        <record model="ir.actions.todo" id="config_auto_directory">
             <field name="name">Auto Configure Directory</field>
-			<field name="note">This wizard will be configure directory for ressource model.</field>
+            <field name="note">This wizard will be configure directory for ressource model.</field>
             <field name="action_id" ref="action_config_auto_directory"/>
             <field name="state">open</field>
         </record>