Merge

bzr revid: ruchakpatel@gmail.com-20081022045328-tmfonkuowvzdnsib

6 files changed, 90 insertions, 20 deletions

diff --git a/addons/document/__terp__.py b/addons/document/__terp__.py
index 0e1c845cff6..aafdbebdb1a 100644
--- a/addons/document/__terp__.py
+++ b/addons/document/__terp__.py
@@ -12,9 +12,14 @@
 	* User Authentification
 	* Document Indexation
 """,
-	"depends" : ["base", "process"],
+	"depends" : ["base", "process", "hr"],
 	"init_xml" : ["document_data.xml"],
-	"update_xml" : ["document_view.xml"],
+	"update_xml" : [
+		"document_view.xml",
+		"security/document_security.xml",
+		"security/ir.model.access.csv",
+        "process/document_process.xml"
+	],
 	"demo_xml" : ["document_demo.xml"],
 	"active": False,
 	"installable": True
diff --git a/addons/document/document.py b/addons/document/document.py
index deb830a6d7c..d7904d31285 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -1,7 +1,9 @@
-#############################################################################
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
 #
-# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#                    Fabien Pinckaers <fp@tiny.Be>
+# $Id$
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -597,8 +599,8 @@ class document_file(osv.osv):
 		return super(document_file, self).unlink(cr, uid, ids, context)
 document_file()
 
-class auto_configuration(osv.osv_memory):
-    _name='auto.configuration'
+class document_configuration_wizard(osv.osv_memory):
+    _name='document.configuration.wizard'
     _rec_name = 'Auto Directory configuration'
     _columns = {
      			}
@@ -687,4 +689,4 @@ class auto_configuration(osv.osv_memory):
 	            doc_obj.create(cr,uid,res)
 	    return True
 
-auto_configuration()
\ No newline at end of file
+document_configuration_wizard()
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index dfc3cc4c85a..6b15382af63 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -67,11 +67,13 @@
         <field name="res_model">document.directory</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-    </record>
+	</record>
+	<menuitem name="Configuration" id="menu_document_configuration" parent="menu_document"/>
     <menuitem
-        name="Document Management/Configuration/Directories"
+        name="Directories"
         action="action_document_directory_form"
-        id="menu_document_directories"/>
+		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>
@@ -80,9 +82,10 @@
         <field name="domain">[('ressource_parent_type_id','=',False),('parent_id','=',False)]</field>
     </record>
     <menuitem
-        name="Document Management/Directorie's Structure"
+        name="Directorie's Structure"
         action="action_document_directory_tree"
-        id="menu_document_directories_tree"/>
+		id="menu_document_directories_tree"
+		parent="menu_document"/>
 
 
     <record model="ir.ui.view" id="view_document_file_form">
@@ -141,9 +144,10 @@
         <field name="view_type">form</field>
     </record>
     <menuitem
-        name="Document Management/Search a File"
+        name="Search a File"
         action="action_document_file_form"
-        id="menu_document_files"/>
+		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>
@@ -201,21 +205,31 @@
 
 	<record id="view_auto_config_form" model="ir.ui.view">
             <field name="name">Auto Configure Directory</field>
-            <field name="model">auto.configuration</field>
+            <field name="model">document.configuration.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Auto Configure">
-                    <label string="" colspan="2"/>
+					<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="Do you want to configure Directory Automatically ?" colspan="2"/>
+                    <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"/>
                     <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/>
-                    <label string="You Can use ftp://admin:admin@localhost:8021 " colspan="2"/>
+                   
                 </form>
             </field>
         </record>
@@ -223,7 +237,7 @@
         <record id="action_config_auto_directory" model="ir.actions.act_window">
             <field name="name">Auto Configure Directory</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">auto.configuration</field>
+            <field name="res_model">document.configuration.wizard</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -232,6 +246,7 @@
       <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="action_id" ref="action_config_auto_directory"/>
             <field name="state">open</field>
         </record>
diff --git a/addons/document/process/document_process.xml b/addons/document/process/document_process.xml
new file mode 100644
index 00000000000..3c37c793ab4
--- /dev/null
+++ b/addons/document/process/document_process.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+    
+    	<record id="process_node_papers0" model="process.node">
+			<field name="menu_id" ref="document.menu_document_directories"/>
+			<field name="model_id" ref="document.model_document_directory"/>
+			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+			<field eval="&quot;&quot;&quot;Papers&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Employee get papers and matrieal&quot;&quot;&quot;" name="note"/>
+			<field name="process_id" ref="hr.process_process_employeecontractworkflow0"/>
+			<field eval="0" name="flow_start"/>
+		</record>
+		
+		<record id="process_transition_papersandmaterials0" model="process.transition">
+			<field eval="[(6,0,[])]" name="role_ids"/>
+			<field eval="[(6,0,[])]" name="transition_ids"/>
+			<field eval="&quot;&quot;&quot;Papers and materials&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Employee get papers and necessary materials&quot;&quot;&quot;" name="note"/>
+			<field model="process.node" name="target_node_id" ref="process_node_papers0"/>
+			<field model="process.node" name="source_node_id" ref="hr.process_node_employee0"/>
+		</record>
+    
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
new file mode 100644
index 00000000000..4cef19d31ed
--- /dev/null
+++ b/addons/document/security/document_security.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+    <record id="group_document_manager" model="res.groups">
+		<field name="name">Document / Manager</field>
+    </record>
+
+	<record id="menu_document_configuration" model="ir.ui.menu">
+		<field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
+	</record>
+
+</data>
+</openerp>
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
new file mode 100644
index 00000000000..dfe882e49d8
--- /dev/null
+++ b/addons/document/security/ir.model.access.csv
@@ -0,0 +1,9 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_document_directory_all","document.directory all","model_document_directory",,1,0,0,0
+"access_document_directory_group_document_manager","document.directory document manager","model_document_directory","group_document_manager",1,1,1,1
+"access_document_directory_group_system","document.directory group system","model_document_directory","base.group_system",1,1,1,1
+"access_document_directory_content_all","document.directory.content all","model_document_directory_content",,1,0,0,0
+"access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","group_document_manager",1,1,1,1
+"access_document_directory_content_group_system","document.directory.content group system","model_document_directory_content","base.group_system",1,1,1,1
+"access_document_configuation_wizard","document.configuration.wizard document manager","model_document_configuration_wizard","group_document_manager",1,1,1,1
+"access_document_configuation_wizard_sytem","document.configuration.wizard group system","model_document_configuration_wizard","base.group_system",1,1,1,1