diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 7639418f825..856fc209768 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -237,9 +237,17 @@
-
+
+ New User
+
+
+ Create additional users and assign them groups that will allow them to have access to selected functionalities within the system. Click on 'Done' if you do not wish to add more users at this stage, you can always do this later.
+
+
+
+
-
@@ -292,21 +300,21 @@
- res.users.confirm.simple_view
+ Configure Your Interface
res.config.view
form
- We suggest simplified interface, It has less options and fields but is easier to start with OpenERP. You will be able to switch to the extended interface later from your user preferences.
+ OpenERP allows you to select between a simplified and extended interface. If you use OpenERP for the first time we strongly advise you to select the simplified interface. You can always switch later from the user preferences.
- Choose Your Interface
+ Configure Your Interface
@@ -318,15 +326,12 @@
-
- Set
-
- Select Your Interface
+ Configure Your Interface
ir.actions.act_window
res.config.view
form
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index a950089a44f..9fbec3d4981 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -8208,24 +8208,6 @@ msgstr ""
msgid "Integrity Error"
msgstr ""
-#. module: base
-#: code:addons/osv/osv.py:0
-#, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
-msgstr "L'opération ne peut être mené, sans doute pour les raisons suivantes: \n-suppression: vous pouvez essayer de supprimer un enregistrement alors que d'autres documents de référence, il reste \n-création / mise à jour: un champ obligatoire n'est pas correctement configurée"
-
-#. module: base
-#: code:addons/osv/osv.py:0
-#, python-format
-msgid "\n\n[object with reference: %s - %s]"
-msgstr "\n\n[Objet avec de référence: %s - %s]"
-
-#. module: base
-#: code:addons/osv/osv.py:0
-#, python-format
-msgid "Integrity Error"
-msgstr "Défaut d'intégrité"
-
#~ msgid "Others Partners"
#~ msgstr "Autres partenaires"
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index a0f016e94c9..089d5ee777f 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -1,360 +1,360 @@
-
-
+
+
-
+
-
- workflow.form
- workflow
- form
-
-
-
-
+
+ workflow.form
+ workflow
+ form
+
+
+
+
-
- workflow.search
- workflow
- search
-
-
-
-
-
-
-
+
+ workflow.search
+ workflow
+ search
+
+
+
+
+
+
+
-
- workflow.diagram
- workflow
- diagram
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- workflow.tree
- workflow
- tree
-
-
-
-
-
-
-
-
+
+ workflow.diagram
+ workflow
+ diagram
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ workflow.tree
+ workflow
+ tree
+
+
+
+
+
+
+
+
-
- Workflows
- workflow
- form
-
- tree,form,diagram
-
-
+
+ Workflows
+ workflow
+ form
+
+ tree,form,diagram
+
+
-
+ -->
-
- workflow.activity.form
- workflow.activity
- form
-
-
-
-
-
- workflow.activity.tree
- workflow.activity
- tree
-
-
-
-
-
-
-
-
-
-
-
-
- workflow.activity.search
- workflow.activity
- search
-
-
-
-
-
-
-
-
-
-
+
+ workflow.activity.form
+ workflow.activity
+ form
+
+
+
+
+
+ workflow.activity.tree
+ workflow.activity
+ tree
+
+
+
+
+
+
+
+
+
+
-
- Activities
- workflow.activity
- form
-
-
-
-
+
+ workflow.activity.search
+ workflow.activity
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+ Activities
+ workflow.activity
+ form
+
+
+
+
-
+
-
- workflow.transition.form
- workflow.transition
- form
-
-
-
-
-
- workflow.transition.tree
- workflow.transition
- tree
-
-
-
-
-
-
-
-
-
+
+ workflow.transition.form
+ workflow.transition
+ form
+
+
+
+
+
+ workflow.transition.tree
+ workflow.transition
+ tree
+
+
+
+
+
+
+
+
+
-
- workflow.transition.search
- workflow.transition
- search
-
-
-
-
-
-
-
-
+
+ workflow.transition.search
+ workflow.transition
+ search
+
+
+
+
+
+
+
+
-
- Transitions
- workflow.transition
- form
-
-
-
-
+
+ Transitions
+ workflow.transition
+ form
+
+
+
+
-
+
-
- workflow.instance.form
- workflow.instance
- form
-
-
-
-
-
- workflow.instance.tree
- workflow.instance
- tree
-
-
-
-
-
-
-
-
-
-
-
- workflow.instance.search
- workflow.instance
- search
-
-
-
-
-
-
-
-
-
-
+
+ workflow.instance.form
+ workflow.instance
+ form
+
+
+
+
+
+ workflow.instance.tree
+ workflow.instance
+ tree
+
+
+
+
+
+
+
+
+
+
+
+ workflow.instance.search
+ workflow.instance
+ search
+
+
+
+
+
+
+
+
+
+
-
- Instances
- workflow.instance
- form
-
-
-
-
+
+ Instances
+ workflow.instance
+ form
+
+
+
+
-
+
-
- workflow.workitem.form
- workflow.workitem
- form
-
-
-
-
-
- workflow.workitem.tree
- workflow.workitem
- tree
-
-
-
-
-
-
-
-
-
-
- workflow.workitem.search
- workflow.workitem
- search
-
-
-
-
-
-
-
-
-
+
+ workflow.workitem.form
+ workflow.workitem
+ form
+
+
+
+
+
+ workflow.workitem.tree
+ workflow.workitem
+ tree
+
+
+
+
+
+
+
+
+
+
+ workflow.workitem.search
+ workflow.workitem
+ search
+
+
+
+
+
+
+
+
+
-
- Workitems
- workflow.workitem
- form
-
-
-
-
+
+ Workitems
+ workflow.workitem
+ form
+
+
+
+
-
+
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d8645a83cc0..2b1d39381cc 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -560,7 +560,7 @@ class res_config_view(osv.osv_memory):
'Interface', required=True ),
}
_defaults={
- 'view':lambda *args: 'simple',
+ 'view':lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
}
def execute(self, cr, uid, ids, context=None):