diff --git a/bin/addons/base/i18n/fr_FR.po b/bin/addons/base/i18n/fr_FR.po
index 4b3419d31c7..9b44dc28807 100644
--- a/bin/addons/base/i18n/fr_FR.po
+++ b/bin/addons/base/i18n/fr_FR.po
@@ -121,7 +121,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.todo,state:0
 msgid "Skipped"
-msgstr ""
+msgstr "Omis"
 
 #. module: base
 #, python-format
@@ -172,7 +172,7 @@ msgstr "Objet"
 #. module: base
 #: view:wizard.module.lang.export:0
 msgid "To browse official translations, you can visit this link: "
-msgstr ""
+msgstr "Pour consulter les traductions officielles, vous pouvez visiter ce lien :"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_category_tree
@@ -188,7 +188,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.todo,state:0
 msgid "Not Started"
-msgstr ""
+msgstr "Pas commencé"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -248,7 +248,7 @@ msgstr "Avoir le Max"
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr ""
+msgstr "Vues créées"
 
 #. module: base
 #: selection:res.request,priority:0
@@ -275,7 +275,7 @@ msgstr "Importer une nouvelle langue"
 #: wizard_field:server.action.create,step_1,report:0
 #: wizard_view:server.action.create,step_1:0
 msgid "Select Report"
-msgstr ""
+msgstr "Sélectionnez le rapport"
 
 #. module: base
 #: field:ir.report.custom.fields,fc1_condition:0
@@ -297,7 +297,7 @@ msgstr "Grouper par"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Field Mapping"
-msgstr ""
+msgstr "Association de Champs"
 
 #. module: base
 #: field:ir.sequence,suffix:0
@@ -344,7 +344,7 @@ msgstr "Activités"
 #. module: base
 #: field:ir.actions.todo,start_on:0
 msgid "Start On"
-msgstr ""
+msgstr "Débuté le"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -446,7 +446,7 @@ msgstr "Autre propriétaire"
 #. module: base
 #: field:ir.actions.server,address:0
 msgid "Email / Mobile"
-msgstr ""
+msgstr "E-mail / Mobile"
 
 #. module: base
 #: field:res.partner,comment:0
@@ -495,6 +495,8 @@ msgstr "Impossible de définir la colonne %s. Mot clé réservé !"
 #: help:ir.ui.menu,groups_id:0
 msgid "If you put groups, the visibility of this menu will be based on these groups. If this field is empty, Open ERP will compute visibility based on the related object's read access."
 msgstr ""
+"Si vous ajoutez des groupes, la visibilité de ce menu sera basée sur ces groupes. Si ce champ reste "
+"vide, Open ERP calculera la visibilité en se basant sur l'accès en lecture des objets concernés."
 
 #. module: base
 #: field:workflow.transition,act_to:0
@@ -504,7 +506,7 @@ msgstr "Activité de Destination"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_10
 msgid "Open Source Service Company"
-msgstr ""
+msgstr "Société de Service Open Source"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -812,7 +814,7 @@ msgstr ""
 #: wizard_field:server.action.create,init,type:0
 #: wizard_view:server.action.create,init:0
 msgid "Select Action Type"
-msgstr ""
+msgstr "Sélectionnez le Type d'Action"
 
 #. module: base
 #, python-format
@@ -830,7 +832,7 @@ msgstr "Devises"
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Configure"
-msgstr ""
+msgstr "Configuration"
 
 #. module: base
 #: help:res.partner,lang:0
@@ -892,7 +894,7 @@ msgstr "Réf. ID"
 #. module: base
 #: help:res.partner.address,active:0
 msgid "Uncheck the active field to hide the contact."
-msgstr ""
+msgstr "Désélectionnez le champ actif pour cacher ce contact."
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_10
@@ -980,7 +982,7 @@ msgstr "historique des Requêtes"
 #. module: base
 #: view:res.users:0
 msgid "Roles are used to defined available actions, provided by workflows."
-msgstr ""
+msgstr "Les Rôles sont utilisés pour définir les actions possibles, fournies par les workflows."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -997,7 +999,7 @@ msgstr "Évènements Partenaire"
 #. module: base
 #: field:ir.actions.todo,note:0
 msgid "Text"
-msgstr ""
+msgstr "Texte"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1282,7 +1284,7 @@ msgstr "Modèle"
 #, python-format
 #: code:addons/base/module/module.py:0
 msgid "You try to install a module that depends on the module: %s.\nBut this module is not available in your system."
