From 80c88779fa844231e90246cf18d4d4a17d8c0d19 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 8 Aug 2007 06:12:38 +0000
Subject: [PATCH] Better texts

bzr revid: fp@tinyerp.com-25f47f4ead061a4fc546fca8feff3b0a4aa4a8ba
---
 addons/account/account_invoice_view.xml       | 35 ++++++++++---------
 addons/account/account_report.xml             |  6 ++--
 addons/account/account_view.xml               | 10 +++---
 addons/account/project/project_view.xml       | 10 +++---
 .../base_report_designer.py                   |  2 ++
 5 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 787befad8aa..a834690a4d0 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -273,7 +273,7 @@
 	<menuitem name="Financial Management/Invoices" sequence="6"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_tree1">
-		<field name="name">Customers Invoice</field>
+		<field name="name">Customers invoice</field>
 		<field name="res_model">account.invoice</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">form,tree</field>
@@ -284,7 +284,7 @@
 	<menuitem name="Financial Management/Invoices/" id="menu_action_invoice_tree1" action="action_invoice_tree1"/>
 	
 	<record model="ir.actions.act_window" id="action_invoice_tree2">
-		<field name="name">Suppliers Invoice</field>
+		<field name="name">Suppliers invoice</field>
 		<field name="res_model">account.invoice</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">form,tree</field>
@@ -317,7 +317,7 @@
 	<menuitem name="Financial Management/Invoices/" id="menu_action_invoice_tree4" action="action_invoice_tree4"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_tree5">
-		<field name="name">Draft Customers Invoices</field>
+		<field name="name">Draft customer invoices</field>
 		<field name="res_model">account.invoice</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','draft'),('type','=','out_invoice')]</field>
@@ -335,10 +335,10 @@
 		<field name="act_window_id" ref="action_invoice_tree5"/>
 	</record>
 
-	<menuitem name="Financial Management/Invoices/Customers Invoice/Draft" action="action_invoice_tree5" id="menu_invoice_draft"/>
+	<menuitem name="Financial Management/Invoices/Customers invoice/" action="action_invoice_tree5" id="menu_invoice_draft"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_tree6">
-		<field name="name">PRO-FORMA Customers Invoices</field>
+		<field name="name">PRO-FORMA customers invoices</field>
 		<field name="res_model">account.invoice</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','proforma'),('type','=','out_invoice')]</field>
@@ -356,7 +356,7 @@
 		<field name="act_window_id" ref="action_invoice_tree6"/>
 	</record>
 
-	<menuitem name="Financial Management/Invoices/Customers Invoice/PRO-FORMA" id="menu_action_invoice_tree6" action="action_invoice_tree6"/>
+	<menuitem name="Financial Management/Invoices/Customers invoice/" id="menu_action_invoice_tree6" action="action_invoice_tree6"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_tree7">
 		<field name="name">Open customer invoices</field>
@@ -377,10 +377,10 @@
 		<field name="act_window_id" ref="action_invoice_tree7"/>
 	</record>
 
-	<menuitem name="Financial Management/Invoices/Customers Invoice/Open" id="menu_action_invoice_tree7" action="action_invoice_tree7"/>
+	<menuitem name="Financial Management/Invoices/Customers invoice/" id="menu_action_invoice_tree7" action="action_invoice_tree7"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_tree8">
-		<field name="name">Draft Suppliers Invoices</field>
+		<field name="name">Draft supplier invoices</field>
 		<field name="res_model">account.invoice</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','draft'),('type','=','in_invoice')]</field>
@@ -398,7 +398,7 @@
 		<field name="act_window_id" ref="action_invoice_tree8"/>
 	</record>
 
-	<menuitem name="Financial Management/Invoices/Suppliers Invoice/Draft" id="menu_action_invoice_tree8" action="action_invoice_tree8"/>
+	<menuitem name="Financial Management/Invoices/Suppliers invoice/" id="menu_action_invoice_tree8" action="action_invoice_tree8"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_tree9">
 		<field name="name">Open supplier invoices</field>
@@ -419,10 +419,10 @@
 		<field name="act_window_id" ref="action_invoice_tree9"/>
 	</record>
 
