improve

bzr revid: fp@tinyerp.com-20081027134700-xjzef3vf23cffzel

4 files changed, 314 insertions, 312 deletions

diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__terp__.py
index a267a7631c0..0923b6324de 100644
--- a/addons/base_contact/__terp__.py
+++ b/addons/base_contact/__terp__.py
@@ -22,7 +22,9 @@
     """,
     "depends" : ["base"],
     "init_xml" : [],
-    "demo_xml" : ["base_contact_demo.xml"],
+    "demo_xml" : [
+        "base_contact_demo.xml"
+    ],
     "update_xml" : [
         "security/ir.model.access.csv",
         'base_contact_view.xml'
diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml
index 00104813896..09cca7acdb6 100644
--- a/addons/base_contact/base_contact_demo.xml
+++ b/addons/base_contact/base_contact_demo.xml
@@ -1,326 +1,326 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
         <!-- Create the functions -->
-		<record id="res_partner_function_privateaddress0" model="res.partner.function">
-			<field eval="&quot;&quot;&quot;Private Address&quot;&quot;&quot;" name="name"/>
-		</record>
+        <record id="res_partner_function_privateaddress0" model="res.partner.function">
+            <field eval="&quot;&quot;&quot;Private Address&quot;&quot;&quot;" name="name"/>
+        </record>
 
         <!-- Create the contacts -->
-		<record id="res_partner_contact_mortier0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Benoit&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Mortier&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_jacot0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Laurent&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Jacot&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_passot0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Thomas&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Passot&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_lacarte0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Etienne&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Lacarte&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_tang0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Tang&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_wong0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Wong&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_lavente0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Jean-Guy&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Lavente&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_lelitre0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Sylvie&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Lelitre&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Mss&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_grosbonnet0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Arthur&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Grosbonnet&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_lesbrouffe0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Karine&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Lesbrouffe&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Ms.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_zen0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Zen&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_pinckears0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;http://fptiny.blogspot.com/&quot;&quot;&quot;" name="website"/>
-			<field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Pinckears&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_debois0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Cécile&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Debois&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Mss&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_luu0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Phuong&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Luu&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Ms.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_elkhayat0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Najlaâ&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;El Khayat&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Ms.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_depaoli0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Quentin&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;De Paoli&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_semal0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Fabian&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Semal&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_vandewerve0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Alain&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;van de Werve&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_lambotte0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Frédéric&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Lambotte&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_laurent0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Olivier&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Laurent&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_simonis0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Christophe&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Simonis&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_wirtel0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Stéphane&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Wirtel&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_contact_mignon0" model="res.partner.contact">
-			<field eval="&quot;&quot;&quot;Philippe&quot;&quot;&quot;" name="first_name"/>
-			<field eval="&quot;&quot;&quot;Mignon&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-			<field eval="1" name="active"/>
-		</record>
+        <record id="res_partner_contact_mortier0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Benoit&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Mortier&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_jacot0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Laurent&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Jacot&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_passot0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Thomas&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Passot&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_lacarte0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Etienne&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Lacarte&quot;&quot;&quot;" name="name"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_tang0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Tang&quot;&quot;&quot;" name="name"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_wong0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Wong&quot;&quot;&quot;" name="name"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_lavente0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Jean-Guy&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Lavente&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_lelitre0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Sylvie&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Lelitre&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Mss&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_grosbonnet0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Arthur&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Grosbonnet&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_lesbrouffe0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Karine&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Lesbrouffe&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Ms.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_zen0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Zen&quot;&quot;&quot;" name="name"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_pinckears0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;http://fptiny.blogspot.com/&quot;&quot;&quot;" name="website"/>
+            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Pinckears&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_debois0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Cécile&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Debois&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Mss&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_luu0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Phuong&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Luu&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Ms.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_elkhayat0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Najlaâ&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;El Khayat&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Ms.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_depaoli0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Quentin&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;De Paoli&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_semal0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Fabian&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Semal&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_vandewerve0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Alain&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;van de Werve&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_lambotte0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Frédéric&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Lambotte&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_laurent0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Olivier&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Laurent&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_simonis0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Christophe&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Simonis&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_wirtel0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Stéphane&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Wirtel&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_contact_mignon0" model="res.partner.contact">
+            <field eval="&quot;&quot;&quot;Philippe&quot;&quot;&quot;" name="first_name"/>
+            <field eval="&quot;&quot;&quot;Mignon&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field eval="1" name="active"/>
+        </record>
 
 
         <!-- Create the addresses -->
-		<record id="base.main_address" model="res.partner.address">
-			<field eval="&quot;&quot;&quot;Grand-Rosière&quot;&quot;&quot;" name="city"/>
-			<field eval="&quot;&quot;&quot;+32.81.73.35.01&quot;&quot;&quot;" name="fax"/>
-			<field eval="&quot;&quot;&quot;1367&quot;&quot;&quot;" name="zip"/>
-			<field name="country_id" ref="base.be"/>
-			<field eval="&quot;&quot;&quot;+32.81.81.37.00&quot;&quot;&quot;" name="phone"/>
-			<field eval="&quot;&quot;&quot;Chaussée de Namur, 40&quot;&quot;&quot;" name="street"/>
-		</record>
-		<record id="res_partner_address_0" model="res.partner.address">
-			<field eval="&quot;&quot;&quot;Louvain-La-Neuve&quot;&quot;&quot;" name="city"/>
-			<field eval="&quot;&quot;&quot;1348&quot;&quot;&quot;" name="zip"/>
-			<field eval="&quot;&quot;&quot;contact&quot;&quot;&quot;" name="type"/>
-			<field name="country_id" ref="base.be"/>
-			<field eval="&quot;&quot;&quot;rue du pré, 115&quot;&quot;&quot;" name="street"/>
-			<field eval="1" name="active"/>
-		</record>
-		<record id="res_partner_address_1" model="res.partner.address">
-			<field eval="&quot;&quot;&quot;Charleroi&quot;&quot;&quot;" name="city"/>
-			<field eval="&quot;&quot;&quot;6000&quot;&quot;&quot;" name="zip"/>
-			<field eval="&quot;&quot;&quot;contact&quot;&quot;&quot;" name="type"/>
-			<field name="country_id" ref="base.be"/>
-			<field eval="&quot;&quot;&quot;Boulevars Tirou, 32&quot;&quot;&quot;" name="street"/>
-			<field eval="1" name="active"/>
-		</record>
+        <record id="base.main_address" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Grand-Rosière&quot;&quot;&quot;" name="city"/>
+            <field eval="&quot;&quot;&quot;+32.81.73.35.01&quot;&quot;&quot;" name="fax"/>
+            <field eval="&quot;&quot;&quot;1367&quot;&quot;&quot;" name="zip"/>
+            <field name="country_id" ref="base.be"/>
+            <field eval="&quot;&quot;&quot;+32.81.81.37.00&quot;&quot;&quot;" name="phone"/>
+            <field eval="&quot;&quot;&quot;Chaussée de Namur, 40&quot;&quot;&quot;" name="street"/>
+        </record>
+        <record id="res_partner_address_0" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Louvain-La-Neuve&quot;&quot;&quot;" name="city"/>
+            <field eval="&quot;&quot;&quot;1348&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;contact&quot;&quot;&quot;" name="type"/>
+            <field name="country_id" ref="base.be"/>
+            <field eval="&quot;&quot;&quot;rue du pré, 115&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_partner_address_1" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Charleroi&quot;&quot;&quot;" name="city"/>
+            <field eval="&quot;&quot;&quot;6000&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;contact&quot;&quot;&quot;" name="type"/>
+            <field name="country_id" ref="base.be"/>
+            <field eval="&quot;&quot;&quot;Boulevars Tirou, 32&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+        </record>
 
         <!-- Create the jobs -->
-		<record id="res_partner_job_0" model="res.partner.job">
-			<field name="address_id" ref="base.res_partner_address_1"/>
-			<field name="function_id" ref="base.function_sale"/>
-			<field name="contact_id" ref="res_partner_contact_mortier0"/>
+        <record id="res_partner_job_0" model="res.partner.job">
+            <field name="address_id" ref="base.res_partner_address_1"/>
+            <field name="function_id" ref="base.function_sale"/>
+            <field name="contact_id" ref="res_partner_contact_mortier0"/>
             <field name="sequence_partner">2</field>
-		</record>
-		<record id="res_partner_job_1" model="res.partner.job">
-			<field name="address_id" ref="base.res_partner_address_2"/>
-			<field name="function_id" ref="base.function_sale"/>
-			<field eval="&quot;&quot;&quot;contact@tecsas.fr&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_jacot0"/>
-		</record>
-		<record id="res_partner_job_2" model="res.partner.job">
-			<field name="address_id" ref="base.res_partner_address_3"/>
-			<field name="function_id" ref="base.function_it"/>
-			<field eval="&quot;&quot;&quot;info@mediapole.net&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_passot0"/>
-		</record>
-		<record id="res_partner_job_3" model="res.partner.job">
-			<field name="address_id" ref="base.res_partner_address_tang"/>
-			<field name="function_id" ref="base.function_sale"/>
-			<field name="contact_id" ref="res_partner_contact_tang0"/>
-		</record>
-		<record id="res_partner_job_4" model="res.partner.job">
-			<field name="address_id" ref="base.res_partner_address_wong"/>
-			<field name="function_id" ref="base.function_sale"/>
-			<field name="contact_id" ref="res_partner_contact_wong0"/>
-		</record>
-		<record id="res_partner_job_5" model="res.partner.job">
-			<field name="address_id" ref="base.res_partner_address_6"/>
-			<field name="function_id" ref="base.function_director"/>
-			<field name="contact_id" ref="res_partner_contact_lacarte0"/>
+        </record>
+        <record id="res_partner_job_1" model="res.partner.job">
+            <field name="address_id" ref="base.res_partner_address_2"/>
+            <field name="function_id" ref="base.function_sale"/>
+            <field eval="&quot;&quot;&quot;contact@tecsas.fr&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_jacot0"/>
+        </record>
+        <record id="res_partner_job_2" model="res.partner.job">
+            <field name="address_id" ref="base.res_partner_address_3"/>
+            <field name="function_id" ref="base.function_it"/>
+            <field eval="&quot;&quot;&quot;info@mediapole.net&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_passot0"/>
+        </record>
+        <record id="res_partner_job_3" model="res.partner.job">
+            <field name="address_id" ref="base.res_partner_address_tang"/>
+            <field name="function_id" ref="base.function_sale"/>
+            <field name="contact_id" ref="res_partner_contact_tang0"/>
+        </record>
+        <record id="res_partner_job_4" model="res.partner.job">
+            <field name="address_id" ref="base.res_partner_address_wong"/>
+            <field name="function_id" ref="base.function_sale"/>
+            <field name="contact_id" ref="res_partner_contact_wong0"/>
+        </record>
+        <record id="res_partner_job_5" model="res.partner.job">
+            <field name="address_id" ref="base.res_partner_address_6"/>
+            <field name="function_id" ref="base.function_director"/>
+            <field name="contact_id" ref="res_partner_contact_lacarte0"/>
             <field name="sequence_contact">1</field>
             <field name="sequence_partner">0</field>
 
-		</record>
-		<record id="res_partner_job_6" model="res.partner.job">
-			<field name="address_id" ref="base.res_partner_address_7"/>
-			<field name="function_id" ref="base.function_sale"/>
-			<field name="contact_id" ref="res_partner_contact_lavente0"/>
-		</record>
-		<record id="res_partner_job_7" model="res.partner.job">
-			<field name="address_id" ref="base.res_partner_address_8"/>
-			<field name="function_id" ref="base.function_it"/>
-			<field name="contact_id" ref="res_partner_contact_lelitre0"/>
-		</record>
-		<record id="res_partner_job_8" model="res.partner.job">
-			<field name="address_id" ref="base.res_partner_address_9"/>
-			<field name="function_id" ref="base.function_director"/>
-			<field name="contact_id" ref="res_partner_contact_grosbonnet0"/>
-		</record>
-		<record id="res_partner_job_9" model="res.partner.job">
-			<field name="address_id" ref="base.res_partner_address_10"/>
-			<field name="function_id" ref="base.function_sale"/>
-			<field name="contact_id" ref="res_partner_contact_lesbrouffe0"/>
-		</record>
-		<record id="res_partner_job_10" model="res.partner.job">
-			<field name="address_id" ref="base.res_partner_address_zen"/>
-			<field name="function_id" ref="base.function_it"/>
-			<field name="contact_id" ref="res_partner_contact_zen0"/>
-		</record>
-		<record id="res_partner_job_11" model="res.partner.job">
-			<field name="address_id" ref="base.main_address"/>
-			<field name="function_id" ref="base.function_sale"/>
-			<field eval="&quot;&quot;&quot;pmi@tinyerp.com&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_mignon0"/>
-		</record>
-		<record id="res_partner_job_12" model="res.partner.job">
-			<field name="address_id" ref="base.main_address"/>
-			<field name="function_id" ref="base.function_it"/>
-			<field eval="&quot;&quot;&quot;stw@tinyerp.com&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_wirtel0"/>
-		</record>
-		<record id="res_partner_job_13" model="res.partner.job">
-			<field name="address_id" ref="base.main_address"/>
-			<field name="function_id" ref="base.function_it"/>
-			<field eval="&quot;&quot;&quot;chs@tinyerp.com&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_simonis0"/>
-		</record>
-		<record id="res_partner_job_14" model="res.partner.job">
-			<field name="address_id" ref="base.main_address"/>
-			<field name="function_id" ref="base.function_it"/>
-			<field eval="&quot;&quot;&quot;olt@tinyerp.com&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_laurent0"/>
-		</record>
-		<record id="res_partner_job_15" model="res.partner.job">
-			<field name="address_id" ref="base.main_address"/>
-			<field name="function_id" ref="base.function_it"/>
-			<field eval="&quot;&quot;&quot;fla@tinyerp.com&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_lambotte0"/>
-		</record>
-		<record id="res_partner_job_16" model="res.partner.job">
-			<field name="address_id" ref="base.main_address"/>
-			<field name="function_id" ref="base.function_sale"/>
-			<field eval="&quot;&quot;&quot;avw@tinyerp.com&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_vandewerve0"/>
-		</record>
-		<record id="res_partner_job_17" model="res.partner.job">
-			<field name="address_id" ref="base.main_address"/>
-			<field name="function_id" ref="base.function_it"/>
-			<field eval="&quot;&quot;&quot;fbs@tinyerp.com&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_semal0"/>
-		</record>
-		<record id="res_partner_job_18" model="res.partner.job">
-			<field name="address_id" ref="base.main_address"/>
-			<field name="function_id" ref="base.function_it"/>
-			<field eval="&quot;&quot;&quot;qdp@tinyerp.com&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_depaoli0"/>
-		</record>
-		<record id="res_partner_job_19" model="res.partner.job">
-			<field name="address_id" ref="base.main_address"/>
-			<field name="function_id" ref="base.function_it"/>
-			<field eval="&quot;&quot;&quot;nel@tinyerp.com&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_elkhayat0"/>
-		</record>
-		<record id="res_partner_job_20" model="res.partner.job">
-			<field name="address_id" ref="base.main_address"/>
-			<field name="function_id" ref="base.function_it"/>
-			<field eval="&quot;&quot;&quot;phu@tinyerp.com&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_luu0"/>
-		</record>
-		<record id="res_partner_job_21" model="res.partner.job">
-			<field name="address_id" ref="base.main_address"/>
-			<field name="function_id" ref="base.function_director"/>
-			<field eval="&quot;&quot;&quot;fp@tinyerp.com&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_pinckears0"/>
+        </record>
+        <record id="res_partner_job_6" model="res.partner.job">
+            <field name="address_id" ref="base.res_partner_address_7"/>
+            <field name="function_id" ref="base.function_sale"/>
+            <field name="contact_id" ref="res_partner_contact_lavente0"/>
+        </record>
+        <record id="res_partner_job_7" model="res.partner.job">
+            <field name="address_id" ref="base.res_partner_address_8"/>
+            <field name="function_id" ref="base.function_it"/>
+            <field name="contact_id" ref="res_partner_contact_lelitre0"/>
+        </record>
+        <record id="res_partner_job_8" model="res.partner.job">
+            <field name="address_id" ref="base.res_partner_address_9"/>
+            <field name="function_id" ref="base.function_director"/>
+            <field name="contact_id" ref="res_partner_contact_grosbonnet0"/>
+        </record>
+        <record id="res_partner_job_9" model="res.partner.job">
+            <field name="address_id" ref="base.res_partner_address_10"/>
+            <field name="function_id" ref="base.function_sale"/>
+            <field name="contact_id" ref="res_partner_contact_lesbrouffe0"/>
+        </record>
+        <record id="res_partner_job_10" model="res.partner.job">
+            <field name="address_id" ref="base.res_partner_address_zen"/>
+            <field name="function_id" ref="base.function_it"/>
+            <field name="contact_id" ref="res_partner_contact_zen0"/>
+        </record>
+        <record id="res_partner_job_11" model="res.partner.job">
+            <field name="address_id" ref="base.main_address"/>
+            <field name="function_id" ref="base.function_sale"/>
+            <field eval="&quot;&quot;&quot;pmi@tinyerp.com&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_mignon0"/>
+        </record>
+        <record id="res_partner_job_12" model="res.partner.job">
+            <field name="address_id" ref="base.main_address"/>
+            <field name="function_id" ref="base.function_it"/>
+            <field eval="&quot;&quot;&quot;stw@tinyerp.com&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_wirtel0"/>
+        </record>
+        <record id="res_partner_job_13" model="res.partner.job">
+            <field name="address_id" ref="base.main_address"/>
+            <field name="function_id" ref="base.function_it"/>
+            <field eval="&quot;&quot;&quot;chs@tinyerp.com&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_simonis0"/>
+        </record>
+        <record id="res_partner_job_14" model="res.partner.job">
+            <field name="address_id" ref="base.main_address"/>
+            <field name="function_id" ref="base.function_it"/>
+            <field eval="&quot;&quot;&quot;olt@tinyerp.com&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_laurent0"/>
+        </record>
+        <record id="res_partner_job_15" model="res.partner.job">
+            <field name="address_id" ref="base.main_address"/>
+            <field name="function_id" ref="base.function_it"/>
+            <field eval="&quot;&quot;&quot;fla@tinyerp.com&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_lambotte0"/>
+        </record>
+        <record id="res_partner_job_16" model="res.partner.job">
+            <field name="address_id" ref="base.main_address"/>
+            <field name="function_id" ref="base.function_sale"/>
+            <field eval="&quot;&quot;&quot;avw@tinyerp.com&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_vandewerve0"/>
+        </record>
+        <record id="res_partner_job_17" model="res.partner.job">
+            <field name="address_id" ref="base.main_address"/>
+            <field name="function_id" ref="base.function_it"/>
+            <field eval="&quot;&quot;&quot;fbs@tinyerp.com&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_semal0"/>
+        </record>
+        <record id="res_partner_job_18" model="res.partner.job">
+            <field name="address_id" ref="base.main_address"/>
+            <field name="function_id" ref="base.function_it"/>
+            <field eval="&quot;&quot;&quot;qdp@tinyerp.com&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_depaoli0"/>
+        </record>
+        <record id="res_partner_job_19" model="res.partner.job">
+            <field name="address_id" ref="base.main_address"/>
+            <field name="function_id" ref="base.function_it"/>
+            <field eval="&quot;&quot;&quot;nel@tinyerp.com&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_elkhayat0"/>
+        </record>
+        <record id="res_partner_job_20" model="res.partner.job">
+            <field name="address_id" ref="base.main_address"/>
+            <field name="function_id" ref="base.function_it"/>
+            <field eval="&quot;&quot;&quot;phu@tinyerp.com&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_luu0"/>
+        </record>
+        <record id="res_partner_job_21" model="res.partner.job">
+            <field name="address_id" ref="base.main_address"/>
+            <field name="function_id" ref="base.function_director"/>
+            <field eval="&quot;&quot;&quot;fp@tinyerp.com&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_pinckears0"/>
             <field name="sequence_partner">-1</field>
-		</record>
-		<record id="res_partner_job_22" model="res.partner.job">
-			<field name="address_id" ref="base.main_address"/>
-			<field name="function_id" ref="base.function_sale"/>
-			<field eval="&quot;&quot;&quot;cde@tinyerp.com&quot;&quot;&quot;" name="email"/>
-			<field name="contact_id" ref="res_partner_contact_debois0"/>
-		</record>
-		<record id="res_partner_job_23" model="res.partner.job">
-			<field name="address_id" ref="res_partner_address_0"/>
-			<field name="contact_id" ref="res_partner_contact_mortier0"/>
-			<field name="function_id" ref="res_partner_function_privateaddress0"/>
+        </record>
+        <record id="res_partner_job_22" model="res.partner.job">
+            <field name="address_id" ref="base.main_address"/>
+            <field name="function_id" ref="base.function_sale"/>
+            <field eval="&quot;&quot;&quot;cde@tinyerp.com&quot;&quot;&quot;" name="email"/>
+            <field name="contact_id" ref="res_partner_contact_debois0"/>
+        </record>
+        <record id="res_partner_job_23" model="res.partner.job">
+            <field name="address_id" ref="res_partner_address_0"/>
+            <field name="contact_id" ref="res_partner_contact_mortier0"/>
+            <field name="function_id" ref="res_partner_function_privateaddress0"/>
             <field name="sequence_contact">5</field>
-		</record>
-		<record id="res_partner_job_24" model="res.partner.job">
-			<field eval="1" name="sequence_contact"/>
-			<field name="address_id" ref="res_partner_address_1"/>
-			<field name="contact_id" ref="res_partner_contact_lacarte0"/>
-			<field name="function_id" ref="res_partner_function_privateaddress0"/>
+        </record>
+        <record id="res_partner_job_24" model="res.partner.job">
+            <field eval="1" name="sequence_contact"/>
+            <field name="address_id" ref="res_partner_address_1"/>
+            <field name="contact_id" ref="res_partner_contact_lacarte0"/>
+            <field name="function_id" ref="res_partner_function_privateaddress0"/>
             <field name="sequence_contact">5</field>
-		</record>
-		<record id="res_partner_job_25" model="res.partner.job">
-			<field eval="2" name="sequence_contact"/>
-			<field name="address_id" ref="base.res_partner_address_1"/>
-			<field name="contact_id" ref="res_partner_contact_lacarte0"/>
-			<field name="function_id" ref="base.function_director"/>
+        </record>
+        <record id="res_partner_job_25" model="res.partner.job">
+            <field eval="2" name="sequence_contact"/>
+            <field name="address_id" ref="base.res_partner_address_1"/>
+            <field name="contact_id" ref="res_partner_contact_lacarte0"/>
+            <field name="function_id" ref="base.function_director"/>
             <field name="sequence_contact">1</field>
-		</record>
-	</data>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 0ae8fda9eda..c06f6323392 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -35,7 +35,7 @@
                         <field name="lang_id"/>
                         <field name="active"/>
                         <separator string="Functions" colspan="4"/>
-                        <field name="job_ids" colspan="4" nolabel="1" mode="tree, form">
+                        <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
                             <form string="Functions">
                                 <field name="function_id"/>
                                 <field name="address_id"/>
@@ -103,7 +103,7 @@
                         <field name="phone"/>
                         <field name="fax"/>
                         <newline/>
-                        <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="sequence_partner"/>
                                 <field name="contact_id"/>
@@ -222,7 +222,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"/>
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 0b4720e4254..5491bde1c62 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -70,7 +70,7 @@ class project_project(osv.osv):
     def name_get(self, cr, user, ids, context=None):
         result = []
         for project in self.browse(cr, user, ids, context):
-            if project.category_id:
+            if project.category_id and projet.category_id.code:
                 result.append((project.id, '['+(project.category_id.code or '')+'] '+project.name))
             else:
                 result.append((project.id, '[?] '+project.name))