diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 82bab896fbf..dcb8f3a2eb0 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -47,8 +47,8 @@ import logging
 
 logger = netsvc.Logger()
 
-_ad = os.path.abspath(opj(tools.config['root_path'], 'addons'))     # default addons path (base)
-ad_paths= map(lambda m: os.path.abspath(m.strip()),tools.config['addons_path'].split(','))
+_ad = os.path.abspath(opj(tools.ustr(tools.config['root_path']), u'addons'))     # default addons path (base)
+ad_paths= map(lambda m: os.path.abspath(tools.ustr(m.strip())), tools.config['addons_path'].split(','))
 
 sys.path.insert(1, _ad)
 
@@ -819,12 +819,18 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
         report = tools.assertion_report()
         # NOTE: Try to also load the modules that have been marked as uninstallable previously...
         STATES_TO_LOAD = ['installed', 'to upgrade', 'uninstallable']
+        if 'base' in tools.config['update']:
+            cr.execute("update ir_module_module set state=%s where name=%s", ('to upgrade', 'base'))
         graph = create_graph(cr, ['base'], force)
         if not graph:
             logger.notifyChannel('init', netsvc.LOG_CRITICAL, 'module base cannot be loaded! (hint: verify addons-path)')
             raise osv.osv.except_osv(_('Could not load base module'), _('module base cannot be loaded! (hint: verify addons-path)'))
         has_updates = load_module_graph(cr, graph, status, perform_checks=(not update_module), report=report, skip_cleanup=True)
 
+        if tools.config['load_language']:
+            for lang in tools.config['load_language'].split(','):
+                tools.load_language(cr, lang)
+
         if update_module:
             modobj = pool.get('ir.module.module')
             logger.notifyChannel('init', netsvc.LOG_INFO, 'updating modules list')
diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py
index eefaf9f4442..bb419fc90d3 100644
--- a/bin/addons/base/__openerp__.py
+++ b/bin/addons/base/__openerp__.py
@@ -89,6 +89,7 @@
         'test/base_test.yml',
         'test/test_context.xml',
         'test/bug_lp541545.xml',
+        'test/test_osv_expression.yml',
     ],
     'installable': True,
     'active': True,
diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index ef0c031068d..db74b9b1b1e 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1022,7 +1022,6 @@
         <!-- Currencies -->
         <record id="EUR" model="res.currency">
             <field name="name">EUR</field>
-            <field name="code">EUR</field>
             <field name="symbol">€</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1075,7 +1074,6 @@
         </record>
         <record id="USD" model="res.currency">
             <field name="name">USD</field>
-            <field name="code">USD</field>
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1089,7 +1087,6 @@
 
         <record id="VEB" model="res.currency">
             <field name="name">Bs</field>
-            <field name="code">VEB</field>
             <field name="symbol">Bs</field>
             <field name="rounding">2.95</field>
             <field name="accuracy">4</field>
@@ -1103,7 +1100,6 @@
 
         <record id="CAD" model="res.currency">
             <field name="name">CAD</field>
-            <field name="code">CAD</field>
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1118,7 +1114,6 @@
 
         <record id="CHF" model="res.currency">
             <field name="name">CHF</field>
-            <field name="code">CHF</field>
             <field name="symbol">CHF</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1132,7 +1127,6 @@
 
         <record id="BRL" model="res.currency">
             <field name="name">BRL</field>
-            <field name="code">BRL</field>
             <field name="symbol">R$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1146,7 +1140,6 @@
 
         <record id="CNY" model="res.currency">
             <field name="name">CNY</field>
-            <field name="code">CNY</field>
             <field name="symbol">¥</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1161,7 +1154,6 @@
 
         <record id="COP" model="res.currency">
             <field name="name">COP</field>
-            <field name="code">COP</field>
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1175,7 +1167,6 @@
 
         <record id="CZK" model="res.currency">
             <field name="name">Kč</field>
-            <field name="code">CZK</field>
             <field name="symbol">Kč</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1189,7 +1180,6 @@
 
         <record id="DKK" model="res.currency">
             <field name="name">kr</field>
-            <field name="code">DKK</field>
             <field name="symbol">kr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1204,7 +1194,6 @@
 
         <record id="HUF" model="res.currency">
             <field name="name">Ft</field>
-            <field name="code">HUF</field>
             <field name="symbol">Ft</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1218,7 +1207,6 @@
 
         <record id="IDR" model="res.currency">
             <field name="name">Rp</field>
-            <field name="code">IDR</field>
             <field name="symbol">Rp</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1237,7 +1225,6 @@
 
         <record id="LVL" model="res.currency">
             <field name="name">Ls</field>
-            <field name="code">LVL</field>
             <field name="symbol">Ls</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1252,7 +1239,6 @@
 
         <record id="NOK" model="res.currency">
             <field name="name">kr</field>
-            <field name="code">NOK</field>
             <field name="symbol">kr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1264,10 +1250,21 @@
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
 
+        <record id="XPF" model="res.currency">
+            <field name="name">XPF</field>
+            <field name="symbol">XPF</field>
+            <field name="rounding">1.00</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateXPF" model="res.currency.rate">
+            <field name="rate">119.331742</field>
+            <field name="currency_id" ref="XPF"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
 
         <record id="PAB" model="res.currency">
             <field name="name">PAB</field>
-            <field name="code">PAB</field>
             <field name="symbol">B/.</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1281,7 +1278,6 @@
 
         <record id="PLN" model="res.currency">
             <field name="name">zł</field>
-            <field name="code">PLN</field>
             <field name="symbol">zł</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1295,7 +1291,6 @@
 
         <record id="SEK" model="res.currency">
             <field name="name">kr</field>
-            <field name="code">SEK</field>
             <field name="symbol">kr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1309,7 +1304,6 @@
 
         <record id="GBP" model="res.currency">
             <field name="name">GBP</field>
-            <field name="code">GBP</field>
             <field name="symbol">₤</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1323,7 +1317,6 @@
 
         <record id="ARS" model="res.currency">
             <field name="name">ARS</field>
-            <field name="code">ARS</field>
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1337,7 +1330,6 @@
 
         <record id="INR" model="res.currency">
             <field name="name">Rs</field>
-            <field name="code">INR</field>
             <field name="symbol">Rs</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1351,7 +1343,6 @@
 
         <record id="AUD" model="res.currency">
             <field name="name">AUD</field>
-            <field name="code">AUD</field>
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1365,7 +1356,6 @@
 
         <record id="UAH" model="res.currency">
             <field name="name">UAH</field>
-            <field name="code">UAH</field>
             <field name="symbol">₴</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1379,7 +1369,6 @@
 
         <record id="VND" model="res.currency">
             <field name="name">VND</field>
-            <field name="code">VND</field>
             <field name="symbol">₫</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1393,7 +1382,6 @@
 
         <record id="HKD" model="res.currency">
             <field name="name">HKD</field>
-            <field name="code">HKD</field>
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1407,7 +1395,6 @@
 
         <record id="JPY" model="res.currency">
             <field name="name">JPY</field>
-            <field name="code">JPY</field>
             <field name="symbol">¥</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1421,7 +1408,6 @@
 
         <record id="BGN" model="res.currency">
             <field name="name">BGN</field>
-            <field name="code">BGN</field>
             <field name="symbol">лв</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1435,7 +1421,6 @@
 
         <record id="EEK" model="res.currency">
             <field name="name">EEK</field>
-            <field name="code">EEK</field>
             <field name="symbol">kr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1449,7 +1434,6 @@
 
         <record id="LTL" model="res.currency">
             <field name="name">LTL</field>
-            <field name="code">LTL</field>
             <field name="symbol">Lt</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1463,7 +1447,6 @@
 
         <record id="RON" model="res.currency">
             <field name="name">RON</field>
-            <field name="code">RON</field>
             <field name="symbol">kr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1477,7 +1460,6 @@
 
         <record id="HRK" model="res.currency">
             <field name="name">HRK</field>
-            <field name="code">HRK</field>
             <field name="symbol">kn</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1491,7 +1473,6 @@
 
         <record id="RUB" model="res.currency">
             <field name="name">RUB</field>
-            <field name="code">RUB</field>
             <field name="symbol">руб</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1505,7 +1486,6 @@
 
         <record id="TRY" model="res.currency">
             <field name="name">TRY</field>
-            <field name="code">TRY</field>
             <field name="symbol">TL</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1519,7 +1499,6 @@
 
         <record id="KRW" model="res.currency">
             <field name="name">KRW</field>
-            <field name="code">KRW</field>
             <field name="symbol">₩</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1533,7 +1512,6 @@
 
         <record id="MXN" model="res.currency">
             <field name="name">MXN</field>
-            <field name="code">MXN</field>
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1547,7 +1525,6 @@
 
         <record id="MYR" model="res.currency">
             <field name="name">MYR</field>
-            <field name="code">MYR</field>
             <field name="symbol">RM</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1561,7 +1538,6 @@
 
         <record id="NZD" model="res.currency">
             <field name="name">NZD</field>
-            <field name="code">NZD</field>
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1575,7 +1551,6 @@
 
         <record id="PHP" model="res.currency">
             <field name="name">PHP</field>
-            <field name="code">PHP</field>
             <field name="symbol">Php</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1589,7 +1564,6 @@
 
         <record id="SGD" model="res.currency">
             <field name="name">SGD</field>
-            <field name="code">SGD</field>
             <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1603,7 +1577,6 @@
 
         <record id="THB" model="res.currency">
             <field name="name">THB</field>
-            <field name="code">THB</field>
             <field name="symbol">฿</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1617,7 +1590,6 @@
 
         <record id="ZAR" model="res.currency">
             <field name="name">ZAR</field>
-            <field name="code">ZAR</field>
             <field name="symbol">R</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
@@ -1636,7 +1608,6 @@
 
         <record id="CRC" model="res.currency">
            <field name="name">CRC</field>
-           <field name="code">CRC</field>
            <field name="rounding">0.01</field>
            <field name="accuracy">4</field>
            <field name="symbol">¢</field>
diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 71e52fa612b..eb1b1611c66 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -11,7 +11,7 @@
             parent="base.menu_administration" sequence="2"
             groups="base.group_extended"/>
         <menuitem id="next_id_4" name="Low Level Objects"
-            parent="base.menu_custom" sequence="3"/>
+            parent="base.menu_custom" sequence="30"/>
         <menuitem id="menu_low_workflow" name="Workflows" parent="base.next_id_4"/>
         <menuitem id="menu_custom_action" name="Actions" parent="base.menu_custom" groups="base.group_extended" sequence="20"/>
         <menuitem id="menu_config" name="Configuration" parent="base.menu_administration" sequence="1"/>
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 5a008bd7d7e..969b8d49bdd 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -76,13 +76,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Password">
-	                <field name="current_password" password="True" readonly="0" colspan="4"/>
-	                <field name="new_password" password="True" readonly="0" colspan="4"/>
-	                <field name="confirm_password" password="True" readonly="0" colspan="4"/>
+                    <field name="current_password" password="True" readonly="0" colspan="4"/>
+                    <field name="new_password" password="True" readonly="0" colspan="4"/>
+                    <field name="confirm_password" password="True" readonly="0" colspan="4"/>
+                    <label colspan="1" string=""/>
+                    <label colspan="3" string="You must logout and login again after changing your password."/>
                     <separator colspan="4" />
                     <label align="0.0" colspan="2" string=""/>
                     <button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button colspan="1" icon="gtk-execute" name="change_password" string="Change" type="object"/>
+                    <button colspan="1" icon="gtk-ok" name="change_password" string="Change" type="object"/>
                 </form>
             </field>
         </record>
@@ -106,7 +108,7 @@
                     <notebook colspan="4">
                         <page string="Current Activity">
                             <field name="company_id" widget="selection" readonly="0"
-                                    context="{'user_id': self, 'user_preference': 1}" groups="base.group_multi_company"
+                                    groups="base.group_multi_company"
                                     on_change="on_change_company_id(company_id)" />
                             <field name="view" readonly="0"/>
                             <label string="" colspan="2"/>
@@ -116,8 +118,6 @@
                          <page string="Preferences">
                             <field name="context_lang" completion="1" readonly="0"/>
                             <field name="context_tz" completion="1" readonly="0"/>
-                            <label string="" colspan="1"/>
-                            <label colspan="3" string="You must logout and login again after changing your password."/>
                             <field name="menu_tips" colspan="2" readonly="0"/>
                             <label string="" colspan="1"/>
                             <button name="%(action_view_change_password_form)d" string="Change Password" type="action" icon="gtk-execute"/>
@@ -146,7 +146,7 @@
                             <group colspan="1" col="2">
                                 <separator string="Contact" colspan="2"/>
                                 <field name="company_id" required="1"
-                                    context="{'user_id': self, 'user_preference': 1}"
+                                    context="{'user_preference': 0}"
                                     groups="base.group_multi_company"
                                     />
                                 <field name="address_id"/>
diff --git a/bin/addons/base/i18n/base.pot b/bin/addons/base/i18n/base.pot
index 075bdc83010..5f7fb173555 100644
--- a/bin/addons/base/i18n/base.pot
+++ b/bin/addons/base/i18n/base.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:45+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:45+0000\n"
+"POT-Creation-Date: 2010-12-29 18:06:01+0000\n"
+"PO-Revision-Date: 2010-12-29 18:06:01+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -39,6 +39,12 @@ msgstr ""
 msgid "DateTime"
 msgstr ""
 
+#. module: base
+#: code:addons/fields.py:534
+#, python-format
+msgid "The second argument of the many2many field %s must be a SQL table !You used %s, which is not a valid SQL table name."
+msgstr ""
+
 #. module: base
 #: view:ir.values:0
 #: field:ir.values,meta_unpickle:0
@@ -51,12 +57,6 @@ msgstr ""
 msgid "View Architecture"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "You can not create this kind of document! (%s)"
-msgstr ""
-
 #. module: base
 #: field:base.language.import,code:0
 msgid "Code (eg:en__US)"
@@ -107,6 +107,12 @@ msgstr ""
 msgid "Created Views"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_model.py:339
+#, python-format
+msgid "You can not write in this document (%s) ! Be sure your user belongs to one of these groups: %s."
+msgstr ""
+
 #. module: base
 #: field:res.partner,ref:0
 msgid "Reference"
@@ -123,10 +129,9 @@ msgid "South Korea"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_workflow_transition_form
-#: model:ir.ui.menu,name:base.menu_workflow_transition
-#: view:workflow.activity:0
-msgid "Transitions"
+#: code:addons/osv.py:133
+#, python-format
+msgid "Constraint Error"
 msgstr ""
 
 #. module: base
@@ -139,13 +144,20 @@ msgstr ""
 msgid "Swaziland"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:1993
+#: code:addons/orm.py:3653
+#, python-format
+msgid "created."
+msgstr ""
+
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
 msgid "Wood Suppliers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:0
+#: code:addons/base/module/module.py:303
 #, python-format
 msgid "Some installed modules depend on the module you plan to Uninstall :\n"
 " %s"
@@ -173,13 +185,13 @@ msgid "Search Partner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_user.py:0
+#: code:addons/base/res/res_user.py:132
 #, python-format
 msgid "\"smtp_server\" needs to be set to send mails to users"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:0