-	<menuitem name="Financial Management/Invoices/Suppliers Invoice/Open" id="menu_action_invoice_tree9" action="action_invoice_tree9"/>
+	<menuitem name="Financial Management/Invoices/Suppliers invoice/" id="menu_action_invoice_tree9" action="action_invoice_tree9"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_tree10">
-		<field name="name">Draft customers refund</field>
+		<field name="name">Draft customer refunds</field>
 		<field name="res_model">account.invoice</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','draft'),('type','=','out_refund')]</field>
@@ -440,7 +440,7 @@
 		<field name="act_window_id" ref="action_invoice_tree10"/>
 	</record>
 
-	<menuitem name="Financial Management/Invoices/Customers refund/Draft" id="menu_action_invoice_tree10" action="action_invoice_tree10"/>
+	<menuitem name="Financial Management/Invoices/Customers refund/" id="menu_action_invoice_tree10" action="action_invoice_tree10"/>
 	
 	<record model="ir.actions.act_window" id="action_invoice_tree11">
 		<field name="name">Open customer refunds</field>
@@ -461,10 +461,10 @@
 		<field name="act_window_id" ref="action_invoice_tree11"/>
 	</record>
 
-	<menuitem name="Financial Management/Invoices/Customers refund/Open" id="menu_action_invoice_tree11" action="action_invoice_tree11"/>
+	<menuitem name="Financial Management/Invoices/Customers refund/" id="menu_action_invoice_tree11" action="action_invoice_tree11"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_tree12">
-		<field name="name">Draft suppliers refund</field>
+		<field name="name">Draft supplier refunds</field>
 		<field name="res_model">account.invoice</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','draft'),('type','=','in_refund')]</field>
@@ -482,10 +482,10 @@
 		<field name="act_window_id" ref="action_invoice_tree12"/>
 	</record>
 
-	<menuitem name="Financial Management/Invoices/Suppliers refund/Draft" id="menu_action_invoice_tree12" action="action_invoice_tree12"/>
+	<menuitem name="Financial Management/Invoices/Suppliers refund/" id="menu_action_invoice_tree12" action="action_invoice_tree12"/>
 	
 	<record model="ir.actions.act_window" id="action_invoice_tree13">
-		<field name="name">Open suppliers refund</field>
+		<field name="name">Open supplier refunds</field>
 		<field name="res_model">account.invoice</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','open'),('type','=','in_refund')]</field>
@@ -503,9 +503,10 @@
 		<field name="act_window_id" ref="action_invoice_tree13"/>
 	</record>
 
-	<menuitem name="Financial Management/Invoices/Suppliers refund/Open" id="menu_action_invoice_tree13" action="action_invoice_tree13"/>
+	<menuitem name="Financial Management/Invoices/Suppliers refund/" id="menu_action_invoice_tree13" action="action_invoice_tree13"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_tree">
+		<field name="name">All invoices</field>
 		<field name="res_model">account.invoice</field>
 		<field name="view_type">form</field>
 		<field name="view_id" ref="invoice_tree"/>
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 607639089d6..eef9ba1ee6c 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -90,7 +90,7 @@
 
 
 		<report id="account_vat_declaration"
-			string="VAT Declaration"
+			string="Taxes report"
 			model="account.tax.code"
 			name="account.vat.declaration"
 			rml="account/report/tax_report.rml"
@@ -98,14 +98,14 @@
 			menu="False"/>
 
 		<wizard 
-			string="Wizard VAT Declaration"
+			string="Wizard taxes report"
 			model="account.tax.code"
 			name="account.vat.declaration"
 			menu="False"
 			id="wizard_vat_declaration"/>
 
 		<menuitem
-			name="Financial Management/Reporting/VAT Declaration"
+			name="Financial Management/Reporting/Taxes report"
 			action="wizard_vat_declaration"
 			type="wizard"
 			id="menu_wizard_vat_declaration"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f738b729b03..9e584603ac4 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -524,7 +524,7 @@
 		<field name="view_id" ref="view_tax_code_tree"/>
 	</record>
 	<record model="ir.actions.act_window" id="action_tax_code_tree">
-		<field name="name">Tax codes structure</field>
+		<field name="name">Tax report</field>
 		<field name="res_model">account.tax.code</field>
 		<field name="domain">[('parent_id','=',False)]</field>
 		<field name="view_type">tree</field>
