From f10ef4a42aff84939505e06b0761bce27f0648e8 Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Thu, 6 Jan 2011 14:53:47 +0530
Subject: [PATCH] [FIX] hr_timesheet_invoice: Improved rml, field and view

lp bug: https://launchpad.net/bugs/697704 fixed

bzr revid: pso@tinyerp.com-20110106092347-dz5cj7rb1zzorf1j
---
 .../hr_timesheet_invoice/report/account_analytic_profit.rml | 2 +-
 .../wizard/hr_timesheet_analytic_profit.py                  | 2 +-
 .../wizard/hr_timesheet_analytic_profit_view.xml            | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
index b6d9f155cab..010ebdc3d7c 100755
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
@@ -176,7 +176,7 @@
     <blockTable colWidths="159.0,62.0,63.0,68.0,65.0,53.0,52.0" style="Table_Header_Employee">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Employee or Journal Name</para>
+          <para style="terp_tblheader_Details">User or Journal Name</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Units</para>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
index 068119c44a1..7d5d7a36867 100755
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
@@ -30,7 +30,7 @@ class account_analytic_profit(osv.osv_memory):
         'date_from': fields.date('From', required=True),
         'date_to': fields.date('To', required=True),
         'journal_ids': fields.many2many('account.analytic.journal', 'analytic_profit_journal_rel', 'analytic_id', 'journal_id', 'Journal', required=True),
-        'employee_ids': fields.many2many('res.users', 'analytic_profit_emp_rel', 'analytic_id', 'emp_id', 'Employee', required=True),
+        'employee_ids': fields.many2many('res.users', 'analytic_profit_emp_rel', 'analytic_id', 'emp_id', 'User', required=True),
                 }
 
     def _date_from(*a):
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 7bdae9bee1d..1ed51fc0a63 100755
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 				<form string="Timesheet Profit">
-					<group height="400" width="480">
-						<group col="4" colspan="6">
+					<group height="420" width="370">
+						<group col="4" colspan="4">
 							<field name="date_from"/>
 							<field name="date_to"/>
                             <separator string="Journals" colspan="4"/>
 							<field name="journal_ids" colspan="4" nolabel="1"/>
-                            <separator string="Employees" colspan="4"/>
+                            <separator string="Users" colspan="4"/>
 							<field name="employee_ids" colspan="4" nolabel="1"/>
 						</group>
 						<separator colspan="4"/>