+#: code:addons/base/module/wizard/base_export_language.py:60
 #, python-format
 msgid "new"
 msgstr ""
@@ -210,7 +222,7 @@ msgid "Contact Name"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:0
+#: code:addons/base/module/wizard/base_export_language.py:56
 #, python-format
 msgid "Save this document to a %s file and edit it with a specific software or a text editor. The file encoding is UTF-8."
 msgstr ""
@@ -230,6 +242,12 @@ msgstr ""
 msgid "Wizard Name"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:2160
+#, python-format
+msgid "Invalid group_by"
+msgstr ""
+
 #. module: base
 #: field:res.partner,credit_limit:0
 msgid "Credit Limit"
@@ -262,7 +280,6 @@ msgstr ""
 
 #. module: base
 #: field:res.widget.user,widget_id:0
-#: field:res.widget.wizard,widget_id:0
 msgid "Widget"
 msgstr ""
 
@@ -313,7 +330,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_user.py:0
+#: code:addons/base/res/res_user.py:373
 #, python-format
 msgid "You can not remove the admin user as it is used internally for resources created by OpenERP (updates, module installation, ...)"
 msgstr ""
@@ -334,13 +351,14 @@ msgid "Bosnian / bosanski jezik"
 msgstr ""
 
 #. module: base
-#: field:ir.ui.menu,web_icon_data:0
-msgid "Web Icons"
+#: help:ir.actions.report.xml,attachment_use:0
+msgid "If you check this, then the second time the user prints with same attachment name, it returns the previous report."
 msgstr ""
 
 #. module: base
-#: help:ir.actions.report.xml,attachment_use:0
-msgid "If you check this, then the second time the user prints with same attachment name, it returns the previous report."
+#: code:addons/orm.py:904
+#, python-format
+msgid "The read method is not implemented on this object !"
 msgstr ""
 
 #. module: base
@@ -369,6 +387,12 @@ msgstr ""
 msgid "Schedule Upgrade"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:838
+#, python-format
+msgid "Key/value '%s' not found in selection field '%s'"
+msgstr ""
+
 #. module: base
 #: help:res.country,code:0
 msgid "The ISO country code in two chars.\n"
@@ -408,7 +432,7 @@ msgid "Miscellaneous Suppliers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
+#: code:addons/base/ir/ir_model.py:216
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr ""
@@ -646,6 +670,12 @@ msgstr ""
 msgid "Sets the language for the user's user interface, when UI translations are available"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:1043
+#, python-format
+msgid "The unlink method is not implemented on this object !"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
 #: view:wizard.ir.model.menu.create:0
@@ -710,6 +740,13 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:210
+#, python-format
+msgid "Language with code \"%s\" is not defined in your system !\n"
+"Define it through the Administration menu."
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.gu
 msgid "Guam (USA)"
@@ -736,6 +773,19 @@ msgstr ""
 msgid "Cayman Islands"
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4018
+#, python-format
+msgid "Record #%d of %s not found, cannot copy!"
+msgstr ""
+
 #. module: base
 #: field:ir.module.module,contributors:0
 msgid "Contributors"
@@ -834,6 +884,14 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: base
+#: code:addons/osv.py:136
+#, 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 ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "2. Group-specific rules are combined together with a logical AND operator"
@@ -888,13 +946,13 @@ msgid "ir.exports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:0
+#: code:addons/base/module/wizard/base_update_translations.py:38
 #, python-format
 msgid "No language with code \"%s\" exists"
 msgstr ""
 
 #. module: base
-#: code:addons/base/publisher_warranty/publisher_warranty.py:0
+#: code:addons/base/publisher_warranty/publisher_warranty.py:163
 #, python-format
 msgid "Error during communication with the publisher warranty server."
 msgstr ""
@@ -919,6 +977,12 @@ msgstr ""
 msgid "This wizard helps you register a publisher warranty contract in your OpenERP system. After the contract has been registered, you will be able to send issues directly to OpenERP."
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:1744
+#, python-format
+msgid "The search method is not implemented on this object !"
+msgstr ""
+
 #. module: base
 #: view:wizard.ir.model.menu.create:0
 msgid "Create _Menu"
@@ -964,7 +1028,7 @@ msgid "On Create"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
+#: code:addons/base/ir/ir_model.py:461
 #, python-format
 msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
@@ -1057,12 +1121,6 @@ msgstr ""
 msgid "Day: %(day)s"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "You can not read this document! (%s)"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,help:base.open_module_tree
 msgid "List all certified modules available to configure your OpenERP. Modules that are installed are flagged as such. You can search for a specific module using the name or the description of the module. You do not need to install modules one by one, you can install many at the same time by clicking on the schedule button in this list. Then, apply the schedule upgrade from Action menu once for all the ones you have scheduled for installation."
@@ -1094,8 +1152,8 @@ msgid "Condition that is to be tested before action is executed, e.g. object.lis
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/partner/partner.py:0
-#: code:addons/base/res/res_company.py:0
+#: code:addons/base/res/partner/partner.py:155
+#: code:addons/base/res/res_company.py:66
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1171,7 +1229,7 @@ msgid "Formula"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_user.py:0
+#: code:addons/base/res/res_user.py:373
 #, python-format
 msgid "Can not remove root user!"
 msgstr ""
@@ -1182,7 +1240,8 @@ msgid "Malawi"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_user.py:0
+#: code:addons/base/res/res_user.py:51
+#: code:addons/base/res/res_user.py:397
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1228,7 +1287,6 @@ msgstr ""
 
 #. module: base
 #: help:res.config.users,password:0
-#: help:res.users,password:0
 msgid "Keep empty if you don't want the user to be able to connect on the system."
 msgstr ""
 
@@ -1252,6 +1310,12 @@ msgstr ""
 msgid "When using CSV format, please also check that the first line of your file is one of the following:"
 msgstr ""
 
+#. module: base
+#: code:addons/fields.py:114
+#, python-format
+msgid "Not implemented search_memory method !"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.res_log_act_window
 #: model:ir.ui.menu,name:base.menu_res_log_act_window
@@ -1301,7 +1365,7 @@ msgid "Bahamas"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/partner/partner.py:0
+#: code:addons/base/res/partner/partner.py:250
 #, python-format
 msgid "Couldn't generate the next id because some partners have an alphabetic id !"
 msgstr ""
@@ -1321,6 +1385,12 @@ msgstr ""
 msgid "Number of modules updated"
 msgstr ""
 
+#. module: base
+#: code:addons/fields.py:100
+#, python-format
+msgid "Not implemented set_memory method !"
+msgstr ""
+
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
@@ -1387,6 +1457,12 @@ msgstr ""
 msgid "Comma-separated list of allowed view modes, such as 'form', 'tree', 'calendar', etc. (Default: tree,form)"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:3147
+#, python-format
+msgid "A document was modified since you last viewed it (%s:%d)"
+msgstr ""
+
 #. module: base
 #: view:workflow:0
 msgid "Workflow Editor"
@@ -1453,7 +1529,7 @@ msgid "Madagascar"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
+#: code:addons/base/ir/ir_model.py:94
 #, python-format
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
@@ -1535,12 +1611,6 @@ msgstr ""
 msgid "French (BE) / Français (BE)"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "You can not write in this document! (%s)"
-msgstr ""
-
 #. module: base
 #: view:ir.actions.server:0
 #: field:workflow.activity,action_id:0
@@ -1609,6 +1679,12 @@ msgstr ""
 msgid "Name of object whose function will be called when this scheduler will run. e.g. 'res.partener'"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:1040
+#, python-format
+msgid "The perm_read method is not implemented on this object !"
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "%y - Year without century [00,99]."
@@ -1619,13 +1695,19 @@ msgstr ""
 msgid "Slovenia"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:1350
+#, python-format
+msgid "Invalid Object Architecture!"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_email_gateway_form
 msgid "Messages"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:0
+#: code:addons/base/module/wizard/base_update_translations.py:38
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1655,6 +1737,12 @@ msgstr ""
 msgid "New Zealand"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:3366
+#, python-format
+msgid "One of the records you are trying to modify has already been deleted (Document type: %s)."
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country
 msgid "Display and manage the list of all countries that can be assigned to your partner records. You can create or delete countries to make sure the ones you are working on will be maintained."
@@ -1701,19 +1789,13 @@ msgstr ""
 msgid "Valid"
 msgstr ""
 
-#. module: base
-#: code:addons/base/ir/ir_model.py:0
-#, python-format
-msgid "You can not delete this document! (%s)"
-msgstr ""
-
 #. module: base
 #: selection:ir.translation,type:0
 msgid "XSL"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:0
+#: code:addons/base/module/module.py:322
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr ""
@@ -1824,6 +1906,12 @@ msgstr ""
 msgid "HR sector"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:3817
+#, python-format
+msgid "Invalid \"order\" specified. A valid \"order\" specification is a comma-separated list of valid field names (optionally followed by asc/desc for the direction)"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
 msgid "Module dependency"
@@ -1874,6 +1962,11 @@ msgstr ""
 msgid "Main Company"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,web_icon_hover:0
+msgid "Web Icon File (hover)"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.server:0
 msgid "If you use a formula type, use a python expression using the variable 'object'."
@@ -1956,8 +2049,9 @@ msgid "Sir"
 msgstr ""
 
 #. module: base
-#: view:base.module.import:0
-msgid "Select module package to import (.zip file):"
+#: code:addons/orm.py:1622
+#, python-format
+msgid "There is no view of type '%s' defined for the structure!"
 msgstr ""
 
 #. module: base
@@ -2056,7 +2150,7 @@ msgid "Mayotte"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:0
+#: code:addons/base/ir/ir_actions.py:593
 #, python-format
 msgid "Please specify an action to launch !"
 msgstr ""
@@ -2080,6 +2174,12 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:758
+#, python-format
+msgid "Please check that all your lines have %d columns."
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_cron_act
 #: view:ir.cron:0
@@ -2100,7 +2200,13 @@ msgid "If not set, acts as a default value for new resources"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:0
+#: code:addons/orm.py:3448
+#, python-format
+msgid "Recursivity Detected."
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:262
 #, python-format
 msgid "Recursion error in modules dependencies !"
 msgstr ""
@@ -2120,6 +2226,11 @@ msgstr ""
 msgid "Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."
 msgstr ""
 
+#. module: base
+#: model:ir.model,name:base.model_maintenance_contract
+msgid "maintenance.contract"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ru
 msgid "Russian Federation"
@@ -2172,11 +2283,6 @@ msgstr ""
 msgid "VAT"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,web_icon_hover_data:0
-msgid "Web Icons Hover"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
@@ -2213,19 +2319,25 @@ msgid "M."
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:0
+#: code:addons/base/module/module.py:429
 #, python-format
 msgid "Can not create the module file:\n"
 " %s"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:2973
+#, python-format
+msgid "Operation prohibited by access rules, or performed on an already deleted document (Operation: read, Document type: %s)."
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.nr
 msgid "Nauru"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:0
+#: code:addons/base/module/module.py:200
 #, python-format
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
@@ -2298,6 +2410,12 @@ msgstr ""
 msgid "EAN13"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:1622
+#, python-format
+msgid "Invalid Architecture!"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.pt
 msgid "Portugal"
@@ -2354,7 +2472,7 @@ msgid "Ecuador"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:0
+#: code:addons/base/module/wizard/base_export_language.py:52
 #, python-format
 msgid "Save this document to a .CSV file and open it with your favourite spreadsheet software. The file encoding is UTF-8. You have to translate the latest column before reimporting it."
 msgstr ""
@@ -2415,7 +2533,7 @@ msgid "Action to Trigger"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_user.py:0
+#: code:addons/base/res/res_user.py:136
 #, python-format
 msgid "\"email_from\" needs to be set to send welcome mails to users"
 msgstr ""
@@ -2604,18 +2722,13 @@ msgstr ""
 msgid "FYROM"
 msgstr ""
 
-#. module: base
-#: selection:ir.model.fields,select_level:0
-msgid "Advanced Search"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:0
+#: code:addons/base/res/res_config.py:422
 #, python-format
 msgid "Your database is now fully configured.\n"
 "\n"
@@ -2660,7 +2773,7 @@ msgid "Rules"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:0
+#: code:addons/base/module/module.py:216
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
@@ -2726,7 +2839,7 @@ msgid "Lesotho"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
+#: code:addons/base/ir/ir_model.py:112
 #, python-format
 msgid "You can not remove the model '%s' !"
 msgstr ""
@@ -2756,6 +2869,12 @@ msgstr ""
 msgid "System Configuration Done"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:929
+#, python-format
+msgid "Error occurred while validating the field(s) %s: %s"
+msgstr ""
+
 #. module: base
 #: view:ir.property:0
 msgid "Generic"
@@ -2787,7 +2906,7 @@ msgid "Benin"
 msgstr ""
 
 #. module: base
-#: code:addons/base/publisher_warranty/publisher_warranty.py:0
+#: code:addons/base/publisher_warranty/publisher_warranty.py:281
 #, python-format
 msgid "That contract is already registered in the system."
 msgstr ""
@@ -2817,6 +2936,12 @@ msgstr ""
 msgid "API ID"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_model.py:340
+#, python-format
+msgid "You can not create this document (%s) ! Be sure your user belongs to one of these groups: %s."
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.mu
 msgid "Mauritius"
@@ -3046,6 +3171,12 @@ msgstr ""
 msgid "Nicaragua"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:1046
+#, python-format
+msgid "The write method is not implemented on this object !"
+msgstr ""
+
 #. module: base
 #: view:res.partner.event:0
 msgid "General Description"
@@ -3317,7 +3448,8 @@ msgid "Bank Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_user.py:0
+#: code:addons/base/res/res_user.py:58
+#: code:addons/base/res/res_user.py:67
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr ""
@@ -3339,7 +3471,7 @@ msgid "Gujarati / ગુજરાતી"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:0
+#: code:addons/base/module/module.py:257
 #, python-format
 msgid "Unable to process module \"%s\" because an external dependency is not met: %s"
 msgstr ""
@@ -3356,7 +3488,7 @@ msgid "Flow Start"
 msgstr ""
 
 #. module: base
-#: code:addons/__init__.py:0
+#: code:addons/__init__.py:827
 #, python-format
 msgid "module base cannot be loaded! (hint: verify addons-path)"
 msgstr ""
@@ -3388,7 +3520,9 @@ msgid "Guadeloupe (French)"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_lang.py:0
+#: code:addons/base/res/res_lang.py:86
+#: code:addons/base/res/res_lang.py:88
+#: code:addons/base/res/res_lang.py:90
 #, python-format
 msgid "User Error"
 msgstr ""
@@ -3460,6 +3594,11 @@ msgstr ""
 msgid "Cape Verde"
 msgstr ""
 
+#. module: base
+#: view:base.module.import:0
+msgid "Select module package to import (.zip file):"
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.act_res_partner_event
 #: field:res.partner,events:0
@@ -3473,6 +3612,12 @@ msgstr ""
 msgid "ir.actions.url"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:156