-msgstr ""
+msgstr "Vous essayez d'installer un module qui dépend du module : %s.\nMais ce module n'est pas disponible sur votre système."
 
 #. module: base
 #: wizard_field:res.partner.spam_send,init,text:0
@@ -1375,7 +1377,7 @@ msgstr "Position inconnue dans la vue héritée %s !"
 #. module: base
 #: view:res.users:0
 msgid "Add User"
-msgstr ""
+msgstr "Ajouter un Utilisateur"
 
 #. module: base
 #: field:res.request,trigger_date:0
@@ -1485,7 +1487,7 @@ msgstr "Envoyer un E-mail"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Basic Partner"
-msgstr ""
+msgstr "Partenaire de Base"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1534,7 +1536,7 @@ msgstr ""
 #, python-format
 #: code:addons/base/module/module.py:0
 msgid "Can not create the module file:\n %s"
-msgstr ""
+msgstr "Imossible de créer le fichier du module :\n %s"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_form
@@ -1651,7 +1653,7 @@ msgstr "Le chemin vers le fichier .rml ou NULL si le contenu se trouve dans 'rep
 #. module: base
 #: view:res.users:0
 msgid "Skip"
-msgstr ""
+msgstr "Passer"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -1716,7 +1718,7 @@ msgstr "Détaillant"
 #. module: base
 #: wizard_button:server.action.create,init,step_1:0
 msgid "Next"
-msgstr ""
+msgstr "Suivant"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_11
@@ -1757,7 +1759,7 @@ msgstr "Type"
 #. module: base
 #: view:ir.module.module:0
 msgid "Defined Reports"
-msgstr ""
+msgstr "Rapports définis"
 
 #. module: base
 #: field:workflow.transition,act_from:0
@@ -1772,7 +1774,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
 msgid "Components Supplier"
-msgstr ""
+msgstr "Fournisseur de Composants"
 
 #. module: base
 #: view:ir.rule.group:0
@@ -1820,6 +1822,8 @@ msgstr ""
 #: help:res.partner,supplier:0
 msgid "Check this box if the partner if a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."
 msgstr ""
+"Cochez cette case si le partenaire est un fournisseur. Si elle n'est pas cochée, les responsables "
+"de l'achat ne la verront pas lorsqu'ils encoderont une commande d'achat. "
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
@@ -1845,7 +1849,7 @@ msgstr ""
 #, python-format
 #: code:report/report_sxw.py:0
 msgid "print"
-msgstr ""
+msgstr "imprimer"
 
 #. module: base
 #, python-format
@@ -1914,7 +1918,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.todo,start_on:0
 msgid "At Once"
-msgstr ""
+msgstr "n une fois"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_security
@@ -2012,7 +2016,7 @@ msgstr "Nom du canal"
 #. module: base
 #: view:ir.actions.configuration.wizard:0
 msgid "Continue"
-msgstr ""
+msgstr "Continuer"
 
 #. module: base
 #: selection:res.config.view,view:0
@@ -2301,7 +2305,7 @@ msgstr "Code"
 #. module: base
 #: view:ir.module.module:0
 msgid "Features"
-msgstr ""
+msgstr "Fonctionnalités"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2446,7 +2450,7 @@ msgstr "Chemin vers le RML"
 #. module: base
 #: field:ir.actions.configuration.wizard,item_id:0
 msgid "Next Configuration Wizard"
-msgstr ""
+msgstr "Prochain Assistant de Configuration"
 
 #. module: base
 #: field:workflow.workitem,inst_id:0
@@ -2579,7 +2583,7 @@ msgstr "Cumul"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_14
 msgid "Bad customers"
-msgstr ""
+msgstr "Mauvais Clients"
 
 #. module: base
 #: model:ir.model,name:base.model_res_lang
@@ -2644,7 +2648,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,reports_by_module:0
 msgid "Reports"
-msgstr ""
+msgstr "Rapports"
 
 #. module: base
 #: field:workflow,on_create:0
@@ -2763,7 +2767,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:base.wizard_lang_install
 #: model:ir.ui.menu,name:base.menu_wizard_lang_install
 msgid "Reload an Official Translation"
-msgstr ""
+msgstr "Recharger une Traduction Officielle"
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
@@ -3046,7 +3050,7 @@ msgstr "Aide"
 #, python-format
 #: code:addons/base/module/module.py:0
 msgid "Some installed modules depends on the module you plan to desinstall :\n %s"
