From 6969cc1a9e652a1bc917ba2926784a0be002b4f5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 2 Aug 2007 09:37:45 +0000
Subject: [PATCH] Cleaning upper/lowercase in menus

bzr revid: fp@tinyerp.com-163c70a775bfbd2fe7e782ee069946e3d1446147
---
 bin/addons/base/base_menu.xml             |  4 ++--
 bin/addons/base/base_update.xml           |  2 +-
 bin/addons/base/ir/ir.xml                 | 16 ++++++++--------
 bin/addons/base/module/module_view.xml    | 16 ++++++++--------
 bin/addons/base/module/module_wizard.xml  |  6 +++---
 bin/addons/base/res/ir_property_view.xml  |  6 +++---
 bin/addons/base/res/partner/crm_view.xml  |  3 ++-
 bin/addons/base/res/partner/partner.py    |  1 +
 bin/addons/base/res/res_currency_view.xml |  2 +-
 bin/addons/base/res/res_request_view.xml  |  2 +-
 bin/report/report_sxw.py                  |  5 +++--
 11 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 6c5d15ff6e8..3cfd64c5304 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -7,7 +7,7 @@
 	<menuitem name="Administration/Translations" sequence="4" id="menu_translation"/>
 	<menuitem name="Administration/Users" sequence="6" id="menu_users"/>
 	<menuitem name="Administration/Security" sequence="8" id="menu_security"/>
-	<menuitem name="Administration/Modules Management" sequence="10" id="menu_management"/>
+	<menuitem name="Administration/Modules management" sequence="10" id="menu_management"/>
 
 	<!--
 	# Admin config
@@ -21,7 +21,7 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="Administration/Configuration/Base/Define Main Company" action="open_module_tree_company" sequence="2" id="menu_company_def"/>
+	<menuitem name="Administration/Configuration/Base/Define main company" action="open_module_tree_company" sequence="2" id="menu_company_def"/>
 
 </data>
 </terp>
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 0389b67606e..9b72199c73f 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -213,7 +213,7 @@
 		<field name="act_window_id" ref="open_module_users_list"/>
 	</record>
 
-	<menuitem name="Administration/Configuration/User/Define Users" action="open_module_users_list" sequence="1" id="menu_users_list"/>
+	<menuitem name="Administration/Configuration/User/Define users" action="open_module_users_list" sequence="1" id="menu_users_list"/>
 
 </data>
 </terp>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 4555db7076e..afba465743b 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -65,7 +65,7 @@
 		</field>
 	</record>	
 	<record model="ir.actions.act_window" id="ir_sequence_type">
-		<field name="name">Sequence Types</field>
+		<field name="name">Sequence types</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">ir.sequence.type</field>
 		<field name="view_type">form</field>
@@ -205,7 +205,7 @@
 	</record>
 
 	<record model="ir.actions.act_window" id="ir_action_report_custom">
-		<field name="name">Report Custom</field>
+		<field name="name">Report custom</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">ir.actions.report.custom</field>
 		<field name="view_type">form</field>
@@ -245,7 +245,7 @@
 	</record>
 
 	<record model="ir.actions.act_window" id="ir_action_report_xml">
-		<field name="name">Report Xml</field>
+		<field name="name">Report XML</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">ir.actions.report.xml</field>
 		<field name="view_type">form</field>
@@ -298,7 +298,7 @@
 		</field>
 	</record>
 	<record model="ir.actions.act_window" id="ir_action_window">
-		<field name="name">Open Window</field>
+		<field name="name">Window actions</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -648,7 +648,7 @@
 			<form string="Model Description">
 				<field name="name" select="1"/>
 				<field name="model" select="1"/>
-				<separator string="Information"/>
+				<separator string="Information" colspan="4"/>
 				<field name="info" select="1" colspan="4" nolabel="1"/>
 				<separator string="Fields" colspan="4"/>
 				<field name="field_id" colspan="4" nolabel="1" readonly="1">
@@ -714,7 +714,7 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="view_model_tree"/>
 	</record>
-	<menuitem name="Administration/Custom/Low level/Base/Database Structure/Objects" action="action_model_model" id="ir_model_model_menu"/>
+	<menuitem name="Administration/Custom/Low level/Base/Database structure/Objects" action="action_model_model" id="ir_model_model_menu"/>
 
 	<record model="ir.actions.act_window" id="action_model_fields">
 		<field name="name">Fields</field>
@@ -722,7 +722,7 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="view_model_fields_tree"/>
 	</record>
-	<menuitem name="Administration/Custom/Low level/Base/Database Structure/Fields" action="action_model_fields" id="ir_model_model_fields"/>
+	<menuitem name="Administration/Custom/Low level/Base/Database structure/Fields" action="action_model_fields" id="ir_model_model_fields"/>
 
 	==========================================================
 	Translations
@@ -822,7 +822,7 @@
 		</field>
 	</record>
 	<record model="ir.actions.act_window" id="grant_menu_access">