+#, python-format
+msgid "Wrong ID for the browse record, got %r, expected an integer."
+msgstr ""
+
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_addess_tree
 #: view:res.partner:0
@@ -3506,8 +3651,9 @@ msgid "French / Français"
 msgstr ""
 
 #. module: base
-#: view:ir.module.module:0
-msgid "Created Menus"
+#: code:addons/orm.py:1049
+#, python-format
+msgid "The create method is not implemented on this object !"
 msgstr ""
 
 #. module: base
@@ -3758,6 +3904,12 @@ msgstr ""
 msgid "ir.attachment"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:3533
+#, python-format
+msgid "You cannot perform this operation. New Record Creation is not allowed for this object as this object is for reporting purpose."
+msgstr ""
+
 #. module: base
 #: view:base.language.import:0
 msgid "- module,type,name,res_id,src,value"
@@ -3794,8 +3946,8 @@ msgid "Project"
 msgstr ""
 
 #. module: base
-#: model:ir.model,name:base.model_maintenance_contract
-msgid "maintenance.contract"
+#: field:ir.ui.menu,web_icon_hover_data:0
+msgid "Web Icon Image (hover)"
 msgstr ""
 
 #. module: base
@@ -3825,11 +3977,8 @@ msgid "Serial Key"
 msgstr ""
 
 #. module: base
-#: field:res.partner,customer:0
-#: view:res.partner.address:0
-#: field:res.partner.address,is_customer_add:0
-#: model:res.partner.category,name:base.res_partner_category_0
-msgid "Customer"
+#: model:ir.ui.menu,name:base.menu_audit
+msgid "Audit"
 msgstr ""
 
 #. module: base
@@ -3938,6 +4087,18 @@ msgstr ""
 msgid "Signature"
 msgstr ""
 
+#. module: base
+#: code:addons/fields.py:456
+#: code:addons/fields.py:654
+#: code:addons/fields.py:656
+#: code:addons/fields.py:658
+#: code:addons/fields.py:660
+#: code:addons/fields.py:662
+#: code:addons/fields.py:664
+#, python-format
+msgid "Not Implemented"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_res_widget_user
 msgid "res.widget.user"
@@ -3959,7 +4120,7 @@ msgid "False means for every user"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:0
+#: code:addons/base/module/module.py:198
 #, python-format
 msgid "The name of the module must be unique !"
 msgstr ""
@@ -4000,8 +4161,9 @@ msgid "Contacts"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.fo
-msgid "Faroe Islands"
+#: code:addons/orm.py:3199
+#, python-format
+msgid "Unable to delete this document because it is used as a default property"
 msgstr ""
 
 #. module: base
@@ -4031,6 +4193,12 @@ msgstr ""
 msgid "Widget Wizard"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:1350
+#, python-format
+msgid "Insufficient fields for Calendar View!"
+msgstr ""
+
 #. module: base
 #: selection:ir.property,type:0
 msgid "Integer"
@@ -4073,14 +4241,8 @@ msgid "Mongolia"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:0
-#: code:addons/base/ir/ir_model.py:0
-#: code:addons/base/module/module.py:0
-#: code:addons/base/publisher_warranty/publisher_warranty.py:0
-#: code:addons/base/res/res_currency.py:0
-#: code:addons/base/res/res_user.py:0
-#, python-format
-msgid "Error"
+#: view:ir.module.module:0
+msgid "Created Menus"
 msgstr ""
 
 #. module: base
@@ -4192,11 +4354,6 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,web_icon:0
-msgid "Icon File"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_fields
 #: view:ir.model:0
@@ -4292,7 +4449,7 @@ msgid "Change My Preferences"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:0
+#: code:addons/base/ir/ir_actions.py:160
 #, python-format
 msgid "Invalid model name in the action definition."
 msgstr ""
@@ -4360,7 +4517,7 @@ msgid "Raphaël Valyi's tweets"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:0
+#: code:addons/base/res/res_config.py:384
 #, python-format
 msgid "\n"
 "\n"
@@ -4435,7 +4592,13 @@ msgid "Client Actions"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:0
+#: code:addons/orm.py:1806
+#, python-format
+msgid "The exists method is not implemented on this object !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:336
 #, python-format
 msgid "You try to upgrade a module that depends on the module: %s.\n"
 "But this module is not available in your system."
@@ -4507,7 +4670,7 @@ msgid "ir.server.object.lines"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:0
+#: code:addons/base/module/module.py:530
 #, python-format
 msgid "Module %s: Invalid Quality Certificate"
 msgstr ""
@@ -4552,6 +4715,11 @@ msgstr ""
 msgid "Accepted Users"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,web_icon_data:0
+msgid "Web Icon Image"
+msgstr ""
+
 #. module: base
 #: view:ir.values:0
 msgid "Values for Event Type"
@@ -4658,6 +4826,12 @@ msgstr ""
 msgid "Nepal"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:2307
+#, python-format
+msgid "Invalid value for reference field \"%s\" (last part must be a non-zero integer): \"%s\""
+msgstr ""
+
 #. module: base
 #: help:ir.cron,args:0
 msgid "Arguments to be passed to the method. e.g. (uid,)"
@@ -4684,13 +4858,13 @@ msgid "Update Modules List"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:0
+#: code:addons/base/module/module.py:255
 #, python-format
 msgid "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_user.py:0
+#: code:addons/base/res/res_user.py:241
 #, python-format
 msgid "Please keep in mind that documents currently displayed may not be relevant after switching to another company. If you have unsaved changes, please make sure to save and close all forms before switching to a different company. (You can click on Cancel in the User Preferences now)"
 msgstr ""
@@ -4705,6 +4879,12 @@ msgstr ""
 msgid "Thai / ภาษาไทย"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:158
+#, python-format
+msgid "Object %s does not exists"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Slovenian / slovenščina"
@@ -4835,6 +5015,13 @@ msgstr ""
 msgid "Iteration"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:3448
+#: code:addons/orm.py:3532
+#, python-format
+msgid "UserError"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ae
 msgid "United Arab Emirates"
@@ -4873,7 +5060,12 @@ msgid "Solomon Islands"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
+#: code:addons/base/ir/ir_model.py:344
+#: code:addons/orm.py:1897
+#: code:addons/orm.py:2972
+#: code:addons/orm.py:3165
+#: code:addons/orm.py:3365
+#: code:addons/orm.py:3817
 #, python-format
 msgid "AccessError"
 msgstr ""
@@ -4884,7 +5076,7 @@ msgid "Waiting"
 msgstr ""
 
 #. module: base
-#: code:addons/__init__.py:0
+#: code:addons/__init__.py:827
 #, python-format
 msgid "Could not load base module"
 msgstr ""
@@ -4894,6 +5086,12 @@ msgstr ""
 msgid "8.  %I:%M:%S %p  ==> 06:25:20 PM"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:1803
+#, python-format
+msgid "The copy method is not implemented on this object !"
+msgstr ""
+
 #. module: base
 #: field:res.log,create_date:0
 msgid "Creation Date"
@@ -5009,7 +5207,7 @@ msgid "ir.actions.todo"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:0
+#: code:addons/base/res/res_config.py:94
 #, python-format
 msgid "Couldn't find previous ir.actions.todo"
 msgstr ""
@@ -5083,17 +5281,23 @@ msgid "res.widget"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
+#: code:addons/base/ir/ir_model.py:219
 #, python-format
 msgid "Model %s does not exist!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_lang.py:0
+#: code:addons/base/res/res_lang.py:88
 #, python-format
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
 
+#. module: base
+#: code:addons/fields.py:103
+#, python-format
+msgid "Not implemented get_memory method !"
+msgstr ""
+
 #. module: base
 #: view:ir.actions.server:0
 #: field:ir.actions.server,code:0
@@ -5102,7 +5306,7 @@ msgid "Python Code"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_module_import.py:0
+#: code:addons/base/module/wizard/base_module_import.py:67
 #, python-format
 msgid "Can not create the module file: %s !"
 msgstr ""
@@ -5219,7 +5423,7 @@ msgid "View type: set to 'tree' for a hierarchical tree view, or 'form' for othe
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_config.py:0
+#: code:addons/base/res/res_config.py:421
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
 msgstr ""
@@ -5256,7 +5460,7 @@ msgid "Select the object on which the action will work (read, write, create)."
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:0
+#: code:addons/base/ir/ir_actions.py:625
 #, python-format
 msgid "Please specify server option --email-from !"
 msgstr ""
@@ -5463,7 +5667,7 @@ msgid "Afghanistan, Islamic State of"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_module_import.py:0
+#: code:addons/base/module/wizard/base_module_import.py:67
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -5484,6 +5688,12 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:3775
+#, python-format
+msgid "This method does not exist anymore"
+msgstr ""
+
 #. module: base
 #: field:res.bank,fax:0
 #: field:res.partner.address,fax:0
@@ -5731,6 +5941,12 @@ msgstr ""
 msgid "To browse official translations, you can start with these links:"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_model.py:338
+#, python-format
+msgid "You can not read this document (%s) ! Be sure your user belongs to one of these groups: %s."
+msgstr ""
+
 #. module: base
 #: view:res.bank:0
 #: field:res.config.users,address_id:0
@@ -5740,11 +5956,6 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#. module: base
-#: field:ir.ui.menu,web_icon_hover:0
-msgid "Icon hover File"
-msgstr ""
-
 #. module: base
 #: field:ir.module.module,latest_version:0
 msgid "Installed version"
@@ -5823,7 +6034,7 @@ msgid "Saint Kitts & Nevis Anguilla"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_currency.py:0
+#: code:addons/base/res/res_currency.py:100
 #, python-format
 msgid "No rate found \n"
 "for the currency: %s \n"
@@ -5904,7 +6115,7 @@ msgid "Samoa"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_lang.py:0
+#: code:addons/base/res/res_lang.py:90
 #, python-format
 msgid "You cannot delete the language which is Active !\n"
 "Please de-activate the language first."
@@ -5922,11 +6133,19 @@ msgid "Child IDs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_actions.py:0
+#: code:addons/base/ir/ir_actions.py:709
+#: code:addons/base/ir/ir_actions.py:712
 #, python-format
 msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:2306
+#: code:addons/orm.py:2316
+#, python-format
+msgid "ValidateError"
+msgstr ""
+
 #. module: base
 #: view:base.module.import:0
 #: view:base.module.update:0
@@ -5971,6 +6190,13 @@ msgstr ""
 msgid "Home Action"
 msgstr ""
 
+#. module: base
+#: code:addons/custom.py:558
+#, python-format
+msgid "The sum of the data (2nd field) is null.\n"
+"We can't draw a pie chart !"
+msgstr ""
+
 #. module: base
 #: model:ir.ui.menu,name:base.menu_lunch_reporting
 #: model:ir.ui.menu,name:base.menu_project_report
@@ -5999,10 +6225,9 @@ msgid "Stop All"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_add_wizard
-#: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
-#: view:publisher_warranty.contract.wizard:0
-msgid "Register a Contract"
+#: code:addons/orm.py:412
+#, python-format
+msgid "The read_group method is not implemented on this object !"
 msgstr ""
 
 #. module: base
@@ -6051,7 +6276,7 @@ msgid "Start update"
 msgstr ""
 
 #. module: base
-#: code:addons/base/publisher_warranty/publisher_warranty.py:0
+#: code:addons/base/publisher_warranty/publisher_warranty.py:144
 #, python-format
 msgid "Contract validation error"
 msgstr ""
@@ -6109,7 +6334,7 @@ msgid "HR Manager Dashboard"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:0
+#: code:addons/base/module/module.py:253
 #, python-format
 msgid "Unable to install module \"%s\" because an external dependency is not met: %s"
 msgstr ""
@@ -6156,7 +6381,7 @@ msgid "Module Update"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_module_upgrade.py:0
+#: code:addons/base/module/wizard/base_module_upgrade.py:97
 #, python-format
 msgid "Following modules are not installed or unknown: %s"
 msgstr ""
@@ -6237,7 +6462,14 @@ msgid "The new user's real name, used for searching and most listings"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
+#: code:addons/osv.py:154
+#: code:addons/osv.py:156
+#, python-format
+msgid "Integrity Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:189
 #, python-format
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
@@ -6275,6 +6507,12 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:716
+#, python-format
+msgid "Database ID doesn't exist: %s : %s"
+msgstr ""
+
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
@@ -6285,14 +6523,29 @@ msgstr ""
 msgid "GPL Version 3"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:836
+#, python-format
+msgid "key '%s' not found in selection field '%s'"
+msgstr ""
+
 #. module: base
 #: view:partner.wizard.ean.check:0
 msgid "Correct EAN13"
 msgstr ""
 
 #. module: base
-#: model:ir.ui.menu,name:base.menu_audit
-msgid "Audit"
+#: code:addons/orm.py:2317
+#, python-format
+msgid "The value \"%s\" for the field \"%s\" is not in the selection"
+msgstr ""
+
+#. module: base
+#: field:res.partner,customer:0
+#: view:res.partner.address:0
+#: field:res.partner.address,is_customer_add:0
+#: model:res.partner.category,name:base.res_partner_category_0
+msgid "Customer"
 msgstr ""
 
 #. module: base
@@ -6398,7 +6651,7 @@ msgid "Copy Object"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_user.py:0
+#: code:addons/base/res/res_user.py:551
 #, python-format
 msgid "Group(s) cannot be deleted, because some user(s) still belong to them: %s !"
 msgstr ""
@@ -6448,6 +6701,14 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
+#. module: base
+#: code:addons/osv.py:151
+#, python-format
+msgid "\n"
+"\n"
+"[object with reference: %s - %s]"
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_ir_default
 msgid "ir.default"
@@ -6482,7 +6743,7 @@ msgid "User Ref."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_user.py:0
+#: code:addons/base/res/res_user.py:550
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -6623,7 +6884,7 @@ msgid "workflow.triggers"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
+#: code:addons/base/ir/ir_model.py:60
 #, python-format
 msgid "Invalid search criterions"
 msgstr ""
@@ -6677,7 +6938,7 @@ msgid "Action Type"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/module.py:0
+#: code:addons/base/module/module.py:268
 #, python-format
 msgid "You try to install module '%s' that depends on module '%s'.\n"
 "But the latter module is not available in your system."
@@ -6776,11 +7037,23 @@ msgstr ""
 msgid "workflow.instance"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:278
+#, python-format
+msgid "Unknown attribute %s in %s "
+msgstr ""
+
 #. module: base
 #: view:res.lang:0
 msgid "10. %S              ==> 20"
 msgstr ""
 
+#. module: base
+#: code:addons/fields.py:106
+#, python-format
+msgid "undefined get method !"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Norwegian Bokmål / Norsk bokmål"
@@ -6953,6 +7226,11 @@ msgstr ""
 msgid "Menu Action"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.fo
+msgid "Faroe Islands"
+msgstr ""
+
 #. module: base
 #: selection:base.language.export,state:0
 msgid "choose"
@@ -7083,7 +7361,7 @@ msgid "China"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_user.py:0
+#: code:addons/base/res/res_user.py:486
 #, python-format
 msgid "--\n"
 "%(name)s %(email)s\n"