-msgstr ""
+msgstr "Quelques modules installés dépendent du module que vous voulez désinstaller :\n %s"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_request_link-act
@@ -3124,7 +3128,7 @@ msgstr "Nom du déclencheur"
 #. module: base
 #: wizard_button:server.action.create,step_1,create:0
 msgid "Create"
-msgstr ""
+msgstr "Créer"
 
 #. module: base
 #, python-format
@@ -3166,12 +3170,12 @@ msgstr "Source"
 #: model:ir.actions.act_window,name:base.action_partner_title_contact
 #: model:ir.ui.menu,name:base.menu_partner_title_contact
 msgid "Contacts Titles"
-msgstr ""
+msgstr "Titres de Contacts"
 
 #. module: base
 #: help:res.partner.address,partner_id:0
 msgid "Keep empty for a private address, not related to partner."
-msgstr ""
+msgstr "Laisser vide pour une adresse privée, non associée au partenaire."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3307,7 +3311,7 @@ msgstr "Les Arbres peuvent uniquement utilisés dans les rapports tabulaires"
 #. module: base
 #: selection:ir.actions.todo,start_on:0
 msgid "Manual"
-msgstr ""
+msgstr "Manuel"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -3325,7 +3329,7 @@ msgstr "Arbre"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_12
 msgid "Segmentation"
-msgstr ""
+msgstr "Segmentation"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3361,7 +3365,7 @@ msgstr "Champ Personalisé"
 #. module: base
 #: field:ir.model.fields,relation_field:0
 msgid "Relation Field"
-msgstr ""
+msgstr "Champ Relation"
 
 #. module: base
 #, python-format
@@ -3412,7 +3416,7 @@ msgstr "Règles"
 #: model:ir.actions.act_window,name:base.action_partner_title
 #: model:ir.ui.menu,name:base.menu_partner_title
 msgid "Titles"
-msgstr ""
+msgstr "Titres"
 
 #. module: base
 #: wizard_view:module.upgrade,start:0
@@ -3440,7 +3444,7 @@ msgstr "pdf"
 #. module: base
 #: field:ir.actions.todo,start_date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Date de Début"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_address_form
@@ -3468,12 +3472,14 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_11
 msgid "Textile Suppliers"
-msgstr ""
+msgstr "Fournisseurs de Textile"
 
 #. module: base
 #: view:wizard.module.lang.export:0
 msgid "The official translations pack of all OpenERP/OpenObjects module are managed through launchpad. We use their online interface to synchronize all translations efforts."
 msgstr ""
+"Les paquets de traductions officiels de tous les module Open ERP/Open Objets sont gérés "
+"par Launchpad. Nous utilisons l'interface en ligne pour synchronizer tous les efforts de Traduction."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.grant_menu_access
@@ -3495,7 +3501,7 @@ msgstr "Nouvelle fenêtre"
 #. module: base
 #: help:res.partner,customer:0
 msgid "Check this box if the partner if a customer."
-msgstr ""
+msgstr "Cochez cette case si le partenaire est un client."
 
 #. module: base
 #, python-format
@@ -3532,7 +3538,7 @@ msgstr "Nombre de modules mis à jour"
 #. module: base
 #: view:ir.actions.configuration.wizard:0
 msgid "Skip Step"
-msgstr ""
+msgstr "Passer cette étape"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_res_partner_event
@@ -3568,12 +3574,12 @@ msgstr "Évènements Actifs des Partenaires"
 #, python-format
 #: code:osv/orm.py:0
 msgid "Error occured while validating the field(s) %s: %s"
-msgstr ""
+msgstr "Une erreur est survenue pendant la validation du(des) champ(s) %s: %s"
 
 #. module: base
 #: view:res.users:0
 msgid "Define New Users"
-msgstr ""
+msgstr "Définir de Nouveaux Utilisateurs"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_rule
@@ -3649,7 +3655,7 @@ msgstr "Actif"
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Menus"
-msgstr ""
+msgstr "Menus Créés"
 
 #. module: base
 #: field:ir.ui.view.custom,ref_id:0
@@ -3810,7 +3816,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.todo,state:0
 msgid "Done"
-msgstr ""
+msgstr "Terminé"
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -3886,7 +3892,7 @@ msgstr "Module :"
 #. module: base
 #: field:ir.actions.configuration.wizard,name:0
 msgid "Next Wizard"
-msgstr ""
+msgstr "Assistant Suivant"
 
 #. module: base
 #: selection:ir.rule,operator:0
@@ -3909,7 +3915,7 @@ msgstr "<="
 #. module: base
 #: view:wizard.module.lang.export:0
 msgid "Export Data"