@@ -892,8 +892,8 @@
 
 	<menuitem name="Financial Management/Charts" sequence="7"/>
 	<wizard string="Accounts Charts" menu="False" model="account.account" name="account.chart" id="wizard_account_chart"/>
-	<menuitem name="Financial Management/Charts/Accounts charts" id="menu_action_account_tree2" action="wizard_account_chart" type="wizard"/>
-	<menuitem name="Financial Management/Charts/Accounts charts/Fast account chart" id="menu_action_account_tree3" action="action_account_tree2"/>
+	<menuitem name="Financial Management/Charts/Charts of accounts" id="menu_action_account_tree2" action="wizard_account_chart" type="wizard"/>
+	<menuitem name="Financial Management/Charts/Charts of accounts/Fast charts of accounts" id="menu_action_account_tree3" action="action_account_tree2"/>
 
 	<menuitem name="Financial Management/Periodical processing" sequence="3"/>
 
@@ -1430,7 +1430,9 @@
 		<field name="name">Set account charts</field>
 		<field name="wiz_name">module.upgrade</field>
 	</record>
-	<menuitem name="Administration/Configuration/Account/Apply account charts and VAT mode" action="account_wizard_upgrade" sequence="3" type="wizard" id="menu_install_module"/>
+	<menuitem
+		name="Administration/Configuration/Account/Set account charts and VAT mode" 
+		action="account_wizard_upgrade" sequence="3" type="wizard" id="menu_install_module"/>
 
 	<record model="ir.actions.act_window" id="open_module_plan_ctbl">
 		<field name="res_model">account.account</field>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 1ec7959bab7..5401089332f 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -8,7 +8,7 @@
 			<field name="type">tree</field>
 			<field name="priority" eval="8"/>
 			<field name="arch" type="xml">
-				<tree string="Analytic Account" colors="red:date and (date&lt;=current_date); red:quantity_max and (quantity_max&gt;quantity)">
+				<tree string="Analytic account" colors="red:date and (date&lt;=current_date); red:quantity_max and (quantity_max&gt;quantity)">
 					<field name="code" />
 					<field name="complete_name"/>
 					<field name="quantity" />
@@ -24,7 +24,7 @@
 			<field name="type">tree</field>
 			<field name="field_parent">child_ids</field>
 			<field name="arch" type="xml">
-				<tree string="Analytic Account" colors="red:date and (date&lt;=current_date); red:quantity_max and (quantity_max&gt;quantity)">
+				<tree string="Analytic account" colors="red:date and (date&lt;=current_date); red:quantity_max and (quantity_max&gt;quantity)">
 					<field name="name"/>
 					<field name="code"/>
 					<field name="date" />
@@ -43,7 +43,7 @@
 			<field name="model">account.analytic.account</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
-				<form string="Analytic Account">
+				<form string="Analytic account">
 					<notebook>
 						<page string="Account Data">
 							<field name="name" select="1"/>
@@ -136,7 +136,7 @@
 			<field name="view_type">form</field>
 			<field name="view_id" ref="view_account_analytic_line_tree"/>
 		</record>
-		<menuitem name="Financial Management/Entries/Analytic account/Analytic antries" id="account_entries_analytic_entries" action="action_account_analytic_line_form" />
+		<menuitem name="Financial Management/Entries/Analytic entries/Analytic entries" id="account_entries_analytic_entries" action="action_account_analytic_line_form" />
 
 
 		<record model="ir.actions.act_window" id="action_account_tree1">
@@ -252,7 +252,7 @@
 		<field name="view_type">tree</field>
 		<field name="view_id" ref="view_account_analytic_journal_tree"/>
 	</record>
-	<menuitem name="Financial Management/Entries/Analytic account/Journal Entries"
+	<menuitem name="Financial Management/Entries/Analytic entries/Entries by journal"
 		id="account_analytic_journal_entries"
 		action="action_account_analytic_journal_tree2"/>
 
diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py
index 7d9ac22f871..16563c40eb3 100644
--- a/addons/base_report_designer/base_report_designer.py
+++ b/addons/base_report_designer/base_report_designer.py
@@ -30,6 +30,8 @@ from osv import fields,osv
 from wizard.tiny_sxw2rml import sxw2rml
 from StringIO import StringIO
 import base64
+import pooler
+import tools
 
 class report_xml(osv.osv):
 	_inherit = 'ir.actions.report.xml'