diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 0e1bd12472a..5f4b7263e5c 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1288,6 +1288,129 @@
 		<field name="currency_id" ref="EUR"/>
 	</record>
 
+	<record model="res.currency" id="USD">
+		<field name="name">USD</field>
+		<field name="code">USD</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+	<record model="res.currency.rate" id="rateUSD">
+		<field name="rate">0.8400</field>
+		<field name="currency_id" ref="USD"/>
+	</record>
+
+	<record model="res.currency" id="VEB">
+		<field name="name">Bs</field>
+		<field name="code">VEB</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="CAD">
+		<field name="name">CAD</field>
+		<field name="code">CAD</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="CHF">
+		<field name="name">CHF</field>
+		<field name="code">CHF</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="BRL">
+		<field name="name">BRL</field>
+		<field name="code">BRL</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="CNY">
+		<field name="name">CNY</field>
+		<field name="code">CNY</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="COP">
+		<field name="name">COP</field>
+		<field name="code">COP</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="CZK">
+		<field name="name">K&#269;</field>
+		<field name="code">CZK</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="DKK">
+		<field name="name">kr</field>
+		<field name="code">DKK</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="HUF">
+		<field name="name">Ft</field>
+		<field name="code">HUF</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="IDR">
+		<field name="name">Rs</field>
+		<field name="code">IDR</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="LVL">
+		<field name="name">Ls</field>
+		<field name="code">LVL</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="NOK">
+		<field name="name">kr</field>
+		<field name="code">NOK</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="PAB">
+		<field name="name">PAB</field>
+		<field name="code">PAB</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="PLN">
+		<field name="name">z&#322;</field>
+		<field name="code">PLN</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="SEK">
+		<field name="name">kr</field>
+		<field name="code">SEK</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
+	<record model="res.currency" id="GBP">
+		<field name="name">GBP</field>
+		<field name="code">GBP</field>
+		<field name="rounding">0.01</field>
+		<field name="accuracy">4</field>
+	</record>
+
 	<record model="res.company" id="main_company">
 		<field name="name">Tiny sprl</field>
 		<field name="partner_id" ref="main_partner"/>
diff --git a/bin/addons/base/base_demo.xml b/bin/addons/base/base_demo.xml
index 2f8f5d9a83e..903afa3e1fc 100644
--- a/bin/addons/base/base_demo.xml
+++ b/bin/addons/base/base_demo.xml
@@ -12,16 +12,5 @@
 		<field name="company_id" ref="main_company"/>
 	</record>
 
-	<record model="res.currency" id="USD">
-		<field name="name">USD</field>
-		<field name="rounding">0.01</field>
-		<field name="accuracy">4</field>
-	</record>
-	
-	<record model="res.currency.rate" id="rateUSD">
-		<field name="rate">0.8400</field>
-		<field name="currency_id" ref="USD"/>
-	</record>
-
 </data>
 </terp>
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 8b6300fff12..4efbe5285c4 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -58,9 +58,26 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Groups">
-				<field name="name" colspan="4" select="1"/>
-				<field name="rule_groups" />
-
+				<notebook>
+					<page string="Group">
+						<field name="name" colspan="4" select="1"/>
+						<field name="users" colspan="4"/>
+					</page>
+					<page string="Security">
+						<field name="model_access" colspan="4">
+							<form string="Access Controls">
+								<field name="name" select="1" colspan="4"/>
+								<field name="model_id" select="1"/>
+								<newline/>
+								<field name="perm_read"/>
+								<field name="perm_write"/>
+								<field name="perm_create"/>
+								<field name="perm_unlink"/>
+							</form>
+						</field>
+						<field name="rule_groups" colspan="4"/>
+					</page>
+				</notebook>
 			</form>
 		</field>
 	</record>
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 6ef209f6c98..a5ac3c3dfab 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -62,7 +62,7 @@
 		<field name="res_model">res.country</field>
 		<field name="view_type">form</field>
 	</record>
-	<menuitem name="Partners/Configuration/Localisation/Countries" groups="admin" action="action_country" id="menu_country"/>
+	<menuitem name="Administration/Localisation/Countries" groups="admin" action="action_country" id="menu_country"/>
 	
 	<!--
 	================================
@@ -100,7 +100,7 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="view_country_state_tree"/>
 	</record>
-	<menuitem name="Partners/Configuration/Localisation/States" groups="admin" action="action_country_state" id="menu_country_state"/>
+	<menuitem name="Administration/Localisation/Countries/States" groups="admin" action="action_country_state" id="menu_country_state"/>
 	
 	<!--
 	=====================
diff --git a/bin/addons/base/res/res_currency.py b/bin/addons/base/res/res_currency.py
index eef14854d3a..485ba469d28 100644
--- a/bin/addons/base/res/res_currency.py
+++ b/bin/addons/base/res/res_currency.py
@@ -89,6 +89,15 @@ class res_currency(osv.osv):
 				return self.round(cr, uid, to_currency, from_amount * from_currency.rate/to_currency.rate)
 			else:
 				return (from_amount * from_currency.rate/to_currency.rate)
+	def name_search(self, cr, uid, name, args=[], operator='ilike', context={}, limit=80):
+		args2 = args[:]
+		if name:
+			args += [('name', operator, name)]
+			args2 += [('code', operator, name)]
+		ids = self.search(cr, uid, args, limit=limit)
+		ids += self.search(cr, uid, args2, limit=limit)
+		res = self.name_get(cr, uid, ids, context)
+		return res
 res_currency()
 
 class res_currency_rate(osv.osv):
diff --git a/bin/addons/base/res/res_currency_view.xml b/bin/addons/base/res/res_currency_view.xml
index ee0bc76d9bc..fba85dd8d71 100644
--- a/bin/addons/base/res/res_currency_view.xml
+++ b/bin/addons/base/res/res_currency_view.xml
@@ -50,7 +50,7 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="Partners/Configuration/Localisation/Currencies" action="action_currency_form" sequence="11" id="menu_action_currency_form"/>
+	<menuitem name="Administration/Localisation/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"/>
 
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index a9be701bfe0..cd2f6ce5ec2 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -33,6 +33,7 @@ class groups(osv.osv):
 	_name = "res.groups"
 	_columns = {
 		'name': fields.char('Group Name', size=64, required=True),
+		'model_access': fields.one2many('ir.model.access', 'group_id', 'Access Controls'),
 		'rule_groups': fields.many2many('ir.rule.group', 'group_rule_group_rel', 'group_id', 'rule_group_id', 'Rules', domain="[('global', '<>', True)]"),
 	}
 	def write(self, cr, uid, *args, **argv):
@@ -129,7 +130,12 @@ class users(osv.osv):
 		login = self.read(cr, uid, [id], ['login'])[0]['login']
 		default.update({'login': login+' (copy)'})
 		return super(users, self).copy(cr, uid, id, default, context)
-
-
 users()
 
+class groups2(osv.osv):
+	_inherit = 'res.groups'
+	_columns = {
+		'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'),
+	}
+groups2()
+