@@ -7275,7 +7553,7 @@ msgid "Account No."
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_lang.py:0
+#: code:addons/base/res/res_lang.py:86
 #, python-format
 msgid "Base Language 'en_US' can not be deleted !"
 msgstr ""
@@ -7315,6 +7593,12 @@ msgstr ""
 msgid "Antigua and Barbuda"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:3166
+#, python-format
+msgid "Operation prohibited by access rules, or performed on an already deleted document (Operation: %s, Document type: %s)."
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.zr
 msgid "Zaire"
@@ -7373,7 +7657,7 @@ msgid "Auto-Refresh"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
+#: code:addons/base/ir/ir_model.py:60
 #, python-format
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
@@ -7383,6 +7667,11 @@ msgstr ""
 msgid "Diagram"
 msgstr ""
 
+#. module: base
+#: model:res.country,name:base.wf
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
 #. module: base
 #: help:multi_company.default,name:0
 msgid "Name it to easily find a record"
@@ -7439,6 +7728,35 @@ msgstr ""
 msgid "Turkmenistan"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_actions.py:593
+#: code:addons/base/ir/ir_actions.py:625
+#: code:addons/base/ir/ir_actions.py:709
+#: code:addons/base/ir/ir_actions.py:712
+#: code:addons/base/ir/ir_model.py:112
+#: code:addons/base/ir/ir_model.py:197
+#: code:addons/base/ir/ir_model.py:216
+#: code:addons/base/ir/ir_model.py:219
+#: code:addons/base/module/module.py:215
+#: code:addons/base/module/module.py:258
+#: code:addons/base/module/module.py:262
+#: code:addons/base/module/module.py:268
+#: code:addons/base/module/module.py:303
+#: code:addons/base/module/module.py:321
+#: code:addons/base/module/module.py:336
+#: code:addons/base/module/module.py:429
+#: code:addons/base/module/module.py:530
+#: code:addons/base/publisher_warranty/publisher_warranty.py:163
+#: code:addons/base/publisher_warranty/publisher_warranty.py:281
+#: code:addons/base/res/res_currency.py:100
+#: code:addons/base/res/res_user.py:57
+#: code:addons/base/res/res_user.py:66
+#: code:addons/custom.py:558
+#: code:addons/orm.py:3199
+#, python-format
+msgid "Error"
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.pm
 msgid "Saint Pierre and Miquelon"
@@ -7567,7 +7885,7 @@ msgid "Internal Header/Footer"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_export_language.py:0
+#: code:addons/base/module/wizard/base_export_language.py:59
 #, python-format
 msgid "Save this document to a .tgz file. This archive containt UTF-8 %s files and may be uploaded to launchpad."
 msgstr ""
@@ -7604,6 +7922,13 @@ msgstr ""
 msgid "Serbian (Cyrillic) / српски"
 msgstr ""
 
+#. module: base
+#: code:addons/orm.py:2161
+#, python-format
+msgid "Invalid group_by specification: \"%s\".\n"
+"A group_by specification must be a list of valid fields."
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.sa
 msgid "Saudi Arabia"
@@ -7625,7 +7950,7 @@ msgid "Event Logs"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_module_configuration.py:0
+#: code:addons/base/module/wizard/base_module_configuration.py:37
 #, python-format
 msgid "System Configuration done"
 msgstr ""
@@ -7672,18 +7997,25 @@ msgid "Low"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_ui_menu.py:0
+#: code:addons/base/ir/ir_ui_menu.py:305
 #, python-format
 msgid "Error ! You can not create recursive Menu."
 msgstr ""
 
+#. module: base
+#: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_add_wizard
+#: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
+#: view:publisher_warranty.contract.wizard:0
+msgid "Register a Contract"
+msgstr ""
+
 #. module: base
 #: view:ir.rule:0
 msgid "3. If user belongs to several groups, the results from step 2 are combined with logical OR operator"
 msgstr ""
 
 #. module: base
-#: code:addons/base/publisher_warranty/publisher_warranty.py:0
+#: code:addons/base/publisher_warranty/publisher_warranty.py:145
 #, python-format
 msgid "Please check your publisher warranty contract name and validity."
 msgstr ""
@@ -7832,7 +8164,7 @@ msgid "View Auto-Load"
 msgstr ""
 
 #. module: base
-#: code:addons/base/ir/ir_model.py:0
+#: code:addons/base/ir/ir_model.py:197
 #, python-format
 msgid "You cannot remove the field '%s' !"
 msgstr ""
@@ -7844,6 +8176,11 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
+#. module: base
+#: field:ir.ui.menu,web_icon:0
+msgid "Web Icon File"
+msgstr ""
+
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Persian / فارس"
@@ -7855,7 +8192,7 @@ msgid "View Ordering"
 msgstr ""
 
 #. module: base
-#: code:addons/base/module/wizard/base_module_upgrade.py:0
+#: code:addons/base/module/wizard/base_module_upgrade.py:97
 #, python-format
 msgid "Unmet dependency !"
 msgstr ""
@@ -7865,6 +8202,12 @@ msgstr ""
 msgid "Supported file formats: *.csv (Comma-separated values) or *.po (GetText Portable Objects)"
 msgstr ""
 
+#. module: base
+#: code:addons/base/ir/ir_model.py:341
+#, python-format
+msgid "You can not delete this document (%s) ! Be sure your user belongs to one of these groups: %s."
+msgstr ""
+
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
 msgid "base.module.configuration"
@@ -7985,7 +8328,7 @@ msgid "Azerbaijan"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/partner/partner.py:0
+#: code:addons/base/res/partner/partner.py:250
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -8012,8 +8355,8 @@ msgid "Czech / Čeština"
 msgstr ""
 
 #. module: base
-#: model:res.country,name:base.wf
-msgid "Wallis and Futuna Islands"
+#: selection:ir.model.fields,select_level:0
+msgid "Advanced Search"
 msgstr ""
 
 #. module: base
@@ -8301,7 +8644,7 @@ msgid "Account Owner"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/res_user.py:0
+#: code:addons/base/res/res_user.py:240
 #, python-format
 msgid "Company Switch Warning"
 msgstr ""
@@ -8361,7 +8704,7 @@ msgid "Workflow Instances"
 msgstr ""
 
 #. module: base
-#: code:addons/base/res/partner/partner.py:0
+#: code:addons/base/res/partner/partner.py:261
 #, python-format
 msgid "Partners: "
 msgstr ""
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 6c4c1025880..6e794827a96 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -937,7 +937,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"  groups="base.group_extended"/>
-                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Company" icon="terp-gtk-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
                     </group>
@@ -1144,11 +1144,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fields">
-                    <filter icon="terp-camera_test"
+                    <filter icon="terp-gnome-cpu-frequency-applet+"
                         string="Required"
                         domain="[('required', '=', True)]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-stock_align_left_24"
+                    <filter icon="terp-dialog-close"
                         string="Readonly"
                         domain="[('readonly', '=', True)]"/>
                     <separator orientation="vertical"/>
@@ -1264,7 +1264,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Translations">
-                    <filter icon="terp-document-new"
+                    <filter icon="terp-gdu-smart-failing"
                         string="Untranslated"
                         domain="['|',('value', '=', False),('value','=','')]"/>
                     <separator orientation="vertical"/>
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 95b003c8a35..4dfe39a7762 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -324,14 +324,24 @@ class ir_model_access(osv.osv):
             r = cr.fetchone()[0]
 
         if not r and raise_exception:
+            cr.execute('''select
+                    g.name
+                from
+                    ir_model_access a 
+                    left join ir_model m on (a.model_id=m.id) 
+                    left join res_groups g on (a.group_id=g.id)
+                where
+                    m.model=%s and
+                    a.group_id is not null and perm_''' + mode, (model_name, ))
+            groups = ', '.join(map(lambda x: x[0], cr.fetchall())) or '/'
             msgs = {
-                'read':   _('You can not read this document! (%s)'),
-                'write':  _('You can not write in this document! (%s)'),
-                'create': _('You can not create this kind of document! (%s)'),
-                'unlink': _('You can not delete this document! (%s)'),
+                'read':   _("You can not read this document (%s) ! Be sure your user belongs to one of these groups: %s."),
+                'write':  _("You can not write in this document (%s) ! Be sure your user belongs to one of these groups: %s."),
+                'create': _("You can not create this document (%s) ! Be sure your user belongs to one of these groups: %s."),
+                'unlink': _("You can not delete this document (%s) ! Be sure your user belongs to one of these groups: %s."),
             }
 
-            raise except_orm(_('AccessError'), msgs[mode] % model_name )
+            raise except_orm(_('AccessError'), msgs[mode] % (model_name, groups) )
         return r
 
     check = tools.cache()(check)