-msgstr ""
+msgstr "Exporter les Données"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -3949,7 +3955,7 @@ msgstr "Champ Enfant"
 #. module: base
 #: view:wizard.module.lang.export:0
 msgid "https://translations.launchpad.net/openobject"
-msgstr ""
+msgstr "https://translations.launchpad.net/openobject"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3986,7 +3992,7 @@ msgstr "Autres Actions"
 #: model:ir.actions.wizard,name:base.wizard_server_action_create
 #: view:ir.actions.server:0
 msgid "Create Action"
-msgstr ""
+msgstr "Créer l'Action"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_workitem
@@ -4062,7 +4068,7 @@ msgstr "Menu fils"
 #. module: base
 #: field:ir.actions.todo,end_date:0
 msgid "End Date"
-msgstr ""
+msgstr "Date de Fin"
 
 #. module: base
 #: field:ir.exports,resource:0
@@ -4275,7 +4281,7 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Service"
-msgstr ""
+msgstr "Service"
 
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
@@ -4290,7 +4296,7 @@ msgstr "Fichier"
 #. module: base
 #: field:ir.model,access_ids:0
 msgid "Access"
-msgstr ""
+msgstr "Accès"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4327,7 +4333,7 @@ msgstr "Fax"
 #. module: base
 #: view:res.users:0
 msgid "Groups are used to defined access rights on each screen and menu."
-msgstr ""
+msgstr "Les Groupes sont utilisés pour définir les droits d'accès sur chaque écran et menu."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_workitem_form
@@ -4343,8 +4349,8 @@ msgstr ""
 #. module: base
 #, python-format
 #: code:report/custom.py:0
-msgid "The sum of the data (2nd field) is null.\nWe can draw a pie chart !"
-msgstr ""
+msgid "The sum of the data (2nd field) is null.\nWe can't draw a pie chart !"
+msgstr "La somme des données (2ème champ) est nulle.\nImpossible de générer un Graphique en Camembert"
 
 #. module: base
 #: field:ir.default,company_id:0
@@ -4447,7 +4453,7 @@ msgstr "Ou"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
 msgid "Openstuff.net"
-msgstr ""
+msgstr "Openstuff.net"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule_group
@@ -4596,7 +4602,7 @@ msgstr "Imprimé:"
 #, python-format
 #: code:addons/base/module/module.py:0
 msgid "Can not upgrade module '%s'. It is not installed."
-msgstr ""
+msgstr "Impossoble de mettre à jour le module '%s'. Il n'est pas installé."
 
 #. module: base
 #, python-format
@@ -4701,7 +4707,7 @@ msgstr "Le Champ %d doit être une image"
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Gantt"
-msgstr ""
+msgstr "Gantt"
 
 #. module: base
 #, python-format
@@ -4728,7 +4734,7 @@ msgstr "Type de compte bancaire"
 #. module: base
 #: view:ir.actions.configuration.wizard:0
 msgid "Next Configuration Step"
-msgstr ""
+msgstr "Prochaine Étape de la Configuration"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4766,6 +4772,8 @@ msgstr "Description courte"
 #: help:ir.actions.report.xml,attachment:0
 msgid "This is the prefix of the file name the print will be saved as attachement. Keep empty to not save the printed reports"
 msgstr ""
+"C'est le préfixe du nom du fichier sous lequel l'impression sera sauvegardée "
+"en pièce jointe. Laisser vide pour ne pas Sauvegarder les rapports imprimés."
 
 #. module: base
 #: field:res.country.state,name:0
@@ -4814,6 +4822,9 @@ msgstr ""
 #: view:wizard.module.lang.export:0
 msgid "To improve some terms of the official translations of OpenERP, you should modify the terms directly on the launchpad interface. If you made lots of translations for your own module, you can also publish all your translation at once."
 msgstr ""
+"Pour améliorer certains termes de la traduction officielle d'Open ERP, vous devez "
+"modifier les termes directement dans l'interface de Launchpad. Si vous avez effectué "
+"beaucoup de traductions pour votre module, vous pouvez aussi publier toutes les traductions en une fois."
 
 #. module: base
 #: view:res.users:0
@@ -4878,7 +4889,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2
 msgid "OpenERP Partners"
-msgstr ""
+msgstr "Partenaires OpenERP"
 
 #. module: base
 #: view:res.config.view:0
@@ -4899,7 +4910,7 @@ msgstr "Actions Serveur"
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-3"
-msgstr ""
+msgstr "GPL-3"
 
 #. module: base
 #: view:ir.sequence:0
