diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 994992b69c0..5db326cf0d6 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -280,18 +280,24 @@
-
-
-
-
-
-
-
-
-
-
+
+ Choose between the simplified interface and the extended one. If you are testing OpenERP or using it for the first time, We suggest you use the simplified interface. It has less options and fields but is easier to understand. You will be able to switch to the extended interface later.
+
+
+ Choose Your Interface
+
+
+
+ 14
+
+
+
+
+
+ Set
@@ -320,6 +326,5 @@
1
-
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 2644ebd3706..c23a2f689a3 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1352,6 +1352,7 @@
+
@@ -1365,6 +1366,11 @@
+
+
+
+
+
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 200aa09db7f..4432ebe62e9 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -737,6 +737,7 @@ class ir_actions_todo(osv.osv):
'state': fields.selection(TODO_STATES, string='State', required=True),
'name':fields.char('Name', size=64),
'restart': fields.selection([('onskip','On Skip'),('always','Always'),('never','Never')],'Restart',required=True),
+ 'groups_id':fields.many2many('res.groups', 'res_groups_action_rel', 'uid', 'gid', 'Groups'),
'note':fields.text('Text', translate=True),
}
_defaults={
diff --git a/bin/addons/base/res/config_pixmaps/1.png b/bin/addons/base/res/config_pixmaps/1.png
new file mode 100644
index 00000000000..82b1df61251
Binary files /dev/null and b/bin/addons/base/res/config_pixmaps/1.png differ
diff --git a/bin/addons/base/res/config_pixmaps/2.png b/bin/addons/base/res/config_pixmaps/2.png
new file mode 100644
index 00000000000..b883d17e17e
Binary files /dev/null and b/bin/addons/base/res/config_pixmaps/2.png differ
diff --git a/bin/addons/base/res/config_pixmaps/3.png b/bin/addons/base/res/config_pixmaps/3.png
new file mode 100644
index 00000000000..5d6a19d2880
Binary files /dev/null and b/bin/addons/base/res/config_pixmaps/3.png differ
diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 0cdf3d927d4..3e890e6efed 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -134,7 +134,7 @@ class res_partner(osv.osv):
'title': fields.selection(_partner_title_get, 'Title', size=32),
'parent_id': fields.many2one('res.partner','Parent Partner', select=2),
'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'),
- 'ref': fields.char('Code', size=64),
+ 'ref': fields.char('Reference', size=64),
'lang': fields.selection(_lang_get, 'Language', size=5, help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
@@ -151,7 +151,9 @@ class res_partner(osv.osv):
'supplier': fields.boolean('Supplier', help="Check this box if the partner is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
'city': fields.related('address', 'city', type='char', string='City'),
'phone': fields.related('address', 'phone', type='char', string='Phone'),
- 'country': fields.related('address', 'country_id', type='many2one', relation='res.country', string='Country'),
+ 'country': fields.related('address', 'country_id', type='many2one', relation='res.country', string='Country'),
+ 'employee': fields.boolean('Employee', help="Check this box if the partner is an Employee."),
+ 'email': fields.related('address', 'email', type='char', size=240, string='E-mail'),
'company_id': fields.many2one('res.company', 'Company', select=1),
}
diff --git a/bin/addons/base/res/partner/partner_report.xml b/bin/addons/base/res/partner/partner_report.xml
index b4057414f56..61e3876527f 100644
--- a/bin/addons/base/res/partner/partner_report.xml
+++ b/bin/addons/base/res/partner/partner_report.xml
@@ -1,8 +1,8 @@
-
-
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 38dbeb34bc8..840ee132481 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -6,7 +6,7 @@
-
+