* Document

      	- Added document_directory_node to add directory_id to process.node
      	- Added required inherited views
      	- Added dependency to process
* Process
	- Now integrated with document module

bzr revid: ame@tinyerp.com-20080926143755-m2tcrqiyjirj00of

1 files changed, 187 insertions, 159 deletions

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index fb87bb56d21..1b44907af30 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -1,174 +1,202 @@
 <terp>
 <data>
-	<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
+    <menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
 
-	<record model="ir.ui.view" id="view_document_directory_form">
-		<field name="name">document.directory</field>
-		<field name="model">document.directory</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Directories">
-				<notebook>
-				<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)"/>
-					<newline/>
-					<field name="domain"/>
-					<field name="ressource_tree"/>
-					<field name="ressource_id" select="2"/>
-					<field name="ressource_parent_type_id"/>
+    <record model="ir.ui.view" id="view_document_directory_form">
+        <field name="name">document.directory</field>
+        <field name="model">document.directory</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Directories">
+                <notebook>
+                <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)"/>
+                    <newline/>
+                    <field name="domain"/>
+                    <field name="ressource_tree"/>
+                    <field name="ressource_id" select="2"/>
+                    <field name="ressource_parent_type_id"/>
 
-					<separator string="Contents" colspan="4"/>
-					<field name="content_ids" nolabel="1" colspan="4">
-						<form string="Contents">
-							<field name="name"/>
-							<field name="sequence"/>
-							<field name="suffix"/>
-							<field name="extension"/>
-							<field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
-						</form>
-						<tree string="Contents">
-							<field name="sequence"/>
-							<field name="name"/>
-							<field name="suffix"/>
-							<field name="extension"/>
-							<field name="report_id"/>
-						</tree>
-					</field>
-				</page><page string="Security">
-					<field name="group_ids" colspan="4" nolabel="1"/>
-				</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_document_directory_tree">
-		<field name="name">document.directory</field>
-		<field name="model">document.directory</field>
-		<field name="type">tree</field>
-		<field name="field_parent">child_ids</field>
-		<field name="arch" type="xml">
-			<tree string="Directories">
-				<field name="name"/>
-				<field name="type"/>
-				<field name="user_id"/>
-				<field name="create_date"/>
-				<field name="write_date"/>
-			</tree>
-		</field>
-	</record>
+                    <separator string="Contents" colspan="4"/>
+                    <field name="content_ids" nolabel="1" colspan="4">
+                        <form string="Contents">
+                            <field name="name"/>
+                            <field name="sequence"/>
+                            <field name="suffix"/>
+                            <field name="extension"/>
+                            <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
+                        </form>
+                        <tree string="Contents">
+                            <field name="sequence"/>
+                            <field name="name"/>
+                            <field name="suffix"/>
+                            <field name="extension"/>
+                            <field name="report_id"/>
+                        </tree>
+                    </field>
+                </page><page string="Security">
+                    <field name="group_ids" colspan="4" nolabel="1"/>
+                </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_document_directory_tree">
+        <field name="name">document.directory</field>
+        <field name="model">document.directory</field>
+        <field name="type">tree</field>
+        <field name="field_parent">child_ids</field>
+        <field name="arch" type="xml">
+            <tree string="Directories">
+                <field name="name"/>
+                <field name="type"/>
+                <field name="user_id"/>
+                <field name="create_date"/>
+                <field name="write_date"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_document_directory_form">
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">document.directory</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-	<menuitem
-		name="Document Management/Configuration/Directories"
-		action="action_document_directory_form"
-		id="menu_document_directories"/>
+    <record model="ir.actions.act_window" id="action_document_directory_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">document.directory</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem
+        name="Document Management/Configuration/Directories"
+        action="action_document_directory_form"
+        id="menu_document_directories"/>
 