@@ -4918,7 +4929,7 @@ msgstr "Nom de l'Action"
 #. module: base
 #: field:ir.actions.configuration.wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progression de la Configuration"
 
 #. module: base
 #: field:res.company,rml_footer2:0
@@ -4992,7 +5003,7 @@ msgstr "Importer un Fichier de Traduction"
 #, python-format
 #: code:addons/base/ir/ir_actions.py:0
 msgid "Please specify the Partner Email address !"
-msgstr ""
+msgstr "Veuillez spécifier l'adresse E-mail du Partenaire !"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_title_partner
@@ -5198,7 +5209,7 @@ msgstr "Commencer la Mise à Jour"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
 msgid "Important customers"
-msgstr ""
+msgstr "Client Important"
 
 #. module: base
 #: field:res.partner.som,factor:0
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 7a479344e18..8e601589f60 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -164,21 +164,16 @@ class act_window(osv.osv):
         res={}
         for act in self.browse(cr, uid, ids):
             res[act.id]=[(view.view_id.id, view.view_mode) for view in act.view_ids]
-            if (not act.view_ids):
-                modes = act.view_mode.split(',')
+            modes = act.view_mode.split(',')
+            if len(modes)>len(act.view_ids):
                 find = False
                 if act.view_id:
                     res[act.id].append((act.view_id.id, act.view_id.type))
-                for t in modes:
+                for t in modes[len(act.view_ids):]:
                     if act.view_id and (t == act.view_id.type) and not find:
                         find = True
                         continue
                     res[act.id].append((False, t))
-
-                if 'calendar' not in modes:
-                    mobj = self.pool.get(act.res_model)
-                    if hasattr(mobj, '_date_name') and mobj._date_name in mobj._columns:
-                        res[act.id].append((False, 'calendar'))
         return res
 
     _columns = {
diff --git a/bin/addons/base/module/module_wizard.xml b/bin/addons/base/module/module_wizard.xml
index 737a3bb60e8..ff8f51bef6d 100644
--- a/bin/addons/base/module/module_wizard.xml
+++ b/bin/addons/base/module/module_wizard.xml
@@ -17,7 +17,7 @@
         <menuitem action="wizard_upgrade" id="menu_wizard_upgrade" parent="menu_management" type="wizard"/>
         
         <record id="wizard_lang_install" model="ir.actions.wizard">
-            <field name="name">Reload an Official Translation</field>
+            <field name="name">Load an Official Translation</field>
             <field name="wiz_name">module.lang.install</field>
         </record>
         <menuitem action="wizard_lang_install" id="menu_wizard_lang_install" parent="menu_translation" type="wizard"/>
diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index f5a7bf5a3bb..09cce57c49c 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -269,7 +269,7 @@ class res_partner_address(osv.osv):
     _name = 'res.partner.address'
     _order = 'id'
     _columns = {
-        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=True, help="Keep empty for a private address, not related to partner."),
+        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null', select=True, help="Keep empty for a private address, not related to partner."),
         'type': fields.selection( [ ('default','Default'),('invoice','Invoice'), ('delivery','Delivery'), ('contact','Contact'), ('other','Other') ],'Address Type', help="Used to select automatically the right address according to the context in sales and purchases documents."),
         'function': fields.many2one('res.partner.function', 'Function'),
         'title': fields.selection(_contact_title_get, 'Title', size=32),
diff --git a/bin/report/custom.py b/bin/report/custom.py
index e8276fa0d4f..1826b37096f 100644
--- a/bin/report/custom.py
+++ b/bin/report/custom.py
@@ -28,6 +28,7 @@ import print_xml
 import render
 from interface import report_int
 import common
+from osv.osv import except_osv
 from osv.orm import browse_null
 from osv.orm import browse_record_list
 import pooler
@@ -564,7 +565,7 @@ class report_custom(report_int):
         colors = map(lambda x:fill_style.Plain(bgcolor=x), misc.choice_colors(len(results)))
 
         if reduce(lambda x,y : x+y, map(lambda x : x[1],results)) == 0.0:
-            raise(_('The sum of the data (2nd field) is null.\nWe can draw a pie chart !'))
+            raise except_osv('Error', _("The sum of the data (2nd field) is null.\nWe can't draw a pie chart !"))
 
         plot = pie_plot.T(data=results, arc_offsets=[0,10,0,10],
                           shadow = (2, -2, fill_style.gray50),