merge from parent

bzr revid: nch@tinyerp.com-20090507092843-4mf6o64znjp0rrps

3 files changed, 39 insertions, 35 deletions

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index f06fe81dfa7..1729f086122 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -46,7 +46,8 @@ class res_partner_contact(osv.osv):
         'birthdate':fields.date('Birth Date'),
         'active' : fields.boolean('Active'),
         'partner_id':fields.related('job_ids','address_id','partner_id',type='many2one', relation='res.partner', string='Main Employer'),
-        'function_id':fields.related('job_ids','function_id',type='many2one', relation='res.partner.function', string='Main Job'),
+        'function_id':fields.related('job_ids','function_id',type='many2one', relation='res.partner.function', string='Main Function'),
+        'job_id':fields.related('job_ids',type='many2one', relation='res.partner.job', string='Main Job'),
         'email': fields.char('E-Mail', size=240),
     }
     _defaults = {
@@ -87,6 +88,7 @@ class res_partner_address(osv.osv):
     _inherit='res.partner.address'
     _description ='Partner Address'
     _columns = {
+        'job_id':fields.related('job_ids','contact_id','job_id',type='many2one', relation='res.partner.job', string='Main Job'),
         'job_ids':fields.one2many('res.partner.job', 'address_id', 'Contacts'),
     }
 res_partner_address()
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 2298334ca7a..9b2a9c179fc 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -40,6 +40,7 @@
                         <field name="active"/>
                         <field name="partner_id" invisible="1" select="2"/>
                         <field name="function_id" invisible="1" select="2"/>
+                        <field name="job_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"/>
@@ -153,42 +154,42 @@
     </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>
+        <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_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>
+        <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 -->
@@ -268,6 +269,7 @@
             <field name="partner_id" position="replace">
                 <field name='partner_id' select='1'/>
                 <field name='type' select='2'/>
+                <field name='job_id' invisible="1" select="2"/>
             </field>
         </field>
     </record>
diff --git a/addons/report_timesheet/report_timesheet.py b/addons/report_timesheet/report_timesheet.py
index 3bea79c5289..939adab7f88 100644
--- a/addons/report_timesheet/report_timesheet.py
+++ b/addons/report_timesheet/report_timesheet.py
@@ -135,7 +135,7 @@ class report_timesheet_invoice(osv.osv):
                     l.account_id as account_id,
                     a.user_id as manager_id,
                     sum(l.unit_amount) as quantity,
-                    sum(l.unit_amount * t.list_price) as revenue
+                    sum(l.unit_amount * t.list_price) as amount_invoice
                 from account_analytic_line l
                     left join hr_timesheet_invoice_factor f on (l.to_invoice=f.id)
                     left join account_analytic_account a on (l.account_id=a.id)