From 21d9d106819be93b4d9f441dd79bf7448311fc71 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Mon, 27 Dec 2010 10:38:50 +0200
Subject: [PATCH] hr_expense, payroll_account: Correct the English word
 "Expanse"

We obviously mean "expense" as in spending, not "expanse" as in stretch.

bzr revid: p_christ@hol.gr-20101227083850-u61v7sju7x29ndsw
---
 addons/hr_expense/hr_expense.py                 |  2 +-
 addons/hr_payroll_account/hr_payroll_account.py | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index bc9c1cc36e4..e7fd63eadb4 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -142,7 +142,7 @@ class hr_expense_expense(osv.osv):
                 else:
                     acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category')
                     if not acc:
-                        raise osv.except_osv(_('Error !'), _('Please configure Default Expanse account for Product purchase, `property_account_expense_categ`'))
+                        raise osv.except_osv(_('Error !'), _('Please configure Default Expense account for Product purchase, `property_account_expense_categ`'))
 
                 lines.append((0, False, {
                     'name': l.name,
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index adf1fada169..214297ffeb5 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -64,7 +64,7 @@ class hr_employee(osv.osv):
             method=True,
             domain="[('type', '=', 'liquidity')]",
             view_load=True,
-            help="Select Bank Account from where Salary Expanse will be Paid"),
+            help="Select Bank Account from where Salary Expense will be Paid"),
         'salary_account':fields.property(
             'account.account',
             type='many2one',
@@ -73,7 +73,7 @@ class hr_employee(osv.osv):
             method=True,
             domain="[('type', '=', 'other')]",
             view_load=True,
-            help="Expanse account when Salary Expanse will be recorded"),
+            help="Expense account when Salary Expense will be recorded"),
         'employee_account':fields.property(
             'account.account',
             type='many2one',
@@ -99,7 +99,7 @@ class payroll_register(osv.osv):
     _description = 'Payroll Register'
 
     _columns = {
-        'journal_id': fields.many2one('account.journal', 'Expanse Journal'),
+        'journal_id': fields.many2one('account.journal', 'Expense Journal'),
         'bank_journal_id': fields.many2one('account.journal', 'Bank Journal'),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
     }
@@ -213,7 +213,7 @@ class hr_payslip(osv.osv):
     _description = 'Pay Slip'
 
     _columns = {
-        'journal_id': fields.many2one('account.journal', 'Expanse Journal'),
+        'journal_id': fields.many2one('account.journal', 'Expense Journal'),
         'bank_journal_id': fields.many2one('account.journal', 'Bank Journal'),
         'move_ids':fields.one2many('hr.payslip.account.move', 'slip_id', 'Accounting vouchers'),
         'move_line_ids':fields.many2many('account.move.line', 'payslip_lines_rel', 'slip_id', 'line_id', 'Accounting Lines', readonly=True),
@@ -332,7 +332,7 @@ class hr_payslip(osv.osv):
                     name = '[%s]-%s' % (slip.number, line.name)
                     invoice_pool.pay_and_reconcile(cr, uid, invids, amount, acc_id, period_id, journal_id, False, period_id, False, context, name)
                     other_pay -= amount
-                    #TODO: link this account entries to the Payment Lines also Expanse Entries to Account Lines
+                    #TODO: link this account entries to the Payment Lines also Expense Entries to Account Lines
                     l_ids = movel_pool.search(cr, uid, [('name','=',name)], context=context)
                     line_ids += l_ids