diff --git a/bin/i18n/fr_FR.csv b/bin/i18n/fr_FR.csv
index f3a277d6791..e29c5e1dda8 100644
--- a/bin/i18n/fr_FR.csv
+++ b/bin/i18n/fr_FR.csv
@@ -365,7 +365,7 @@
 "view","sale.order",0,"Cancel Order","Annuler"
 "view","ir.module.module",0,"Cancel Uninstall","Annuler la désinstallation"
 "view","ir.module.module",0,"Cancel Upgrade","Annuler la mise à jour"
-"field","ir.model.access,perm_unlink",0,"Delete Permission","Annuler la permission"
+"field","ir.model.access,perm_unlink",0,"Delete Permission","Droit a la suppression"
 "model","ir.actions.wizard,name","account.wizard_invoice_state_cancel","Cancel selected invoices","Annuler les factures sélectionnées"
 "wizard_field","res.partner.sms_send,init,app_id",0,"API ID","API ID"
 "field","crm.case.rule,act_method",0,"Call Object Method","Appeler la méthode objet"
@@ -1705,7 +1705,7 @@
 "view","ir.rule.group",0,"Record rules","Entrer des règles "
 "selection","stock.picking,type",0,"Sending Goods","Envoi de marchandises"
 "wizard_view","res.partner.sms_send,init",0,"Bulk SMS send","Envoi de SMS"
-"selection","sale.order,order_policy",0,"Shipping & Manual Invoice","Envoi et facture manuelle"
+"selection","sale.order,order_policy",0,"Shipping & Manual Invoice","Livraison et facture manuelle"
 "view","res.request",0,"Send","Envoyer"
 "model","ir.actions.act_window,name","stock.action_picking_tree","Sending Goods","Envoyer des marchandises"
 "wizard_field","account_followup.followup.print.all,init,email_conf",0,"Send email confirmation","Envoyer email de confirmation"
@@ -4920,7 +4920,7 @@ a negative number indicates that the function will always be called","Le nombre
 "wizard_view","account.move.line.unreconcile,init",0,"If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable","Si vous déreconciliez des transactions, vous devez aussi vérifier toutes les actions qui sont liées à ces transactions car elles ne seront pas déactivées"
 "model","ir.ui.menu,name","base.menu_wizard_module_import","Import New Module","Importer un nouveau module"
 "model","ir.ui.menu,name","base.menu_wizard_lang_export","Export Language","Exporter la langue"
-"model","ir.ui.menu,name","base.menu_wizard_lang_import","Import Language","Impoter la langue"
+"model","ir.ui.menu,name","base.menu_wizard_lang_import","Import Language","Importer la langue"
 "field","report_timesheet.invoice,amount_invoice",0,"To invoice","A facturer"
 "wizard_button","stock.picking.make,init,make",0,"Ok","Ok"
 "help","ir.module.repository,filter",0,"Regexp to search module on the repository webpage:
@@ -5309,7 +5309,7 @@ a negative number indicates that the function will always be called","Le nombre
 "selection","project.project,state",0,"Cancelled","Annulé"
 "selection","project.project,state",0,"Pending","En attente"
 "selection","project.project,state",0,"Open","Ouvert"
-"selection","sale.order,order_policy",0,"Invoice from the packings","Facture des colis"
+"selection","sale.order,order_policy",0,"Invoice from the packings","Facturation sur base des livraisons"
 "field","res.currency,rate_ids",0,"Rates","Taux"
 "help","ir.actions.act_window,limit",0,"Default limit for the list view","Limite par défaut pour la vue liste"
 "help","ir.actions.report.xml,multi",0,"If set to true, the action will not be displayed on the right toolbar of a form views.","Si positionné à true, l'action ne sera pas affichée sur la barre d'outils de droite d'une vue formulaire."
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index ce39bba8617..c761c256275 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -393,6 +393,15 @@ class orm(object):
 									cr.execute("UPDATE \"%s\" SET \"%s\"=NULL" % (self._table, k))
 								else:
 									cr.execute("UPDATE \"%s\" SET \"%s\"='%s'" % (self._table, k, default))
+							if isinstance(f,fields.function):
+								cr.execute('select id from '+self._table)
+								ids_lst = map(lambda x: x[0], cr.fetchall())
+								while ids_lst:
+									iids = ids_lst[:40]
+									ids_lst = ids_lst[40:]
+									res = f.get(cr, self, iids, k, 1, {})
+									for r in res.items():
+										cr.execute("UPDATE \"%s\" SET \"%s\"='%s' where id=%d"% (self._table, k, r[1],r[0]))
 
 							# and add constraints if needed
 							if isinstance(f, fields.many2one):