diff --git a/bin/addons/base/ir/ir_translation.py b/bin/addons/base/ir/ir_translation.py
index 40d763b0130..eec5b8522bb 100644
--- a/bin/addons/base/ir/ir_translation.py
+++ b/bin/addons/base/ir/ir_translation.py
@@ -158,7 +158,7 @@ class ir_translation(osv.osv):
                        WHERE lang=%s 
                         AND type in %s 
                         AND src=%s"""
-            params = (lang or '', types, source)
+            params = (lang or '', types, tools.ustr(source))
             if name:
                 query += " AND name=%s"
                 params += (tools.ustr(name),)
diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index dff6823f6c6..8696df80311 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -286,10 +286,10 @@ class ir_ui_menu(osv.osv):
             string='Complete Name', type='char', size=128),
         'icon': fields.selection(tools.icons, 'Icon', size=64),
         'icon_pict': fields.function(_get_icon_pict, method=True, type='char', size=32),
-        'web_icon': fields.char('Icon File', size=128),
-        'web_icon_hover':fields.char('Icon Over File', size=128),
-        'web_icon_data': fields.function(_get_image_icon, string='Web Icons', type='binary', method=True, readonly=True, store=True, multi='icon'),
-        'web_icon_hover_data':fields.function(_get_image_icon, string='Web Icons Over', type='binary', method=True, readonly=True, store=True,multi='icon'),
+        'web_icon': fields.char('Web Icon File', size=128),
+        'web_icon_hover':fields.char('Web Icon File (hover)', size=128),
+        'web_icon_data': fields.function(_get_image_icon, string='Web Icon Image', type='binary', method=True, readonly=True, store=True, multi='icon'),
+        'web_icon_hover_data':fields.function(_get_image_icon, string='Web Icon Image (hover)', type='binary', method=True, readonly=True, store=True, multi='icon'),
         'action': fields.function(_action, fnct_inv=_action_inv,
             method=True, type='reference', string='Action',
             selection=[
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index a207eea52ab..5866b81a25e 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -182,7 +182,7 @@
           <field name="action"/>
           <newline/>
               <group expand="0" string="Group By...">
-                  <filter string="Workflow" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'wkf_id'}"/>
+                  <filter string="Workflow" icon="terp-stage" domain="[]" context="{'group_by':'wkf_id'}"/>
               </group>
         </search>
       </field>
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index ba79dea4e13..d90ef415951 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -475,7 +475,7 @@ class module(osv.osv):
                 categs = categs[1:]
             self.write(cr, uid, [mod_browse.id], {'category_id': p_id})
 
-    def update_translations(self, cr, uid, ids, filter_lang=None, context=None):
+    def update_translations(self, cr, uid, ids, filter_lang=None, context={}):
         logger = logging.getLogger('i18n')
         if not filter_lang:
             pool = pooler.get_pool(cr.dbname)
@@ -495,15 +495,23 @@ class module(osv.osv):
             for lang in filter_lang:
                 iso_lang = tools.get_iso_codes(lang)
                 f = addons.get_module_resource(mod.name, 'i18n', iso_lang + '.po')
+                context2 = context and context.copy() or {}
+                if f and '_' in iso_lang:
+                    iso_lang2 = iso_lang.split('_')[0]
+                    f2 = addons.get_module_resource(mod.name, 'i18n', iso_lang2 + '.po')
+                    if f2:
+                        logger.info('module %s: loading base translation file %s for language %s', mod.name, iso_lang2, lang)
+                        tools.trans_load(cr.dbname, f2, lang, verbose=False, context=context)
+                        context2['overwrite'] = True
                 # Implementation notice: we must first search for the full name of
                 # the language derivative, like "en_UK", and then the generic,
                 # like "en".
                 if (not f) and '_' in iso_lang:
-                    f = addons.get_module_resource(mod.name, 'i18n', iso_lang.split('_')[0] + '.po')
                     iso_lang = iso_lang.split('_')[0]
+                    f = addons.get_module_resource(mod.name, 'i18n', iso_lang + '.po')
                 if f:
-                    logger.info('module %s: loading translation file for language %s', mod.name, iso_lang)
-                    tools.trans_load(cr.dbname, f, lang, verbose=False, context=context)
+                    logger.info('module %s: loading translation file (%s) for language %s', mod.name, iso_lang, lang)
+                    tools.trans_load(cr.dbname, f, lang, verbose=False, context=context2)
                 elif iso_lang != 'en':
                     logger.warning('module %s: no translation for language %s', mod.name, iso_lang)
 
diff --git a/bin/addons/base/module/wizard/base_module_configuration_view.xml b/bin/addons/base/module/wizard/base_module_configuration_view.xml
index 2d0b31b7126..8ab47e2c2bc 100644
--- a/bin/addons/base/module/wizard/base_module_configuration_view.xml
+++ b/bin/addons/base/module/wizard/base_module_configuration_view.xml
@@ -21,7 +21,7 @@
             <field name="name">Start Configuration</field>
             <field name="model_id" ref="model_base_module_configuration"/>
             <field name="state">code</field>
-            <field name="code">action = obj.start([])</field>
+            <field name="code">action = obj.start()</field>
         </record>
 
         <menuitem name="Start Configuration"
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 9b52ecdbd09..20b8f736e38 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -29,7 +29,7 @@
                         <filter string="Customer" name="customer" icon="terp-personal" domain="[('is_customer_add','=','1')]" />
                         <filter string="Supplier" name="supplier"  icon="terp-personal" domain="[('is_supplier_add','=','1')]" />
                         <separator orientation="vertical"/>
-                        <field name="partner_id" />
+                        <field name="partner_id" string="Partner"/>
                         <field name="name" />
                         <field name="country_id" />
                     </group>
diff --git a/bin/addons/base/res/partner/wizard/partner_sms_send_view.xml b/bin/addons/base/res/partner/wizard/partner_sms_send_view.xml
index 97c418d9f81..7d84d6d405a 100644
--- a/bin/addons/base/res/partner/wizard/partner_sms_send_view.xml
+++ b/bin/addons/base/res/partner/wizard/partner_sms_send_view.xml
@@ -20,7 +20,7 @@
 			        <separator string="" colspan="4" />
                     <group colspan="4" col="6">
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="sms_send" string="Send SMS" type="object" icon="gtk-go-forward"/>
+                        <button name="sms_send" string="Send SMS" type="object" icon="terp-mail-message-new"/>
                     </group>
              </form>
             </field>
diff --git a/bin/addons/base/res/partner/wizard/partner_wizard_spam_view.xml b/bin/addons/base/res/partner/wizard/partner_wizard_spam_view.xml
index b7c940b5a22..0de26400f90 100644
--- a/bin/addons/base/res/partner/wizard/partner_wizard_spam_view.xml
+++ b/bin/addons/base/res/partner/wizard/partner_wizard_spam_view.xml
@@ -17,7 +17,7 @@
                 <separator string="" colspan="6"/>
                 <group colspan="6" col="4" >
                 <button special="cancel" string="Cancel" icon="gtk-cancel" />
-                <button name="mass_mail_send" string="Send Email" type="object" icon="gtk-go-forward"/>
+                <button name="mass_mail_send" string="Send Email" type="object" icon="terp-mail-message-new"/>
                 </group>
             </form>
             </field>
diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index c2d8d2c8324..3fc4595c11c 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -98,13 +98,7 @@ class res_company(osv.osv):
             context = {}
         user_preference = context.get('user_preference', False)
         if user_preference:
-            # TODO: improve this as soon as the client sends the proper
-            # combination of active_id and active_model we'll be able to
-            # use active_id here to restrict to the user being modified instead
-            # of current user.
-            user_id = context.get('user_id', uid)
-
-            user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             cmp_ids = list(set([user.company_id.id] + [cmp.id for cmp in user.company_ids]))
             return cmp_ids
         return super(res_company, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
diff --git a/bin/addons/base/res/res_company_view.xml b/bin/addons/base/res/res_company_view.xml
index 31cb145caa8..0d227e3265c 100644
--- a/bin/addons/base/res/res_company_view.xml
+++ b/bin/addons/base/res/res_company_view.xml
@@ -9,7 +9,7 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <tree string="Multi Company">
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id"/>
                     <field name="object_id"/>
                     <field name="field_id"/>
                     <field name="expression" />
@@ -29,7 +29,7 @@
                     <group col="6" colspan="4">
                         <field name="name" colspan="6"/>
                         <separator string="Matching" colspan="6"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="company_id"/>
                         <field name="object_id"/>
                         <field name="field_id" domain="[('model_id','=',object_id)]"/>
                         <separator string="Condition" colspan="6"/>
diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 4b0db4c64f5..56432f51f7b 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -13,7 +13,7 @@
              <label align="0.0" string="description" width="200" colspan="2"/>
            </group>
            <separator string="vsep" orientation="vertical" colspan="1" rowspan="12"/>
-           <group colspan="4">
+           <group colspan="6">
              <separator string="title" colspan="4"/>
              <group string="res_config_contents"/>
            </group>
@@ -61,13 +61,13 @@
       <field name="arch" type="xml">
         <form>
           <group colspan="4" col="8">
-            <group colspan="3" width="220" height="250">
+            <group colspan="1" width="220" height="250">
               <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
               <newline/>
               <label align="0.0" string="description" width="200" colspan="2"/>
             </group>
             <separator string="vsep" orientation="vertical" colspan="1" rowspan="12"/>
-            <group colspan="4">
+            <group colspan="6">
               <separator string="title" colspan="4"/>
               <group colspan="8"/>
             </group>
diff --git a/bin/addons/base/res/res_log_view.xml b/bin/addons/base/res/res_log_view.xml
index 48dac9ca119..e8cb912e227 100644
--- a/bin/addons/base/res/res_log_view.xml
+++ b/bin/addons/base/res/res_log_view.xml
@@ -7,12 +7,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Logs">
-                    <filter icon="terp-stock_align_left_24" string="Read" domain="[('read','=',True)]" name="read"/>
-                    <filter icon="terp-stock_align_left_24" string="Unread" domain="[('read','&lt;&gt;',True)]" name="unread"/>
+                    <filter icon="terp-camera_test" string="Read" domain="[('read','=',True)]" name="read"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Unread" domain="[('read','&lt;&gt;',True)]" name="unread"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-stock_align_left_24" string="My Logs" domain="[('user_id','=',uid)]" name="my"/>
+                    <filter icon="terp-personal" string="My Logs" domain="[('user_id','=',uid)]" name="my"/>
                     <filter icon="terp-stock_align_left_24" string="System Logs"
-                    	domain="[('res_model','=','publisher_warranty.contract')]" name="sys"/>
+                        domain="[('res_model','=','publisher_warranty.contract')]" name="sys"/>
                     <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="user_id"/>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index e7f6bfd7de0..c8aa83f3253 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -578,8 +578,8 @@ class change_user_password(osv.osv_memory):
     _name = 'change.user.password'
     _columns = {
         'current_password':fields.char('Current Password', size=64, required=True, help="Enter your current password."),
-        'new_password': fields.char('New Password', size=64, required=True, help="Enter new password."),
-        'confirm_password': fields.char('Confirm Password', size=64, required=True, help="Enter new password again for confirmation."),
+        'new_password': fields.char('New Password', size=64, required=True, help="Enter the new password."),
+        'confirm_password': fields.char('Confirm Password', size=64, required=True, help="Enter the new password again for confirmation."),
     }
     _defaults={
         'current_password' : '',
@@ -588,16 +588,22 @@ class change_user_password(osv.osv_memory):
     }
 
     def change_password(self, cr, uid, ids, context=None):
-        user_obj = self.pool.get('res.users')
-        if ids:
-            current_password = user_obj.browse(cr, uid, uid, context).password
-            password_rec = self.browse(cr, uid, ids[0], context)
+        for form_id in ids:
+            password_rec = self.browse(cr, uid, form_id, context)
             if password_rec.new_password != password_rec.confirm_password:
-                raise osv.except_osv(_('Warning !'), _('New password and confirm password does not match !'))
-            elif current_password != password_rec.current_password:
-                raise osv.except_osv(_('Warning !'), _('Current password does not match !'))
-            else:
-                user_obj.write(cr, uid, [uid], {'password': password_rec.new_password}, context)
+                raise osv.except_osv(_('Error !'), _('The new and confirmation passwords do not match, please double-check them.'))
+
+            # Validate current password without reading it from database,
+            # as it could be stored differently (LDAP, encrypted/hashed, etc.)
+            is_correct_password = False
+            try:
+                user_obj = self.pool.get('res.users')
+                is_correct_password = user_obj.check(cr.dbname, uid, password_rec.current_password)
+            except Exception:
+                pass
+            if not is_correct_password:
+                raise osv.except_osv(_('Error !'), _('The current password does not match, please double-check it.'))
+            user_obj.write(cr, uid, [uid], {'password': password_rec.new_password}, context=context)
         return {}
 
 change_user_password()
diff --git a/bin/addons/base/test/test_osv_expression.yml b/bin/addons/base/test/test_osv_expression.yml
index 71488597579..4916fe06203 100644
--- a/bin/addons/base/test/test_osv_expression.yml
+++ b/bin/addons/base/test/test_osv_expression.yml
@@ -43,4 +43,71 @@
 - 
     Filtering on invalid value across x2many relationship should return an empty set
 -
-    !assert {model: res.partner, search: "[('address.city','=','foo')]", count: 0, string: "Searching for address.city = foo should give empty results"}
\ No newline at end of file
+    !assert {model: res.partner, search: "[('address.city','=','foo')]", count: 0, string: "Searching for address.city = foo should give empty results"}
+-
+    Check if many2one works with empty search list
+-
+    !assert {model: res.partner, search: "[('company_id','in', [])]", count: 0, string: "Searching for company_id in [] should be empty!" }
+-
+    For the sake of the following tests, I will create a second company
+-
+    !record {model: res.company, id: ymltest_company2}:
+        name: Acme 2
+-
+    And create a few partners with that company or no company
+-
+    !python {model: res.partner }: |
+        for r in range(4):
+            self.create(cr, uid, { 'name': 'P of Acme %d' % r,
+                    'company_id': ref('ymltest_company2') })
+        for r in range(4):
+            self.create(cr, uid, { 'name': 'P of All %d' % r,
+                    'company_id': False })
+-
+    Check if many2one works with negative empty list
+-
+    !python {model: res.partner }: |
+        all_ids = self.search(cr, uid, [])
+        all_ids.sort()
+        res_ids = self.search(cr, uid,['|',('company_id','not in', []), ('company_id','=',False)])
+        res_ids.sort()
+        assert all_ids == res_ids, "not in [] fails"
+-
+    Check that many2one will pick the correct records with a list
+-
+    !python {model: res.partner }: |
+        res_ids = self.search(cr, uid, [('company_id', 'in', [False,])])
+        assert len(res_ids) >= 4, "We created 4 partners w/company, why find %d? %r" % \
+                    (len(res_ids), res_ids)
+-
+    Check that many2one will exclude the correct records with a list
+-
+    !python {model: res.partner }: |
+        # assuming that the default company is #1
+        res_ids = self.search(cr, uid, [('company_id', 'not in', [1])])
+        assert len(res_ids) >= 4, "We should have found 4 records at least, only have %d! %r" % \
+            (len(res_ids), res_ids)
+-
+    Check that we exclude the correct records, + False
+-
+    !python {model: res.partner }: |
+        # assuming that the default company is #1
+        res_ids = self.search(cr, uid, ['|', ('company_id', 'not in', [1]), ('company_id', '=', False)])
+        assert len(res_ids) >= 8, "We should have found 8 records at least, only have %d! %r" % \
+            (len(res_ids), res_ids)
+-
+    Check that multi-level expressions also work
+-
+    !python {model: res.partner }: |
+        res_ids = self.search(cr, uid, [('company_id.partner_id', 'in', [])])
+        assert res_ids == [], "Searching an empty set should return empty result, not %r" % res_ids
+-
+    Check that multi-level expressions with negative op work
+-
+    !python {model: res.partner }: |
+        all_ids = self.search(cr, uid, [('company_id', '!=', False)])
+        all_ids.sort()
+        res_ids = self.search(cr, uid, [('company_id.partner_id', 'not in', [])])
+        res_ids.sort()
+        assert res_ids == all_ids, "Searching against empty set failed, returns %r" % res_ids
+
diff --git a/bin/openerp-server.py b/bin/openerp-server.py
index 8d210fc2906..5c67c879d84 100755
--- a/bin/openerp-server.py
+++ b/bin/openerp-server.py
@@ -119,13 +119,17 @@ if not ( tools.config["stop_after_init"] or \
 if tools.config['db_name']:
     for dbname in tools.config['db_name'].split(','):
         db,pool = pooler.get_db_and_pool(dbname, update_module=tools.config['init'] or tools.config['update'], pooljobs=False)
+        cr = db.cursor()
+
         if tools.config["test_file"]:
             logger.info('loading test file %s', tools.config["test_file"])
-            cr = db.cursor()
             tools.convert_yaml_import(cr, 'base', file(tools.config["test_file"]), {}, 'test', True)
             cr.rollback()
+
         pool.get('ir.cron')._poolJobs(db.dbname)
 
+        cr.close()
+
 #----------------------------------------------------------
 # translation stuff
 #----------------------------------------------------------
@@ -147,9 +151,11 @@ if tools.config["translate_out"]:
     sys.exit(0)
 
 if tools.config["translate_in"]:
+    context = {'overwrite': tools.config["overwrite_existing_translations"]}
     tools.trans_load(tools.config["db_name"], 
                      tools.config["translate_in"], 
-                     tools.config["language"])
+                     tools.config["language"],
+                     context=context)
     sys.exit(0)
 
 #----------------------------------------------------------------------------------
diff --git a/bin/osv/expression.py b/bin/osv/expression.py
index dddd11af569..7608e963e7a 100644
--- a/bin/osv/expression.py
+++ b/bin/osv/expression.py
@@ -143,13 +143,19 @@ class expression(object):
             if len(fargs) > 1:
                 if field._type == 'many2one':
                     right = field_obj.search(cr, uid, [(fargs[1], operator, right)], context=context)
-                    self.__exp[i] = (fargs[0], 'in', right)
+                    if right == []:
+                        self.__exp[i] = ( 'id', '=', 0 )
+                    else:
+                        self.__exp[i] = (fargs[0], 'in', right)
                 # Making search easier when there is a left operand as field.o2m or field.m2m
                 if field._type in ['many2many','one2many']:
                     right = field_obj.search(cr, uid, [(fargs[1], operator, right)], context=context)
                     right1 = table.search(cr, uid, [(fargs[0],'in', right)], context=context)
-                    self.__exp[i] = ('id', 'in', right1)
-                
+                    if right1 == []:
+                        self.__exp[i] = ( 'id', '=', 0 )
+                    else:
+                        self.__exp[i] = ('id', 'in', right1)
+
                 if not isinstance(field,fields.property):
                     continue
 
@@ -313,6 +319,13 @@ class expression(object):
                                 if not isinstance(ele, basestring): 
                                     m2o_str = False
                                     break
+                    elif right == []:
+                        m2o_str = False
+                        if operator in ('not in', '!=', '<>'):
+                            # (many2one not in []) should return all records
+                            self.__exp[i] = self.__DUMMY_LEAF
+                        else:
+                            self.__exp[i] = ('id','=',0)
                     else:
                         new_op = '='
                         if operator in  ['not like','not ilike','not in','<>','!=']:
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 65e90922794..7cf337994d3 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -59,8 +59,10 @@ from query import Query
 import tools
 from tools.safe_eval import safe_eval as eval
 
-regex_order = re.compile('^(([a-z0-9_]+|"[a-z0-9_]+")( *desc| *asc)?( *, *|))+$', re.I)
+# List of etree._Element subclasses that we choose to ignore when parsing XML.
+from tools import SKIPPED_ELEMENT_TYPES
 
+regex_order = re.compile('^(([a-z0-9_]+|"[a-z0-9_]+")( *desc| *asc)?( *, *|))+$', re.I)
 
 POSTGRES_CONFDELTYPES = {
     'RESTRICT': 'r',
@@ -70,10 +72,6 @@ POSTGRES_CONFDELTYPES = {
     'SET DEFAULT': 'd',
 }
 
-# List of etree._Element subclasses that we choose to ignore when parsing view architecture.
-# We include the *Base ones just in case, currently they seem to be subclasses of the _* ones.
-SKIPPED_ELEMENT_TYPES = (etree._Comment, etree._ProcessingInstruction, etree.CommentBase, etree.PIBase)
-
 def last_day_of_current_month():
     today = datetime.date.today()
     last_day = str(calendar.monthrange(today.year, today.month)[1])
@@ -518,8 +516,7 @@ class orm_template(object):
             self._table = self._name.replace('.', '_')
 
     def browse(self, cr, uid, select, context=None, list_class=None, fields_process=None):
-        """
-        Fetch records as objects allowing to use dot notation to browse fields and relations
+        """Fetch records as objects allowing to use dot notation to browse fields and relations
 
         :param cr: database cursor
         :param user: current user id
@@ -687,8 +684,10 @@ class orm_template(object):
         :param filename: optional file to store partial import state for recovery
         :rtype: tuple
 
-        This method is used when importing data via client menu
-        Example of fields to import for a sale.order
+        This method is used when importing data via client menu.
+
+        Example of fields to import for a sale.order::
+
             .id,                         (=database_id)
             partner_id,                  (=name_search)
             order_line/.id,              (=database_id)
@@ -3907,7 +3906,9 @@ class orm(orm_template):
                 order_field = order_split[0].strip()
                 order_direction = order_split[1].strip() if len(order_split) == 2 else ''
                 inner_clause = None
-                if order_field in self._columns:
+                if order_field == 'id':
+                    order_by_clause = '"%s"."%s"' % (self._table, order_field)
+                elif order_field in self._columns:
                     order_column = self._columns[order_field]
                     if order_column._classic_read:
                         inner_clause = '"%s"."%s"' % (self._table, order_field)
diff --git a/bin/report/render/rml2pdf/customfonts.py b/bin/report/render/rml2pdf/customfonts.py
index a60c2d267f5..ccbcd2c1a4a 100644
--- a/bin/report/render/rml2pdf/customfonts.py
+++ b/bin/report/render/rml2pdf/customfonts.py
@@ -16,7 +16,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -34,7 +34,7 @@ the reportlab engine.
 This file could be customized per distro (although most Linux/Unix ones)
 should have the same filenames, only need the code below).
 
-Due to an awful configuration that ships with reportlab at many Linux 
+Due to an awful configuration that ships with reportlab at many Linux
 and Ubuntu distros, we have to override the search path, too.
 """
 