-		<field name="name">Grant Access to menu</field>
+		<field name="name">Grant access to menu</field>
 		<field name="res_model">ir.ui.menu</field>
 		<field name="view_type">form</field>
 		<field name="view_id" ref="edit_menu"/>
diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml
index 019cbc53be3..3a3e4dc0d04 100644
--- a/bin/addons/base/module/module_view.xml
+++ b/bin/addons/base/module/module_view.xml
@@ -38,7 +38,7 @@
 			<field name="domain">[('parent_id','=',False)]</field>
 		</record>
 		<menuitem
-			name="Administration/Modules Management/Categories of Modules"
+			name="Administration/Modules management/Categories of modules"
 			action="action_module_category_tree"
 			id="menu_action_module_category_tree"
 			/>
@@ -132,24 +132,24 @@
 			<field name="view_mode">tree,form</field>
 			<field name="domain"></field>
 		</record>
-		<menuitem name="Administration/Modules Management/Modules" action="open_module_tree" id="menu_module_tree"/>
+		<menuitem name="Administration/Modules management/Modules" action="open_module_tree" id="menu_module_tree"/>
 
 		<record model="ir.actions.act_window" id="open_module_tree_install">
-			<field name="name">Installed Modules</field>
+			<field name="name">Installed modules</field>
 			<field name="res_model">ir.module.module</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 			<field name="domain">[('state', 'in', ['installed', 'to upgrade', 'to remove'])]</field>
 		</record>
-		<menuitem name="Administration/Modules Management/Modules/Installed Modules" action="open_module_tree_install" id="menu_module_tree_install"/>
+		<menuitem name="Administration/Modules management/Modules/Installed modules" action="open_module_tree_install" id="menu_module_tree_install"/>
 		<record model="ir.actions.act_window" id="open_module_tree_uninstall">
-			<field name="name">Uninstalled Modules</field>
+			<field name="name">Uninstalled modules</field>
 			<field name="res_model">ir.module.module</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 			<field name="domain">[('state', 'in', ['uninstalled', 'uninstallable'])]</field>
 		</record>
-		<menuitem name="Administration/Modules Management/Modules/Uninstalled Modules" action="open_module_tree_uninstall" id="menu_module_tree_uninstall"/>
+		<menuitem name="Administration/Modules management/Modules/Uninstalled modules" action="open_module_tree_uninstall" id="menu_module_tree_uninstall"/>
 		<record model="ir.actions.act_window" id="open_module_tree_upgrade">
 			<field name="name">Modules to be installed, upgraded or removed</field>
 			<field name="res_model">ir.module.module</field>
@@ -157,7 +157,7 @@
 			<field name="view_mode">tree,form</field>
 			<field name="domain">[('state','in', ['to upgrade', 'to remove', 'to install'])]</field>
 		</record>
-		<menuitem name="Administration/Modules Management/Modules/Modules to be installed, upgraded or removed" action="open_module_tree_upgrade" id="menu_module_tree_upgrade"/>
+		<menuitem name="Administration/Modules management/Modules/Modules to be installed, upgraded or removed" action="open_module_tree_upgrade" id="menu_module_tree_upgrade"/>
 
 		<record model="ir.ui.view" id="repository_form">
 			<field name="name">ir.module.repository.form</field>
@@ -190,7 +190,7 @@
 			<field name="view_mode">tree,form</field>
 		</record>
 		<menuitem
-			name="Administration/Modules Management/Repositories"
+			name="Administration/Modules management/Repositories"
 			action="open_repository_tree"
 			id="menu_module_repository_tree"
 			/>
diff --git a/bin/addons/base/module/module_wizard.xml b/bin/addons/base/module/module_wizard.xml
index 70db979b40d..195d89bb376 100644
--- a/bin/addons/base/module/module_wizard.xml
+++ b/bin/addons/base/module/module_wizard.xml
@@ -6,7 +6,7 @@
 			<field name="wiz_name">base.module.import</field>
 		</record>
 		<menuitem
-			name="Administration/Modules Management/Import a new module"
+			name="Administration/Modules management/Import a new module"
 			action="wizard_base_module_import"
 			type="wizard"
 			id="menu_wizard_module_import"/>
@@ -16,7 +16,7 @@
 			<field name="wiz_name">module.module.update</field>
 		</record>
 		<menuitem
-			name="Administration/Modules Management/Update modules list"
+			name="Administration/Modules management/Update modules list"
 			action="wizard_update"
 			type="wizard"
 			groups="admin"
@@ -28,7 +28,7 @@
 			name="module.upgrade"
 			id="wizard_upgrade"/>
 		<menuitem
-			name="Administration/Modules Management/Apply Upgrades"
+			name="Administration/Modules management/Apply Upgrades"
 			action="wizard_upgrade"
 			id="menu_wizard_upgrade"
 			type="wizard"/>
