bugfix

[odoo/odoo.git] / addons / base_contact / base_contact_view.xml

diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index e1395f7..4ee3082 100644 (file)
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -13,6 +13,8 @@
                 <field name="first_name"/>
                 <field name="mobile"/>
                 <field name="lang_id"/>
+                <field name="partner_id"/>
+                <field name="function_id"/>
             </tree>
         </field>
     </record>
@@ -34,9 +36,10 @@
                         <field name="website"/>
                         <field name="lang_id"/>
                         <field name="active"/>
-                        <separator string="Functions" colspan="4"/>
-                        <field name="job_ids" colspan="4" nolabel="1" mode="tree, form">
-                            <form string="Functions">
+                        <field name="partner_id" invisible="1" select="2"/>
+                        <field name="function_id" invisible="1" select="2"/>
+                        <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
+                            <form string="Functions and Addresses">
                                 <field name="function_id"/>
                                 <field name="address_id"/>
                                 <field name="name"/>
@@ -47,7 +50,7 @@
                                 <field name="date_stop" />
                                 <field name="state" />
                             </form>
-                            <tree string="Functions">
+                            <tree string="Functions and Addresses">
                                 <field name="sequence_contact" string="Seq."/>
                                 <field name="function_id"/>
                                 <field name="name"/>
@@ -102,8 +105,9 @@
                         <newline/>
                         <field name="phone"/>
                         <field name="fax"/>
+                        <field name="email"/>
                         <newline/>
-                        <field name="job_ids" mode="tree, form" colspan="4">
+                        <field name="job_ids" mode="tree,form" nolabel="1" colspan="4">
                             <tree string="Contacts" editable="top">
                                 <field name="sequence_partner"/>
                                 <field name="contact_id"/>
@@ -112,6 +116,7 @@
                                 <field name="email"/>
                             </tree>
                             <form string="Contacts">
+                                <field name="name"/>
                                 <field name="sequence_partner"/>
                                 <field name="contact_id"/>
                                 <field name="function_id"/>
@@ -133,6 +138,45 @@
         </field>
     </record>
 
+<!-- don't display the categories, since it is displayed in an other tab-->
+               <record model="ir.ui.view" id="view_partner_form_inherit2">
+                       <field name="name">res.partner.form</field>
+                       <field name="type">form</field>
+                       <field name="model">res.partner</field>
+                       <field name="inherit_id" ref="base.view_partner_form"/>
+                       <field name="arch" type="xml">
+                               <field name="category_id" position="replace">
+                               </field>
+                       </field>
+               </record>
+
+<!-- don't display the categories label-->
+               <record model="ir.ui.view" id="view_partner_form_inherit2bis">
+                       <field name="name">res.partner.form</field>
+                       <field name="type">form</field>
+                       <field name="model">res.partner</field>
+                       <field name="inherit_id" ref="base.view_partner_form"/>
+                       <field name="arch" type="xml">
+                               <separator colspan="4" string="Categories" position="replace"/>
+                       </field>
+               </record>
+
+               <record model="ir.ui.view" id="view_partner_form_inherit3">
+                       <field name="name">res.partner.form</field>
+                       <field name="type">form</field>
+                       <field name="model">res.partner</field>
+                       <field name="inherit_id" ref="base.view_partner_form"/>
+                       <field name="arch" type="xml">
+                               <notebook position="inside">
+                                       <page string="Categories">
+                                               <separator colspan="4" string="Categories"/>
+                                               <field colspan="4" name="category_id" nolabel="1" select="2"/>
+                                       </page>
+                               </notebook>
+                       </field>
+               </record>
+
+
     <!-- Views for Addresses -->
     <record model="ir.ui.view" id="view_partner_address_tree_inherited1">
         <field name="name">Partner addresses inherited</field>
@@ -222,7 +266,7 @@
         <field name='type'>form</field>
         <field name='arch' type='xml'>
             <field name="email" position="replace">
-                <field name="job_ids" mode="tree, form" colspan="4">
+                <field name="job_ids" mode="tree,form" colspan="4">
                     <tree string="Contacts" editable="top">
                         <field name="contact_id"/>
                         <field name="function_id"/>
@@ -247,12 +291,13 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Contact Functions">
-                <field name="name"/>
-                <field name="address_id"/>
                 <field name="contact_id"/>
                 <field name="function_id"/>
+                <field name="name"/>
+                <field name="address_id"/>
                 <field name="email"/>
                 <field name="phone"/>
+                <field name="state" />
             </tree>
         </field>
     </record>
@@ -271,8 +316,11 @@
                         <field name="function_id" select="1"/>
                         <field name="email" select="2"/>
                         <field name="phone" select="2"/>
-                        <field name="sequence_contact" select="2"/>
-                        <field name="sequence_partner" select="2"/>
+                        <field name="sequence_contact" select="2" groups="base.group_user"/>
+                        <field name="sequence_partner" select="2" groups="base.group_user"/>
+                        <field name="date_start" groups="base.group_user"/>
+                        <field name="date_stop" groups="base.group_user"/>
+                        <field name="state" select="2" />
                     </page>
                 </notebook>
             </form>
@@ -281,18 +329,23 @@
 
     <!-- Menuitem for res.partner.job -->
     <record model="ir.actions.act_window" id="action_res_partner_job">
-        <field name="name">Functions</field>
+        <field name="name">Contact's Jobs</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">res.partner.job</field>
         <field name="view_type">form</field>
     </record>
-    <menuitem name="Partners/Functions" action="action_res_partner_job" id="menu_action_res_partner_job"/>
+    <menuitem
+        name="Partners/Contact's Jobs" 
+        action="action_res_partner_job" 
+        id="menu_action_res_partner_job"
+        groups="base.group_extended"/>
+
     <!-- Act window defining a shorcut on partners to open all his contacts -->
-    <act_window name="Open all Partner's Function"
-        domain="[('name', '=', active_id)]"
+    <act_window domain="[('name', '=', active_id)]"
+        id="act_res_partner_jobs" name="Partner Contacts"
         res_model="res.partner.job"
         src_model="res.partner"
-        view_mode='tree,form'
-        id="act_res_partner_jobs"/>
+        />
+
 </data>
 </openerp>