From bee7076f8d657f85ef8569c0f26de7673670deb0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 15 Apr 2008 17:32:50 +0000
Subject: [PATCH] Modifs

bzr revid: fp@tinyerp.com-c97eeb950ce16d0bd29c35404380377bd323b3b3
---
 addons/account/account.py               | 2 +-
 addons/account/account_invoice_view.xml | 4 ++--
 addons/account/report/tax_report.rml    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index b0ce34d333d..2fcb072507e 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -240,7 +240,7 @@ class account_account(osv.osv):
 		return result
 
 	_columns = {
-		'name': fields.char('Name', size=128, required=True, translate=True, select=True),
+		'name': fields.char('Name', size=128, required=True, select=True),
 		'sign': fields.selection([(-1, 'Negative'), (1, 'Positive')], 'Sign', required=True, help='Allows to change the displayed amount of the balance to see positive results instead of negative ones in expenses accounts'),
 		'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Force all moves for this account to have this secondary currency."),
 		'code': fields.char('Code', size=64),
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 78187567edf..3400d12fd4f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -117,7 +117,7 @@
 				<form string="Supplier invoice">
 				<notebook>
 					<page string="Invoice">
-						<field name="journal_id" domain="[('type', '=', 'purchase'),('centralisation', '=', False)]" select="2"/>
+						<field name="journal_id" domain="[('type', '=', 'purchase')]" select="2"/>
 						<field name="type" select="2" readonly="1"/>
 						<field name="partner_id"
 							on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank)"
@@ -208,7 +208,7 @@
 				<form string="Invoice">
 					<notebook>
 						<page string="Invoice">
-							<field name="journal_id" domain="[('centralisation', '=', False)]" select="2"/>
+							<field name="journal_id" select="2"/>
 							<field name="type" select="2" readonly="1"/>
 							<field name="partner_id"
 								on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term)"
diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml
index 36efe5319b7..ab2d3a0c24a 100644
--- a/addons/account/report/tax_report.rml
+++ b/addons/account/report/tax_report.rml
@@ -144,7 +144,7 @@
             <para style="P11">[[repeatIn(get_general(o[1], data['form']['period_id'], data['form']['company_id'], data['form']['based_on']), 'g') ]]</para>
           </td>
           <td>
-            <para style="P12">[[ g['account'].name ]]</para>
+            <para style="P12">[[ g['account'].code ]] - [[ g['account'].name ]]</para>
           </td>
           <td>
             <para style="P13">[[ g['debit'] and '%.2f' % g['debit'] or '' ]]</para>