@@ -56,26 +56,26 @@ CustomTTFonts = [ ('Helvetica',"DejaVu Sans", "DejaVuSans.ttf", 'normal'),
         ('Courier',"FreeMono BoldOblique", "FreeMonoBoldOblique.ttf", 'bolditalic'),]
 
 
-TTFSearchPath_Linux = ( 
+TTFSearchPath_Linux = [
             '/usr/share/fonts/truetype', # SuSE
             '/usr/share/fonts/dejavu', '/usr/share/fonts/liberation', # Fedora, RHEL
             '/usr/share/fonts/truetype/*', # Ubuntu,
             '/usr/share/fonts/TTF/*', # at Mandriva/Mageia
-            )
+            ]
 
-TTFSearchPath_Windows = ( 
+TTFSearchPath_Windows = [
             'c:/winnt/fonts',
             'c:/windows/fonts'
-            )
+            ]
 
-TTFSearchPath_Darwin = ( 
+TTFSearchPath_Darwin = [
             #mac os X - from
             #http://developer.apple.com/technotes/tn/tn2024.html
             '~/Library/Fonts',
             '/Library/Fonts',
             '/Network/Library/Fonts',
             '/System/Library/Fonts',
-            )
+            ]
 
 TTFSearchPathMap = {
     'Darwin': TTFSearchPath_Darwin,
@@ -89,7 +89,7 @@ __foundFonts = None
 def FindCustomFonts():
     """Fill the __foundFonts list with those filenames, whose fonts
        can be found in the reportlab ttf font path.
-       
+
        This process needs only be done once per loading of this module,
        it is cached. But, if the system admin adds some font in the
        meanwhile, the server must be restarted eventually.
@@ -131,7 +131,7 @@ def FindCustomFonts():
 
 def SetCustomFonts(rmldoc):
     """ Map some font names to the corresponding TTF fonts
-    
+
         The ttf font may not even have the same name, as in
         Times -> Liberation Serif.
         This function is called once per report, so it should
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 04de2caca51..40b884f5a06 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -65,7 +65,7 @@ def _open_image(filename, path=None):
         except IOError:
             pass
     raise IOError("File %s cannot be found in image path" % filename)
-    
+
 class NumberedCanvas(canvas.Canvas):
     def __init__(self, *args, **kwargs):
         canvas.Canvas.__init__(self, *args, **kwargs)
@@ -243,7 +243,8 @@ class _rml_doc(object):
             for font in node.findall('registerFont'):
                 name = font.get('fontName').encode('ascii')
                 fname = font.get('fontFile').encode('ascii')
-                pdfmetrics.registerFont(TTFont(name, fname ))
+                if name not in pdfmetrics._fonts:
+                    pdfmetrics.registerFont(TTFont(name, fname))
                 addMapping(name, 0, 0, name)    #normal
                 addMapping(name, 0, 1, name)    #italic
                 addMapping(name, 1, 0, name)    #bold
@@ -254,7 +255,8 @@ class _rml_doc(object):
         from reportlab.pdfbase import pdfmetrics
         from reportlab.pdfbase.ttfonts import TTFont
 
-        pdfmetrics.registerFont(TTFont(fontname, filename ))
+        if fontname not in pdfmetrics._fonts:
+            pdfmetrics.registerFont(TTFont(fontname, filename))
         if (mode == 'all'):
             addMapping(face, 0, 0, fontname)    #normal
             addMapping(face, 0, 1, fontname)    #italic
@@ -899,7 +901,7 @@ class _rml_template(object):
             ps = map(lambda x:x.strip(), node.get('pageSize').replace(')', '').replace('(', '').split(','))
             pageSize = ( utils.unit_get(ps[0]),utils.unit_get(ps[1]) )
 
-        self.doc_tmpl = TinyDocTemplate(out, pagesize=pageSize, **utils.attr_get(node, ['leftMargin','rightMargin','topMargin','bottomMargin'], {'allowSplitting':'int','showBoundary':'bool','title':'str','author':'str'}))
+        self.doc_tmpl = TinyDocTemplate(out, pagesize=pageSize, **utils.attr_get(node, ['leftMargin','rightMargin','topMargin','bottomMargin'], {'allowSplitting':'int','showBoundary':'bool','rotation':'int','title':'str','author':'str'}))
         self.page_templates = []
         self.styles = doc.styles
         self.doc = doc
diff --git a/bin/tools/config.py b/bin/tools/config.py
index 0c47c2a61bc..bc9229e0b72 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -58,6 +58,8 @@ class configmanager(object):
             'xmlrpcs': True,
             'translate_in': None,
             'translate_out': None,
+            'overwrite_existing_translations': False,
+            'load_language': None,
             'language': None,
             'pg_path': None,
             'admin_passwd': 'admin',
@@ -94,7 +96,7 @@ class configmanager(object):
             'publisher_warranty_url': 'http://services.openerp.com/publisher-warranty/',
         }
         
-        self.blacklist_for_save = set(["publisher_warranty_url"])
+        self.blacklist_for_save = set(["publisher_warranty_url", "load_language"])
 
         self.misc = {}
         self.config_file = fname
@@ -209,12 +211,16 @@ class configmanager(object):
             "Option '-l' is mandatory in case of importation"
             )
 
+        group.add_option('--load-language', dest="load_language",
+                         help="specifies the languages for the translations you want to be loaded")
         group.add_option('-l', "--language", dest="language",
                          help="specify the language of the translation file. Use it with --i18n-export or --i18n-import")
         group.add_option("--i18n-export", dest="translate_out",
                          help="export all sentences to be translated to a CSV file, a PO file or a TGZ archive and exit")
         group.add_option("--i18n-import", dest="translate_in",
                          help="import a CSV or a PO file with translations and exit. The '-l' option is required.")