diff --git a/bin/addons/base/res/ir_property_view.xml b/bin/addons/base/res/ir_property_view.xml
index 81aa44977a3..a31ec44d7c7 100644
--- a/bin/addons/base/res/ir_property_view.xml
+++ b/bin/addons/base/res/ir_property_view.xml
@@ -34,14 +34,14 @@
 	</record>
 
 	<record model="ir.actions.act_window" id="ir_property_form">
-		<field name="name">Default Properties</field>
+		<field name="name">Default properties</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">ir.property</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('res_id','=',False)]</field>
 		<field name="view_id" ref="ir_property_view_tree"/>
 	</record>
-	<menuitem name="Administration/Custom/Properties/Default Properties" action="ir_property_form" id="menu_ir_property_form"/>
+	<menuitem name="Administration/Custom/Properties/Default properties" action="ir_property_form" id="menu_ir_property_form"/>
 
 	<record model="ir.actions.act_window" id="ir_property_form_all">
 		<field name="type">ir.actions.act_window</field>
@@ -49,7 +49,7 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="ir_property_view_tree"/>
 	</record>
-	<menuitem name="Administration/Custom/Properties/All Properties" action="ir_property_form_all" id="menu_ir_property_form_all"/>
+	<menuitem name="Administration/Custom/Properties/All properties" action="ir_property_form_all" id="menu_ir_property_form_all"/>
 
 	</data>
 </terp>
diff --git a/bin/addons/base/res/partner/crm_view.xml b/bin/addons/base/res/partner/crm_view.xml
index 2717a35c595..70ed82ce542 100644
--- a/bin/addons/base/res/partner/crm_view.xml
+++ b/bin/addons/base/res/partner/crm_view.xml
@@ -63,11 +63,12 @@
 		</field>
 	</record>
 	<record model="ir.actions.act_window" id="res_partner_som-act">
+		<field name="name">States of mind</field>
 		<field name="res_model">res.partner.som</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="Partners/Configuration/Partner events/States of Mind" groups="admin" action="res_partner_som-act" id="menu_res_partner_som-act"/>
+	<menuitem name="Partners/Configuration/Partner events/States of mind" groups="admin" action="res_partner_som-act" id="menu_res_partner_som-act"/>
 
 	<record model="ir.ui.view" id="res_partner_event-wopartner-view_form">
 		<field name="name">res.partner.event.form</field>
diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index dd3d5bc2b0b..be15064ceb6 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -191,6 +191,7 @@ class res_partner(osv.osv):
 		'responsible': fields.many2one('res.users', 'Users'),
 		'vat': fields.char('VAT',size=32 ,help="Value Added Tax number"),
 		'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
+		'sales': fields.one2many('sale.order', 'partner_id', 'Sales'),
 		'website': fields.char('Website',size=64),
 		'comment': fields.text('Notes'),
 		'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'),
diff --git a/bin/addons/base/res/res_currency_view.xml b/bin/addons/base/res/res_currency_view.xml
index fe50777c178..582aa5ab33b 100644
--- a/bin/addons/base/res/res_currency_view.xml
+++ b/bin/addons/base/res/res_currency_view.xml
@@ -53,7 +53,7 @@
 
 	<menuitem name="Financial Management/Configuration/Currencies" action="action_currency_form" sequence="11" id="menu_action_currency_form"/>
 
-	<menuitem name="Administration/Configuration/Base/Define Currencies" action="action_currency_form" sequence="1" id="menu_currency_def"/>
+	<menuitem name="Administration/Configuration/Base/Define currencies" action="action_currency_form" sequence="1" id="menu_currency_def"/>
 
 </data>
 </terp>
diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml
index 1b0f65524dc..61eeffee1ee 100644
--- a/bin/addons/base/res/res_request_view.xml
+++ b/bin/addons/base/res/res_request_view.xml
@@ -93,7 +93,7 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="res_request_link-view"/>
 	</record>
-	<menuitem name="Administration/Custom/Low level/Base/Requests/Request Links" action="res_request_link-act" id="menu_res_request_link_act"/>
+	<menuitem name="Administration/Custom/Low level/Base/Requests/Request links" action="res_request_link-act" id="menu_res_request_link_act"/>
 
 
 	<record model="ir.ui.view" id="res_request_history_tree-view">
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index b554bd0521a..42293105fcd 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -155,13 +155,14 @@ class rml_parse(object):
 	def _eval(self, expr):
 		try:
 			res = eval(expr, self.localcontext)
-			if res is False or res is None:
+			if not res:
 				res = ''
+			print expr, res
 		except Exception,e:
 			import traceback, sys
 			tb_s = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
 			netsvc.Logger().notifyChannel('report', netsvc.LOG_ERROR, 'report %s:\n%s\n%s\nexpr: %s' % (self.name, tb_s, str(e), expr))
-			res = 'Error'
+			res = ''
 		return res
 
 	def _find_parent(self, node, parents):