From 6be95981f425b06cb2bdf5a2ffa8b5d7e794f9ea Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Mon, 1 Dec 2008 17:44:05 +0100
Subject: [PATCH] *reverted address mail = fields.chart instead of
 fields.related *improved view or res.partner

bzr revid: qdp@tinyerp.com-20081201164405-d93u1b0fpahgnsjt
---
 addons/base_contact/base_contact.py       |  1 -
 addons/base_contact/base_contact_view.xml | 49 ++++++++++++++++++++---
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 9fa43c42e43..fa3dc37b311 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -88,7 +88,6 @@ class res_partner_address(osv.osv):
     _description ='Partner Address'
     _columns = {
         'job_ids':fields.one2many('res.partner.job', 'address_id', 'Contacts'),
-        'email': fields.related('job_ids', 'email', type='char', string='Default Email'),
     }
 res_partner_address()
 
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 6bf2b2ef61a..4ee308221ff 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -107,7 +107,7 @@
                         <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"/>
@@ -138,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>
@@ -302,11 +341,11 @@
         groups="base.group_extended"/>
 
     <!-- Act window defining a shorcut on partners to open all his contacts -->
-    <act_window name="Partner Contacts"
-        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>