-	<record model="ir.actions.act_window" id="action_document_directory_tree">
-		<field name="type">ir.actions.act_window</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="Document Management/Directorie's Structure"
-		action="action_document_directory_tree"
-		id="menu_document_directories_tree"/>
+    <record model="ir.actions.act_window" id="action_document_directory_tree">
+        <field name="type">ir.actions.act_window</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="Document Management/Directorie's Structure"
+        action="action_document_directory_tree"
+        id="menu_document_directories_tree"/>
 
 
-	<record model="ir.ui.view" id="view_document_file_form">
-		<field name="name">ir.attachment</field>
-		<field name="model">ir.attachment</field>
-		<field name="priority" eval="1"/>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Files">
-				<notebook>
-				<page string="Definition">
-					<field name="name" select="1" colspan="4"/>
-					<field name="title" select="1"  colspan="4"/>
-					<newline/>
-					<field name="datas"/>
-					<field name="file_size"/>
-					<newline/>
-					<field name="parent_id"/>
-					<newline/>
-					<field name="user_id"/>
-					<field name="partner_id"/>
-					<newline/>
-					<field name="create_date"/>
-					<field name="create_uid"/>
-					<field name="write_date"/>
-					<field name="write_uid"/>
-				</page><page string="Indexed Content">
-					<field name="index_content" nolabel="1" colspan="4" select="1"/>
-				</page><page string="Security">
-					<field name="group_ids" colspan="4" nolabel="1"/>
-				</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_document_file_tree">
-		<field name="name">ir.attachment</field>
-		<field name="model">ir.attachment</field>
-		<field name="type">tree</field>
-		<field name="priority" eval="1"/>
-		<field name="arch" type="xml">
-			<tree string="Files">
-				<field name="name"/>
-				<field name="title" />
-				<field name="partner_id"/>
-				<field name="file_size"/>
-				<field name="user_id"/>
-				<field name="write_date"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_document_file_form">
+        <field name="name">ir.attachment</field>
+        <field name="model">ir.attachment</field>
+        <field name="priority" eval="1"/>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Files">
+                <notebook>
+                <page string="Definition">
+                    <field name="name" select="1" colspan="4"/>
+                    <field name="title" select="1"  colspan="4"/>
+                    <newline/>
+                    <field name="datas"/>
+                    <field name="file_size"/>
+                    <newline/>
+                    <field name="parent_id"/>
+                    <newline/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                    <newline/>
+                    <field name="create_date"/>
+                    <field name="create_uid"/>
+                    <field name="write_date"/>
+                    <field name="write_uid"/>
+                </page><page string="Indexed Content">
+                    <field name="index_content" nolabel="1" colspan="4" select="1"/>
+                </page><page string="Security">
+                    <field name="group_ids" colspan="4" nolabel="1"/>
+                </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_document_file_tree">
+        <field name="name">ir.attachment</field>
+        <field name="model">ir.attachment</field>
+        <field name="type">tree</field>
+        <field name="priority" eval="1"/>
+        <field name="arch" type="xml">
+            <tree string="Files">
+                <field name="name"/>
+                <field name="title" />
+                <field name="partner_id"/>
+                <field name="file_size"/>
+                <field name="user_id"/>
+                <field name="write_date"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_document_file_form">
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">ir.attachment</field>
-		<field name="view_type">form</field>
-	</record>
-	<menuitem
-		name="Document Management/Search a File"
-		action="action_document_file_form"
-		id="menu_document_files"/>
+    <record model="ir.actions.act_window" id="action_document_file_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">ir.attachment</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Document Management/Search a File"
+        action="action_document_file_form"
+        id="menu_document_files"/>
 
-	<record model="ir.actions.act_window" id="action_document_file_directory_form">
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">ir.attachment</field>
-		<field name="view_type">form</field>
-		<field name="domain">[('parent_id','=',active_id)]</field>
-	</record>
+    <record model="ir.actions.act_window" id="action_document_file_directory_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">ir.attachment</field>
+        <field name="view_type">form</field>
+        <field name="domain">[('parent_id','=',active_id)]</field>
+    </record>
 
-	<record model="ir.values" id="ir_action_document_file_directory_form">
-		<field name="key2" eval="'tree_but_open'"/>
-		<field name="model" eval="'document.directory'"/>
-		<field name="name">Browse Files</field>
-		<field name="value" eval="'ir.actions.act_window,%d'%action_document_file_directory_form"/>
-		<field name="object" eval="True"/>
-	</record>
+    <record model="ir.values" id="ir_action_document_file_directory_form">
+        <field name="key2" eval="'tree_but_open'"/>
+        <field name="model" eval="'document.directory'"/>
+        <field name="name">Browse Files</field>
+        <field name="value" eval="'ir.actions.act_window,%d'%action_document_file_directory_form"/>
+        <field name="object" eval="True"/>
+    </record>
 
-	<record model="ir.ui.view" id="view_attachment_form_inherit">
-		<field name="name">ir.attachment.view.inherit</field>
-		<field name="model">ir.attachment</field>
-		<field name="inherit_id" ref="base.view_attachment_form"/>
-		<field name="arch" type="xml">
-			<field name="datas_fname" position = "replace" >
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_attachment_form_inherit">
+        <field name="name">ir.attachment.view.inherit</field>
+        <field name="model">ir.attachment</field>
+        <field name="inherit_id" ref="base.view_attachment_form"/>
+        <field name="arch" type="xml">
+            <field name="datas_fname" position = "replace" >
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_process_node_form_inherit1">
+        <field name="name">process.node.form</field>
+        <field name="model">process.node</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="process.view_process_node_form"/>
+        <field name="priority" eval="1"/>
+        <field name="arch" type="xml">
+            <field name="subflow_id" position="after">
+                <field name="directory_id"/>
+                <newline/>
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_process_form_inherit1">
+        <field name="name">process.process.form</field>
+        <field name="model">process.process</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="process.view_process_form"/>
+        <field name="priority" eval="1"/>
+        <field name="arch" type="xml">
+            <field name="subflow_id" position="after">
+                <field name="directory_id"/>
+                <newline/>
+            </field>
+        </field>
+    </record>
 
 </data>
 </terp>