From 64bd1cdd8786a6aaf89275d426298760c2ddf7bd Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 6 Jul 2012 13:12:15 +0530
Subject: [PATCH] [FIX]: Add currency_id field

bzr revid: atp@tinyerp.com-20120706074215-4225u3zkx00gtfw5
---
 addons/account/account_analytic_line.py                  | 2 +-
 addons/account/project/project_view.xml                  | 9 +++------
 .../hr_timesheet_invoice/hr_timesheet_invoice_view.xml   | 2 +-
 addons/project_timesheet/project_timesheet_view.xml      | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index d610e3813b9..06de5a3e43e 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -34,7 +34,7 @@ class account_analytic_line(osv.osv):
         'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
         'code': fields.char('Code', size=8),
         'ref': fields.char('Ref.', size=64),
-        'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
+        'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account Currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
         'amount_currency': fields.related('move_id', 'amount_currency', type='float', string='Amount Currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
     }
 
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index a721f543c36..f132e6f50d0 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -253,12 +253,9 @@
                         </group>
                         <group string="Amount">
                             <field name="amount"/>
-                            <label for="amount_currency"/>
-                            <div>
-                                <field name="amount_currency" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
-                                <field invisible="1" name="general_account_id"/>
-                            </div>
+                            <field name="amount_currency"/>
+                            <field name="currency_id"/>
+                            <field invisible="1" name="general_account_id"/>
                         </group>
                         <group string="Product Information">
                             <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 3ec14a81213..9888972105e 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -123,7 +123,7 @@
 
         <!-- Menus -->
         <record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
-            <field name="name">Invoice Tasks Works</field>
+            <field name="name">Invoice Tasks Work</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 1a15af1df3e..4d3d288b981 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -88,7 +88,7 @@
 
         <!-- Menus -->
         <record id="action_project_timesheet_bill_task" model="ir.actions.act_window">
-            <field name="name">Invoice Tasks Works</field>
+            <field name="name">Invoice Tasks Work</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>