+        group.add_option("--i18n-overwrite", dest="overwrite_existing_translations", action="store_true", default=False,
+                         help="overwrites existing translation terms on importing a CSV or a PO file.")
         group.add_option("--modules", dest="translate_modules",
                          help="specify modules to export. Use in combination with --i18n-export")
         group.add_option("--addons-path", dest="addons_path",
@@ -240,6 +246,9 @@ class configmanager(object):
         die(opt.translate_in and (not opt.language or not opt.db_name),
             "the i18n-import option cannot be used without the language (-l) and the database (-d) options")
 
+        die(opt.overwrite_existing_translations and (not opt.translate_in),
+            "the i18n-overwrite option cannot be used without the i18n-import option")
+
         die(opt.translate_out and (not opt.db_name),
             "the i18n-export option cannot be used without the database (-d) option")
 
@@ -285,7 +294,8 @@ class configmanager(object):
                 self.options[arg] = getattr(opt, arg)
 
         keys = [
-            'language', 'translate_out', 'translate_in', 'debug_mode', 'smtp_ssl',
+            'language', 'translate_out', 'translate_in', 'overwrite_existing_translations',
+            'debug_mode', 'smtp_ssl', 'load_language',
             'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog',
             'list_db', 'xmlrpcs',
             'test_file', 'test_disable', 'test_commit', 'test_report_directory'
@@ -443,7 +453,7 @@ class configmanager(object):
         loglevelnames = dict(zip(self._LOGLEVELS.values(), self._LOGLEVELS.keys()))
         p.add_section('options')
         for opt in sorted(self.options.keys()):
-            if opt in ('version', 'language', 'translate_out', 'translate_in', 'init', 'update'):
+            if opt in ('version', 'language', 'translate_out', 'translate_in', 'overwrite_existing_translations', 'init', 'update'):
                 continue
             if opt in self.blacklist_for_save:
                 continue
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index e46d37f688a..db8d71843ba 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -45,10 +45,12 @@ import netsvc
 import osv
 import pooler
 from config import config
-from osv.orm import except_orm, SKIPPED_ELEMENT_TYPES
 from tools.translate import _
 from yaml_import import convert_yaml_import
 
+# List of etree._Element subclasses that we choose to ignore when parsing XML.
+from tools import SKIPPED_ELEMENT_TYPES
+
 # Import of XML records requires the unsafe eval as well,
 # almost everywhere, which is ok because it supposedly comes
 # from trusted data, but at least we make it obvious now.
@@ -865,7 +867,7 @@ form: module.record_id""" % (xml_id,)
                             self.__logger.error('Parse error in %s:%d: \n%s',
                                                 rec.getroottree().docinfo.URL,
                                                 rec.sourceline,
-                                                etree.tostring(rec).strip())
+                                                etree.tostring(rec).strip(), exc_info=True)
                             self.cr.rollback()
                             raise
         return True
@@ -945,7 +947,7 @@ def convert_csv_import(cr, module, fname, csvcontent, idref=None, mode='init',
     result, rows, warning_msg, dummy = pool.get(model).import_data(cr, uid, fields, datas,mode, module, noupdate, filename=fname_partial)
     if result < 0:
         # Report failed import and abort module install
-        raise except_orm(_('Module loading failed'), _('Loading %s/%s failed:\n %s') % (module, fname, warning_msg))
+        raise Exception(_('Module loading failed: file %s/%s could not be processed:\n %s') % (module, fname, warning_msg))
     if config.get('import_partial'):
         data = pickle.load(file(config.get('import_partial')))
         data[fname_partial] = 0
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 2515803f452..390be6b7837 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -44,6 +44,7 @@ from email.Header import Header
 from email.Utils import formatdate, COMMASPACE
 from email import Encoders
 from itertools import islice, izip
+from lxml import etree
 from which import which
 if sys.version_info[:2] < (2, 4):
     from threadinglocal import local
@@ -60,6 +61,10 @@ from lru import LRU
 
 _logger = logging.getLogger('tools')
 
+# List of etree._Element subclasses that we choose to ignore when parsing XML.
+# We include the *Base ones just in case, currently they seem to be subclasses of the _* ones.
+SKIPPED_ELEMENT_TYPES = (etree._Comment, etree._ProcessingInstruction, etree.CommentBase, etree.PIBase)
+
 # initialize a database with base/base.sql
 def init_db(cr):
     import addons
@@ -257,7 +262,7 @@ def file_open(name, mode="r", subdir='addons', pathinfo=False):
             return fo
     if os.path.splitext(name)[1] == '.rml':
         raise IOError, 'Report %s doesn\'t exist or deleted : ' %str(name)
-    raise IOError, 'File not found : '+str(name)
+    raise IOError, 'File not found : %s' % name
 
 
 #----------------------------------------------------------
diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 3ad66f3d041..ea98bd60b77 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -33,14 +33,14 @@ import tarfile
 import tempfile
 import threading
 from os.path import join
-import logging
 
 from datetime import datetime
 from lxml import etree
 
-import tools, pooler
+import tools
 import netsvc
 from tools.misc import UpdateableStr
+from tools.misc import SKIPPED_ELEMENT_TYPES
 
 _LOCALE2WIN32 = {
     'af_ZA': 'Afrikaans_South Africa',
@@ -159,7 +159,7 @@ class GettextAlias(object):
         # find current DB based on thread/worker db name (see netsvc)
         db_name = getattr(threading.currentThread(), 'dbname', None)
         if db_name:
-            return pooler.get_db_only(dbname)
+            return pooler.get_db_only(db_name)
 
     def _get_cr(self, frame):
         is_new_cr = False
@@ -219,6 +219,7 @@ class GettextAlias(object):
                 logger.debug('no translation language detected, skipping translation for "%r" ', source)
         except Exception:
             logger.debug('translation went wrong for "%r", skipped', source)
+                # if so, double-check the root/base translations filenames
         finally:
             if cr and is_new_cr:
                 cr.close()
@@ -468,12 +469,13 @@ def trans_export(lang, modules, buffer, format, dbname=None):
     _process(format, modules, trans, buffer, lang, newlang)
     del trans
 
-
 def trans_parse_xsl(de):
     res = []
     for n in de:
         if n.get("t"):
-            for m in [j for j in n if j.text]:
+            for m in n:
+                if isinstance(m, SKIPPED_ELEMENT_TYPES) or not m.text:
+                    continue
                 l = m.text.strip().replace('\n',' ')
                 if len(l):
                     res.append(l.encode("utf8"))
@@ -483,7 +485,9 @@ def trans_parse_xsl(de):
 def trans_parse_rml(de):
     res = []
     for n in de:
-        for m in [j for j in n if j.text]:
+        for m in n:
+            if isinstance(m, SKIPPED_ELEMENT_TYPES) or not m.text:
+                continue
             string_list = [s.replace('\n', ' ').strip() for s in re.split('\[\[.+?\]\]', m.text)]
             for s in string_list:
                 if s:
@@ -749,6 +753,10 @@ def trans_generate(lang, modules, dbname=None):
     else :
         path_list = [root_path,] + apaths
 
+    # Also scan these non-addon paths
+    for bin_path in ['osv', 'report' ]:
+        path_list.append(os.path.join(tools.config['root_path'], bin_path))
+
     logger.debug("Scanning modules at paths: ", path_list)
 
     mod_paths = []
@@ -768,6 +776,8 @@ def trans_generate(lang, modules, dbname=None):
             if module in installed_modules:
                 frelativepath = str("addons" + frelativepath)
             ite = re_dquotes.finditer(code_string)
+            code_offset = 0
+            code_line = 1
             for i in ite:
                 src = i.group(1)
                 if src.startswith('""'):
@@ -775,11 +785,18 @@ def trans_generate(lang, modules, dbname=None):
                     src = src[2:-2]
                 else:
                     src = join_dquotes.sub(r'\1', src)
+                # try to count the lines from the last pos to our place:
+                code_line += code_string[code_offset:i.start(1)].count('\n')
                 # now, since we did a binary read of a python source file, we
                 # have to expand pythonic escapes like the interpreter does.
                 src = src.decode('string_escape')
-                push_translation(module, terms_type, frelativepath, 0, encode(src))
+                push_translation(module, terms_type, frelativepath, code_line, encode(src))
+                code_line += i.group(1).count('\n')
+                code_offset = i.end() # we have counted newlines up to the match end
+
             ite = re_quotes.finditer(code_string)
+            code_offset = 0 #reset counters
+            code_line = 1
             for i in ite:
                 src = i.group(1)
                 if src.startswith("''"):
@@ -787,8 +804,11 @@ def trans_generate(lang, modules, dbname=None):
                     src = src[2:-2]
                 else:
                     src = join_quotes.sub(r'\1', src)
+                code_line += code_string[code_offset:i.start(1)].count('\n')
                 src = src.decode('string_escape')
-                push_translation(module, terms_type, frelativepath, 0, encode(src))
+                push_translation(module, terms_type, frelativepath, code_line, encode(src))
+                code_line += i.group(1).count('\n')
+                code_offset = i.end() # we have counted newlines up to the match end
 
     for path in path_list:
         logger.debug("Scanning files of modules at %s", path)
@@ -900,7 +920,7 @@ def trans_load_data(db_name, fileobj, fileformat, lang, lang_name=None, verbose=
                 args.append(('res_id', '=', dic['res_id']))
             ids = trans_obj.search(cr, uid, args)
             if ids:
-                if context.get('overwrite'):
+                if context.get('overwrite') and dic['value']:
                     trans_obj.write(cr, uid, ids, {'value': dic['value']})
             else:
                 trans_obj.create(cr, uid, dic)
@@ -952,5 +972,18 @@ def resetlocale():
         except locale.Error:
             continue
 
+def load_language(cr, lang):
+    """Loads a translation terms for a language.
+    Used mainly to automate language loading at db initialization.
+    
+    :param lang: language ISO code with optional _underscore_ and l10n flavor (ex: 'fr', 'fr_BE', but not 'fr-BE')
+    :type lang: str
+    """
+    pool = pooler.get_pool(cr.dbname)
+    language_installer = pool.get('base.language.install')
+    uid = 1
+    oid = language_installer.create(cr, uid, {'lang': lang})
+    language_installer.lang_install(cr, uid, [oid], context=None)
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/setup.nsi b/setup.nsi
index 89d308723e9..5e7a0712d77 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -1,266 +1,399 @@
-##############################################################################
-#
-# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-###############################################################################
-!ifndef VERSION
-    !error "Do not forget to specify the version of OpenERP - /DVERSION=<VERSION>"
-!endif 
-
-!include "MUI.nsh"
-
-;--------------------------------
-;General
-
-;Name and file
-Name "OpenERP Server"
-OutFile "openerp-server-setup-${VERSION}.exe"
-SetCompressor lzma
-SetCompress auto
-
-;Default installation folder
-InstallDir "$PROGRAMFILES\OpenERP Server"
-
-;Get installation folder from registry if available
-InstallDirRegKey HKLM "Software\OpenERP Server" ""
-
-BrandingText "OpenERP Server ${VERSION}"
-
-;Vista redirects $SMPROGRAMS to all users without this
-RequestExecutionLevel admin
-
-;--------------------------------
-;Variables
-
-Var MUI_TEMP
-Var STARTMENU_FOLDER
-
-;--------------------------------
-;Interface Settings
-
-!define MUI_ABORTWARNING
-
-!define REGKEY "SOFTWARE\$(^Name)"
-!define MUI_LANGDLL_REGISTRY_ROOT HKLM
-!define MUI_LANGDLL_REGISTRY_KEY ${REGKEY}
-!define MUI_LANGDLL_REGISTRY_VALUENAME InstallerLanguage
-
-!insertmacro MUI_RESERVEFILE_LANGDLL
-;--------------------------------
-;Pages
-
-!define MUI_ICON ".\pixmaps\openerp-icon.ico"
-!define MUI_WELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp"
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
-!define MUI_HEADER_TRANSPARENT_TEXT ""
-!define MUI_HEADERIMAGE_BITMAP ".\pixmaps\openerp-slogan.bmp"
-!define MUI_LICENSEPAGE_TEXT_BOTTOM "$(LicenseText)"
-!define MUI_LICENSEPAGE_BUTTON "$(LicenseNext)"
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "doc\License.rtf"
-!insertmacro MUI_PAGE_DIRECTORY
-
-;Start Menu Folder Page Configuration
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" 
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\OpenERP Server"
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "OpenERP Server"
-
-!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-
-!insertmacro MUI_PAGE_INSTFILES
-
-!define MUI_FINISHPAGE_NOAUTOCLOSE
-!define MUI_FINISHPAGE_RUN
-!define MUI_FINISHPAGE_RUN_CHECKED
-!define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageText)" 
-!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
-!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\README.txt
-!insertmacro MUI_PAGE_FINISH
-
-
-!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-;--------------------------------
-;Languages
-
-!insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "French"
-
-!macro CreateInternetShortcut FILENAME URL
-	WriteINIStr "${FILENAME}.url" "InternetShortcut" "URL" "${URL}"
-!macroend
-
-;--------------------------------
-;Installer Sections
-Function .onInit 
-!ifndef ALLINONE
-    ;Language selection dialog
-    Push ""
-    Push ${LANG_ENGLISH}
-    Push English
-    Push ${LANG_FRENCH}
-    Push French
-    Push A ; A means auto count languages
-    ; for the auto count to work the first empty push (Push "") must remain
-    LangDLL::LangDialog "Installer Language" "Please select the language of the installer"
-
-    Pop $LANGUAGE
-    StrCmp $LANGUAGE "cancel" 0 +2
-        Abort
-!endif
-
-    ClearErrors
-    ReadRegStr $0 HKLM "Software\OpenERP Server" ""
-    IfErrors DoInstall 0
-        MessageBox MB_OK "$(CannotInstallServerText)"
-        Quit
-    DoInstall:
-FunctionEnd
-
-Section "OpenERP Server" SecOpenERPServer
-    nsExec::Exec "net stop openerp-service"
-    sleep 2
-
-    SetOutPath "$INSTDIR"
-
-    ;ADD YOUR OWN FILES HERE...
-    File /r "dist\*"
-
-    SetOutPath "$INSTDIR\service"
-    File /r "win32\dist\*"
-    File "win32\start.bat"
-    File "win32\stop.bat"
-
-    ;Store installation folder
-    WriteRegStr HKLM "Software\OpenERP Server" "" $INSTDIR
-
-!ifndef ALLINONE
-    ;Create uninstaller
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenERP Server" "DisplayName" "OpenERP Server ${VERSION}"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenERP Server" "UninstallString" "$INSTDIR\Uninstall.exe"
-!else
-    WriteRegStr HKLM  "Software\OpenERP AllInOne" "UninstallServer" "$INSTDIR\Uninstall.exe"
-!endif
-    WriteUninstaller "$INSTDIR\Uninstall.exe"
-
-    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-        ;Create shortcuts
-        CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenERP Server.lnk" "$INSTDIR\openerp-server.exe"
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Start service.lnk" "$INSTDIR\service\start.bat"
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Stop service.lnk" "$INSTDIR\service\stop.bat"
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Edit config.lnk" "notepad.exe" "$INSTDIR\openerp-server.conf"
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\View log.lnk" "notepad.exe" "$INSTDIR\openerp-server.log"
-!ifndef ALLINONE
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe"
-!endif
-	!insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Forum" "http://www.openerp.com/forum"
-	!insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Translation" "https://translations.launchpad.net/openobject"
-    !insertmacro MUI_STARTMENU_WRITE_END
-
-    nsExec::Exec '"$INSTDIR\openerp-server.exe" --stop-after-init --logfile "$INSTDIR\openerp-server.log" -s'
-    nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -auto -install'
-
-SectionEnd
-
-;Descriptions
-
- 
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-    nsExec::Exec "net stop openerp-service"
-    sleep 2
-    nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -remove'
-    sleep 2
-
-    RMDIR /r "$INSTDIR" 
-    !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-
-    Delete "$SMPROGRAMS\$MUI_TEMP\Forum.url"
-    Delete "$SMPROGRAMS\$MUI_TEMP\Translation.url"
-!ifndef ALLINONE
-    Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-!endif 
-    Delete "$SMPROGRAMS\$MUI_TEMP\OpenERP Server.lnk"
-    Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-    Delete "$SMPROGRAMS\$MUI_TEMP\Start service.lnk"
-    Delete "$SMPROGRAMS\$MUI_TEMP\Stop service.lnk"
-    Delete "$SMPROGRAMS\$MUI_TEMP\Edit config.lnk"
-    Delete "$SMPROGRAMS\$MUI_TEMP\View log.lnk"
-
-    ;Delete empty start menu parent diretories
-    StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
- 
-    startMenuDeleteLoop:
-        ClearErrors
-        RMDir $MUI_TEMP
-        GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-
-        IfErrors startMenuDeleteLoopDone
-
-        StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop
-
-    startMenuDeleteLoopDone:
-
-!ifndef ALLINONE
-        DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenERP Server"
-!else 
-        DeleteRegKey HKLM "Software\OpenERP AllInOne\UninstallServer"
-!endif
-        DeleteRegKey /ifempty HKLM "Software\OpenERP Server"
-
-SectionEnd
-
-Function LaunchLink
-    nsExec::Exec "net start openerp-service"
-FunctionEnd
-
-LangString LicenseText ${LANG_ENGLISH} "Usually, a proprietary license is provided with the software: limited number of users, limited in time usage, etc. This Open Source license is the opposite: it garantees you the right to use, copy, study, distribute and modify Open ERP for free."
-LangString LicenseText ${LANG_FRENCH} "Normalement, une licence propri�taire est fournie avec le logiciel: limitation du nombre d'utilisateurs, limitation dans le temps, etc. Cette licence Open Source est l'oppos�: Elle vous garantie le droit d'utiliser, de copier, d'�tudier, de distribuer et de modifier Open ERP librement."
-
-LangString LicenseNext ${LANG_ENGLISH} "Next >"
-LangString LicenseNext ${LANG_FRENCH} "Suivant >"
-
-LangString FinishPageText ${LANG_ENGLISH} "Start OpenERP Server"
-LangString FinishPageText ${LANG_FRENCH} "Lancer le serveur OpenERP"
-
-;Language strings
-LangString DESC_SecOpenERPServer ${LANG_ENGLISH} "OpenERP Server."
-LangString DESC_SecOpenERPServer ${LANG_FRENCH} "Serveur OpenERP."
-
-LangString CannotInstallServerText ${LANG_ENGLISH} "Can not install the Open ERP Server because a previous installation already exists on this system. Please uninstall your current installation and relaunch this setup wizard."
-LangString CannotInstallServerText ${LANG_FRENCH} "Ne peut pas installer le serveur Open ERP parce qu'une installation existe d�j� sur ce syst�me. S'il vous plait, d�sinstallez votre installation actuelle et relancer l'installeur."
-
-
-;Assign language strings to sections
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-    !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenERPServer} $(DESC_SecOpenERPServer)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
+#####################################################################################
+#
+# Copyright (c) 2004-TODAY OpenERP S.A. (http://www.openerp.com) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#####################################################################################
+
+!include 'MUI2.nsh'
+!include 'FileFunc.nsh'
+!include 'LogicLib.nsh'
+!include 'Sections.nsh'
+
+!define PUBLISHER 'OpenERP S.A.'
+
+!ifndef MAJOR_VERSION
+    !define MAJOR_VERSION '6'
+!endif
+!ifndef MINOR_VERSION
+    !define MINOR_VERSION '0'
+!endif
+!ifndef REVISION_VERSION
+    !define REVISION_VERSION '0'
+!endif
+!ifndef BUILD_VERSION
+    !define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}"
+!else
+    !define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}-${BUILD_VERSION}"
+!endif
+
+!define PRODUCT_NAME "OpenERP Server"
+!define DISPLAY_NAME "${PRODUCT_NAME} ${MAJOR_VERSION}.${MINOR_VERSION}"
+
+!define UNINSTALL_REGISTRY_ROOT HKLM
+!define UNINSTALL_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${DISPLAY_NAME}"
+
+!define REGISTRY_KEY "Software\${DISPLAY_NAME}"
+
+!define DEFAULT_POSTGRESQL_HOSTNAME 'localhost'
+!define DEFAULT_POSTGRESQL_PORT 5432
+!define DEFAULT_POSTGRESQL_USERNAME 'openpg'
+!define DEFAULT_POSTGRESQL_PASSWORD 'openpgpwd'
+
+Name '${DISPLAY_NAME}'
+Caption "${PRODUCT_NAME} ${VERSION} Setup"
+OutFile "openerp-server-setup-${VERSION}.exe"
+SetCompressor /final /solid lzma
+SetCompress auto
+ShowInstDetails show
+
+XPStyle on
+
+InstallDir "$PROGRAMFILES\OpenERP ${MAJOR_VERSION}.${MINOR_VERSION}\Server"
+InstallDirRegKey HKCU "${REGISTRY_KEY}" ""
+
+BrandingText '${PRODUCT_NAME} ${VERSION}'
+
+RequestExecutionLevel admin
+
+#VIAddVersionKey "ProductName" "${PRODUCT_NAME}"
+#VIAddVersionKey "CompanyName" "${PUBLISHER}"
+#VIAddVersionKey "FileDescription" "Installer of ${DISPLAY_NAME}" 
+#VIAddVersionKey "LegalCopyright" "${PUBLISHER}"
+#VIAddVersionKey "LegalTrademark" "OpenERP is a trademark of ${PUBLISHER}"
+#VIAddVersionKey "FileVersion" "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}"
+#VIProductVersion "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}"
+
+!insertmacro GetParameters
+!insertmacro GetOptions
+
+Var Option_AllInOne
+Var HasPostgreSQL
+Var cmdLineParams
+
+Var TextPostgreSQLHostname
+Var TextPostgreSQLPort
+Var TextPostgreSQLUsername
+Var TextPostgreSQLPassword
+
+Var HWNDPostgreSQLHostname
+Var HWNDPostgreSQLPort
+Var HWNDPostgreSQLUsername
+Var HWNDPostgreSQLPassword
+
+Var MUI_TEMP
+Var STARTMENU_FOLDER
+
+!define MUI_ABORTWARNING
+!define MUI_ICON ".\pixmaps\openerp-icon.ico"
+
+!define MUI_WELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP ".\pixmaps\openerp-slogan.bmp"
+!define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
+!define MUI_HEADER_TRANSPARENT_TEXT ""
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "doc\License.rtf"
+!define MUI_COMPONENTSPAGE_SMALLDESC
+!insertmacro MUI_PAGE_DIRECTORY
+Page Custom ShowPostgreSQL LeavePostgreSQL
+
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" 
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "${REGISTRY_KEY}"
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${DISPLAY_NAME}"
+
+!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+!insertmacro MUI_PAGE_INSTFILES
+
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_FINISHPAGE_LINK $(DESC_FinishPage_Link) 
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.openerp.com/contact"
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+!macro CreateInternetShortcut FILENAME URL
+	WriteINIStr "${FILENAME}.url" "InternetShortcut" "URL" "${URL}"
+!macroend
+
+; English
+LangString DESC_FinishPage_Link ${LANG_ENGLISH} "Contact OpenERP for Partnership and/or Support"
+LangString WARNING_HostNameIsEmpty ${LANG_ENGLISH} "The hostname for the connection to the PostgreSQL Server is empty"
+LangString WARNING_UserNameIsEmpty ${LANG_ENGLISH} "The username for the connection to the PostgreSQL Server is empty"
+LangString WARNING_PasswordIsEmpty ${LANG_ENGLISH} "The password for the connection to the PostgreSQL Server is empty"
+LangString WARNING_PortIsWrong ${LANG_ENGLISH} "The port for the connexion to the PostgreSQL Server is wrong (default: 5432)"
+LangString DESC_PostgreSQLPage ${LANG_ENGLISH} "Configure the information for the PostgreSQL connection"
+LangString DESC_PostgreSQL_Hostname ${LANG_ENGLISH} "Hostname"
+LangString DESC_PostgreSQL_Port ${LANG_ENGLISH} "Port"
+LangString DESC_PostgreSQL_Username ${LANG_ENGLISH} "Username"
+LangString DESC_PostgreSQL_Password ${LANG_ENGLISH} "Password"
+
+
+; French
+LangString DESC_FinishPage_Link ${LANG_FRENCH} "Contactez OpenERP pour un Partenariat et/ou du Support"
+LangString WARNING_HostNameIsEmpty ${LANG_FRENCH} "L'adresse pour la connection au serveur PostgreSQL est vide"
+LangString WARNING_UserNameIsEmpty ${LANG_FRENCH} "Le nom d'utilisateur pour la connection au serveur PostgreSQL est vide"
+LangString WARNING_PasswordIsEmpty ${LANG_FRENCH} "Le mot de passe pour la connection au serveur PostgreSQL est vide"
+LangString WARNING_PortIsWrong ${LANG_FRENCH} "Le port pour la connection au serveur PostgreSQL est erron� (d�faut: 5432)"
+LangString DESC_PostgreSQLPage ${LANG_FRENCH} "Configurez les informations de connection pour le serveur PostgreSQL"
+LangString DESC_PostgreSQL_Hostname ${LANG_FRENCH} "H�te"
+LangString DESC_PostgreSQL_Port ${LANG_FRENCH} "Port"
+LangString DESC_PostgreSQL_Username ${LANG_FRENCH} "Utilisateur"
+LangString DESC_PostgreSQL_Password ${LANG_FRENCH} "Mot de passe"
+
+Section -StopService
+    nsExec::Exec "net stop openerp-server-6.0"
+    sleep 2
+SectionEnd
+
+Section OpenERP_Server SectionOpenERP_Server
+    SetOutPath '$INSTDIR'
+
+    File /r "dist\*"
+
+    SetOutPath "$INSTDIR\service"
+    File /r "win32\dist\*"
+    File "win32\start.bat"
+    File "win32\stop.bat"
+
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+        ;Create shortcuts
+        CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenERP Server.lnk" "$INSTDIR\openerp-server.exe"
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Start service.lnk" "$INSTDIR\service\start.bat"
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Stop service.lnk" "$INSTDIR\service\stop.bat"
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Edit config.lnk" "notepad.exe" "$INSTDIR\openerp-server.conf"
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\View log.lnk" "notepad.exe" "$INSTDIR\openerp-server.log"
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+        !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Forum" "http://www.openerp.com/forum"
+        !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Translation" "https://translations.launchpad.net/openobject"
+    !insertmacro MUI_STARTMENU_WRITE_END
+
+
+    FileOpen $9 '$INSTDIR\install.log' w
+    FileWrite $9 "Hostname $TextPostgreSQLHostname$\r$\n"
+    FileWrite $9 "Port $TextPostgreSQLPort$\r$\n"
+    FileWrite $9 "Username $TextPostgreSQLUsername$\r$\n"
+    FileWrite $9 "Password $TextPostgreSQLPassword$\r$\n"
+    FileClose $9
+
+# If there is a previous install of the OpenERP Server, keep the login/password from the config file
+    WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_host" $TextPostgreSQLHostname
+    WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_user" $TextPostgreSQLUsername
+    WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword
+    WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort
+
+    nsExec::Exec '"$INSTDIR\openerp-server.exe" --stop-after-init --logfile "$INSTDIR\openerp-server.log" -s'
+    nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -auto -install'
+SectionEnd
+
+Section -RestartServer
+    nsExec::Exec "net start openerp-server-6.0"
+    sleep 2
+SectionEnd
+
+Section -Post
+    WriteRegExpandStr HKLM "${UNINSTALL_REGISTRY_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"
+    WriteRegExpandStr HKLM "${UNINSTALL_REGISTRY_KEY}" "InstallLocation" "$INSTDIR"
+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "DisplayName" "${DISPLAY_NAME}"
+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "DisplayVersion" "${MAJOR_VERSION}.${MINOR_VERSION}"
+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "Publisher" "${PUBLISHER}"
+    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "Version" "${VERSION}"
+    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "VersionMajor" "${MAJOR_VERSION}.${MINOR_VERSION}"
+    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "VersionMinor" "${REVISION_VERSION}"
+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "HelpLink" "support@openerp.com"
+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "HelpTelephone" "+32.81.81.37.00"
+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "URLInfoAbout" "http://www.openerp.com"
+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "Contact" "sales@openerp.com"
+    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "NoModify" "1"
+    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "NoRepair" "1"
+    WriteUninstaller "$INSTDIR\Uninstall.exe"
+SectionEnd
+
+Section "Uninstall"
+    ; Stop the NT Service
+    nsExec::Exec "net stop openerp-server-6.0"
+    sleep 2
+
+    ; Uninstall the OpenERP Service
+    nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -remove'
+    sleep 2
+
+    Rmdir /r "$INSTDIR"
+
+    !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+
+    Delete "$SMPROGRAMS\$MUI_TEMP\Forum.url"
+    Delete "$SMPROGRAMS\$MUI_TEMP\Translation.url"
+    Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+    Delete "$SMPROGRAMS\$MUI_TEMP\OpenERP Server.lnk"
+    Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+    Delete "$SMPROGRAMS\$MUI_TEMP\Start service.lnk"
+    Delete "$SMPROGRAMS\$MUI_TEMP\Stop service.lnk"
+    Delete "$SMPROGRAMS\$MUI_TEMP\Edit config.lnk"
+    Delete "$SMPROGRAMS\$MUI_TEMP\View log.lnk"
+    ;
+    ;Delete empty start menu parent diretories
+    StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
+ 
+    startMenuDeleteLoop:
+        ClearErrors
+        RMDir $MUI_TEMP
+        GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
+
+        IfErrors startMenuDeleteLoopDone
+
+        StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop
+
+    startMenuDeleteLoopDone:
+
+    ; Clean the Registry
+    DeleteRegKey HKLM "${UNINSTALL_REGISTRY_KEY}"
+SectionEnd
+
+Function .onInit
+    Push $R0
+
+    ${GetParameters} $cmdLineParams
+    ClearErrors
+
+    Pop $R0
+
+    StrCpy $Option_AllInOne 0
+    StrCpy $HasPostgreSQL 0
+
+    StrCpy $TextPostgreSQLHostname ${DEFAULT_POSTGRESQL_HOSTNAME}
+    StrCpy $TextPostgreSQLPort ${DEFAULT_POSTGRESQL_PORT}
+    StrCpy $TextPostgreSQLUsername ${DEFAULT_POSTGRESQL_USERNAME}
+    StrCpy $TextPostgreSQLPassword ${DEFAULT_POSTGRESQL_PASSWORD}
+
+    Push $R0
+    ${GetOptions} $cmdLineParams '/allinone' $R0
+    IfErrors +2 0
+    StrCpy $Option_AllInOne 1
+    Pop $R0
+
+    StrCmp $Option_AllInOne 1 AllInOneMode
+    StrCmp $Option_AllInOne 0 NoAllInOneMode
+
+    AllInOneMode:
+        MessageBox MB_OK|MB_ICONINFORMATION "All In One"
+
+    NoAllInOneMode:
+    
+    !insertmacro MUI_LANGDLL_DISPLAY
+
+    ClearErrors
+    EnumRegKey $0 HKLM "SOFTWARE\PostgreSQL" 0
+    IfErrors DoInstallPostgreSQL 0
+        StrCpy $HasPostgreSQL 1
+
+    DoInstallPostgreSQL:
+FunctionEnd
+
+Function PostgreSQLOnBack
+FunctionEnd
+
+Function ShowPostgreSQL
+    SectionGetFlags ${SectionOpenERP_Server} $0
+    IntOp $0 $0 & ${SF_SELECTED}
+    IntCmp $0 ${SF_SELECTED} LaunchPostgreSQLConfiguration
+    Abort
+    LaunchPostgreSQLConfiguration:
+
+    nsDialogs::Create /NOUNLOAD 1018
+    Pop $0
+
+    ${If} $0 == error
+        Abort
+    ${EndIf}
+
+    GetFunctionAddress $0 PostgreSQLOnBack
+    nsDialogs::OnBack $0
+
+    ${NSD_CreateLabel} 0 0 100% 10u $(DESC_PostgreSQLPage)
+    Pop $0
+
+    ${NSD_CreateLabel} 0 45 60u 12u $(DESC_PostgreSQL_Hostname)
+    Pop $0
+    ${NSD_CreateText} 100 45 150u 12u $TextPostgreSQLHostname
+    Pop $HWNDPostgreSQLHostname
+
+    ${NSD_CreateLabel} 0 75 60u 12u $(DESC_PostgreSQL_Port)
+    Pop $0
+    ${NSD_CreateNumber} 100 75 150u 12u $TextPostgreSQLPort
+    Pop $HWNDPostgreSQLPort
+    ${NSD_CreateLabel} 0 105 60u 12u $(DESC_PostgreSQL_Username)
+    Pop $0
+    ${NSD_CreateText} 100 105 150u 12u $TextPostgreSQLUsername
+    Pop $HWNDPostgreSQLUsername
+    ${NSD_CreateLabel} 0 135 60u 12u $(DESC_PostgreSQL_Password)
+    Pop $0
+    ${NSD_CreateText} 100 135 150u 12u $TextPostgreSQLPassword
+    Pop $HWNDPostgreSQLPassword
+
+    nsDialogs::Show
+FunctionEnd
+
+Function LeavePostgreSQL
+    # Before to leave the PostgreSQL configuration screen, we check the values
+    # from the inputs, to be sure we have the right values
+
+    ${NSD_GetText} $HWNDPostgreSQLHostname $TextPostgreSQLHostname
+    ${NSD_GetText} $HWNDPostgreSQLPort $TextPostgreSQLPort
+    ${NSD_GetText} $HWNDPostgreSQLUsername $TextPostgreSQLUsername
+    ${NSD_GetText} $HWNDPostgreSQLPassword $TextPostgreSQLPassword
+
+    StrLen $1 $TextPostgreSQLHostname
+    ${If} $1 == 0
+        MessageBox MB_ICONEXCLAMATION|MB_OK $(WARNING_HostNameIsEmpty)
+        Abort
+    ${EndIf}
+
+    ${If} $TextPostgreSQLPort <= 0
+    ${OrIf} $TextPostgreSQLPort > 65535
+        MessageBox MB_ICONEXCLAMATION|MB_OK $(WARNING_PortIsWrong)
+        Abort
+    ${EndIf}
+
+    StrLen $1 $TextPostgreSQLUsername
+    ${If} $1 == 0
+        MessageBox MB_ICONEXCLAMATION|MB_OK $(WARNING_UserNameIsEmpty)
+        Abort
+    ${EndIf}
+
+    StrLen $1 $TextPostgreSQLPassword
+    ${If} $1 == 0
+        MessageBox MB_ICONEXCLAMATION|MB_OK $(WARNING_PasswordIsEmpty)
+        Abort
+    ${EndIf}
+FunctionEnd
+
diff --git a/setup.py b/setup.py
index 894c7f7c11e..4a686ebfe15 100755
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ import glob
 
 from pprint import pprint as pp
 
-from setuptools import setup as official_setup, find_packages
+from setuptools import setup, find_packages
 from setuptools.command.install import install
 from distutils.sysconfig import get_python_lib
 
@@ -169,21 +169,18 @@ options = {
         "optimize": 2,
         "dist_dir": 'dist',
         "packages": [
-                 "lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
-                 "lxml.objectify", "decimal", "xml", "xml", "xml.dom", "xml.xpath",
-                 "encodings", "dateutil", "wizard", "pychart", "PIL", "pyparsing",
-                 "pydot", "asyncore","asynchat", "reportlab", "vobject",
-                 "HTMLParser", "select", "mako", "poplib",
-                 "imaplib", "smtplib", "email", "yaml", "DAV",
-                 ],
+            "lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
+            "lxml.objectify", "decimal", "xml", "xml", "xml.dom", "xml.xpath",
+            "encodings", "dateutil", "wizard", "pychart", "PIL", "pyparsing",
+            "pydot", "asyncore","asynchat", "reportlab", "vobject",
+            "HTMLParser", "select", "mako", "poplib",
+            "imaplib", "smtplib", "email", "yaml", "DAV",
+            "uuid",
+        ],
         "excludes" : ["Tkconstants","Tkinter","tcl"],
     }
 }
 
-def setup(**kwargs):
-    #pp(kwargs)
-    return official_setup(**kwargs)
-
 setup(name             = name,
       version          = version,
       description      = description,
@@ -225,13 +222,8 @@ setup(name             = name,
           'reportlab',
           'caldav',
           'pyyaml',
-          #'django',
           'pywebdav'
-          #'cx_Oracle',
-          #'mysqldb',
           'feedparser',
-          #'bsddb3',
-          'egenix-mx-base'
       ],
       extras_require={
           'SSL' : ['pyopenssl'],
diff --git a/win32/OpenERPServerService.py b/win32/OpenERPServerService.py
index e44a9d274a1..bdf371aca68 100644
--- a/win32/OpenERPServerService.py
+++ b/win32/OpenERPServerService.py
@@ -34,10 +34,10 @@ import thread
 
 class OpenERPServerService(win32serviceutil.ServiceFramework):
     # required info
-    _svc_name_ = "openerp-service"
-    _svc_display_name_ = "OpenERP Server"
+    _svc_name_ = "openerp-server-6.0"
+    _svc_display_name_ = "OpenERP Server 6.0"
     # optionnal info
-    _svc_description_ = "OpenERP Server service"
+    _svc_description_ = "OpenERP Server 6.0 service"
 
     def __init__(self, args):
         win32serviceutil.ServiceFramework.__init__(self, args)
diff --git a/win32/start.bat b/win32/start.bat
index 67e580e9fb9..c6b78835900 100644
--- a/win32/start.bat
+++ b/win32/start.bat
@@ -1,7 +1,7 @@
 @PATH=%WINDIR%\system32;%WINDIR%;%WINDIR%\System32\Wbem;.
 
-@net stop openerp-service
+@net stop openerp-server-6.0
 
-@net start openerp-service
+@net start openerp-server-6.0
 
 cls
diff --git a/win32/stop.bat b/win32/stop.bat
index c7dd4b79dc1..7d6d41ecf87 100644
--- a/win32/stop.bat
+++ b/win32/stop.bat
@@ -1,5 +1,5 @@
 @PATH=%WINDIR%\system32;%WINDIR%;%WINDIR%\System32\Wbem;.
 
-@net stop openerp-service
+@net stop openerp-server-6.0
 
 cls